From e80c20d2584e17b43dd456bbb4b3dc0f8c11eeb4 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 15 Oct 2014 17:55:20 -0700 Subject: Don't recognise hashtags starting with #, e.g. ### --- include/text.php | 4 ++-- version.inc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/text.php b/include/text.php index 0e38de2d2..fca23ca22 100644 --- a/include/text.php +++ b/include/text.php @@ -619,8 +619,8 @@ function get_tags($s) { } if(substr($mtch,-1,1) === '.') $mtch = substr($mtch,0,-1); - // ignore strictly numeric tags like #1 - if((strpos($mtch,'#') === 0) && ( ctype_digit(substr($mtch,1)) || substr($mtch,1,1) === '^')) + // ignore strictly numeric tags like #1 or #^ bookmarks or ## double hash + if((strpos($mtch,'#') === 0) && ( ctype_digit(substr($mtch,1)) || substr($mtch,1,1) === '^') || substr($mtch,1,1) === '#') continue; // try not to catch url fragments if(strpos($s,$mtch) && preg_match('/[a-zA-z0-9\/]/',substr($s,strpos($s,$mtch)-1,1))) diff --git a/version.inc b/version.inc index 1984d7bf1..ccf12f9fc 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2014-10-14.828 +2014-10-15.829 -- cgit v1.2.3 From 11ad127c68216734c406c393a361f2231e3a5a15 Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Thu, 16 Oct 2014 01:57:04 +0100 Subject: Let's not play security expert. Use Mozillas recommended server config, even if it's ridiculously verbose. Reasoning - they make the browser, so if they've got it wrong, you're buggered anyway. --- doc/install/sample-nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/install/sample-nginx.conf b/doc/install/sample-nginx.conf index dd3b63d3b..f533d8ee0 100644 --- a/doc/install/sample-nginx.conf +++ b/doc/install/sample-nginx.conf @@ -56,7 +56,7 @@ server { ssl_certificate_key /etc/nginx/ssl/example.net.key; ssl_session_timeout 5m; ssl_protocols TLSv1 TLSv1.1 TLSv1.2; - ssl_ciphers ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv3:+EXP; + ssl_ciphers ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA:AES256-SHA:AES:CAMELLIA:DES-CBC3-SHA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!PSK:!aECDH:!EDH-DSS-DES-CBC3-SHA:!EDH-RSA-DES-CBC3-SHA:!KRB5-DES-CBC3-SHA; ssl_prefer_server_ciphers on; fastcgi_param HTTPS on; -- cgit v1.2.3 From ae9e1fa688c90e128637b5c44cf4705287f6cfa1 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 15 Oct 2014 18:35:56 -0700 Subject: missing event permissions --- include/acl_selectors.php | 3 ++- mod/events.php | 1 + view/tpl/event_form.tpl | 3 ++- view/tpl/event_head.tpl | 4 ++-- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/include/acl_selectors.php b/include/acl_selectors.php index 0b68ba227..3cdbd411c 100644 --- a/include/acl_selectors.php +++ b/include/acl_selectors.php @@ -248,7 +248,8 @@ function populate_acl($defaults = null,$show_jotnets = true) { '$aclModalTitle' => t('Permissions'), '$aclModalDismiss' => t('Close') )); - + + logger($o); return $o; diff --git a/mod/events.php b/mod/events.php index c80d1dd39..d24f84d44 100755 --- a/mod/events.php +++ b/mod/events.php @@ -582,6 +582,7 @@ function events_content(&$a) { '$t_orig' => $t_orig, '$sh_text' => t('Share this event'), '$sh_checked' => $sh_checked, + '$permissions' => t('Permissions'), '$acl' => (($orig_event['event_xchan']) ? '' : populate_acl(((x($orig_event)) ? $orig_event : $perm_defaults),false)), '$submit' => t('Submit') diff --git a/view/tpl/event_form.tpl b/view/tpl/event_form.tpl index 2a580e3b8..d91e44458 100755 --- a/view/tpl/event_form.tpl +++ b/view/tpl/event_form.tpl @@ -66,7 +66,8 @@
{{$sh_text}}
-{{$acl}} + + {{$acl}}
diff --git a/view/tpl/event_head.tpl b/view/tpl/event_head.tpl index 8388187d1..6f1d2f22c 100755 --- a/view/tpl/event_head.tpl +++ b/view/tpl/event_head.tpl @@ -115,10 +115,10 @@ $('#event-share-checkbox').change(function() { if ($('#event-share-checkbox').is(':checked')) { - $('#acl-wrapper').show(); + $('#event-permissions-button').show(); } else { - $('#acl-wrapper').hide(); + $('#event-permissions-button').hide(); } }).trigger('change'); -- cgit v1.2.3 From 4cbe69685965eaa8900d927a55487599b4683b2e Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 15 Oct 2014 18:36:36 -0700 Subject: remove log statement --- include/acl_selectors.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/include/acl_selectors.php b/include/acl_selectors.php index 3cdbd411c..5adafff2c 100644 --- a/include/acl_selectors.php +++ b/include/acl_selectors.php @@ -249,8 +249,6 @@ function populate_acl($defaults = null,$show_jotnets = true) { '$aclModalDismiss' => t('Close') )); - logger($o); - return $o; } -- cgit v1.2.3 From e1f88fd15d75f81af5017860b9f197771326c9b7 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 16 Oct 2014 02:02:11 -0700 Subject: jsonp support (thankxs fabrixxm) --- include/api.php | 5 ++++- include/taxonomy.php | 2 +- version.inc | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/include/api.php b/include/api.php index 2505def4c..8b52253dd 100644 --- a/include/api.php +++ b/include/api.php @@ -197,7 +197,10 @@ require_once('include/items.php'); case "json": header ("Content-Type: application/json"); foreach($r as $rr) - return json_encode($rr); + $json = json_encode($rr); + if ($_GET['callback']) + $json = $_GET['callback']."(".$json.")"; + return $json; break; case "rss": header ("Content-Type: application/rss+xml"); diff --git a/include/taxonomy.php b/include/taxonomy.php index 92003328f..35605da22 100644 --- a/include/taxonomy.php +++ b/include/taxonomy.php @@ -154,7 +154,7 @@ function tagadelic($uid, $count = 0, $authors = '', $flags = 0, $restrict = 0, $ } function tags_sort($a,$b) { - if($a[0] == $b[0]) + if(strtolower($a[0]) == strtolower($b[0])) return 0; return((strtolower($a[0]) < strtolower($b[0])) ? -1 : 1); } diff --git a/version.inc b/version.inc index ccf12f9fc..ab083bbd8 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2014-10-15.829 +2014-10-16.830 -- cgit v1.2.3 From 6867a8a7f6060c82cba3a34cd944a3737e8e263e Mon Sep 17 00:00:00 2001 From: Stefan Parviainen Date: Thu, 16 Oct 2014 17:21:37 +0200 Subject: Login menu --- include/nav.php | 11 +++++------ view/tpl/nav.tpl | 15 ++++++++------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/include/nav.php b/include/nav.php index 4f7d609aa..ba817648b 100644 --- a/include/nav.php +++ b/include/nav.php @@ -84,6 +84,7 @@ EOT; $nav['usermenu']=array(); $userinfo = null; + $nav['loginmenu']=array(); if(local_user()) { @@ -120,8 +121,9 @@ EOT; $nav['usermenu'][] = Array('webpages/' . $channel['channel_address'],t('Webpages'),"",t('Your webpages')); } else { - if(! get_account_id()) - $nav['login'] = Array('login',t('Login'), ($a->module == 'login'?'selected':''), t('Sign in')); + if(! get_account_id()) { + $nav['loginmenu'][] = Array('login',t('Login'),'',t('Sign in')); + } else $nav['alogout'] = Array('logout',t('Logout'), "", t('End this session')); @@ -136,14 +138,11 @@ EOT; } if($observer) { - $nav['locked'] = true; $nav['lock'] = array('logout','','lock', sprintf( t('%s - click to logout'), $observer['xchan_addr'])); } else { - $nav['locked'] = false; - $nav['lock'] = array('rmagic','','unlock', - t('Click to authenticate to your home hub')); + $nav['loginmenu'][] = Array('rmagic',t('Remote login'),'',t('Click to authenticate to your home hub')); } /** diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index 6c461f062..ac6cb1a9c 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -48,14 +48,15 @@
- {{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}} + {{if $item.verified}} {{elseif $item.forged}} {{/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 6719f2e75..fe683b91a 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.editedtime}} {{/if}} {{if $item.app}}{{$item.str_app}}{{/if}} + {{if $item.verified}} {{elseif $item.forged}} {{/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 fd48d4d81d878928fe6821d3808eb578cb5088b4 Mon Sep 17 00:00:00 2001 From: marijus Date: Fri, 17 Oct 2014 14:28:21 +0200 Subject: make lockview for photos work --- mod/photos.php | 4 ++-- view/tpl/photo_view.tpl | 16 +++++++++++++--- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/mod/photos.php b/mod/photos.php index 2b859b7f1..85bd47399 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -956,7 +956,7 @@ function photos_content(&$a) { $edit = array( 'edit' => t('Edit photo'), - 'id' => $ph[0]['id'], + 'id' => print_r($ph[0]), //['id'], 'rotatecw' => t('Rotate CW (right)'), 'rotateccw' => t('Rotate CCW (left)'), 'albums' => $albums['albums'], @@ -1114,7 +1114,7 @@ function photos_content(&$a) { $photo_tpl = get_markup_template('photo_view.tpl'); $o .= replace_macros($photo_tpl, array( - '$id' => $ph[0]['id'], + '$id' => $link_item['id'], //$ph[0]['id'], '$album' => $album_e, '$tools' => $tools, '$lock' => $lock, diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl index 4a9c0dfe8..4961464dc 100755 --- a/view/tpl/photo_view.tpl +++ b/view/tpl/photo_view.tpl @@ -3,11 +3,21 @@

{{$album.1}}

-- cgit v1.2.3 From 7c4f55af9f8e28a761155eaf6d0d379b28d88f23 Mon Sep 17 00:00:00 2001 From: Stefan Parviainen Date: Sat, 18 Oct 2014 22:17:49 +0200 Subject: Oops, forgot one file --- include/datetime.php | 158 +++++++++++++++++++++++++++------------------------ 1 file changed, 85 insertions(+), 73 deletions(-) diff --git a/include/datetime.php b/include/datetime.php index 84ab1e2fa..3d0ae0404 100644 --- a/include/datetime.php +++ b/include/datetime.php @@ -134,7 +134,7 @@ function dob($dob) { $f = get_config('system','birthday_input_format'); if(! $f) $f = 'ymd'; - $o = datesel($f,'',1920,$y,true,$year,$month,$day); + $o = datesel($f,'dob',1920,$y,true,$year,$month,$day); return $o; } @@ -169,95 +169,107 @@ function datesel_format($f) { return $o; } +/** + * returns a date selector + * @param $format + * format string, e.g. 'ymd' or 'mdy'. Not currently supported + * @param $id + * id and name of datetimepicker (defaults to "datepicker") + * @param $ymin + * first year shown in selector dropdown + * @param $ymax + * last year shown in selector dropdown + * @param $allow_blank + * allow an empty response on any field. Not currently supported + * @param $y + * already selected year + * @param $m + * already selected month + * @param $d + * already selected day + */ +function datesel($format, $id, $ymin, $ymax, $allow_blank, $y, $m, $d) { + if($ymin > $ymax) list($ymin,$ymax) = array($ymax,$ymin); -// returns a date selector. -// $f = format string, e.g. 'ymd' or 'mdy' -// $pre = prefix (if needed) for HTML name and class fields -// $ymin = first year shown in selector dropdown -// $ymax = last year shown in selector dropdown -// $allow_blank = allow an empty response on any field -// $y = already selected year -// $m = already selected month -// $d = already selected day - - -function datesel($f,$pre,$ymin,$ymax,$allow_blank,$y,$m,$d) { + if($id == '') $id = 'datepicker'; $o = ''; - if(strlen($f)) { - for($z = 0; $z < strlen($f); $z ++) { - if($f[$z] === 'y') { - - $o .= " "; + $o .= "
"; + $o .= ""; return $o; } +/** + * returns a date selector + * @param $format + * format string, e.g. 'ymd' or 'mdy'. Not currently supported + * @param $id + * id and name of datetimepicker (defaults to "timepicker") + * @param $h + * already selected hour + * @param $m + * already selected minute + */ +function timesel($format,$id,$h,$m) { + if($id == '') $id = 'timepicker'; -function timesel($pre,$h,$m) { + $timeformat = 'HH:mm'; $o = ''; - $o .= " : "; + $o .= "
"; + $o .= ""; return $o; } +/** + * returns a datetime selector + * @param $format + * format string, e.g. 'ymd' or 'mdy'. Not currently supported + * @param $id + * id and name of datetimepicker (defaults to "datetimepicker") + * @param $ymin + * first year shown in selector dropdown + * @param $ymax + * last year shown in selector dropdown + * @param $allow_blank + * allow an empty response on any field. Not currently supported + * @param $y + * already selected year + * @param $m + * already selected month + * @param $d + * already selected day + * @param $h + * already selected hour + * @param $min + * already selected minute + */ +function datetimesel($format, $id, $ymin, $ymax, $allow_blank, $y, $m, $d, $h, $min) { + if($ymin > $ymax) list($ymin,$ymax) = array($ymax,$ymin); + if($id == '') $id = 'datetimepicker'; + $o = ''; + $dateformat = 'YYYY-MM-DD HH:mm'; + $mindate = $ymin ? "new Date($ymin,1,1)" : ''; + $maxdate = $ymin ? "new Date($ymax,11,31)" : ''; + + $defaultDate = ($y != 0 && $m != 0 && $d != 0) ? ", defaultDate: new Date($y, $m, $d, $h, $min)" : ''; - - + $o .= "
"; + $o .= ""; + return $o; +} // implements "3 seconds ago" etc. // based on $posted_date, (UTC). @@ -516,4 +528,4 @@ function update_birthdays() { } } } -} \ No newline at end of file +} -- cgit v1.2.3 From d9817779fbeaebf4b75c0670da7013bf4482b72b Mon Sep 17 00:00:00 2001 From: Stefan Parviainen Date: Sun, 19 Oct 2014 08:33:18 +0200 Subject: Give an error if event is supposed to end before it starts. Closes friendica/red#534 --- mod/events.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mod/events.php b/mod/events.php index 337852170..e5ae7c662 100755 --- a/mod/events.php +++ b/mod/events.php @@ -67,8 +67,10 @@ function events_post(&$a) { // and we'll waste a bunch of time responding to it. Time that // could've been spent doing something else. - if(strcmp($finish,$start) < 0) - $finish = $start; + if(strcmp($finish,$start) < 0) { + notice( t('Event can not end before it has started.') . EOL); + goaway($a->get_baseurl() . '/events/new'); + } $summary = escape_tags(trim($_POST['summary'])); $desc = escape_tags(trim($_POST['desc'])); -- cgit v1.2.3 From 519ef4850021c929764f1175a9aae569d1ae36a6 Mon Sep 17 00:00:00 2001 From: Stefan Parviainen Date: Sun, 19 Oct 2014 10:47:42 +0200 Subject: Changes in the datetimesel api, prevent user from picking event end date earlier than start date --- include/datetime.php | 121 ++++++++++++++++++++++----------------------------- mod/events.php | 4 +- 2 files changed, 53 insertions(+), 72 deletions(-) diff --git a/include/datetime.php b/include/datetime.php index 3d0ae0404..76c3ddb25 100644 --- a/include/datetime.php +++ b/include/datetime.php @@ -130,11 +130,12 @@ function datetime_convert($from = 'UTC', $to = 'UTC', $s = 'now', $fmt = "Y-m-d function dob($dob) { list($year,$month,$day) = sscanf($dob,'%4d-%2d-%2d'); - $y = datetime_convert('UTC',date_default_timezone_get(),'now','Y'); $f = get_config('system','birthday_input_format'); if(! $f) $f = 'ymd'; - $o = datesel($f,'dob',1920,$y,true,$year,$month,$day); + + $o = datesel($f,mktime(0,0,0,0,0,1900),mktime(),mktime(0,0,0,$month,$day,$year),'dob'); + return $o; } @@ -173,101 +174,81 @@ function datesel_format($f) { * returns a date selector * @param $format * format string, e.g. 'ymd' or 'mdy'. Not currently supported + * @param $min + * unix timestamp of minimum date + * @param $max + * unix timestap of maximum date + * @param $default + * unix timestamp of default date * @param $id - * id and name of datetimepicker (defaults to "datepicker") - * @param $ymin - * first year shown in selector dropdown - * @param $ymax - * last year shown in selector dropdown - * @param $allow_blank - * allow an empty response on any field. Not currently supported - * @param $y - * already selected year - * @param $m - * already selected month - * @param $d - * already selected day + * id and name of datetimepicker (defaults to "datetimepicker") */ -function datesel($format, $id, $ymin, $ymax, $allow_blank, $y, $m, $d) { - if($ymin > $ymax) list($ymin,$ymax) = array($ymax,$ymin); - - if($id == '') $id = 'datepicker'; - - $o = ''; - - $dateformat = 'YYYY-MM-DD'; - $mindate = $ymin ? "new Date($ymin,1,1)" : ''; - $maxdate = $ymin ? "new Date($ymax,11,31)" : ''; // Yes, JS months really go from 0 to 11. - - $m = $m -1; // Because JavaScript month weirdness - - $defaultDate = ($y != 0 && $m != 0 && $d != 0) ? ", defaultDate: new Date($y,$m,$d)" : ''; - - $o .= "
"; - $o .= ""; - return $o; +function datesel($format, $min, $max, $default,$id = 'datepicker') { + return datetimesel($format,$min,$max,$default,$id,true,false); } /** * returns a date selector * @param $format * format string, e.g. 'ymd' or 'mdy'. Not currently supported - * @param $id - * id and name of datetimepicker (defaults to "timepicker") * @param $h * already selected hour * @param $m * already selected minute + * @param $id + * id and name of datetimepicker (defaults to "timepicker") */ -function timesel($format,$id,$h,$m) { - if($id == '') $id = 'timepicker'; - - $timeformat = 'HH:mm'; - - $o = ''; - $o .= "
"; - $o .= ""; - return $o; +function timesel($format,$h,$m,$id='timepicker') { + return datetimesel($format,mktime(),mktime(),mktime($h,$m),$id,false,true); } /** * returns a datetime selector * @param $format * format string, e.g. 'ymd' or 'mdy'. Not currently supported + * @param $min + * unix timestamp of minimum date + * @param $max + * unix timestap of maximum date + * @param $default + * unix timestamp of default date * @param $id * id and name of datetimepicker (defaults to "datetimepicker") - * @param $ymin - * first year shown in selector dropdown - * @param $ymax - * last year shown in selector dropdown - * @param $allow_blank - * allow an empty response on any field. Not currently supported - * @param $y - * already selected year - * @param $m - * already selected month - * @param $d - * already selected day - * @param $h - * already selected hour - * @param $min - * already selected minute + * @param $pickdate + * true to show date picker (default) + * @param $picktime + * true to show time picker (default) + * @param $minfrom + * set minimum date from picker with id $minfrom (none by default) + * @param $maxfrom + * set maximum date from picker with id $maxfrom (none by default) */ -function datetimesel($format, $id, $ymin, $ymax, $allow_blank, $y, $m, $d, $h, $min) { - if($ymin > $ymax) list($ymin,$ymax) = array($ymax,$ymin); - - if($id == '') $id = 'datetimepicker'; - +function datetimesel($format, $min, $max, $default, $id = 'datetimepicker', $pickdate = true, $picktime = true, $minfrom = '', $maxfrom = '') { $o = ''; - $dateformat = 'YYYY-MM-DD HH:mm'; - $mindate = $ymin ? "new Date($ymin,1,1)" : ''; - $maxdate = $ymin ? "new Date($ymax,11,31)" : ''; + $dateformat = ''; + if($pickdate) $dateformat .= 'YYYY-MM-DD'; + if($pickdate && $picktime) $dateformat .= ' '; + if($picktime) $dateformat .= 'HH:mm'; + + $mindate = $min ? "new Date($min*1000)" : ''; + $maxdate = $max ? "new Date($max*1000)" : ''; - $defaultDate = ($y != 0 && $m != 0 && $d != 0) ? ", defaultDate: new Date($y, $m, $d, $h, $min)" : ''; + $defaultDate = $default ? ", defaultDate: new Date($default*1000)" : ''; + + $pickers = ''; + if(!$pickdate) $pickers .= 'pickDate: false,'; + if(!$picktime) $pickers .= 'pickTime: false,'; + + $extra_js = ''; + if($minfrom != '') + $extra_js .= "\$('#$minfrom').on('dp.change',function (e) { \$('#$id').data('DateTimePicker').setMinDate(e.date); });"; + + if($maxfrom != '') + $extra_js .= "\$('#$maxfrom').on('dp.change',function (e) { \$('#$id').data('DateTimePicker').setMaxDate(e.date); });"; $o .= "
"; - $o .= ""; + $o .= ""; return $o; } diff --git a/mod/events.php b/mod/events.php index e5ae7c662..459ed05bb 100755 --- a/mod/events.php +++ b/mod/events.php @@ -554,11 +554,11 @@ function events_content(&$a) { '$ftext' => $ftext, '$ModalCANCEL' => t('Cancel'), '$ModalOK' => t('OK'), - '$s_dsel' => datetimesel($f,'start_text',$syear+5,$syear,false,$syear,$smonth,$sday,$shour,$sminute), + '$s_dsel' => datetimesel($f,mktime(),mktime(0,0,0,0,0,$syear+5),mktime(),'start_text'), '$n_text' => t('Finish date/time is not known or not relevant'), '$n_checked' => $n_checked, '$f_text' => t('Event Finishes:'), - '$f_dsel' => datetimesel($f,'finish_text',$fyear+5,$fyear,false,$fyear,$fmonth,$fday,$fhour,$fminute), + '$f_dsel' => datetimesel($f,mktime(),mktime(0,0,0,0,0,$fyear+5),mktime(),'finish_text',true,true,'start_text'), '$a_text' => t('Adjust for viewer timezone'), '$a_checked' => $a_checked, '$d_text' => t('Description:'), -- cgit v1.2.3 From a6c4ae186e9e9962ce9ea364a95b49b5e2cbc81d Mon Sep 17 00:00:00 2001 From: Stefan Parviainen Date: Sun, 19 Oct 2014 11:09:51 +0200 Subject: Don't display date format, it's already in the placeholder text --- include/datetime.php | 30 ------------------------------ mod/events.php | 6 ------ mod/profiles.php | 2 +- 3 files changed, 1 insertion(+), 37 deletions(-) diff --git a/include/datetime.php b/include/datetime.php index 76c3ddb25..fe0f29c7a 100644 --- a/include/datetime.php +++ b/include/datetime.php @@ -140,36 +140,6 @@ function dob($dob) { } -function datesel_format($f) { - - $o = ''; - - if(strlen($f)) { - for($x = 0; $x < strlen($f); $x ++) { - switch($f[$x]) { - case 'y': - if(strlen($o)) - $o .= '-'; - $o .= t('year'); - break; - case 'm': - if(strlen($o)) - $o .= '-'; - $o .= t('month'); - break; - case 'd': - if(strlen($o)) - $o .= '-'; - $o .= t('day'); - break; - default: - break; - } - } - } - return $o; -} - /** * returns a date selector * @param $format diff --git a/mod/events.php b/mod/events.php index 459ed05bb..86a2286b2 100755 --- a/mod/events.php +++ b/mod/events.php @@ -520,11 +520,6 @@ function events_content(&$a) { } } - - - $dateformat = datesel_format($f); - $timeformat = t('hour:minute'); - require_once('include/acl_selectors.php'); $perm_defaults = array( @@ -544,7 +539,6 @@ function events_content(&$a) { '$mid' => $mid, '$title' => t('Event details'), - '$format_desc' => sprintf( t('Format is %s %s.'),$dateformat,$timeformat), '$desc' => t('Starting date and Title are required.'), '$catsenabled' => $catsenabled, '$placeholdercategory' => t('Categories (comma-separated list)'), diff --git a/mod/profiles.php b/mod/profiles.php index b23ae5cc5..14f24c5cf 100644 --- a/mod/profiles.php +++ b/mod/profiles.php @@ -626,7 +626,7 @@ logger('extra_fields: ' . print_r($extra_fields,true)); '$lbl_fullname' => t('Your Full Name:'), '$lbl_title' => t('Title/Description:'), '$lbl_gender' => t('Your Gender:'), - '$lbl_bd' => sprintf( t("Birthday \x28%s\x29:"),datesel_format($f)), + '$lbl_bd' => t("Birthday :"), '$lbl_address' => t('Street Address:'), '$lbl_city' => t('Locality/City:'), '$lbl_zip' => t('Postal/Zip Code:'), -- cgit v1.2.3 From fe877b68aafc4afc6f10d16f09976cb9fc4b1dca Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Sun, 19 Oct 2014 17:09:06 +0100 Subject: Seventy five people you won't believe contributed to RedMatrix! --- doc/credits.bb | 77 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) create mode 100644 doc/credits.bb diff --git a/doc/credits.bb b/doc/credits.bb new file mode 100644 index 000000000..264efb11a --- /dev/null +++ b/doc/credits.bb @@ -0,0 +1,77 @@ +[b]Credits[/b] + +Mike Macgirvin +Thomas Willingham +Fabio Comuni +Simon L'nu +marijus +Tobias Diekershoff +fabrixxm +tommy tomson +Simon +zottel +Christian Vogeley +jeroenpraat +Michael Vogel +erik +Zach Prezkuta +Paolo T +Michael Meer +Michael +Abinoam P. Marques Jr +Tobias Hößl +Alexander Kampmann +Olaf Conradi +Paolo Tacconi +tobiasd +Devlon Duthie +Zvi ben Yaakov (a.k.a rdc) +Alexandre Hannud Abdo +Olivier Migeot +Chris Case +Klaus Weidenbach +Michael Johnston +olivierm +Vasudev Kamath +pixelroot +Max Weller +duthied +Martin Schmitt +Sebastian Egbers +Erkan Yilmaz +sasiflo +Stefan Parviainen +Haakon Meland Eriksen +Oliver +Erik Lundin +habeascodice +sirius +23n +Charles +Tony Baldwin +Hauke Zuehl +Keith Fernie +toclimb +Daniel Frank +Matthew Exon +Michal Supler +Tobias Luther +U-SOUND\mike +mrjive +nostupidzone +tonnerkiller +Antoine G +Christian Drechsler +Ludovic Grossard +RedMatrixCanada +Stanislav Lechev [0xAF] +aweiher +bufalo1973 +dsp1986 +felixgilles +ike +maase2 +mycocham +ndurchx +pafcu +Simó Albert i Beltran -- cgit v1.2.3 From 6ee514579f85927e60fa5ebd2b89f97cbfe6544d Mon Sep 17 00:00:00 2001 From: Stefan Parviainen Date: Sun, 19 Oct 2014 21:08:53 +0200 Subject: Move registration button to before login in nav to avoid problems with mobile. In the long run a better fix should be found. --- view/tpl/nav.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index ac6cb1a9c..bc9d0ba37 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -47,6 +47,7 @@
-

Referenced by admin_page_users(), admin_page_users_post(), chanman_remove_everything_from_network(), and removeaccount_post().

+

Referenced by admin_page_users(), admin_page_users_post(), chanman_remove_everything_from_network(), and removeaccount_post().

diff --git a/doc/html/account_8php.html b/doc/html/account_8php.html index 1c7e4d4da..0346796e4 100644 --- a/doc/html/account_8php.html +++ b/doc/html/account_8php.html @@ -410,7 +410,7 @@ Functions
-

Referenced by attach_store(), chatroom_create(), chatroom_enter(), RedDirectory\createFile(), RedMatrix\RedDAV\RedBrowser\generateDirectoryIndex(), RedDirectory\getQuotaInfo(), manage_content(), photo_upload(), photos_content(), poller_run(), process_channel_sync_delivery(), RedFile\put(), and widget_follow().

+

Referenced by attach_store(), chatroom_create(), chatroom_enter(), RedMatrix\RedDAV\RedDirectory\createFile(), RedMatrix\RedDAV\RedBrowser\generateDirectoryIndex(), RedMatrix\RedDAV\RedDirectory\getQuotaInfo(), manage_content(), photo_upload(), photos_content(), poller_run(), process_channel_sync_delivery(), RedMatrix\RedDAV\RedFile\put(), and widget_follow().

diff --git a/doc/html/annotated.html b/doc/html/annotated.html index 95ded2c80..3ec0d40ad 100644 --- a/doc/html/annotated.html +++ b/doc/html/annotated.html @@ -116,32 +116,32 @@ $(document).ready(function(){initNavTree('annotated.html','');}); oNfriendica-to-smarty-tpl oNRedMatrix |\NRedDAV -| \CRedBrowserProvides a DAV frontend for the webbrowser -oNupdatetpl -oNutil -oCApp -oCBaseObject -oCCache -oCConversation -oCdba_driver -oCdba_mysql -oCdba_mysqli -oCenotify -oCFKOAuth1 -oCFKOAuthDataStore -oCFriendicaSmarty -oCFriendicaSmartyEngine -oCItem -oCITemplateEngine -oCphoto_driver -oCphoto_gd -oCphoto_imagick -oCProtoDriver -oCRedBasicAuthAuthentication backend class for RedDAV -oCRedDirectoryRedDirectory class -oCRedFile -oCTemplate -\CZotDriver +| oCRedBasicAuthAuthentication backend class for RedDAV +| oCRedBrowserProvides a DAV frontend for the webbrowser +| oCRedDirectoryRedDirectory class +| \CRedFileThis class represents a file in DAV +oNupdatetpl +oNutil +oCApp +oCBaseObject +oCCache +oCConversation +oCdba_driver +oCdba_mysql +oCdba_mysqli +oCenotify +oCFKOAuth1 +oCFKOAuthDataStore +oCFriendicaSmarty +oCFriendicaSmartyEngine +oCItem +oCITemplateEngine +oCphoto_driver +oCphoto_gd +oCphoto_imagick +oCProtoDriver +oCTemplate +\CZotDriver diff --git a/doc/html/annotated.js b/doc/html/annotated.js index f3572b940..5ab4ca9b5 100644 --- a/doc/html/annotated.js +++ b/doc/html/annotated.js @@ -24,9 +24,6 @@ var annotated = [ "photo_gd", "classphoto__gd.html", "classphoto__gd" ], [ "photo_imagick", "classphoto__imagick.html", "classphoto__imagick" ], [ "ProtoDriver", "classProtoDriver.html", "classProtoDriver" ], - [ "RedBasicAuth", "classRedBasicAuth.html", "classRedBasicAuth" ], - [ "RedDirectory", "classRedDirectory.html", "classRedDirectory" ], - [ "RedFile", "classRedFile.html", "classRedFile" ], [ "Template", "classTemplate.html", "classTemplate" ], [ "ZotDriver", "classZotDriver.html", "classZotDriver" ] ]; \ No newline at end of file diff --git a/doc/html/apw_2php_2style_8php.html b/doc/html/apw_2php_2style_8php.html index c5755a3f6..58c81a57b 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_group_members(), 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(), connedit_content(), construct_page(), consume_feed(), conversation(), RedDirectory\createFile(), photo_gd\cropImage(), photo_imagick\cropImage(), datesel(), datesel_format(), decode_tags(), deliver_run(), diaspora_comment(), diaspora_like(), diaspora_mention_callback(), dir_tagadelic(), directory_content(), directory_run(), dirprofile_init(), discover_by_url(), discover_by_webbie(), display_content(), downgrade_accounts(), editblock_content(), editlayout_content(), editwebpage_content(), 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_diaspora_reshare_xml(), 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_role_perms(), 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(), impel_init(), import_author_diaspora(), import_author_rss(), import_author_unknown(), 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(), notifications_off(), notifications_on(), 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_location_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(), remove_obsolete_hublocs(), rpost_content(), photo_driver\save(), scrape_feed(), scrape_vcard(), search_ac_init(), send_status_notifications(), service_limits_content(), share_init(), share_unshield(), site_default_perms(), smilies(), sources_content(), sslify_init(), photo_driver\store(), store_diaspora_comment_sig(), string_splitter(), stringify_array_elms(), sync_directories(), sync_locations(), tag_deliver(), tagadelic(), tagrm_content(), tagrm_post(), theme_status(), thing_content(), timesel(), toggle_theme(), update_channels_active_halfyear_stat(), update_channels_active_monthly_stat(), 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_encode_locations(), 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_group_members(), 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(), RedMatrix\RedDAV\RedDirectory\childExists(), cloud_init(), common_init(), connedit_content(), construct_page(), consume_feed(), conversation(), RedMatrix\RedDAV\RedDirectory\createFile(), photo_gd\cropImage(), photo_imagick\cropImage(), datesel(), datesel_format(), decode_tags(), deliver_run(), diaspora_comment(), diaspora_like(), diaspora_mention_callback(), dir_tagadelic(), directory_content(), directory_run(), dirprofile_init(), discover_by_url(), discover_by_webbie(), display_content(), downgrade_accounts(), editblock_content(), editlayout_content(), editwebpage_content(), 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(), foofoo(), fsuggest_post(), get_all_perms(), get_diaspora_reshare_xml(), 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_role_perms(), get_system_apps(), get_terms_oftype(), get_theme_uid(), get_things(), RedMatrix\RedDAV\RedDirectory\getChild(), RedMatrix\RedDAV\RedDirectory\getDir(), RedMatrix\RedDAV\RedDirectory\getQuotaInfo(), gprobe_run(), handle_feed(), hcard_init(), hostxrd_init(), ids_to_querystr(), impel_init(), import_author_diaspora(), import_author_rss(), import_author_unknown(), 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(), notifications_off(), notifications_on(), 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_location_delivery(), process_mail_delivery(), profile_init(), profile_load(), profile_photo_post(), prune_hub_reinstalls(), public_recips(), pubrsatome(), RedMatrix\RedDAV\RedFile\put(), dba_mysql\q(), dba_mysqli\q(), randprof_init(), red_item_new(), RedCollectionData(), RedFileData(), remote_online_status(), remove_community_tag(), remove_obsolete_hublocs(), rpost_content(), photo_driver\save(), scrape_feed(), scrape_vcard(), search_ac_init(), send_status_notifications(), service_limits_content(), share_init(), share_unshield(), site_default_perms(), smilies(), sources_content(), sslify_init(), photo_driver\store(), store_diaspora_comment_sig(), string_splitter(), stringify_array_elms(), sync_directories(), sync_locations(), tag_deliver(), tagadelic(), tagrm_content(), tagrm_post(), theme_status(), thing_content(), timesel(), toggle_theme(), update_channels_active_halfyear_stat(), update_channels_active_monthly_stat(), update_directory_entry(), update_imported_item(), upgrade_bool_message(), upgrade_message(), valid_email(), RedMatrix\RedDAV\RedBasicAuth\validateUserPass(), webpages_content(), what_next(), widget_affinity(), widget_bookmarkedchats(), widget_suggestedchats(), widget_suggestions(), xchan_query(), xmlify(), zfinger_init(), zot_build_packet(), zot_encode_locations(), zot_process_response(), zot_refresh(), zot_register_hub(), and zotfeed_init().

diff --git a/doc/html/auth_8php.html b/doc/html/auth_8php.html index 11577f332..6df3cfea4 100644 --- a/doc/html/auth_8php.html +++ b/doc/html/auth_8php.html @@ -174,7 +174,7 @@ Variables
Returns
array|null Returns account record on success, null on failure.

A plugin indicates successful login by setting 'authenticated' to non-zero value and returning a user record Plugins should never set 'authenticated' except to indicate success - as hooks may be chained and later plugins should not interfere with an earlier one that succeeded.

-

Referenced by api_login(), removeaccount_post(), removeme_post(), and RedBasicAuth\validateUserPass().

+

Referenced by api_login(), removeaccount_post(), removeme_post(), and RedMatrix\RedDAV\RedBasicAuth\validateUserPass().

diff --git a/doc/html/bb2diaspora_8php.html b/doc/html/bb2diaspora_8php.html index 198b86169..f485a3595 100644 --- a/doc/html/bb2diaspora_8php.html +++ b/doc/html/bb2diaspora_8php.html @@ -134,8 +134,8 @@ Functions    bb2diaspora_itemwallwall (&$item)   - bb2diaspora_itembody ($item) -  + bb2diaspora_itembody ($item, $force_update=false) +   bb2diaspora ($Text, $preserve_nl=false, $fordiaspora=true)    unescape_underscores_in_links ($m) @@ -175,11 +175,11 @@ Functions

Transform #tags, strip off the [url] and replace spaces with underscore

-

Referenced by bb2diaspora_itembody(), diaspora_send_mail(), and format_event_diaspora().

+

Referenced by bb2diaspora_itembody(), diaspora_send_mail(), and format_event_diaspora().

- +
@@ -187,8 +187,18 @@ Functions - + + + + + + + + + + +
bb2diaspora_itembody (  $item)$item,
 $force_update = false 
)
@@ -211,7 +221,7 @@ Functions
-

Referenced by bb2diaspora_itembody().

+

Referenced by bb2diaspora_itembody().

diff --git a/doc/html/bb2diaspora_8php.js b/doc/html/bb2diaspora_8php.js index 9fd7c8e7f..2f70d373c 100644 --- a/doc/html/bb2diaspora_8php.js +++ b/doc/html/bb2diaspora_8php.js @@ -1,7 +1,7 @@ var bb2diaspora_8php = [ [ "bb2diaspora", "bb2diaspora_8php.html#a4f10e0876b27373c762bc1abbe745f5c", null ], - [ "bb2diaspora_itembody", "bb2diaspora_8php.html#a2052c66bc1006a42b4c230320c269e47", null ], + [ "bb2diaspora_itembody", "bb2diaspora_8php.html#ab27761069ea1275f0fc4c543099c5519", null ], [ "bb2diaspora_itemwallwall", "bb2diaspora_8php.html#aab32042f8bd63552d3fadeeae9eab083", null ], [ "bb2dmention_callback", "bb2diaspora_8php.html#a5258d2f1addeb0a2a6b54c4f9e7d0f34", null ], [ "bb_tag_preg_replace", "bb2diaspora_8php.html#ad0abe1a7ee50aa0736a233df0a422eba", null ], diff --git a/doc/html/boot_8php.html b/doc/html/boot_8php.html index 9199aeb2f..2ea8e6f27 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 1129 +const DB_UPDATE_VERSION 1130   const EOL '<br />' . "\r\n"   @@ -1006,7 +1006,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(), 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(), RedMatrix\RedDAV\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(), 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(), send_message(), send_reg_approval_email(), send_status_notifications(), send_verification_email(), service_class_allows(), service_class_fetch(), siteinfo_init(), smilies(), store_diaspora_comment_sig(), 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(), RedMatrix\RedDAV\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(), 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(), process_location_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(), send_message(), send_reg_approval_email(), send_status_notifications(), send_verification_email(), service_class_allows(), service_class_fetch(), siteinfo_init(), smilies(), store_diaspora_comment_sig(), 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().

@@ -1274,7 +1274,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(), fsuggest_content(), fsuggest_post(), RedMatrix\RedDAV\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(), impel_init(), 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(), send_message(), service_class_allows(), service_class_fetch(), service_limits_content(), 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(), RedMatrix\RedDAV\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(), impel_init(), 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(), locs_post(), 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(), send_message(), service_class_allows(), service_class_fetch(), service_limits_content(), 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().

@@ -1326,7 +1326,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_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(), 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(), 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(), service_limits_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(), 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(), import_content(), import_post(), importelm_post(), invite_content(), invite_post(), item_content(), item_post(), layouts_content(), like_content(), locs_post(), 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(), service_limits_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().

@@ -1382,7 +1382,7 @@ Variables

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

$cmd and string args are surrounded with ""

-

Referenced by admin_page_channels(), 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(), remove_obsolete_hublocs(), send_message(), settings_post(), start_delivery_chain(), tag_deliver(), tagger_content(), zid_init(), and zot_refresh().

+

Referenced by admin_page_channels(), 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(), locs_post(), 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(), remove_obsolete_hublocs(), send_message(), settings_post(), start_delivery_chain(), tag_deliver(), tagger_content(), zid_init(), and zot_refresh().

@@ -1494,7 +1494,7 @@ Variables
-

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_like(), diaspora_post(), diaspora_request(), diaspora_reshare(), directory_content(), dirprofile_init(), discover_by_url(), discover_by_webbie(), display_content(), event_store_item(), externals_run(), filestorage_content(), find_upstream_directory(), follow_init(), format_categories(), format_filer(), get_parent_cloudpath(), RedMatrix\RedDAV\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(), oembed_iframe(), 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(), remove_obsolete_hublocs(), 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_like(), diaspora_post(), diaspora_request(), diaspora_reshare(), directory_content(), dirprofile_init(), discover_by_url(), discover_by_webbie(), display_content(), event_store_item(), externals_run(), filestorage_content(), find_upstream_directory(), follow_init(), format_categories(), format_filer(), get_parent_cloudpath(), RedMatrix\RedDAV\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(), locs_post(), 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(), oembed_iframe(), 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(), remove_obsolete_hublocs(), 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().

@@ -1729,7 +1729,7 @@ Variables

Account Flags

-

Referenced by account_verify_password(), create_account(), onepoll_run(), openid_content(), poller_run(), register_post(), and RedBasicAuth\validateUserPass().

+

Referenced by account_verify_password(), create_account(), onepoll_run(), openid_content(), poller_run(), register_post(), and RedMatrix\RedDAV\RedBasicAuth\validateUserPass().

@@ -1826,7 +1826,7 @@ Variables
-

Referenced by account_verify_password(), onepoll_run(), openid_content(), poller_run(), register_post(), user_approve(), and RedBasicAuth\validateUserPass().

+

Referenced by account_verify_password(), onepoll_run(), openid_content(), poller_run(), register_post(), user_approve(), and RedMatrix\RedDAV\RedBasicAuth\validateUserPass().

@@ -2201,7 +2201,7 @@ Variables
-

Referenced by attach_change_permissions(), attach_delete(), attach_mkdir(), RedFile\delete(), filestorage_content(), get_cloudpath(), RedDirectory\getDir(), RedCollectionData(), RedFileData(), and z_readdir().

+

Referenced by attach_change_permissions(), attach_delete(), attach_mkdir(), RedMatrix\RedDAV\RedFile\delete(), filestorage_content(), get_cloudpath(), RedMatrix\RedDAV\RedDirectory\getDir(), RedCollectionData(), RedFileData(), and z_readdir().

@@ -2215,7 +2215,7 @@ Variables
-

Referenced by attach_delete(), attach_init(), attach_mkdir(), RedDirectory\createFile(), RedFile\get(), and RedFile\put().

+

Referenced by attach_delete(), attach_init(), attach_mkdir(), RedMatrix\RedDAV\RedDirectory\createFile(), RedMatrix\RedDAV\RedFile\get(), and RedMatrix\RedDAV\RedFile\put().

@@ -2305,7 +2305,7 @@ Variables
- +
const DB_UPDATE_VERSION 1129const DB_UPDATE_VERSION 1130
@@ -2435,7 +2435,7 @@ Variables
-

Referenced by delete_imported_item(), delete_item_lowlevel(), diaspora_signed_retraction(), and item_content().

+

Referenced by delete_imported_item(), delete_item_lowlevel(), diaspora_signed_retraction(), drop_item(), and item_content().

@@ -2463,7 +2463,7 @@ Variables
-

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(), 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(), import_post(), 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(), service_limits_content(), settings_post(), setup_content(), sources_content(), sources_post(), subthread_content(), suggest_content(), sync_locations(), 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(), 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(), import_post(), importelm_post(), invite_content(), invite_post(), item_content(), item_post(), layouts_content(), like_content(), load_database(), locs_post(), 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(), service_limits_content(), settings_post(), setup_content(), sources_content(), sources_post(), subthread_content(), suggest_content(), sync_locations(), 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().

@@ -2516,7 +2516,7 @@ Variables
-

Referenced by channel_remove(), notifier_run(), post_post(), remove_all_xchan_resources(), remove_obsolete_hublocs(), sync_locations(), zot_encode_locations(), and zot_get_hublocs().

+

Referenced by channel_remove(), locs_post(), notifier_run(), post_post(), remove_all_xchan_resources(), remove_obsolete_hublocs(), sync_locations(), zot_encode_locations(), and zot_get_hublocs().

@@ -2544,7 +2544,7 @@ Variables
-

Referenced by create_identity(), discover_by_webbie(), import_author_zot(), import_post(), rconnect_url(), sync_locations(), xchan_mail_query(), xchan_query(), zot_encode_locations(), zot_finger(), and zot_refresh().

+

Referenced by create_identity(), discover_by_webbie(), hubloc_change_primary(), import_author_zot(), import_post(), locs_post(), rconnect_url(), sync_locations(), xchan_mail_query(), xchan_query(), zot_encode_locations(), zot_finger(), and zot_refresh().

@@ -2788,7 +2788,7 @@ Variables
-

Referenced by bb2diaspora_itembody(), diaspora_process_outbound(), editpost_content(), editwebpage_content(), encode_item(), get_item_elements(), item_post(), item_store(), item_store_update(), localize_item(), notification(), post_activity_item(), start_delivery_chain(), tag_deliver(), unobscure(), and viewsrc_content().

+

Referenced by bb2diaspora_itembody(), diaspora_process_outbound(), editpost_content(), editwebpage_content(), encode_item(), get_item_elements(), item_post(), item_store(), item_store_update(), localize_item(), notification(), post_activity_item(), start_delivery_chain(), tag_deliver(), unobscure(), and viewsrc_content().

@@ -3094,7 +3094,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_decode(), diaspora_dispatch(), diaspora_msg_build(), diaspora_pubmsg_build(), diaspora_reshare(), diaspora_send_followup(), diaspora_send_images(), diaspora_send_mail(), diaspora_send_relay(), diaspora_send_status(), dir_parse_query(), directory_content(), dirprofile_init(), discover_by_url(), encode_item(), fetch_xrd_links(), find_diaspora_person_by_handle(), fix_private_photos(), get_atom_elements(), RedDirectory\getChild(), RedDirectory\getChildren(), RedDirectory\getDir(), RedDirectory\getName(), impel_init(), 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(), process_location_delivery(), 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 admin_page_logs(), build_sync_packet(), check_form_security_token_ForbiddenOnErr(), check_form_security_token_redirectOnErr(), consume_feed(), deliver_run(), detect_language(), diaspora_decode(), diaspora_dispatch(), diaspora_msg_build(), diaspora_pubmsg_build(), diaspora_reshare(), diaspora_send_followup(), diaspora_send_images(), diaspora_send_mail(), diaspora_send_relay(), diaspora_send_status(), dir_parse_query(), directory_content(), dirprofile_init(), discover_by_url(), encode_item(), fetch_xrd_links(), find_diaspora_person_by_handle(), fix_private_photos(), get_atom_elements(), RedMatrix\RedDAV\RedDirectory\getChild(), RedMatrix\RedDAV\RedDirectory\getDir(), impel_init(), import_xchan(), item_post(), item_store(), item_store_update(), RedMatrix\RedDAV\RedDirectory\log(), RedMatrix\RedDAV\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(), RedMatrix\RedDAV\RedFile\setName(), RedMatrix\RedDAV\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().

@@ -3108,7 +3108,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(), bb2diaspora_itemwallwall(), bookmark_add(), consume_feed(), conversation(), RedDirectory\createDirectory(), RedDirectory\createFile(), RedFile\delete(), delete_imported_item(), deliver_run(), diaspora_conversation(), diaspora_handle_from_contact(), diaspora_like(), 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_diaspora_reshare_xml(), get_language_name(), Conversation\get_template_data(), RedDirectory\getDir(), RedFile\getName(), group_content(), guess_image_type(), import_author_rss(), import_author_unknown(), 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(), onepoll_run(), parse_url_content(), photo_upload(), photos_post(), poco_init(), poco_load(), poke_init(), post_post(), process_delivery(), process_location_delivery(), process_profile_delivery(), profile_load(), RedFile\put(), queue_run(), receive_post(), RedFileData(), Item\remove_child(), remove_obsolete_hublocs(), scale_external_images(), scrape_feed(), enotify\send(), Conversation\set_mode(), RedFile\setName(), store_diaspora_comment_sig(), stream_perms_api_uids(), stream_perms_xchans(), sync_locations(), 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(), bb2diaspora_itemwallwall(), bookmark_add(), consume_feed(), conversation(), RedMatrix\RedDAV\RedDirectory\createDirectory(), RedMatrix\RedDAV\RedDirectory\createFile(), RedMatrix\RedDAV\RedFile\delete(), delete_imported_item(), deliver_run(), diaspora_conversation(), diaspora_handle_from_contact(), diaspora_like(), 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(), RedMatrix\RedDAV\RedFile\get(), get_diaspora_key(), get_diaspora_reshare_xml(), get_language_name(), Conversation\get_template_data(), group_content(), guess_image_type(), hubloc_change_primary(), import_author_rss(), import_author_unknown(), 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(), onepoll_run(), parse_url_content(), photo_upload(), photos_post(), poco_init(), poco_load(), poke_init(), post_post(), process_delivery(), process_location_delivery(), process_profile_delivery(), profile_load(), RedMatrix\RedDAV\RedFile\put(), queue_run(), receive_post(), RedChannelList(), RedFileData(), Item\remove_child(), remove_obsolete_hublocs(), scale_external_images(), scrape_feed(), enotify\send(), Conversation\set_mode(), store_diaspora_comment_sig(), stream_perms_api_uids(), stream_perms_xchans(), sync_locations(), tag_deliver(), unload_plugin(), z_fetch_url(), z_post_url(), zot_feed(), zot_finger(), zot_gethub(), zot_register_hub(), and zotfeed_init().

@@ -4017,7 +4017,7 @@ Variables
-

Referenced by admin_page_channels(), admin_page_users(), allowed_public_recips(), authenticate_success(), change_channel(), channel_remove(), channel_total(), channelx_by_hash(), channelx_by_n(), channelx_by_nick(), RedDirectory\createDirectory(), RedDirectory\createFile(), RedDirectory\getDir(), RedDirectory\getQuotaInfo(), identity_check_service_class(), identity_selector(), manage_content(), nav(), notification(), post_init(), profile_load(), public_recips(), RedFile\put(), receive_post(), RedChannelList(), stream_perms_api_uids(), stream_perms_xchans(), zfinger_init(), zot_import(), and zotfeed_init().

+

Referenced by admin_page_channels(), admin_page_users(), allowed_public_recips(), authenticate_success(), change_channel(), channel_remove(), channel_total(), channelx_by_hash(), channelx_by_n(), channelx_by_nick(), RedMatrix\RedDAV\RedDirectory\createDirectory(), RedMatrix\RedDAV\RedDirectory\createFile(), RedMatrix\RedDAV\RedDirectory\getDir(), RedMatrix\RedDAV\RedDirectory\getQuotaInfo(), identity_check_service_class(), identity_selector(), manage_content(), nav(), notification(), post_init(), profile_load(), public_recips(), RedMatrix\RedDAV\RedFile\put(), receive_post(), RedChannelList(), stream_perms_api_uids(), stream_perms_xchans(), zfinger_init(), zot_import(), and zotfeed_init().

@@ -4919,7 +4919,7 @@ Variables
-

Referenced by import_xchan(), local_dir_update(), onedirsync_run(), poller_run(), process_profile_delivery(), update_modtime(), and zot_refresh().

+

Referenced by import_xchan(), local_dir_update(), onedirsync_run(), poller_run(), process_location_delivery(), process_profile_delivery(), update_modtime(), and zot_refresh().

diff --git a/doc/html/chanman_8php.html b/doc/html/chanman_8php.html index 4d829d819..de9e44539 100644 --- a/doc/html/chanman_8php.html +++ b/doc/html/chanman_8php.html @@ -4,7 +4,7 @@ -The Red Matrix: mod/chanman.php File Reference +The Red Matrix: include/chanman.php File Reference @@ -28,7 +28,7 @@ - + + @@ -161,6 +162,7 @@ Private Attributes

Detailed Description

Provides a DAV frontend for the webbrowser.

RedBrowser is a SabreDAV server-plugin to provide a view to the DAV storage for the webbrowser.

+

http://opensource.org/licenses/mit-license.php The MIT License (MIT)

Constructor & Destructor Documentation

@@ -177,11 +179,12 @@ Private Attributes

Constructor for RedBrowser class.

-

$enablePost will be activated through set_writeable() in a later stage. At the moment the write_storage permission is only valid for the whole folder. No file specific permissions yet.

+

$enablePost will be activated through set_writeable() in a later stage. At the moment the write_storage permission is only valid for the whole folder. No file specific permissions yet.

+
Todo:
disable enablePost by default and only activate if permissions grant edit rights.

Disable assets with $enableAssets = false. Should get some thumbnail views anyway.

Parameters
The Red Matrix
@@ -103,10 +103,35 @@ $(document).ready(function(){initNavTree('chanman_8php.html','');});
+
+Functions
chanman.php File Reference
+ + + + +

+Functions

 chanman_remove_everything_from_network ($channel_id)
 
+

Function Documentation

+ +
+
+ + + + + + + + +
chanman_remove_everything_from_network ( $channel_id)
+
+ +
+
diff --git a/doc/html/classRedMatrix_1_1RedDAV_1_1RedBrowser.html b/doc/html/classRedMatrix_1_1RedDAV_1_1RedBrowser.html index 5f0a97269..bebe6019d 100644 --- a/doc/html/classRedMatrix_1_1RedDAV_1_1RedBrowser.html +++ b/doc/html/classRedMatrix_1_1RedDAV_1_1RedBrowser.html @@ -137,6 +137,7 @@ Public Member Functions
 Creates the directory listing for the given path. More...
 
 userReadableSize ($size)
 Returns a human readable formatted string for filesizes. More...
 
 htmlActionsPanel (DAV\INode $node, &$output)
 Creates a form to add new folders and upload files. More...
- +
RedBasicAuth&$auth
RedBasicAuth&$auth
@@ -385,7 +388,8 @@ Private Attributes

The DAV browser is instantiated after the auth module and directory classes but before we know the current directory and who the owner and observer are. So we add a pointer to the browser into the auth module and vice versa. Then when we've figured out what directory is actually being accessed, we call the following function to decide whether or not to show web elements which include writeable objects.

-
Todo:
Maybe this can be solved with some $server->subscribeEvent()?
+

It only disable/enable the visible parts. Not the POST handler which handels the actual requests when uploading files or creating folders.

+
Todo:
Maybe this whole way of doing this can be solved with some $server->subscribeEvent().
@@ -403,6 +407,16 @@ Private Attributes
+

Returns a human readable formatted string for filesizes.

+

Don't we need such a functionality in other places, too?

+
Parameters
+ + +
int$sizefilesize in bytes
+
+
+
Returns
string
+

Referenced by RedMatrix\RedDAV\RedBrowser\generateDirectoryIndex().

diff --git a/doc/html/classes.html b/doc/html/classes.html index 5683c0e61..97e7852d8 100644 --- a/doc/html/classes.html +++ b/doc/html/classes.html @@ -123,13 +123,13 @@ $(document).ready(function(){initNavTree('classes.html','');}); dba_mysqli    BaseObject   
  E  
-Item   RedBasicAuth    +Item   RedBasicAuth (RedMatrix\RedDAV)   
  C  
ITemplateEngine   RedBrowser (RedMatrix\RedDAV)    enotify   
  P  
-RedDirectory    +RedDirectory (RedMatrix\RedDAV)    Cache   
  F  
-RedFile    +RedFile (RedMatrix\RedDAV)    Conversation   photo_driver   
  T  
FKOAuth1    diff --git a/doc/html/crypto_8php.html b/doc/html/crypto_8php.html index a1c2b2eeb..1e0227a30 100644 --- a/doc/html/crypto_8php.html +++ b/doc/html/crypto_8php.html @@ -344,7 +344,7 @@ Functions
-

Referenced by bb2diaspora_itembody(), diaspora_process_outbound(), diaspora_send_followup(), diaspora_send_mail(), diaspora_send_relay(), 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(), start_delivery_chain(), tag_deliver(), unobscure(), viewsrc_content(), zot_import(), and zot_refresh().

+

Referenced by bb2diaspora_itembody(), diaspora_process_outbound(), diaspora_send_followup(), diaspora_send_mail(), diaspora_send_relay(), 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(), start_delivery_chain(), tag_deliver(), unobscure(), viewsrc_content(), zot_import(), and zot_refresh().

@@ -464,7 +464,7 @@ Functions
-

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

+

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

diff --git a/doc/html/datetime_8php.html b/doc/html/datetime_8php.html index aca76728a..41dc0f97f 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(), 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_send_images(), diaspora_send_mail(), diaspora_send_status(), diaspora_transmit(), directory_run(), dirsearch_content(), discover_by_url(), 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(), RedMatrix\RedDAV\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(), impel_init(), import_author_rss(), import_author_unknown(), 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(), p_init(), 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(), sync_locations(), 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(), RedMatrix\RedDAV\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_send_images(), diaspora_send_mail(), diaspora_send_status(), diaspora_transmit(), directory_run(), dirsearch_content(), discover_by_url(), 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(), RedMatrix\RedDAV\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(), RedMatrix\RedDAV\RedFile\getLastModified(), RedMatrix\RedDAV\RedDirectory\getLastModified(), impel_init(), import_author_rss(), import_author_unknown(), 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(), p_init(), 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(), RedMatrix\RedDAV\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(), sync_locations(), 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 a7c3554e1..5a9becc31 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_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(), bb2diaspora_itemwallwall(), bb2dmention_callback(), 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_upstream_directory(), 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_handle_from_contact(), diaspora_like(), diaspora_mention_callback(), diaspora_message(), diaspora_photo(), diaspora_post(), diaspora_process_outbound(), 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_url(), 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(), filter_insecure(), find_diaspora_person_by_handle(), find_filename_by_hash(), find_folder_hash_by_attach_hash(), RedMatrix\RedDAV\RedBrowser\findAttachHash(), RedMatrix\RedDAV\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(), impel_init(), import_author_diaspora(), import_author_rss(), import_author_unknown(), 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(), menu_list_count(), 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(), p_init(), 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_location_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_obsolete_hublocs(), 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(), sitelist_init(), sources_content(), sources_post(), start_delivery_chain(), photo_driver\store(), store_diaspora_comment_sig(), store_item_tag(), stream_perms_xchans(), stringify_array_elms(), subthread_content(), suggest_init(), sync_directories(), sync_locations(), 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(), bb2diaspora_itemwallwall(), bb2dmention_callback(), 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_upstream_directory(), 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(), RedMatrix\RedDAV\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_handle_from_contact(), diaspora_like(), diaspora_mention_callback(), diaspora_message(), diaspora_photo(), diaspora_post(), diaspora_process_outbound(), 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_url(), 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(), filter_insecure(), find_diaspora_person_by_handle(), find_filename_by_hash(), find_folder_hash_by_attach_hash(), RedMatrix\RedDAV\RedBrowser\findAttachHash(), RedMatrix\RedDAV\RedBrowser\findAttachIdByHash(), fix_attached_photo_permissions(), fix_private_photos(), fix_system_urls(), fsuggest_post(), Cache\get(), RedMatrix\RedDAV\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(), RedMatrix\RedDAV\RedDirectory\getDir(), RedMatrix\RedDAV\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(), hubloc_change_primary(), impel_init(), import_author_diaspora(), import_author_rss(), import_author_unknown(), 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(), locs_post(), 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(), menu_list_count(), 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(), p_init(), 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_location_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(), RedMatrix\RedDAV\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_obsolete_hublocs(), 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(), RedMatrix\RedDAV\RedFile\setName(), RedMatrix\RedDAV\RedDirectory\setName(), settings_post(), sitelist_init(), sources_content(), sources_post(), start_delivery_chain(), photo_driver\store(), store_diaspora_comment_sig(), store_item_tag(), stream_perms_xchans(), stringify_array_elms(), subthread_content(), suggest_init(), sync_directories(), sync_locations(), 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(), RedMatrix\RedDAV\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_service_class_fetch(), 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_group(), api_group_members(), 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(), bb2diaspora_itemwallwall(), bb2dmention_callback(), 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(), chatroom_list_count(), chatsvc_content(), chatsvc_init(), chatsvc_post(), check_account_email(), check_account_invite(), check_config(), check_item_source(), check_upstream_directory(), 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_mention_callback(), diaspora_message(), diaspora_photo(), diaspora_post(), diaspora_process_outbound(), 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_url(), 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(), filter_insecure(), find_diaspora_person_by_handle(), find_filename_by_hash(), find_folder_hash_by_attach_hash(), RedMatrix\RedDAV\RedBrowser\findAttachHash(), RedMatrix\RedDAV\RedBrowser\findAttachIdByHash(), first_post_date(), fix_attached_photo_permissions(), fix_private_photos(), fix_system_urls(), fsuggest_content(), fsuggest_post(), RedMatrix\RedDAV\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(), impel_init(), import_author_diaspora(), import_author_rss(), import_author_unknown(), 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(), menu_list_count(), 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_off(), notifications_on(), notifications_post(), notifier_run(), notify_content(), notify_init(), oauth_get_client(), onedirsync_run(), onepoll_run(), openid_content(), p_init(), 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_location_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_obsolete_hublocs(), 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_diaspora_comment_sig(), store_item_tag(), stream_perms_api_uids(), stream_perms_xchans(), subthread_content(), suggest_init(), suggestion_query(), sync_directories(), sync_locations(), tag_deliver(), tagadelic(), tagger_content(), tagrm_content(), tagrm_post(), tgroup_check(), thing_content(), thing_init(), uninstall_plugin(), unregister_hook(), update_birthdays(), update_channels_active_halfyear_stat(), update_channels_active_monthly_stat(), update_channels_total_stat(), update_directory_entry(), update_local_posts_stat(), 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_service_class_fetch(), 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_group(), api_group_members(), 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(), bb2diaspora_itemwallwall(), bb2dmention_callback(), 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(), chatroom_list_count(), chatsvc_content(), chatsvc_init(), chatsvc_post(), check_account_email(), check_account_invite(), check_config(), check_item_source(), check_upstream_directory(), 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(), RedMatrix\RedDAV\RedDirectory\createDirectory(), RedMatrix\RedDAV\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_mention_callback(), diaspora_message(), diaspora_photo(), diaspora_post(), diaspora_process_outbound(), 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_url(), 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(), filter_insecure(), find_diaspora_person_by_handle(), find_filename_by_hash(), find_folder_hash_by_attach_hash(), RedMatrix\RedDAV\RedBrowser\findAttachHash(), RedMatrix\RedDAV\RedBrowser\findAttachIdByHash(), first_post_date(), fix_attached_photo_permissions(), fix_private_photos(), fix_system_urls(), fsuggest_content(), fsuggest_post(), RedMatrix\RedDAV\RedBrowser\generateDirectoryIndex(), Cache\get(), RedMatrix\RedDAV\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(), RedMatrix\RedDAV\RedDirectory\getDir(), RedMatrix\RedDAV\RedDirectory\getLastModified(), RedMatrix\RedDAV\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(), hubloc_change_primary(), identity_basic_export(), identity_check_service_class(), identity_selector(), impel_init(), import_author_diaspora(), import_author_rss(), import_author_unknown(), 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(), locs_post(), 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(), menu_list_count(), 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_off(), notifications_on(), notifications_post(), notifier_run(), notify_content(), notify_init(), oauth_get_client(), onedirsync_run(), onepoll_run(), openid_content(), p_init(), 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_location_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(), RedMatrix\RedDAV\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_obsolete_hublocs(), 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(), RedMatrix\RedDAV\RedFile\setName(), RedMatrix\RedDAV\RedDirectory\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_diaspora_comment_sig(), store_item_tag(), stream_perms_api_uids(), stream_perms_xchans(), subthread_content(), suggest_init(), suggestion_query(), sync_directories(), sync_locations(), tag_deliver(), tagadelic(), tagger_content(), tagrm_content(), tagrm_post(), tgroup_check(), thing_content(), thing_init(), uninstall_plugin(), unregister_hook(), update_birthdays(), update_channels_active_halfyear_stat(), update_channels_active_monthly_stat(), update_channels_total_stat(), update_directory_entry(), update_local_posts_stat(), update_modtime(), update_queue_time(), update_remote_id(), update_suggestions(), user_allow(), user_approve(), user_deny(), RedMatrix\RedDAV\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/dir_d41ce877eb409a4791b288730010abe2.html b/doc/html/dir_d41ce877eb409a4791b288730010abe2.html index 2612a29c4..dfbb42fb9 100644 --- a/doc/html/dir_d41ce877eb409a4791b288730010abe2.html +++ b/doc/html/dir_d41ce877eb409a4791b288730010abe2.html @@ -126,8 +126,6 @@ Files   file  bookmarks.php   -file  chanman.php -  file  channel.php   file  chanview.php @@ -211,6 +209,8 @@ Files   file  lockview.php   +file  locs.php +  file  login.php   file  lostpass.php diff --git a/doc/html/dir_d41ce877eb409a4791b288730010abe2.js b/doc/html/dir_d41ce877eb409a4791b288730010abe2.js index fc3030f12..6364aede9 100644 --- a/doc/html/dir_d41ce877eb409a4791b288730010abe2.js +++ b/doc/html/dir_d41ce877eb409a4791b288730010abe2.js @@ -11,7 +11,6 @@ var dir_d41ce877eb409a4791b288730010abe2 = [ "block.php", "block_8php.html", "block_8php" ], [ "blocks.php", "blocks_8php.html", "blocks_8php" ], [ "bookmarks.php", "mod_2bookmarks_8php.html", "mod_2bookmarks_8php" ], - [ "chanman.php", "mod_2chanman_8php.html", null ], [ "channel.php", "channel_8php.html", "channel_8php" ], [ "chanview.php", "chanview_8php.html", "chanview_8php" ], [ "chat.php", "mod_2chat_8php.html", "mod_2chat_8php" ], @@ -53,6 +52,7 @@ var dir_d41ce877eb409a4791b288730010abe2 = [ "layouts.php", "layouts_8php.html", "layouts_8php" ], [ "like.php", "like_8php.html", "like_8php" ], [ "lockview.php", "lockview_8php.html", "lockview_8php" ], + [ "locs.php", "locs_8php.html", "locs_8php" ], [ "login.php", "login_8php.html", "login_8php" ], [ "lostpass.php", "lostpass_8php.html", "lostpass_8php" ], [ "magic.php", "magic_8php.html", "magic_8php" ], diff --git a/doc/html/dir_d44c64559bbebec7f509842c48db8b23.html b/doc/html/dir_d44c64559bbebec7f509842c48db8b23.html index 888bf73e3..2376fcc5b 100644 --- a/doc/html/dir_d44c64559bbebec7f509842c48db8b23.html +++ b/doc/html/dir_d44c64559bbebec7f509842c48db8b23.html @@ -139,7 +139,7 @@ Files   file  cache.php   -file  chanman.php +file  chanman.php   file  chat.php   @@ -172,6 +172,8 @@ Files   file  diaspora.php   +file  dimport.php +  file  dir_fns.php   file  directory.php @@ -251,7 +253,7 @@ Files file  queue_fn.php   file  reddav.php - DAV related classes from SabreDAV for Red Matrix.
+ some DAV related functions for RedMatrix.
  file  security.php   diff --git a/doc/html/dir_d44c64559bbebec7f509842c48db8b23.js b/doc/html/dir_d44c64559bbebec7f509842c48db8b23.js index 7f10fa98d..f142dff64 100644 --- a/doc/html/dir_d44c64559bbebec7f509842c48db8b23.js +++ b/doc/html/dir_d44c64559bbebec7f509842c48db8b23.js @@ -19,7 +19,7 @@ var dir_d44c64559bbebec7f509842c48db8b23 = [ "cache.php", "cache_8php.html", [ [ "Cache", "classCache.html", null ] ] ], - [ "chanman.php", "include_2chanman_8php.html", "include_2chanman_8php" ], + [ "chanman.php", "chanman_8php.html", "chanman_8php" ], [ "chat.php", "include_2chat_8php.html", "include_2chat_8php" ], [ "cli_startup.php", "cli__startup_8php.html", "cli__startup_8php" ], [ "cli_suggest.php", "cli__suggest_8php.html", "cli__suggest_8php" ], @@ -37,6 +37,7 @@ var dir_d44c64559bbebec7f509842c48db8b23 = [ "datetime.php", "datetime_8php.html", "datetime_8php" ], [ "deliver.php", "deliver_8php.html", "deliver_8php" ], [ "diaspora.php", "diaspora_8php.html", "diaspora_8php" ], + [ "dimport.php", "dimport_8php.html", "dimport_8php" ], [ "dir_fns.php", "dir__fns_8php.html", "dir__fns_8php" ], [ "directory.php", "include_2directory_8php.html", "include_2directory_8php" ], [ "enotify.php", "enotify_8php.html", "enotify_8php" ], diff --git a/doc/html/dir_e7f045be8bb383d8447c6a6b84145083.html b/doc/html/dir_e7f045be8bb383d8447c6a6b84145083.html index f49bce2b4..14d998f04 100644 --- a/doc/html/dir_e7f045be8bb383d8447c6a6b84145083.html +++ b/doc/html/dir_e7f045be8bb383d8447c6a6b84145083.html @@ -104,8 +104,14 @@ $(document).ready(function(){initNavTree('dir_e7f045be8bb383d8447c6a6b84145083.h + + + + + +

Files

file  RedBasicAuth.php
 
file  RedBrowser.php
 
file  RedDirectory.php
 
file  RedFile.php
 
diff --git a/doc/html/dir_e7f045be8bb383d8447c6a6b84145083.js b/doc/html/dir_e7f045be8bb383d8447c6a6b84145083.js index 0d7f52ca2..477c22fe8 100644 --- a/doc/html/dir_e7f045be8bb383d8447c6a6b84145083.js +++ b/doc/html/dir_e7f045be8bb383d8447c6a6b84145083.js @@ -1,6 +1,15 @@ var dir_e7f045be8bb383d8447c6a6b84145083 = [ + [ "RedBasicAuth.php", "RedBasicAuth_8php.html", [ + [ "RedBasicAuth", "classRedMatrix_1_1RedDAV_1_1RedBasicAuth.html", "classRedMatrix_1_1RedDAV_1_1RedBasicAuth" ] + ] ], [ "RedBrowser.php", "RedBrowser_8php.html", [ [ "RedBrowser", "classRedMatrix_1_1RedDAV_1_1RedBrowser.html", "classRedMatrix_1_1RedDAV_1_1RedBrowser" ] + ] ], + [ "RedDirectory.php", "RedDirectory_8php.html", [ + [ "RedDirectory", "classRedMatrix_1_1RedDAV_1_1RedDirectory.html", "classRedMatrix_1_1RedDAV_1_1RedDirectory" ] + ] ], + [ "RedFile.php", "RedFile_8php.html", [ + [ "RedFile", "classRedMatrix_1_1RedDAV_1_1RedFile.html", "classRedMatrix_1_1RedDAV_1_1RedFile" ] ] ] ]; \ No newline at end of file diff --git a/doc/html/extract_8php.html b/doc/html/extract_8php.html index f6a23636a..9e08aa0f4 100644 --- a/doc/html/extract_8php.html +++ b/doc/html/extract_8php.html @@ -132,7 +132,7 @@ Variables
-

Referenced by _well_known_init(), account_service_class_fetch(), 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_url(), discover_by_webbie(), drop_item(), event_store_event(), event_store_item(), externals_run(), feature_enabled(), fetch_xrd_links(), filter_insecure(), 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(), impel_init(), import_author_rss(), import_author_unknown(), 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_location_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(), sync_locations(), 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(), account_service_class_fetch(), 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_url(), discover_by_webbie(), drop_item(), event_store_event(), event_store_item(), externals_run(), feature_enabled(), fetch_xrd_links(), filter_insecure(), find_xchan_in_array(), foofoo(), 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(), impel_init(), import_author_rss(), import_author_unknown(), 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_location_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(), sync_locations(), 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().

diff --git a/doc/html/files.html b/doc/html/files.html index 9ec8b80cc..f5a3e5e36 100644 --- a/doc/html/files.html +++ b/doc/html/files.html @@ -119,7 +119,10 @@ $(document).ready(function(){initNavTree('files.html','');}); ||o*photo_gd.php ||\*photo_imagick.php |o+RedDAV -||\*RedBrowser.php +||o*RedBasicAuth.php +||o*RedBrowser.php +||o*RedDirectory.php +||\*RedFile.php |o*account.php |o*acl_selectors.php |o*activities.php @@ -132,7 +135,7 @@ $(document).ready(function(){initNavTree('files.html','');}); |o*bbcode.php |o*bookmarks.php |o*cache.php -|o*chanman.php +|o*chanman.php |o*chat.php |o*cli_startup.php |o*cli_suggest.php @@ -148,57 +151,58 @@ $(document).ready(function(){initNavTree('files.html','');}); |o*datetime.php |o*deliver.php |o*diaspora.php -|o*dir_fns.php -|o*directory.php -|o*enotify.php -|o*event.php -|o*expire.php -|o*externals.php -|o*features.php -|o*follow.php -|o*gprobe.php -|o*group.php -|o*html2bbcode.php -|o*html2plain.php -|o*hubloc.php -|o*identity.php -|o*ItemObject.php -|o*ITemplateEngine.php -|o*items.php -|o*language.phpTranslation support -|o*menu.php -|o*message.php -|o*nav.php -|o*network.php -|o*notifier.php -|o*notify.php -|o*oauth.php -|o*oembed.php -|o*onedirsync.php -|o*onepoll.php -|o*page_widgets.php -|o*permissions.php -|o*photos.php -|o*plugin.phpSome functions to handle addons and themes -|o*poller.php -|o*probe.php -|o*profile_selectors.php -|o*ProtoDriver.php -|o*queue.php -|o*queue_fn.php -|o*reddav.phpDAV related classes from SabreDAV for Red Matrix -|o*security.php -|o*session.php -|o*smarty.php -|o*socgraph.php -|o*spam.php -|o*statistics_fns.php -|o*system_unavailable.php -|o*taxonomy.php -|o*template_processor.php -|o*text.php -|o*widgets.php -|\*zot.php +|o*dimport.php +|o*dir_fns.php +|o*directory.php +|o*enotify.php +|o*event.php +|o*expire.php +|o*externals.php +|o*features.php +|o*follow.php +|o*gprobe.php +|o*group.php +|o*html2bbcode.php +|o*html2plain.php +|o*hubloc.php +|o*identity.php +|o*ItemObject.php +|o*ITemplateEngine.php +|o*items.php +|o*language.phpTranslation support +|o*menu.php +|o*message.php +|o*nav.php +|o*network.php +|o*notifier.php +|o*notify.php +|o*oauth.php +|o*oembed.php +|o*onedirsync.php +|o*onepoll.php +|o*page_widgets.php +|o*permissions.php +|o*photos.php +|o*plugin.phpSome functions to handle addons and themes +|o*poller.php +|o*probe.php +|o*profile_selectors.php +|o*ProtoDriver.php +|o*queue.php +|o*queue_fn.php +|o*reddav.phpSome DAV related functions for RedMatrix +|o*security.php +|o*session.php +|o*smarty.php +|o*socgraph.php +|o*spam.php +|o*statistics_fns.php +|o*system_unavailable.php +|o*taxonomy.php +|o*template_processor.php +|o*text.php +|o*widgets.php +|\*zot.php o+mod |o*_well_known.php |o*achievements.php @@ -211,48 +215,48 @@ $(document).ready(function(){initNavTree('files.html','');}); |o*block.php |o*blocks.php |o*bookmarks.php -|o*chanman.php -|o*channel.php -|o*chanview.php -|o*chat.php -|o*chatsvc.php -|o*cloud.phpInitialize RedMatrix's cloud (SabreDAV) -|o*common.php -|o*connect.php -|o*connections.php -|o*connedit.php -|o*contactgroup.php -|o*delegate.php -|o*directory.php -|o*dirprofile.php -|o*dirsearch.php -|o*display.php -|o*editblock.php -|o*editlayout.php -|o*editpost.php -|o*editwebpage.php -|o*events.php -|o*fbrowser.php -|o*feed.php -|o*filer.php -|o*filerm.php -|o*filestorage.php -|o*follow.php -|o*fsuggest.php -|o*group.php -|o*hcard.php -|o*help.php -|o*home.php -|o*hostxrd.php -|o*impel.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*channel.php +|o*chanview.php +|o*chat.php +|o*chatsvc.php +|o*cloud.phpInitialize RedMatrix's cloud (SabreDAV) +|o*common.php +|o*connect.php +|o*connections.php +|o*connedit.php +|o*contactgroup.php +|o*delegate.php +|o*directory.php +|o*dirprofile.php +|o*dirsearch.php +|o*display.php +|o*editblock.php +|o*editlayout.php +|o*editpost.php +|o*editwebpage.php +|o*events.php +|o*fbrowser.php +|o*feed.php +|o*filer.php +|o*filerm.php +|o*filestorage.php +|o*follow.php +|o*fsuggest.php +|o*group.php +|o*hcard.php +|o*help.php +|o*home.php +|o*hostxrd.php +|o*impel.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*locs.php |o*login.php |o*lostpass.php |o*magic.php diff --git a/doc/html/filestorage_8php.html b/doc/html/filestorage_8php.html index 91508e06f..5696cd2a8 100644 --- a/doc/html/filestorage_8php.html +++ b/doc/html/filestorage_8php.html @@ -147,6 +147,12 @@ Functions
+
Parameters
+ + +
object&$a
+
+
diff --git a/doc/html/functions.html b/doc/html/functions.html index c7d32363a..8434afa68 100644 --- a/doc/html/functions.html +++ b/doc/html/functions.html @@ -156,15 +156,15 @@ $(document).ready(function(){initNavTree('functions.html','');}); : App
  • $auth -: RedFile +: RedMatrix\RedDAV\RedFile , RedMatrix\RedDAV\RedBrowser -, RedDirectory +, RedMatrix\RedDAV\RedDirectory
  • $baseurl : App
  • $browser -: RedBasicAuth +: RedMatrix\RedDAV\RedBasicAuth
  • $cached_profile_image : App @@ -180,13 +180,13 @@ $(document).ready(function(){initNavTree('functions.html','');}); , Item
  • $channel_hash -: RedBasicAuth +: RedMatrix\RedDAV\RedBasicAuth
  • $channel_id -: RedBasicAuth +: RedMatrix\RedDAV\RedBasicAuth
  • $channel_name -: RedBasicAuth +: RedMatrix\RedDAV\RedBasicAuth
  • $children : Item @@ -240,7 +240,7 @@ $(document).ready(function(){initNavTree('functions.html','');});
  • $data : App , Item -, RedFile +, RedMatrix\RedDAV\RedFile
  • $db : App @@ -258,13 +258,13 @@ $(document).ready(function(){initNavTree('functions.html','');}); , dba_driver
  • $ext_path -: RedDirectory +: RedMatrix\RedDAV\RedDirectory
  • $filename : FriendicaSmarty
  • $folder_hash -: RedDirectory +: RedMatrix\RedDAV\RedDirectory
  • $force_max_items : App @@ -318,7 +318,7 @@ $(document).ready(function(){initNavTree('functions.html','');}); : App
  • $name -: RedFile +: RedMatrix\RedDAV\RedFile , FriendicaSmartyEngine , Template
    • @@ -330,20 +330,20 @@ $(document).ready(function(){initNavTree('functions.html','');});
  • $observer : Conversation -, RedBasicAuth +, RedMatrix\RedDAV\RedBasicAuth , App
  • $os_path -: RedDirectory +: RedMatrix\RedDAV\RedDirectory
  • $owner_id -: RedBasicAuth +: RedMatrix\RedDAV\RedBasicAuth
  • $owner_name : Item
  • $owner_nick -: RedBasicAuth +: RedMatrix\RedDAV\RedBasicAuth
  • $owner_photo : Item @@ -397,7 +397,7 @@ $(document).ready(function(){initNavTree('functions.html','');}); : App
  • $red_path -: RedDirectory +: RedMatrix\RedDAV\RedDirectory
  • $redirect_url : Item @@ -406,7 +406,7 @@ $(document).ready(function(){initNavTree('functions.html','');}); : Template
  • $root_dir -: RedDirectory +: RedMatrix\RedDAV\RedDirectory
  • $scheme : App @@ -448,7 +448,7 @@ $(document).ready(function(){initNavTree('functions.html','');}); : Conversation
  • $timezone -: RedBasicAuth +: RedMatrix\RedDAV\RedBasicAuth , App
  • $toplevel diff --git a/doc/html/functions_0x5f.html b/doc/html/functions_0x5f.html index 9c7d24f69..e94eaa1c4 100644 --- a/doc/html/functions_0x5f.html +++ b/doc/html/functions_0x5f.html @@ -144,8 +144,8 @@ $(document).ready(function(){initNavTree('functions_0x5f.html','');}); : App , Conversation , Item -, RedDirectory -, RedFile +, RedMatrix\RedDAV\RedDirectory +, RedMatrix\RedDAV\RedFile , FKOAuth1 , FriendicaSmarty , FriendicaSmartyEngine diff --git a/doc/html/functions_0x63.html b/doc/html/functions_0x63.html index cdcca330f..2ee7151e5 100644 --- a/doc/html/functions_0x63.html +++ b/doc/html/functions_0x63.html @@ -148,7 +148,7 @@ $(document).ready(function(){initNavTree('functions_0x63.html','');}); : Item
  • childExists() -: RedDirectory +: RedMatrix\RedDAV\RedDirectory
  • clear() : Cache @@ -175,10 +175,10 @@ $(document).ready(function(){initNavTree('functions_0x63.html','');}); : Item
  • createDirectory() -: RedDirectory +: RedMatrix\RedDAV\RedDirectory
  • createFile() -: RedDirectory +: RedMatrix\RedDAV\RedDirectory
  • cropImage() : photo_driver diff --git a/doc/html/functions_0x64.html b/doc/html/functions_0x64.html index 7c8b04fa0..2bada26c8 100644 --- a/doc/html/functions_0x64.html +++ b/doc/html/functions_0x64.html @@ -144,7 +144,7 @@ $(document).ready(function(){initNavTree('functions_0x64.html','');}); : dba_driver
  • delete() -: RedFile +: RedMatrix\RedDAV\RedFile
  • deliver() : ZotDriver diff --git a/doc/html/functions_0x67.html b/doc/html/functions_0x67.html index b34c3eb99..1d0e5e511 100644 --- a/doc/html/functions_0x67.html +++ b/doc/html/functions_0x67.html @@ -147,7 +147,7 @@ $(document).ready(function(){initNavTree('functions_0x67.html','');}); : RedMatrix\RedDAV\RedBrowser
  • get() -: RedFile +: RedMatrix\RedDAV\RedFile , Cache
  • get_account() @@ -266,22 +266,22 @@ $(document).ready(function(){initNavTree('functions_0x67.html','');}); : RedMatrix\RedDAV\RedBrowser
  • getChild() -: RedDirectory +: RedMatrix\RedDAV\RedDirectory
  • getChildren() -: RedDirectory +: RedMatrix\RedDAV\RedDirectory
  • getContentType() -: RedFile +: RedMatrix\RedDAV\RedFile
  • getCurrentUser() -: RedBasicAuth +: RedMatrix\RedDAV\RedBasicAuth
  • getDir() -: RedDirectory +: RedMatrix\RedDAV\RedDirectory
  • getETag() -: RedFile +: RedMatrix\RedDAV\RedFile
  • getExt() : photo_driver @@ -295,21 +295,21 @@ $(document).ready(function(){initNavTree('functions_0x67.html','');}); , photo_driver
  • getLastModified() -: RedFile -, RedDirectory +: RedMatrix\RedDAV\RedFile +, RedMatrix\RedDAV\RedDirectory
  • getName() -: RedDirectory -, RedFile +: RedMatrix\RedDAV\RedDirectory +, RedMatrix\RedDAV\RedFile
  • getQuotaInfo() -: RedDirectory +: RedMatrix\RedDAV\RedDirectory
  • getSize() -: RedFile +: RedMatrix\RedDAV\RedFile
  • getTimezone() -: RedBasicAuth +: RedMatrix\RedDAV\RedBasicAuth
  • getType() : photo_driver diff --git a/doc/html/functions_0x6c.html b/doc/html/functions_0x6c.html index c032d01b6..97abf9ab9 100644 --- a/doc/html/functions_0x6c.html +++ b/doc/html/functions_0x6c.html @@ -146,8 +146,8 @@ $(document).ready(function(){initNavTree('functions_0x6c.html','');}); , photo_imagick
  • log() -: RedDirectory -, RedBasicAuth +: RedMatrix\RedDAV\RedBasicAuth +, RedMatrix\RedDAV\RedDirectory
  • loginUser() : FKOAuth1 diff --git a/doc/html/functions_0x70.html b/doc/html/functions_0x70.html index 543a28bda..f67e4b87b 100644 --- a/doc/html/functions_0x70.html +++ b/doc/html/functions_0x70.html @@ -144,7 +144,7 @@ $(document).ready(function(){initNavTree('functions_0x70.html','');}); : FriendicaSmarty
  • put() -: RedFile +: RedMatrix\RedDAV\RedFile
    • diff --git a/doc/html/functions_0x73.html b/doc/html/functions_0x73.html index 69ad45f49..fd9e35758 100644 --- a/doc/html/functions_0x73.html +++ b/doc/html/functions_0x73.html @@ -225,13 +225,13 @@ $(document).ready(function(){initNavTree('functions_0x73.html','');}); : RedMatrix\RedDAV\RedBrowser
  • setAuthenticated() -: RedBasicAuth +: RedMatrix\RedDAV\RedBasicAuth
  • setBrowserPlugin() -: RedBasicAuth +: RedMatrix\RedDAV\RedBasicAuth
  • setCurrentUser() -: RedBasicAuth +: RedMatrix\RedDAV\RedBasicAuth
  • setDimensions() : photo_driver @@ -239,11 +239,11 @@ $(document).ready(function(){initNavTree('functions_0x73.html','');}); , photo_gd
  • setName() -: RedFile -, RedDirectory +: RedMatrix\RedDAV\RedFile +, RedMatrix\RedDAV\RedDirectory
  • setTimezone() -: RedBasicAuth +: RedMatrix\RedDAV\RedBasicAuth
  • store() : photo_driver diff --git a/doc/html/functions_0x76.html b/doc/html/functions_0x76.html index 04dc1bc4f..7e530d4a2 100644 --- a/doc/html/functions_0x76.html +++ b/doc/html/functions_0x76.html @@ -141,7 +141,7 @@ $(document).ready(function(){initNavTree('functions_0x76.html','');});

    - v -

    diff --git a/doc/html/functions_func_0x73.html b/doc/html/functions_func_0x73.html index 121464b8c..34697fee9 100644 --- a/doc/html/functions_func_0x73.html +++ b/doc/html/functions_func_0x73.html @@ -224,13 +224,13 @@ $(document).ready(function(){initNavTree('functions_func_0x73.html','');}); : RedMatrix\RedDAV\RedBrowser
  • setAuthenticated() -: RedBasicAuth +: RedMatrix\RedDAV\RedBasicAuth
  • setBrowserPlugin() -: RedBasicAuth +: RedMatrix\RedDAV\RedBasicAuth
  • setCurrentUser() -: RedBasicAuth +: RedMatrix\RedDAV\RedBasicAuth
  • setDimensions() : photo_driver @@ -238,11 +238,11 @@ $(document).ready(function(){initNavTree('functions_func_0x73.html','');}); , photo_gd
  • setName() -: RedFile -, RedDirectory +: RedMatrix\RedDAV\RedFile +, RedMatrix\RedDAV\RedDirectory
  • setTimezone() -: RedBasicAuth +: RedMatrix\RedDAV\RedBasicAuth
  • store() : photo_driver diff --git a/doc/html/functions_func_0x76.html b/doc/html/functions_func_0x76.html index 54c79f0bd..c6e5fd2be 100644 --- a/doc/html/functions_func_0x76.html +++ b/doc/html/functions_func_0x76.html @@ -140,7 +140,7 @@ $(document).ready(function(){initNavTree('functions_func_0x76.html','');});

    - v -

    diff --git a/doc/html/globals_func_0x6c.html b/doc/html/globals_func_0x6c.html index 4ab4b23bc..3987ba94b 100644 --- a/doc/html/globals_func_0x6c.html +++ b/doc/html/globals_func_0x6c.html @@ -218,6 +218,9 @@ $(document).ready(function(){initNavTree('globals_func_0x6c.html','');});
  • lockview_content() : lockview.php
    • +
  • locs_post() +: locs.php +
  • logger() : text.php
    • diff --git a/doc/html/hierarchy.html b/doc/html/hierarchy.html index a514cee02..baf1a9507 100644 --- a/doc/html/hierarchy.html +++ b/doc/html/hierarchy.html @@ -112,7 +112,7 @@ $(document).ready(function(){initNavTree('hierarchy.html','');});
    This inheritance list is sorted roughly, but not completely, alphabetically:
    [detail level 12]
    - + @@ -123,17 +123,17 @@ $(document).ready(function(){initNavTree('hierarchy.html','');}); - + - + - + - - + + @@ -146,12 +146,15 @@ $(document).ready(function(){initNavTree('hierarchy.html','');}); - - - - - - + + + + + + + + +
    oCAbstractBasic
    |\CRedBasicAuthAuthentication backend class for RedDAV
    |\CRedMatrix\RedDAV\RedBasicAuthAuthentication backend class for RedDAV
    oCApp
    oCBaseObject
    |oCConversation
    |\Cdba_mysqli
    oCenotify
    oCICollection
    |\CRedDirectoryRedDirectory class
    |\CRedMatrix\RedDAV\RedDirectoryRedDirectory class
    oCIFile
    |\CRedFile
    |\CRedMatrix\RedDAV\RedFileThis class represents a file in DAV
    oCIQuota
    |\CRedDirectoryRedDirectory class
    |\CRedMatrix\RedDAV\RedDirectoryRedDirectory class
    oCITemplateEngine
    |oCFriendicaSmartyEngine
    |\CTemplate
    oCNode
    |oCRedDirectoryRedDirectory class
    |\CRedFile
    |oCRedMatrix\RedDAV\RedDirectoryRedDirectory class
    |\CRedMatrix\RedDAV\RedFileThis class represents a file in DAV
    oCOAuthDataStore
    |\CFKOAuthDataStore
    oCOAuthServer
    oCProtoDriver
    |\CZotDriver
    oCSabre
    |oCRedDirectoryRedDirectory class
    |oCRedDirectoryRedDirectory class
    |oCRedDirectoryRedDirectory class
    |\CRedMatrix\RedDAV\RedBrowserProvides a DAV frontend for the webbrowser
    \CSmarty
     \CFriendicaSmarty
    |oCRedMatrix\RedDAV\RedBasicAuthAuthentication backend class for RedDAV
    |oCRedMatrix\RedDAV\RedBrowserProvides a DAV frontend for the webbrowser
    |oCRedMatrix\RedDAV\RedDirectoryRedDirectory class
    |oCRedMatrix\RedDAV\RedDirectoryRedDirectory class
    |oCRedMatrix\RedDAV\RedDirectoryRedDirectory class
    |oCRedMatrix\RedDAV\RedFileThis class represents a file in DAV
    |\CRedMatrix\RedDAV\RedFileThis class represents a file in DAV
    \CSmarty
     \CFriendicaSmarty
    diff --git a/doc/html/hierarchy.js b/doc/html/hierarchy.js index 6fabb1f7f..006d8f3b6 100644 --- a/doc/html/hierarchy.js +++ b/doc/html/hierarchy.js @@ -1,7 +1,7 @@ var hierarchy = [ [ "AbstractBasic", null, [ - [ "RedBasicAuth", "classRedBasicAuth.html", null ] + [ "RedMatrix\\RedDAV\\RedBasicAuth", "classRedMatrix_1_1RedDAV_1_1RedBasicAuth.html", null ] ] ], [ "App", "classApp.html", null ], [ "BaseObject", "classBaseObject.html", [ @@ -15,21 +15,21 @@ var hierarchy = ] ], [ "enotify", "classenotify.html", null ], [ "ICollection", null, [ - [ "RedDirectory", "classRedDirectory.html", null ] + [ "RedMatrix\\RedDAV\\RedDirectory", "classRedMatrix_1_1RedDAV_1_1RedDirectory.html", null ] ] ], [ "IFile", null, [ - [ "RedFile", "classRedFile.html", null ] + [ "RedMatrix\\RedDAV\\RedFile", "classRedMatrix_1_1RedDAV_1_1RedFile.html", null ] ] ], [ "IQuota", null, [ - [ "RedDirectory", "classRedDirectory.html", null ] + [ "RedMatrix\\RedDAV\\RedDirectory", "classRedMatrix_1_1RedDAV_1_1RedDirectory.html", null ] ] ], [ "ITemplateEngine", "interfaceITemplateEngine.html", [ [ "FriendicaSmartyEngine", "classFriendicaSmartyEngine.html", null ], [ "Template", "classTemplate.html", null ] ] ], [ "Node", null, [ - [ "RedDirectory", "classRedDirectory.html", null ], - [ "RedFile", "classRedFile.html", null ] + [ "RedMatrix\\RedDAV\\RedDirectory", "classRedMatrix_1_1RedDAV_1_1RedDirectory.html", null ], + [ "RedMatrix\\RedDAV\\RedFile", "classRedMatrix_1_1RedDAV_1_1RedFile.html", null ] ] ], [ "OAuthDataStore", null, [ [ "FKOAuthDataStore", "classFKOAuthDataStore.html", null ] @@ -48,10 +48,13 @@ var hierarchy = [ "ZotDriver", "classZotDriver.html", null ] ] ], [ "Sabre", null, [ - [ "RedDirectory", "classRedDirectory.html", null ], - [ "RedDirectory", "classRedDirectory.html", null ], - [ "RedDirectory", "classRedDirectory.html", null ], - [ "RedMatrix\\RedDAV\\RedBrowser", "classRedMatrix_1_1RedDAV_1_1RedBrowser.html", null ] + [ "RedMatrix\\RedDAV\\RedBasicAuth", "classRedMatrix_1_1RedDAV_1_1RedBasicAuth.html", null ], + [ "RedMatrix\\RedDAV\\RedBrowser", "classRedMatrix_1_1RedDAV_1_1RedBrowser.html", null ], + [ "RedMatrix\\RedDAV\\RedDirectory", "classRedMatrix_1_1RedDAV_1_1RedDirectory.html", null ], + [ "RedMatrix\\RedDAV\\RedDirectory", "classRedMatrix_1_1RedDAV_1_1RedDirectory.html", null ], + [ "RedMatrix\\RedDAV\\RedDirectory", "classRedMatrix_1_1RedDAV_1_1RedDirectory.html", null ], + [ "RedMatrix\\RedDAV\\RedFile", "classRedMatrix_1_1RedDAV_1_1RedFile.html", null ], + [ "RedMatrix\\RedDAV\\RedFile", "classRedMatrix_1_1RedDAV_1_1RedFile.html", null ] ] ], [ "Smarty", null, [ [ "FriendicaSmarty", "classFriendicaSmarty.html", null ] diff --git a/doc/html/hubloc_8php.html b/doc/html/hubloc_8php.html index 64d5e920f..bdc2eaa03 100644 --- a/doc/html/hubloc_8php.html +++ b/doc/html/hubloc_8php.html @@ -118,8 +118,28 @@ Functions    remove_obsolete_hublocs ()   + hubloc_change_primary ($hubloc) + 

    Function Documentation

    + +
    +
    + + + + + + + + +
    hubloc_change_primary ( $hubloc)
    +
    + +

    Referenced by sync_locations().

    + +
    +
    diff --git a/doc/html/hubloc_8php.js b/doc/html/hubloc_8php.js index 3b2e4bb1e..0c81388d9 100644 --- a/doc/html/hubloc_8php.js +++ b/doc/html/hubloc_8php.js @@ -1,5 +1,6 @@ var hubloc_8php = [ + [ "hubloc_change_primary", "hubloc_8php.html#ad86214b3a74084bd7b54e8d6c919ce4d", null ], [ "is_matrix_url", "hubloc_8php.html#aebd244b4616ded022cbbee5e82926951", null ], [ "prune_hub_reinstalls", "hubloc_8php.html#ad3d0dcfcfcb347744f7617fe6f5de002", null ], [ "remove_obsolete_hublocs", "hubloc_8php.html#a84c79b7be352f62d12fe4fa2c80fc6ea", null ] diff --git a/doc/html/include_2attach_8php.html b/doc/html/include_2attach_8php.html index 8cfed4f91..22833ea99 100644 --- a/doc/html/include_2attach_8php.html +++ b/doc/html/include_2attach_8php.html @@ -141,7 +141,7 @@ Functions  Changes permissions of a file. More...
       attach_delete ($channel_id, $resource) - Delete a file/directory. More...
    + Delete a file/directory from a channel. More...
       get_cloudpath ($arr)  Returns path to file in cloud/. More...
    @@ -150,8 +150,10 @@ Functions  Returns path to parent folder in cloud/. More...
       find_folder_hash_by_attach_hash ($channel_id, $attachHash) + Return the hash of an attachment's folder. More...
       find_filename_by_hash ($channel_id, $attachHash) + Returns the filename of an attachment in a given channel. More...
       pipe_streams ($in, $out)   @@ -391,16 +393,18 @@ Functions
    -

    Delete a file/directory.

    +

    Delete a file/directory from a channel.

    +

    If the provided resource hash is from a directory it will delete everything recursively under this directory.

    Parameters
    - - + +
    int$channel_id
    string$resourcea hash to delete
    int$channel_idThe id of the channel
    string$resourceThe hash to delete
    +
    Returns
    void
    -

    Referenced by RedDirectory\createFile(), RedFile\delete(), filestorage_content(), and RedFile\put().

    +

    Referenced by RedMatrix\RedDAV\RedDirectory\createFile(), RedMatrix\RedDAV\RedFile\delete(), filestorage_content(), and RedMatrix\RedDAV\RedFile\put().

    @@ -523,7 +527,7 @@ Functions -

    Referenced by RedDirectory\createDirectory().

    +

    Referenced by RedMatrix\RedDAV\RedDirectory\createDirectory().

    @@ -600,6 +604,16 @@ Functions
    +

    Returns the filename of an attachment in a given channel.

    +
    Parameters
    + + + +
    mixed$channel_idThe id of the channel
    mixed$attachHashThe hash of the attachment
    +
    +
    +
    Returns
    string The filename of the attachment
    +

    Referenced by get_parent_cloudpath().

    @@ -628,6 +642,16 @@ Functions
    +

    Return the hash of an attachment's folder.

    +
    Parameters
    + + + +
    int$channel_idThe id of the channel
    string$attachHashThe hash of the attachment
    +
    +
    +
    Returns
    string
    +

    Referenced by get_parent_cloudpath().

    @@ -649,11 +673,11 @@ Functions

    Returns path to file in cloud/.

    Parameters
    - +
    $arr
    array$arr,[uid]int the channels uid $arr[folder] string $arr[filename]] string
    -
    Returns
    string with the path the file to cloud/
    +
    Returns
    string path to the file in cloud/

    Referenced by filestorage_content().

    @@ -692,11 +716,13 @@ Functions

    Returns path to parent folder in cloud/.

    Parameters
    - + + +
    $arr
    int$channel_idThe id of the channel
    string$channel_nameThe name of the channel
    string$attachHash
    -
    Returns
    string with the folder path
    +
    Returns
    string with the full folder path

    Referenced by filestorage_content(), and filestorage_post().

    @@ -761,7 +787,7 @@ Functions
    Returns
    string The mimetype according to a file ending.
    -

    Referenced by attach_store(), and RedDirectory\createFile().

    +

    Referenced by attach_store(), and RedMatrix\RedDAV\RedDirectory\createFile().

    diff --git a/doc/html/include_2config_8php.html b/doc/html/include_2config_8php.html index 754b626c7..b0f3479bb 100644 --- a/doc/html/include_2config_8php.html +++ b/doc/html/include_2config_8php.html @@ -340,7 +340,7 @@ Functions
    Returns
    mixed Return value or false on error or if not set
    -

    Referenced by account_service_class_fetch(), 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(), bb2diaspora_itembody(), bbcode(), build_sync_packet(), channel_content(), check_account_admin(), check_account_invite(), check_config(), check_upstream_directory(), cli_startup(), create_account(), create_identity(), create_sys_channel(), RedDirectory\createFile(), detect_language(), diaspora_comment(), diaspora_conversation(), diaspora_dispatch(), diaspora_dispatch_public(), diaspora_is_blacklisted(), diaspora_like(), diaspora_message(), diaspora_process_outbound(), diaspora_send_followup(), diaspora_send_mail(), diaspora_send_relay(), 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(), filter_insecure(), 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(), get_role_perms(), RedDirectory\getChild(), RedDirectory\getChildren(), group_content(), guess_image_type(), home_content(), home_init(), identity_basic_export(), 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_contact(), new_keypair(), notification(), notifier_run(), oembed_bbcode2html(), openid_content(), parse_url_content(), perm_is_allowed(), photo_factory(), 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(), remove_obsolete_hublocs(), scale_external_images(), search_content(), send_message(), send_reg_approval_email(), send_verification_email(), service_class_allows(), service_class_fetch(), service_limits_content(), set_config(), settings_post(), site_default_perms(), siteinfo_content(), siteinfo_init(), smilies(), start_delivery_chain(), store_diaspora_comment_sig(), 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(), widget_fullprofile(), widget_profile(), z_fetch_url(), z_post_url(), zfinger_init(), zot_fetch(), zot_gethub(), zot_import(), and zotfeed_init().

    +

    Referenced by account_service_class_fetch(), 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(), bb2diaspora_itembody(), bbcode(), build_sync_packet(), channel_content(), check_account_admin(), check_account_invite(), check_config(), check_upstream_directory(), cli_startup(), create_account(), create_identity(), create_sys_channel(), RedMatrix\RedDAV\RedDirectory\createFile(), detect_language(), diaspora_comment(), diaspora_conversation(), diaspora_dispatch(), diaspora_dispatch_public(), diaspora_is_blacklisted(), diaspora_like(), diaspora_message(), diaspora_process_outbound(), diaspora_send_followup(), diaspora_send_mail(), diaspora_send_relay(), 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(), filter_insecure(), 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(), get_role_perms(), RedMatrix\RedDAV\RedDirectory\getChild(), RedMatrix\RedDAV\RedDirectory\getChildren(), group_content(), guess_image_type(), home_content(), home_init(), identity_basic_export(), 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_contact(), new_keypair(), notification(), notifier_run(), oembed_bbcode2html(), openid_content(), parse_url_content(), perm_is_allowed(), photo_factory(), 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(), RedMatrix\RedDAV\RedFile\put(), receive_post(), register_content(), register_post(), reload_plugins(), remove_all_xchan_resources(), remove_obsolete_hublocs(), scale_external_images(), search_content(), send_message(), send_reg_approval_email(), send_verification_email(), service_class_allows(), service_class_fetch(), service_limits_content(), set_config(), settings_post(), site_default_perms(), siteinfo_content(), siteinfo_init(), smilies(), start_delivery_chain(), store_diaspora_comment_sig(), 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(), widget_fullprofile(), widget_profile(), z_fetch_url(), z_post_url(), zfinger_init(), zot_fetch(), zot_gethub(), zot_import(), and zotfeed_init().

    @@ -433,7 +433,7 @@ Functions
    Returns
    mixed Stored value or false if it does not exist
    -

    Referenced by Conversation\__construct(), acl_init(), bb2diaspora_itembody(), App\build_pagehead(), change_channel(), channel_content(), connect_content(), connedit_content(), connedit_post(), construct_page(), contact_block(), contact_remove(), conversation(), current_theme(), display_content(), editpost_content(), feature_enabled(), findpeople_widget(), fix_attached_file_permissions(), fix_attached_photo_permissions(), Item\get_comment_box(), get_online_status(), Item\get_template_data(), 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(), nav(), network_content(), new_contact(), 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(), webpages_content(), and widget_notes().

    +

    Referenced by Conversation\__construct(), acl_init(), bb2diaspora_itembody(), App\build_pagehead(), change_channel(), channel_content(), connect_content(), connedit_content(), connedit_post(), construct_page(), contact_block(), contact_remove(), conversation(), current_theme(), display_content(), editpost_content(), feature_enabled(), findpeople_widget(), fix_attached_file_permissions(), fix_attached_photo_permissions(), Item\get_comment_box(), get_online_status(), Item\get_template_data(), 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(), nav(), network_content(), new_contact(), 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(), webpages_content(), and widget_notes().

    diff --git a/doc/html/include_2network_8php.html b/doc/html/include_2network_8php.html index 6dd338f10..2a5cb1c96 100644 --- a/doc/html/include_2network_8php.html +++ b/doc/html/include_2network_8php.html @@ -509,7 +509,7 @@ Functions
    -

    Referenced by diaspora_decode(), diaspora_dispatch(), fetch_xrd_links(), and get_diaspora_reshare_xml().

    +

    Referenced by diaspora_decode(), diaspora_dispatch(), fetch_xrd_links(), foofoo(), and get_diaspora_reshare_xml().

    diff --git a/doc/html/language_8php.html b/doc/html/language_8php.html index b177f71d5..0f1fe6ebd 100644 --- a/doc/html/language_8php.html +++ b/doc/html/language_8php.html @@ -372,7 +372,7 @@ Functions
    Returns
    translated string if exists, otherwise return $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_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(), bb2diaspora_itembody(), bbcode(), block_content(), blocks_content(), blogtheme_form(), bookmark_add(), bookmarks_content(), bookmarks_init(), categories_widget(), channel_content(), channel_init(), 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(), 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(), RedMatrix\RedDAV\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(), RedMatrix\RedDAV\RedBrowser\htmlActionsPanel(), identity_check_service_class(), impel_init(), import_author_rss(), import_author_unknown(), 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(), like_puller(), 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(), role_selector(), rpost_content(), scale_external_images(), search(), search_content(), searchbox(), select_timezone(), send_message(), send_reg_approval_email(), send_verification_email(), service_limits_content(), settings_post(), setup_content(), sexpref_selector(), sexpref_selector_min(), siteinfo_content(), sources_content(), sources_post(), subthread_content(), suggest_content(), sync_locations(), 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(), bb2diaspora_itembody(), bbcode(), block_content(), blocks_content(), blogtheme_form(), bookmark_add(), bookmarks_content(), bookmarks_init(), categories_widget(), channel_content(), channel_init(), 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(), 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(), foofoo(), format_categories(), format_event_diaspora(), format_event_html(), format_filer(), format_like(), format_notification(), fsuggest_content(), fsuggest_post(), gender_selector(), gender_selector_min(), RedMatrix\RedDAV\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(), RedMatrix\RedDAV\RedBrowser\htmlActionsPanel(), identity_check_service_class(), impel_init(), import_author_rss(), import_author_unknown(), 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(), like_puller(), load_database(), localize_item(), lockview_content(), locs_post(), 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(), role_selector(), rpost_content(), scale_external_images(), search(), search_content(), searchbox(), select_timezone(), send_message(), send_reg_approval_email(), send_verification_email(), service_limits_content(), settings_post(), setup_content(), sexpref_selector(), sexpref_selector_min(), siteinfo_content(), sources_content(), sources_post(), subthread_content(), suggest_content(), sync_locations(), 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/namespaceRedMatrix_1_1RedDAV.html b/doc/html/namespaceRedMatrix_1_1RedDAV.html index 206a9ff9c..f078431e9 100644 --- a/doc/html/namespaceRedMatrix_1_1RedDAV.html +++ b/doc/html/namespaceRedMatrix_1_1RedDAV.html @@ -112,13 +112,19 @@ $(document).ready(function(){initNavTree('namespaceRedMatrix_1_1RedDAV.html','') + + + + + + + + +

    Classes

    class  RedBasicAuth
     Authentication backend class for RedDAV. More...
     
    class  RedBrowser
     Provides a DAV frontend for the webbrowser. More...
     
    class  RedDirectory
     RedDirectory class. More...
     
    class  RedFile
     This class represents a file in DAV. More...
     
    -

    Detailed Description

    -

    RedMatrix - "The Network"

    -

    http://opensource.org/licenses/mit-license.php The MIT License (MIT)

    -
    + diff --git a/doc/html/namespaceRedMatrix_1_1RedDAV.js b/doc/html/namespaceRedMatrix_1_1RedDAV.js index f4892f0d4..b0d685e01 100644 --- a/doc/html/namespaceRedMatrix_1_1RedDAV.js +++ b/doc/html/namespaceRedMatrix_1_1RedDAV.js @@ -1,4 +1,7 @@ var namespaceRedMatrix_1_1RedDAV = [ - [ "RedBrowser", "classRedMatrix_1_1RedDAV_1_1RedBrowser.html", "classRedMatrix_1_1RedDAV_1_1RedBrowser" ] + [ "RedBasicAuth", "classRedMatrix_1_1RedDAV_1_1RedBasicAuth.html", "classRedMatrix_1_1RedDAV_1_1RedBasicAuth" ], + [ "RedBrowser", "classRedMatrix_1_1RedDAV_1_1RedBrowser.html", "classRedMatrix_1_1RedDAV_1_1RedBrowser" ], + [ "RedDirectory", "classRedMatrix_1_1RedDAV_1_1RedDirectory.html", "classRedMatrix_1_1RedDAV_1_1RedDirectory" ], + [ "RedFile", "classRedMatrix_1_1RedDAV_1_1RedFile.html", "classRedMatrix_1_1RedDAV_1_1RedFile" ] ]; \ No newline at end of file diff --git a/doc/html/navtree.js b/doc/html/navtree.js index 8b66b55ce..29bd1cf55 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#a5ab6181607a090bcdbaa13b15b85aba1", -"classApp.html#a58ac598544892ff7c32890291b72635e", -"classdba__driver.html#a558e738b88ae893cc5d79ffa3793d555", -"dir_6cee3bb9ace89cc4e2f065aa2ca7bc5b.html", -"help_8php.html#a06b2a51aaabed99e53a9b639047c4ce4", -"include_2photos_8php.html", -"oexchange_8php.html#a2d8b785cd7d041a4e6274f5af370cf26", -"setup_8php.html#a88247384a96e14516f474d7af6a465c1", -"viewconnections_8php.html#ab6c4d983e97b3a8a879567ff76507776" +"boot_8php.html#a56fd673eaa7014150297ce1162502db5", +"classApp.html#a557d7b779d8259027f4724ebf7b248dc", +"classdba__driver.html", +"dir_05f4fba29266e8fd7869afcd6cefb5cb.html", +"gprobe_8php.html", +"include_2oembed_8php.html#a03fa3b7832c98a3d0b4630afeb73d487", +"notifier_8php.html", +"setup_8php.html#a13cf286774149a0a7bd8adb8179cec75", +"view_2theme_2redbasic_2php_2config_8php.html#a8574a41fa9735ee391ba57ab24b93793" ]; var SYNCONMSG = 'click to disable panel synchronisation'; diff --git a/doc/html/navtreeindex0.js b/doc/html/navtreeindex0.js index ba0dc6c6c..7e19edb9b 100644 --- a/doc/html/navtreeindex0.js +++ b/doc/html/navtreeindex0.js @@ -19,10 +19,13 @@ var NAVTREEINDEX0 = "Contact_8php.html#ad5b02c2a962ee55b1b7ca6c159d6e4c5":[6,0,0,21,1], "Contact_8php.html#ae8803c330352cbf1e828eb7490edf47e":[6,0,0,21,0], "ConversationObject_8php.html":[6,0,0,25], -"ITemplateEngine_8php.html":[6,0,0,46], -"ItemObject_8php.html":[6,0,0,45], -"ProtoDriver_8php.html":[6,0,0,66], -"RedBrowser_8php.html":[6,0,0,2,0], +"ITemplateEngine_8php.html":[6,0,0,47], +"ItemObject_8php.html":[6,0,0,46], +"ProtoDriver_8php.html":[6,0,0,67], +"RedBasicAuth_8php.html":[6,0,0,2,0], +"RedBrowser_8php.html":[6,0,0,2,1], +"RedDirectory_8php.html":[6,0,0,2,2], +"RedFile_8php.html":[6,0,0,2,3], "__well__known_8php.html":[6,0,1,0], "__well__known_8php.html#a6ebfa937a2024f0b5dab53f0ac90fed0":[6,0,1,0,0], "account_8php.html":[6,0,0,3], @@ -104,7 +107,6 @@ var NAVTREEINDEX0 = "auth_8php.html#a6f60fb54f60cd36c2430d6615a7b4f3f":[6,0,0,9,3], "bb2diaspora_8php.html":[6,0,0,11], "bb2diaspora_8php.html#a180b0e3a7d702998be19e3c3b44b0e93":[6,0,0,11,13], -"bb2diaspora_8php.html#a2052c66bc1006a42b4c230320c269e47":[6,0,0,11,1], "bb2diaspora_8php.html#a29a2ad41f5826f3975fa9a49934ff863":[6,0,0,11,9], "bb2diaspora_8php.html#a4a27604f0745f1efda672966aaca9a3b":[6,0,0,11,6], "bb2diaspora_8php.html#a4c2f8f11b29a06809d9b07782215b1b2":[6,0,0,11,10], @@ -113,6 +115,7 @@ var NAVTREEINDEX0 = "bb2diaspora_8php.html#a599428bceb6f6d82a6a78cb66811f747":[6,0,0,11,14], "bb2diaspora_8php.html#a8b96bd45884fa1c40b942939354197d4":[6,0,0,11,7], "bb2diaspora_8php.html#aab32042f8bd63552d3fadeeae9eab083":[6,0,0,11,2], +"bb2diaspora_8php.html#ab27761069ea1275f0fc4c543099c5519":[6,0,0,11,1], "bb2diaspora_8php.html#ab61b4f8c065e97b151411858bb2f209a":[6,0,0,11,12], "bb2diaspora_8php.html#ac9061ee10fcfcdac69566b649614e625":[6,0,0,11,5], "bb2diaspora_8php.html#ad033be99e87a2aaa05e569c68f30792d":[6,0,0,11,11], @@ -246,8 +249,5 @@ var NAVTREEINDEX0 = "boot_8php.html#a525ca93ff35d3535d1a2b8ba57876afa":[6,0,4,166], "boot_8php.html#a52b599cd13e152ebc80d7e4413683195":[6,0,4,43], "boot_8php.html#a53e4bdb6f225da55115acb9277f75e53":[6,0,4,87], -"boot_8php.html#a5542c5c2806ab8bca04bad53d47b5209":[6,0,4,35], -"boot_8php.html#a56fd673eaa7014150297ce1162502db5":[6,0,4,204], -"boot_8php.html#a57eee7352714c004d36c26dda74af73e":[6,0,4,245], -"boot_8php.html#a5a681a672e007cdc22b43345d71f07c6":[6,0,4,295] +"boot_8php.html#a5542c5c2806ab8bca04bad53d47b5209":[6,0,4,35] }; diff --git a/doc/html/navtreeindex1.js b/doc/html/navtreeindex1.js index b2b8ea2c2..5784f0f8f 100644 --- a/doc/html/navtreeindex1.js +++ b/doc/html/navtreeindex1.js @@ -1,5 +1,8 @@ var NAVTREEINDEX1 = { +"boot_8php.html#a56fd673eaa7014150297ce1162502db5":[6,0,4,204], +"boot_8php.html#a57eee7352714c004d36c26dda74af73e":[6,0,4,245], +"boot_8php.html#a5a681a672e007cdc22b43345d71f07c6":[6,0,4,295], "boot_8php.html#a5ab6181607a090bcdbaa13b15b85aba1":[6,0,4,20], "boot_8php.html#a5ae728ac966ea1d3525a19e7fec59434":[6,0,4,66], "boot_8php.html#a5b043b7fdcfd4e8c9c3747574afc6caa":[6,0,4,194], @@ -199,15 +202,17 @@ var NAVTREEINDEX1 = "boot_8php.html#aff210e8403dd72368522b17fb6e5d4e7":[6,0,4,231], "boxy_8php.html":[6,0,3,1,3,1,0], "cache_8php.html":[6,0,0,14], -"channel_8php.html":[6,0,1,12], -"channel_8php.html#a9c6a6179e0e626398ebecc6151905ef1":[6,0,1,12,0], -"channel_8php.html#ac7c8c7845741baadf87fae6bc279f3dc":[6,0,1,12,1], -"chanview_8php.html":[6,0,1,13], -"chanview_8php.html#a4192c6da888c8c1165851acf9ad4cb8b":[6,0,1,13,0], -"chatsvc_8php.html":[6,0,1,15], -"chatsvc_8php.html#a28d248b056fa47452e28ed01130e9116":[6,0,1,15,1], -"chatsvc_8php.html#a7032784215e1f6747cf385a6598770f9":[6,0,1,15,0], -"chatsvc_8php.html#a7c9a9b9c24a2b02eed8efd6b09632d03":[6,0,1,15,2], +"chanman_8php.html":[6,0,0,15], +"chanman_8php.html#a21ba9a5c961e866ff27aee3ee67bf99b":[6,0,0,15,0], +"channel_8php.html":[6,0,1,11], +"channel_8php.html#a9c6a6179e0e626398ebecc6151905ef1":[6,0,1,11,0], +"channel_8php.html#ac7c8c7845741baadf87fae6bc279f3dc":[6,0,1,11,1], +"chanview_8php.html":[6,0,1,12], +"chanview_8php.html#a4192c6da888c8c1165851acf9ad4cb8b":[6,0,1,12,0], +"chatsvc_8php.html":[6,0,1,14], +"chatsvc_8php.html#a28d248b056fa47452e28ed01130e9116":[6,0,1,14,1], +"chatsvc_8php.html#a7032784215e1f6747cf385a6598770f9":[6,0,1,14,0], +"chatsvc_8php.html#a7c9a9b9c24a2b02eed8efd6b09632d03":[6,0,1,14,2], "choklet_8php.html":[6,0,3,0,0], "classApp.html":[5,0,6], "classApp.html#a037049cba88dfc6ff94f4b5b779e3fd3":[5,0,6,56], @@ -244,10 +249,5 @@ var NAVTREEINDEX1 = "classApp.html#a4bdd7bfed62f50515fce652127bf481b":[5,0,6,25], "classApp.html#a4c7cfc62d39508086cf300dc2e39c4df":[5,0,6,59], "classApp.html#a4ffe529fb14389f7fedf5fdc5f722e7f":[5,0,6,67], -"classApp.html#a5293a8543ba338dcf38cd4ff3bc5d4be":[5,0,6,9], -"classApp.html#a557d7b779d8259027f4724ebf7b248dc":[5,0,6,28], -"classApp.html#a560189f048d3db2f526841963cc43e97":[5,0,6,26], -"classApp.html#a56b1a432c96aef8b1971f779c9d93c8c":[5,0,6,88], -"classApp.html#a576ecb1c5b4a283221e6f2f0ec248251":[5,0,6,58], -"classApp.html#a57d041fcc003d08c127dfa99a02bc192":[5,0,6,74] +"classApp.html#a5293a8543ba338dcf38cd4ff3bc5d4be":[5,0,6,9] }; diff --git a/doc/html/navtreeindex2.js b/doc/html/navtreeindex2.js index 0509f02a0..5477cae7b 100644 --- a/doc/html/navtreeindex2.js +++ b/doc/html/navtreeindex2.js @@ -1,5 +1,10 @@ var NAVTREEINDEX2 = { +"classApp.html#a557d7b779d8259027f4724ebf7b248dc":[5,0,6,28], +"classApp.html#a560189f048d3db2f526841963cc43e97":[5,0,6,26], +"classApp.html#a56b1a432c96aef8b1971f779c9d93c8c":[5,0,6,88], +"classApp.html#a576ecb1c5b4a283221e6f2f0ec248251":[5,0,6,58], +"classApp.html#a57d041fcc003d08c127dfa99a02bc192":[5,0,6,74], "classApp.html#a58ac598544892ff7c32890291b72635e":[5,0,6,62], "classApp.html#a59dd4b665c70e7dbd80682c014ff7145":[5,0,6,63], "classApp.html#a5c63eabdc7fdd8b6e3348980ec16a3ad":[5,0,6,3], @@ -152,102 +157,97 @@ var NAVTREEINDEX2 = "classProtoDriver.html#a85e9063f6d0c304410cd246f7900ea1b":[5,0,23,4], "classProtoDriver.html#ae5b44739f84c10d00a9b65adf3785181":[5,0,23,5], "classProtoDriver.html#af66171aa7dab9b62cee915cb4f1abe1b":[5,0,23,3], -"classRedBasicAuth.html":[5,0,24], -"classRedBasicAuth.html#a072e8244a9a7f191b32d3db5ac94f857":[5,0,24,5], -"classRedBasicAuth.html#a09c1488a0b290f5a54dc15180c5690d7":[5,0,24,13], -"classRedBasicAuth.html#a2cc8b1eac9c5a799bfb53ea7f287f3f0":[5,0,24,2], -"classRedBasicAuth.html#a2d0246ed446fd5e55c17938b4ce6ac47":[5,0,24,15], -"classRedBasicAuth.html#a2dab393650d1573e3515969a153e8354":[5,0,24,10], -"classRedBasicAuth.html#a2f5d4ef7040c65b79b2fdfdf1212395a":[5,0,24,6], -"classRedBasicAuth.html#a358ddad4abb5aa8c1382cf49a907adbc":[5,0,24,4], -"classRedBasicAuth.html#a3ef43177abe0ef72da140a25bc568333":[5,0,24,3], -"classRedBasicAuth.html#a438ab125b6ef46581947e35d49cdebac":[5,0,24,11], -"classRedBasicAuth.html#a4a584de8eb31c786fabd8f6e1a6c8925":[5,0,24,0], -"classRedBasicAuth.html#a8d09b8d784cc810a0b3be580d05106a7":[5,0,24,14], -"classRedBasicAuth.html#a8dfd9a0953f8884723b421b7c1acf79b":[5,0,24,7], -"classRedBasicAuth.html#a9fdd4b890e3e7c7e1ae96ead2301418f":[5,0,24,1], -"classRedBasicAuth.html#aa75dc43b59adc98e38a98517d3fd35d1":[5,0,24,12], -"classRedBasicAuth.html#ad5a3ea4dc4783b242d9dc6e76478b6ef":[5,0,24,9], -"classRedBasicAuth.html#af14337f1baad407f8a85d48205c0f30e":[5,0,24,8], -"classRedDirectory.html":[5,0,25], -"classRedDirectory.html#a0f113244cd85c17848df991001d024f4":[5,0,25,13], -"classRedDirectory.html#a11376aed1963b4471eb1592c13c63976":[5,0,25,10], -"classRedDirectory.html#a1e35e3cd31d2a15250655e4cafdea180":[5,0,25,0], -"classRedDirectory.html#a2d12d99d38a6a75fc9a830b2f7fc0bf0":[5,0,25,3], -"classRedDirectory.html#a2f7a574f2115f099d6dd103d5b252375":[5,0,25,9], -"classRedDirectory.html#a3c148c07ad909985125aa4926d8d0021":[5,0,25,15], -"classRedDirectory.html#a5e3fc08b2bf9f61cea4d2ccae0495bec":[5,0,25,1], -"classRedDirectory.html#a6c7e08199abc24e6eeb94a4037ef8bfc":[5,0,25,7], -"classRedDirectory.html#a70173d4458572d95e586b2037d2fd2f4":[5,0,25,6], -"classRedDirectory.html#a9616af16cd19a18a6afebebcc2881c44":[5,0,25,12], -"classRedDirectory.html#a986936910f0216887a25e28916c166c7":[5,0,25,2], -"classRedDirectory.html#aa10254abf177bb2a0e4a88495725e09b":[5,0,25,14], -"classRedDirectory.html#aa42d3065f6f065b17db87146a7cb031a":[5,0,25,5], -"classRedDirectory.html#aaa20f0f44da23781917af8170c0a2569":[5,0,25,4], -"classRedDirectory.html#acb32b8df27538c57772824a745e751d7":[5,0,25,16], -"classRedDirectory.html#ad87c514a307ec97ba0f1372e9bcfa6a4":[5,0,25,17], -"classRedDirectory.html#adc48035679e52c55d9881f83de535553":[5,0,25,11], -"classRedDirectory.html#af6e4475dbd5abcdede00d20b8d388583":[5,0,25,8], -"classRedFile.html":[5,0,26], -"classRedFile.html#a0c961c5f49544d2502420361fa526437":[5,0,26,6], -"classRedFile.html#a26416827eb68554d033d1e2e5cc6dd3b":[5,0,26,3], -"classRedFile.html#a2ff12032b45538353eded9809d3b7550":[5,0,26,11], -"classRedFile.html#a38a82bfc1b30028ea6ac75923e90fa25":[5,0,26,9], -"classRedFile.html#a41562a28007789bbe7fe06d6a20eef47":[5,0,26,5], -"classRedFile.html#a41a49a583eb276b75626fcf97f4a699c":[5,0,26,8], -"classRedFile.html#a4b5d0e33f919c6c175b30a55de6263f2":[5,0,26,10], -"classRedFile.html#a7c868dfcef6c70cd0e24cf3caa2c3535":[5,0,26,2], -"classRedFile.html#a9a67bdb34c9db6ce144b3f371148b183":[5,0,26,0], -"classRedFile.html#acb1edbe1848fab05347746fa1ea09d8f":[5,0,26,7], -"classRedFile.html#acc48c05cd5a70951cb3c615ad84f03ba":[5,0,26,12], -"classRedFile.html#ae96d5caa2db7a461c57b24380fa87e28":[5,0,26,4], -"classRedFile.html#aef71c9eaac7052be7dc8602eb12171e7":[5,0,26,1], -"classRedMatrix_1_1RedDAV_1_1RedBrowser.html":[5,0,3,0,0], -"classRedMatrix_1_1RedDAV_1_1RedBrowser.html#a0733e38e254474d9a456825e72f1ddfd":[5,0,3,0,0,2], -"classRedMatrix_1_1RedDAV_1_1RedBrowser.html#a242ce69a2fe5a5fdf9c2b8d3954accfd":[5,0,3,0,0,7], -"classRedMatrix_1_1RedDAV_1_1RedBrowser.html#a3bd98af2d1cdfd8f26deb914596176cf":[5,0,3,0,0,5], -"classRedMatrix_1_1RedDAV_1_1RedBrowser.html#a8161f2a0be205412e263c947b5ec46c5":[5,0,3,0,0,0], -"classRedMatrix_1_1RedDAV_1_1RedBrowser.html#aa1607857cb59738c4dce2fe8e73d8f19":[5,0,3,0,0,6], -"classRedMatrix_1_1RedDAV_1_1RedBrowser.html#acaa792c08d24e9dc2919759e92ba037d":[5,0,3,0,0,4], -"classRedMatrix_1_1RedDAV_1_1RedBrowser.html#ad19179bf4ac7f18fafa7e2e3df800142":[5,0,3,0,0,8], -"classRedMatrix_1_1RedDAV_1_1RedBrowser.html#ad4bc0516533c62733f38043a37267d78":[5,0,3,0,0,1], -"classRedMatrix_1_1RedDAV_1_1RedBrowser.html#af764d5f14df751f9ec86c34fab300c09":[5,0,3,0,0,3], -"classTemplate.html":[5,0,27], -"classTemplate.html#a07737733f6949bdedea1e3d301b2ab7b":[5,0,27,13], -"classTemplate.html#a285b5b2007dbbf733476273df3fed4ef":[5,0,27,12], -"classTemplate.html#a317d535946dc065c35dd5cd38380e6c6":[5,0,27,22], -"classTemplate.html#a35d599c9b53a02e2fe2232e5b7ed5da7":[5,0,27,2], -"classTemplate.html#a37c15f6d1ade500943629f27a62808b7":[5,0,27,3], -"classTemplate.html#a4b933954086d9e01a1804b0b1c6ee93e":[5,0,27,6], -"classTemplate.html#a4e86b566c3f728e95ce5db1b33665c10":[5,0,27,21], -"classTemplate.html#a6f0efc256688c36110180b501067ff11":[5,0,27,23], -"classTemplate.html#a8469ab2988b6be2681516dc4b4e07d38":[5,0,27,15], -"classTemplate.html#a86e8fd27955ef10cadfd86f3fca70677":[5,0,27,9], -"classTemplate.html#a8f4d17e49f42b876a97364c13fb572d1":[5,0,27,19], -"classTemplate.html#aa6a087e0b7b887dd1c98c9e0ecbd3b29":[5,0,27,4], -"classTemplate.html#aa6f9bd7a8f7512efcf90e8d376fe05ee":[5,0,27,10], -"classTemplate.html#aac9a4638f11271e1b1dcc9f247242718":[5,0,27,20], -"classTemplate.html#aae9c4d761ea1298e745e8052d7910194":[5,0,27,1], -"classTemplate.html#abbc484016ddf5d818f55b823cae6feb0":[5,0,27,14], -"classTemplate.html#abda4c8d049f70553338eae7c905e9d5c":[5,0,27,17], -"classTemplate.html#abf71098c80fd1f218a59452b3408309e":[5,0,27,7], -"classTemplate.html#ac41c96e1f407b1a910029e5f4b7de8e4":[5,0,27,0], -"classTemplate.html#ace26b8a4252fbc1c385d2b5e1e93e5c8":[5,0,27,18], -"classTemplate.html#ae0836e7d5bd5afceb04f50fd635f1228":[5,0,27,8], -"classTemplate.html#ae791766c3d055f7f1ba5a5e60d647934":[5,0,27,5], -"classTemplate.html#afc4afb6f89bebcd5480022312a56cb4a":[5,0,27,16], -"classTemplate.html#afd97b4b1e7754a550e67c0ea79159059":[5,0,27,11], -"classZotDriver.html":[5,0,28], -"classZotDriver.html#a2e15ff09772f0608203dad1c98299394":[5,0,28,3], -"classZotDriver.html#a3cfdf443da4e5326e205855d7c0054f2":[5,0,28,0], -"classZotDriver.html#a40d328ff9f6b0a238afe286dddee1514":[5,0,28,6], -"classZotDriver.html#a6776935156accb0f170e2e24577133db":[5,0,28,1], -"classZotDriver.html#a876e3e0e4cad83c0b58c8696b344be6f":[5,0,28,4], -"classZotDriver.html#af65febb26031eb7f39871b9e2a539797":[5,0,28,2], -"classZotDriver.html#afaaf9941169fc966e43e25b25e6daea6":[5,0,28,5], -"classdba__driver.html":[5,0,10], -"classdba__driver.html#a1a8bc9dc839a6320a0e07d8047a6b721":[5,0,10,1], -"classdba__driver.html#a205f6535e399700b6fca2492f96f2229":[5,0,10,8], -"classdba__driver.html#a3033b5f1c2716b52202faeaae2592fe6":[5,0,10,9], -"classdba__driver.html#a4ccb27243e62a8ca30dd8e1b8cc67746":[5,0,10,6] +"classRedMatrix_1_1RedDAV_1_1RedBasicAuth.html":[5,0,3,0,0], +"classRedMatrix_1_1RedDAV_1_1RedBasicAuth.html#a112ad78a863dc0e598b5f02c596798c0":[5,0,3,0,0,9], +"classRedMatrix_1_1RedDAV_1_1RedBasicAuth.html#a167ae032bd2ad8e6caa2e1e1a6f1b5d3":[5,0,3,0,0,8], +"classRedMatrix_1_1RedDAV_1_1RedBasicAuth.html#a1a23c349cc4699a8474505972684ea9c":[5,0,3,0,0,13], +"classRedMatrix_1_1RedDAV_1_1RedBasicAuth.html#a2926fe923baade564f2663632fa8c633":[5,0,3,0,0,3], +"classRedMatrix_1_1RedDAV_1_1RedBasicAuth.html#a605aa09565a097316b80f0d17d6b5823":[5,0,3,0,0,12], +"classRedMatrix_1_1RedDAV_1_1RedBasicAuth.html#a6333c8ce58998bd11bf8102afe3b0748":[5,0,3,0,0,1], +"classRedMatrix_1_1RedDAV_1_1RedBasicAuth.html#a6ece02655b780469e59e204c5979a624":[5,0,3,0,0,7], +"classRedMatrix_1_1RedDAV_1_1RedBasicAuth.html#a76fdb7fd5dd7376155abb5a58cd6fd69":[5,0,3,0,0,11], +"classRedMatrix_1_1RedDAV_1_1RedBasicAuth.html#a849c99cf0a7ad065d630c8a30106ad5e":[5,0,3,0,0,15], +"classRedMatrix_1_1RedDAV_1_1RedBasicAuth.html#aa0b2a5fa9186d7dc0e637f1ecb379c42":[5,0,3,0,0,0], +"classRedMatrix_1_1RedDAV_1_1RedBasicAuth.html#aad0ef0cc05c407de84dbfbf2050bbbbe":[5,0,3,0,0,14], +"classRedMatrix_1_1RedDAV_1_1RedBasicAuth.html#aadce020fb595c7943829d7f995d3f998":[5,0,3,0,0,5], +"classRedMatrix_1_1RedDAV_1_1RedBasicAuth.html#abe1defedb90ac8e3b6487e124e625521":[5,0,3,0,0,10], +"classRedMatrix_1_1RedDAV_1_1RedBasicAuth.html#abf6fe89b0a8239ed93c3b07e1fbce75b":[5,0,3,0,0,2], +"classRedMatrix_1_1RedDAV_1_1RedBasicAuth.html#adc72f36f0b2b17b20ea4df900afcd697":[5,0,3,0,0,4], +"classRedMatrix_1_1RedDAV_1_1RedBasicAuth.html#af6d239fefed05859327ee8db626703f9":[5,0,3,0,0,6], +"classRedMatrix_1_1RedDAV_1_1RedBrowser.html":[5,0,3,0,1], +"classRedMatrix_1_1RedDAV_1_1RedBrowser.html#a0733e38e254474d9a456825e72f1ddfd":[5,0,3,0,1,2], +"classRedMatrix_1_1RedDAV_1_1RedBrowser.html#a242ce69a2fe5a5fdf9c2b8d3954accfd":[5,0,3,0,1,7], +"classRedMatrix_1_1RedDAV_1_1RedBrowser.html#a3bd98af2d1cdfd8f26deb914596176cf":[5,0,3,0,1,5], +"classRedMatrix_1_1RedDAV_1_1RedBrowser.html#a8161f2a0be205412e263c947b5ec46c5":[5,0,3,0,1,0], +"classRedMatrix_1_1RedDAV_1_1RedBrowser.html#aa1607857cb59738c4dce2fe8e73d8f19":[5,0,3,0,1,6], +"classRedMatrix_1_1RedDAV_1_1RedBrowser.html#acaa792c08d24e9dc2919759e92ba037d":[5,0,3,0,1,4], +"classRedMatrix_1_1RedDAV_1_1RedBrowser.html#ad19179bf4ac7f18fafa7e2e3df800142":[5,0,3,0,1,8], +"classRedMatrix_1_1RedDAV_1_1RedBrowser.html#ad4bc0516533c62733f38043a37267d78":[5,0,3,0,1,1], +"classRedMatrix_1_1RedDAV_1_1RedBrowser.html#af764d5f14df751f9ec86c34fab300c09":[5,0,3,0,1,3], +"classRedMatrix_1_1RedDAV_1_1RedDirectory.html":[5,0,3,0,2], +"classRedMatrix_1_1RedDAV_1_1RedDirectory.html#a14ac61d31a031d139956763db4e03956":[5,0,3,0,2,11], +"classRedMatrix_1_1RedDAV_1_1RedDirectory.html#a17ea47e34cb76b6e79f36ebed790d76a":[5,0,3,0,2,15], +"classRedMatrix_1_1RedDAV_1_1RedDirectory.html#a1a37850bdd1f188abd6160559698d5d7":[5,0,3,0,2,4], +"classRedMatrix_1_1RedDAV_1_1RedDirectory.html#a2fc4e6b9be2108bbaa1ca1a03fd6d44e":[5,0,3,0,2,14], +"classRedMatrix_1_1RedDAV_1_1RedDirectory.html#a438066fb1565fbcffa22c12d5ce23695":[5,0,3,0,2,17], +"classRedMatrix_1_1RedDAV_1_1RedDirectory.html#a4bba2e56bc8ec3e05f05eae46f56f36d":[5,0,3,0,2,16], +"classRedMatrix_1_1RedDAV_1_1RedDirectory.html#a55f7172814a0749b5342f152ab3fa0df":[5,0,3,0,2,8], +"classRedMatrix_1_1RedDAV_1_1RedDirectory.html#a58e750256cdc2f0f79fbe8d5463ffefe":[5,0,3,0,2,3], +"classRedMatrix_1_1RedDAV_1_1RedDirectory.html#a69db443ed3c84938b4352fe515bf8d68":[5,0,3,0,2,9], +"classRedMatrix_1_1RedDAV_1_1RedDirectory.html#a69db5f641f8f5dc999e55cee1832ecd5":[5,0,3,0,2,7], +"classRedMatrix_1_1RedDAV_1_1RedDirectory.html#a76b58fe5223e565c97f1b9af93031a99":[5,0,3,0,2,0], +"classRedMatrix_1_1RedDAV_1_1RedDirectory.html#a825dc5f3e0f83f50736c16daa6a4809d":[5,0,3,0,2,6], +"classRedMatrix_1_1RedDAV_1_1RedDirectory.html#a964b13fde1a5da6f76b51ca5519234dc":[5,0,3,0,2,1], +"classRedMatrix_1_1RedDAV_1_1RedDirectory.html#a9b9a0b5bfa4de1f78e6cafaa534b6f6a":[5,0,3,0,2,5], +"classRedMatrix_1_1RedDAV_1_1RedDirectory.html#aab6907e7fb7f9f7227f9cd42bdc84eb9":[5,0,3,0,2,12], +"classRedMatrix_1_1RedDAV_1_1RedDirectory.html#aca0e8d574ea66a0e210f571700663c62":[5,0,3,0,2,2], +"classRedMatrix_1_1RedDAV_1_1RedDirectory.html#adf8735b3118cdf2f42416edaf42b82e9":[5,0,3,0,2,13], +"classRedMatrix_1_1RedDAV_1_1RedDirectory.html#af90a1a74cfd643a5c56b9a17ea250d59":[5,0,3,0,2,10], +"classRedMatrix_1_1RedDAV_1_1RedFile.html":[5,0,3,0,3], +"classRedMatrix_1_1RedDAV_1_1RedFile.html#a0350cb4e0327e1f9922869a48ee04f1d":[5,0,3,0,3,9], +"classRedMatrix_1_1RedDAV_1_1RedFile.html#a05798eac84c578152ff21758261c6ac6":[5,0,3,0,3,0], +"classRedMatrix_1_1RedDAV_1_1RedFile.html#a07e1b19e7aaf3dcce822e9be8823a87d":[5,0,3,0,3,7], +"classRedMatrix_1_1RedDAV_1_1RedFile.html#a21b6e9d420c352f25610a33f57858215":[5,0,3,0,3,10], +"classRedMatrix_1_1RedDAV_1_1RedFile.html#a235700e2dfbe21dc41613d36e30e8acc":[5,0,3,0,3,11], +"classRedMatrix_1_1RedDAV_1_1RedFile.html#a709ec1288d21ddf1353524435ab916f0":[5,0,3,0,3,8], +"classRedMatrix_1_1RedDAV_1_1RedFile.html#a7241beecd01f5bb4e74659863dd85bd8":[5,0,3,0,3,2], +"classRedMatrix_1_1RedDAV_1_1RedFile.html#a9f14682acf3ccb70df5af5dd0687c689":[5,0,3,0,3,4], +"classRedMatrix_1_1RedDAV_1_1RedFile.html#ab722dcb8c4598426c81fa2b2e4fad5f2":[5,0,3,0,3,12], +"classRedMatrix_1_1RedDAV_1_1RedFile.html#ab7ab7ba81fab28eb02382cfdfd80ecfe":[5,0,3,0,3,1], +"classRedMatrix_1_1RedDAV_1_1RedFile.html#ac47016aa0e3f6f1a1c4570bd6fd8cf25":[5,0,3,0,3,5], +"classRedMatrix_1_1RedDAV_1_1RedFile.html#ac945aa782d6c035d339e59974266ec4d":[5,0,3,0,3,6], +"classRedMatrix_1_1RedDAV_1_1RedFile.html#af5c88b75d0c1f590af03755534cb167e":[5,0,3,0,3,3], +"classTemplate.html":[5,0,24], +"classTemplate.html#a07737733f6949bdedea1e3d301b2ab7b":[5,0,24,13], +"classTemplate.html#a285b5b2007dbbf733476273df3fed4ef":[5,0,24,12], +"classTemplate.html#a317d535946dc065c35dd5cd38380e6c6":[5,0,24,22], +"classTemplate.html#a35d599c9b53a02e2fe2232e5b7ed5da7":[5,0,24,2], +"classTemplate.html#a37c15f6d1ade500943629f27a62808b7":[5,0,24,3], +"classTemplate.html#a4b933954086d9e01a1804b0b1c6ee93e":[5,0,24,6], +"classTemplate.html#a4e86b566c3f728e95ce5db1b33665c10":[5,0,24,21], +"classTemplate.html#a6f0efc256688c36110180b501067ff11":[5,0,24,23], +"classTemplate.html#a8469ab2988b6be2681516dc4b4e07d38":[5,0,24,15], +"classTemplate.html#a86e8fd27955ef10cadfd86f3fca70677":[5,0,24,9], +"classTemplate.html#a8f4d17e49f42b876a97364c13fb572d1":[5,0,24,19], +"classTemplate.html#aa6a087e0b7b887dd1c98c9e0ecbd3b29":[5,0,24,4], +"classTemplate.html#aa6f9bd7a8f7512efcf90e8d376fe05ee":[5,0,24,10], +"classTemplate.html#aac9a4638f11271e1b1dcc9f247242718":[5,0,24,20], +"classTemplate.html#aae9c4d761ea1298e745e8052d7910194":[5,0,24,1], +"classTemplate.html#abbc484016ddf5d818f55b823cae6feb0":[5,0,24,14], +"classTemplate.html#abda4c8d049f70553338eae7c905e9d5c":[5,0,24,17], +"classTemplate.html#abf71098c80fd1f218a59452b3408309e":[5,0,24,7], +"classTemplate.html#ac41c96e1f407b1a910029e5f4b7de8e4":[5,0,24,0], +"classTemplate.html#ace26b8a4252fbc1c385d2b5e1e93e5c8":[5,0,24,18], +"classTemplate.html#ae0836e7d5bd5afceb04f50fd635f1228":[5,0,24,8], +"classTemplate.html#ae791766c3d055f7f1ba5a5e60d647934":[5,0,24,5], +"classTemplate.html#afc4afb6f89bebcd5480022312a56cb4a":[5,0,24,16], +"classTemplate.html#afd97b4b1e7754a550e67c0ea79159059":[5,0,24,11], +"classZotDriver.html":[5,0,25], +"classZotDriver.html#a2e15ff09772f0608203dad1c98299394":[5,0,25,3], +"classZotDriver.html#a3cfdf443da4e5326e205855d7c0054f2":[5,0,25,0], +"classZotDriver.html#a40d328ff9f6b0a238afe286dddee1514":[5,0,25,6], +"classZotDriver.html#a6776935156accb0f170e2e24577133db":[5,0,25,1], +"classZotDriver.html#a876e3e0e4cad83c0b58c8696b344be6f":[5,0,25,4], +"classZotDriver.html#af65febb26031eb7f39871b9e2a539797":[5,0,25,2], +"classZotDriver.html#afaaf9941169fc966e43e25b25e6daea6":[5,0,25,5] }; diff --git a/doc/html/navtreeindex3.js b/doc/html/navtreeindex3.js index 24bc69ce5..a13c90144 100644 --- a/doc/html/navtreeindex3.js +++ b/doc/html/navtreeindex3.js @@ -1,5 +1,10 @@ var NAVTREEINDEX3 = { +"classdba__driver.html":[5,0,10], +"classdba__driver.html#a1a8bc9dc839a6320a0e07d8047a6b721":[5,0,10,1], +"classdba__driver.html#a205f6535e399700b6fca2492f96f2229":[5,0,10,8], +"classdba__driver.html#a3033b5f1c2716b52202faeaae2592fe6":[5,0,10,9], +"classdba__driver.html#a4ccb27243e62a8ca30dd8e1b8cc67746":[5,0,10,6], "classdba__driver.html#a558e738b88ae893cc5d79ffa3793d555":[5,0,10,7], "classdba__driver.html#a5afa54172f3c837df61643f8f5b2c975":[5,0,10,2], "classdba__driver.html#a84675d28c7bd9b7290dd37e66dbd216c":[5,0,10,11], @@ -78,8 +83,8 @@ var NAVTREEINDEX3 = "cli__startup_8php.html#adfdde63686e33ccd4851fa5edc4fc70b":[6,0,0,17,0], "cli__suggest_8php.html":[6,0,0,18], "cli__suggest_8php.html#a8f3a60fc96f4bec7d3837c4efc7725f2":[6,0,0,18,0], -"cloud_8php.html":[6,0,1,16], -"cloud_8php.html#ad2e96e917852f27dedfc263d37e13756":[6,0,1,16,0], +"cloud_8php.html":[6,0,1,15], +"cloud_8php.html#ad2e96e917852f27dedfc263d37e13756":[6,0,1,15,0], "comanche_8php.html":[6,0,0,19], "comanche_8php.html#a028f004d5b8c23d6367816d899e17cfe":[6,0,0,19,5], "comanche_8php.html#a1a208fdb40dd83d6298caec4290ee922":[6,0,0,19,3], @@ -91,23 +96,23 @@ var NAVTREEINDEX3 = "comanche_8php.html#ae9fe1ce574db3dd0931eada80234f82a":[6,0,0,19,6], "comanche_8php.html#aed39ecad69234f3ddf61f0dedb49a58e":[6,0,0,19,1], "comanche_8php.html#af7150df735e5ff9d467994cd6f769c6e":[6,0,0,19,8], -"common_8php.html":[6,0,1,17], -"common_8php.html#ab63408f39abef7a6915186e8dabc5a96":[6,0,1,17,0], -"common_8php.html#aca62f113655809f41f49042ce9b123c2":[6,0,1,17,1], -"connect_8php.html":[6,0,1,18], -"connect_8php.html#a417ec27afe33f21a929667a665e32ee2":[6,0,1,18,2], -"connect_8php.html#a489f0a66c660de6ec4d6917b27674f07":[6,0,1,18,0], -"connect_8php.html#ad46a38f32fd7a3d324b1fa26373efa36":[6,0,1,18,1], -"connections_8php.html":[6,0,1,19], -"connections_8php.html#a1224058db8e3fb56463eb312f98e561d":[6,0,1,19,3], -"connections_8php.html#a15af118efee9c948b6f8294e54a73bb2":[6,0,1,19,0], -"connections_8php.html#a1f23623f802af7bd35e95b0e94e5d558":[6,0,1,19,2], -"connections_8php.html#aec2e457420fce3e3bf6a9f48e36df25c":[6,0,1,19,1], -"connedit_8php.html":[6,0,1,20], -"connedit_8php.html#a234c48426b652bf4d37053f2af329ac5":[6,0,1,20,3], -"connedit_8php.html#a4da871e075597a09a8b374b9171dd92e":[6,0,1,20,2], -"connedit_8php.html#a707ea7e63cf9674025b1d6b081ae74f5":[6,0,1,20,0], -"connedit_8php.html#a795acb3d9d841f55c255d7611681ab67":[6,0,1,20,1], +"common_8php.html":[6,0,1,16], +"common_8php.html#ab63408f39abef7a6915186e8dabc5a96":[6,0,1,16,0], +"common_8php.html#aca62f113655809f41f49042ce9b123c2":[6,0,1,16,1], +"connect_8php.html":[6,0,1,17], +"connect_8php.html#a417ec27afe33f21a929667a665e32ee2":[6,0,1,17,2], +"connect_8php.html#a489f0a66c660de6ec4d6917b27674f07":[6,0,1,17,0], +"connect_8php.html#ad46a38f32fd7a3d324b1fa26373efa36":[6,0,1,17,1], +"connections_8php.html":[6,0,1,18], +"connections_8php.html#a1224058db8e3fb56463eb312f98e561d":[6,0,1,18,3], +"connections_8php.html#a15af118efee9c948b6f8294e54a73bb2":[6,0,1,18,0], +"connections_8php.html#a1f23623f802af7bd35e95b0e94e5d558":[6,0,1,18,2], +"connections_8php.html#aec2e457420fce3e3bf6a9f48e36df25c":[6,0,1,18,1], +"connedit_8php.html":[6,0,1,19], +"connedit_8php.html#a234c48426b652bf4d37053f2af329ac5":[6,0,1,19,3], +"connedit_8php.html#a4da871e075597a09a8b374b9171dd92e":[6,0,1,19,2], +"connedit_8php.html#a707ea7e63cf9674025b1d6b081ae74f5":[6,0,1,19,0], +"connedit_8php.html#a795acb3d9d841f55c255d7611681ab67":[6,0,1,19,1], "contact__selectors_8php.html":[6,0,0,22], "contact__selectors_8php.html#a2c743d2eb526eb758d943a1490162d75":[6,0,0,22,1], "contact__selectors_8php.html#a9839e8fdaac7ffb37bf1420493f5c28f":[6,0,0,22,0], @@ -117,8 +122,8 @@ var NAVTREEINDEX3 = "contact__widgets_8php.html#a1eda66319d170f60a8d07c7ece95533b":[6,0,0,23,2], "contact__widgets_8php.html#a552f8544528cec0c995cea7287ea9d65":[6,0,0,23,1], "contact__widgets_8php.html#a57e73ebcfd62bb5d8c7a7b9e663726d6":[6,0,0,23,3], -"contactgroup_8php.html":[6,0,1,21], -"contactgroup_8php.html#a18c7391b1b25debaf98c9dba639caab3":[6,0,1,21,0], +"contactgroup_8php.html":[6,0,1,20], +"contactgroup_8php.html#a18c7391b1b25debaf98c9dba639caab3":[6,0,1,20,0], "conversation_8php.html":[6,0,0,24], "conversation_8php.html#a0891aaa4492cba2b51eda12fe01957f3":[6,0,0,24,7], "conversation_8php.html#a0ee05f15255fb1cc3d89f30bc378a654":[6,0,0,24,9], @@ -203,8 +208,8 @@ var NAVTREEINDEX3 = "dba__driver_8php.html#af531546fac5f0836a8557a4f6dfee930":[6,0,0,0,0,4], "dba__mysql_8php.html":[6,0,0,0,1], "dba__mysqli_8php.html":[6,0,0,0,2], -"delegate_8php.html":[6,0,1,22], -"delegate_8php.html#a943eea8996ef348eb845c498f9f354dd":[6,0,1,22,0], +"delegate_8php.html":[6,0,1,21], +"delegate_8php.html#a943eea8996ef348eb845c498f9f354dd":[6,0,1,21,0], "deliver_8php.html":[6,0,0,29], "deliver_8php.html#a397afcb9afecf0c1816b0951189dd346":[6,0,0,29,0], "diaspora_8php.html":[6,0,0,30], @@ -242,12 +247,7 @@ var NAVTREEINDEX3 = "diaspora_8php.html#ae6f52efd81fe515cd9912bc8293abf5b":[6,0,0,30,22], "diaspora_8php.html#aeb2bb78f620dbf51d9335e6eb7444f2c":[6,0,0,30,23], "diaspora_8php.html#af4698b165766f83d89ec1ea964bc92cc":[6,0,0,30,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], -"dir_21bc5169ff11430004758be31dcfc6c4.html":[6,0,0,0], -"dir_23ec12649285f9fabf3a6b7380226c28.html":[6,0,2], -"dir_25f74a9991dbbca1b52a94e358ca73c1.html":[6,0,2,1,0], -"dir_3d9c9d0c5e9556dd3eba1e072fa6eaeb.html":[6,0,3,1,3,1], -"dir_55dbaf9b7b53c4fc605c9011743a7353.html":[6,0,3,1,3] +"dimport_8php.html":[6,0,0,31], +"dimport_8php.html#a581f040717941ce3e1868b0b5dceefd1":[6,0,0,31,0], +"dir_032dd9e2cfe278a2cfa5eb9547448eb9.html":[6,0,3,1,3,0] }; diff --git a/doc/html/navtreeindex4.js b/doc/html/navtreeindex4.js index 244e98fb1..a533b3d46 100644 --- a/doc/html/navtreeindex4.js +++ b/doc/html/navtreeindex4.js @@ -1,5 +1,12 @@ var NAVTREEINDEX4 = { +"dir_05f4fba29266e8fd7869afcd6cefb5cb.html":[6,0,3,1,0,2], +"dir_0eaa4a0adae8ba4811e133c6e594aeee.html":[6,0,2,0], +"dir_21bc5169ff11430004758be31dcfc6c4.html":[6,0,0,0], +"dir_23ec12649285f9fabf3a6b7380226c28.html":[6,0,2], +"dir_25f74a9991dbbca1b52a94e358ca73c1.html":[6,0,2,1,0], +"dir_3d9c9d0c5e9556dd3eba1e072fa6eaeb.html":[6,0,3,1,3,1], +"dir_55dbaf9b7b53c4fc605c9011743a7353.html":[6,0,3,1,3], "dir_6cee3bb9ace89cc4e2f065aa2ca7bc5b.html":[6,0,3,1,1,1,0], "dir_720432dea4a717197ae070dbc42b8f20.html":[6,0,2,1], "dir_817f6d302394b98e59575acdb59998bc.html":[6,0,3,0], @@ -8,14 +15,14 @@ var NAVTREEINDEX4 = "dir_8e58ba5e98ac07e59ee15ca7486c9950.html":[6,0,3,1,2], "dir_922c77e958c99a98db92d38a3a349bf2.html":[6,0,3,1,1], "dir_92d6b429199666aa3765c8a934db5e14.html":[6,0,3,1,1,1], -"dir__fns_8php.html":[6,0,0,31], -"dir__fns_8php.html#a2f7d74bb2aea8bcd2537aee5c6708a16":[6,0,0,31,0], -"dir__fns_8php.html#a44062d4b471d1e83f92f6c184585aa13":[6,0,0,31,6], -"dir__fns_8php.html#a8c15aa69da12f2d3476b9e93b82b337d":[6,0,0,31,3], -"dir__fns_8php.html#aa666e7df6ca8c332f4081c9b66b4bdf6":[6,0,0,31,5], -"dir__fns_8php.html#acd37b17dce3bdec6d5a6344a20598c1e":[6,0,0,31,4], -"dir__fns_8php.html#acf621621e929d49441da30aad76a58cf":[6,0,0,31,1], -"dir__fns_8php.html#ae56881d69bb6f8e828c9e35454386774":[6,0,0,31,2], +"dir__fns_8php.html":[6,0,0,32], +"dir__fns_8php.html#a2f7d74bb2aea8bcd2537aee5c6708a16":[6,0,0,32,0], +"dir__fns_8php.html#a44062d4b471d1e83f92f6c184585aa13":[6,0,0,32,6], +"dir__fns_8php.html#a8c15aa69da12f2d3476b9e93b82b337d":[6,0,0,32,3], +"dir__fns_8php.html#aa666e7df6ca8c332f4081c9b66b4bdf6":[6,0,0,32,5], +"dir__fns_8php.html#acd37b17dce3bdec6d5a6344a20598c1e":[6,0,0,32,4], +"dir__fns_8php.html#acf621621e929d49441da30aad76a58cf":[6,0,0,32,1], +"dir__fns_8php.html#ae56881d69bb6f8e828c9e35454386774":[6,0,0,32,2], "dir_a8a0005c2b8590c535262d232c22afab.html":[6,0,3,1,1,1,0,0], "dir_aae29906d7bfc07d076125f669c8352e.html":[6,0,0,1], "dir_b2f003339c516cc00c8cadcafbe82f13.html":[6,0,3], @@ -26,16 +33,16 @@ var NAVTREEINDEX4 = "dir_d520c5cf583201d9437764f209363c22.html":[6,0,3,1,0], "dir_e7f045be8bb383d8447c6a6b84145083.html":[6,0,0,2], "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], +"dirprofile_8php.html":[6,0,1,23], +"dirprofile_8php.html#a3e1d30d3d93863ff5615f2df4ac7f052":[6,0,1,23,0], +"dirsearch_8php.html":[6,0,1,24], +"dirsearch_8php.html#a3e51964ae3f5ff147403407b65324752":[6,0,1,24,3], +"dirsearch_8php.html#a52bcac49b0e35cc8c6b70066143c2ee2":[6,0,1,24,1], +"dirsearch_8php.html#a7d4cd9890d5ed23c3efc58e2a778a305":[6,0,1,24,0], +"dirsearch_8php.html#a985d410a170549429857af6ff2673149":[6,0,1,24,4], +"dirsearch_8php.html#aa1fb04e1de4f25b63349ac78f94ceb4c":[6,0,1,24,2], +"display_8php.html":[6,0,1,25], +"display_8php.html#a37137c98d47bf3306f4c2bb9f5b60de0":[6,0,1,25,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], @@ -48,53 +55,53 @@ var NAVTREEINDEX4 = "docblox__errorchecker_8php.html#ab66bc0493d25f39bf8b4dcbb429f04e6":[6,0,2,3,4], "docblox__errorchecker_8php.html#ae9562cf60aa693114603d27b55d2185f":[6,0,2,3,1], "docblox__errorchecker_8php.html#af4ca738a05beffe9c8c23e1f7aea3c2d":[6,0,2,3,10], -"editblock_8php.html":[6,0,1,27], -"editblock_8php.html#abbe8f55de06967bc8d79d620509a49e6":[6,0,1,27,0], -"editlayout_8php.html":[6,0,1,28], -"editlayout_8php.html#aa877e4157a26b099de904164181dd386":[6,0,1,28,0], -"editpost_8php.html":[6,0,1,29], -"editpost_8php.html#a34011690864d122680c802e9e748ccfb":[6,0,1,29,0], -"editwebpage_8php.html":[6,0,1,30], -"editwebpage_8php.html#a375e945255fad79a71036528f7480650":[6,0,1,30,0], -"enotify_8php.html":[6,0,0,33], -"enotify_8php.html#a3e9a9355b243777c488d2a9883908dfc":[6,0,0,33,1], -"event_8php.html":[6,0,0,34], -"event_8php.html#a018ea4484910a873a7c1eaa126de9b1a":[6,0,0,34,8], -"event_8php.html#a180cccd63c2a2f00ff432b03113531f3":[6,0,0,34,0], -"event_8php.html#a184d6b9690e5b6dee35a0aa9edd47279":[6,0,0,34,1], -"event_8php.html#a2ac9f1b08de03250ecd794f705781d17":[6,0,0,34,7], -"event_8php.html#a32ba1b9ddf7a744a9a1512b052e5f850":[6,0,0,34,2], -"event_8php.html#a7378e839ac3de9d55579eb3ec48eaf92":[6,0,0,34,5], -"event_8php.html#abb74206cf42d694307c3d7abb7af9869":[6,0,0,34,6], -"event_8php.html#ac9f206819186b65952ac1869f0da8c6e":[6,0,0,34,3], -"event_8php.html#af5ac41e7ea3f7131088fe6333fd2846c":[6,0,0,34,4], -"events_8php.html":[6,0,1,31], -"events_8php.html#a1d293fb217ae6bc9e3858c4b32e363ec":[6,0,1,31,0], -"events_8php.html#ab3e8a8f901175f8e40a8089eea45c075":[6,0,1,31,1], -"expire_8php.html":[6,0,0,35], -"expire_8php.html#a444e45c9b67727b27db4c779fd51a298":[6,0,0,35,0], -"externals_8php.html":[6,0,0,36], -"externals_8php.html#a4df44079e6f915286088b7a0d44db926":[6,0,0,36,0], +"editblock_8php.html":[6,0,1,26], +"editblock_8php.html#abbe8f55de06967bc8d79d620509a49e6":[6,0,1,26,0], +"editlayout_8php.html":[6,0,1,27], +"editlayout_8php.html#aa877e4157a26b099de904164181dd386":[6,0,1,27,0], +"editpost_8php.html":[6,0,1,28], +"editpost_8php.html#a34011690864d122680c802e9e748ccfb":[6,0,1,28,0], +"editwebpage_8php.html":[6,0,1,29], +"editwebpage_8php.html#a375e945255fad79a71036528f7480650":[6,0,1,29,0], +"enotify_8php.html":[6,0,0,34], +"enotify_8php.html#a3e9a9355b243777c488d2a9883908dfc":[6,0,0,34,1], +"event_8php.html":[6,0,0,35], +"event_8php.html#a018ea4484910a873a7c1eaa126de9b1a":[6,0,0,35,8], +"event_8php.html#a180cccd63c2a2f00ff432b03113531f3":[6,0,0,35,0], +"event_8php.html#a184d6b9690e5b6dee35a0aa9edd47279":[6,0,0,35,1], +"event_8php.html#a2ac9f1b08de03250ecd794f705781d17":[6,0,0,35,7], +"event_8php.html#a32ba1b9ddf7a744a9a1512b052e5f850":[6,0,0,35,2], +"event_8php.html#a7378e839ac3de9d55579eb3ec48eaf92":[6,0,0,35,5], +"event_8php.html#abb74206cf42d694307c3d7abb7af9869":[6,0,0,35,6], +"event_8php.html#ac9f206819186b65952ac1869f0da8c6e":[6,0,0,35,3], +"event_8php.html#af5ac41e7ea3f7131088fe6333fd2846c":[6,0,0,35,4], +"events_8php.html":[6,0,1,30], +"events_8php.html#a1d293fb217ae6bc9e3858c4b32e363ec":[6,0,1,30,0], +"events_8php.html#ab3e8a8f901175f8e40a8089eea45c075":[6,0,1,30,1], +"expire_8php.html":[6,0,0,36], +"expire_8php.html#a444e45c9b67727b27db4c779fd51a298":[6,0,0,36,0], +"externals_8php.html":[6,0,0,37], +"externals_8php.html#a4df44079e6f915286088b7a0d44db926":[6,0,0,37,0], "extract_8php.html":[6,0,2,4], "extract_8php.html#a0cbe524ffc9a496114fd7ba9f423ef44":[6,0,2,4,3], "extract_8php.html#a50b05cf2e02ef0b67fcad97106dd7634":[6,0,2,4,2], "extract_8php.html#a63bb4c41bc532baacf6a4976cfaa0feb":[6,0,2,4,0], "extract_8php.html#a9590b15215a21e9b42eb546aeef79704":[6,0,2,4,1], -"fbrowser_8php.html":[6,0,1,32], -"fbrowser_8php.html#aee476addcf7a3e0fe9454f7dfd5a56c4":[6,0,1,32,0], -"features_8php.html":[6,0,0,37], -"features_8php.html#a52b5bdfb61b256713efecf7a7b20b0c0":[6,0,0,37,0], -"features_8php.html#ae73c5b03b01c7284ed7e7e0e774e975c":[6,0,0,37,1], -"feed_8php.html":[6,0,1,33], -"feed_8php.html#af86137700b56f33d1d5f25c8dec22c04":[6,0,1,33,0], -"filer_8php.html":[6,0,1,34], -"filer_8php.html#a5fd5d7e61b2f9c43cb5f110c89dc4274":[6,0,1,34,0], -"filerm_8php.html":[6,0,1,35], -"filerm_8php.html#ae2eb28d2054fa2c37e38689882172208":[6,0,1,35,0], +"fbrowser_8php.html":[6,0,1,31], +"fbrowser_8php.html#aee476addcf7a3e0fe9454f7dfd5a56c4":[6,0,1,31,0], +"features_8php.html":[6,0,0,38], +"features_8php.html#a52b5bdfb61b256713efecf7a7b20b0c0":[6,0,0,38,0], +"features_8php.html#ae73c5b03b01c7284ed7e7e0e774e975c":[6,0,0,38,1], +"feed_8php.html":[6,0,1,32], +"feed_8php.html#af86137700b56f33d1d5f25c8dec22c04":[6,0,1,32,0], +"filer_8php.html":[6,0,1,33], +"filer_8php.html#a5fd5d7e61b2f9c43cb5f110c89dc4274":[6,0,1,33,0], +"filerm_8php.html":[6,0,1,34], +"filerm_8php.html#ae2eb28d2054fa2c37e38689882172208":[6,0,1,34,0], "files.html":[6,0], -"filestorage_8php.html":[6,0,1,36], -"filestorage_8php.html#a61bb1be78472555df4ce619f51014040":[6,0,1,36,0], -"filestorage_8php.html#ad3b64e3ece9831f9d3a9f00c0ae983cd":[6,0,1,36,1], +"filestorage_8php.html":[6,0,1,35], +"filestorage_8php.html#a61bb1be78472555df4ce619f51014040":[6,0,1,35,0], +"filestorage_8php.html#ad3b64e3ece9831f9d3a9f00c0ae983cd":[6,0,1,35,1], "fpostit_8php.html":[6,0,2,0,0], "fpostit_8php.html#a3f3ae3ae61578b5671673914fd894443":[6,0,2,0,0,0], "fpostit_8php.html#a501b5ca82f287509fc691c88524064c1":[6,0,2,0,0,1], @@ -114,9 +121,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], -"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], +"fsuggest_8php.html":[6,0,1,37], +"fsuggest_8php.html#a61ecfe10ce937ed526614f8fd3de3c7d":[6,0,1,37,1], +"fsuggest_8php.html#aa6c49ed4b50a387f1845f36844dd7998":[6,0,1,37,0], "full_8php.html":[6,0,3,0,2], "full_8php.html#a3987f5547ceb7e36a210a66a06241a5a":[6,0,3,0,2,0], "functions.html":[5,3,0], @@ -165,8 +172,8 @@ var NAVTREEINDEX4 = "functions_func_0x75.html":[5,3,1,18], "functions_func_0x76.html":[5,3,1,19], "functions_vars.html":[5,3,2], -"globals.html":[6,1,0,0], "globals.html":[6,1,0], +"globals.html":[6,1,0,0], "globals_0x5f.html":[6,1,0,1], "globals_0x61.html":[6,1,0,2], "globals_0x62.html":[6,1,0,3], @@ -193,8 +200,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], @@ -220,8 +227,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], @@ -242,12 +249,5 @@ var NAVTREEINDEX4 = "globals_vars_0x75.html":[6,1,2,18], "globals_vars_0x77.html":[6,1,2,19], "globals_vars_0x78.html":[6,1,2,20], -"globals_vars_0x7a.html":[6,1,2,21], -"gprobe_8php.html":[6,0,0,39], -"gprobe_8php.html#adf72cb0a70b5b9d99fdec1cc60e18ed1":[6,0,0,39,0], -"greenthumbnails_8php.html":[6,0,3,1,0,2,3], -"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] +"globals_vars_0x7a.html":[6,1,2,21] }; diff --git a/doc/html/navtreeindex5.js b/doc/html/navtreeindex5.js index 6a9245f45..87a5fb67d 100644 --- a/doc/html/navtreeindex5.js +++ b/doc/html/navtreeindex5.js @@ -1,67 +1,75 @@ var NAVTREEINDEX5 = { -"help_8php.html#a06b2a51aaabed99e53a9b639047c4ce4":[6,0,1,41,1], -"help_8php.html#af055e15f600ffa6fbca9386fdf715224":[6,0,1,41,0], +"gprobe_8php.html":[6,0,0,40], +"gprobe_8php.html#adf72cb0a70b5b9d99fdec1cc60e18ed1":[6,0,0,40,0], +"greenthumbnails_8php.html":[6,0,3,1,0,2,3], +"hcard_8php.html":[6,0,1,39], +"hcard_8php.html#a3663012f1549849af88aba2bb87388e3":[6,0,1,39,0], +"hcard_8php.html#ac34f26b0e6a37eef44fa49bea135136d":[6,0,1,39,1], +"help_8php.html":[6,0,1,40], +"help_8php.html#a06b2a51aaabed99e53a9b639047c4ce4":[6,0,1,40,1], +"help_8php.html#af055e15f600ffa6fbca9386fdf715224":[6,0,1,40,0], "hierarchy.html":[5,2], -"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,41], -"html2bbcode_8php.html#a39c662b19d318990fee2ba795a55d7a7":[6,0,0,41,3], -"html2bbcode_8php.html#a5ad726995ac4070213abdb3bd09f4837":[6,0,0,41,1], -"html2bbcode_8php.html#a71a07f135d196ec5943b13f7b2e6a9b2":[6,0,0,41,0], -"html2bbcode_8php.html#ad174afe0ccbd8c475e48f8a6ee2f27d8":[6,0,0,41,2], -"html2plain_8php.html":[6,0,0,42], -"html2plain_8php.html#a3214912e3d00cf0a948072daccf16740":[6,0,0,42,0], -"html2plain_8php.html#a56d29b254333d29abb9d96a9a903a4b0":[6,0,0,42,3], -"html2plain_8php.html#ab3e121fa9f3feb16f9f942e705bc6c04":[6,0,0,42,2], -"html2plain_8php.html#ae1c203d0f089d5678d73a6c64a395201":[6,0,0,42,1], -"hubloc_8php.html":[6,0,0,43], -"hubloc_8php.html#a84c79b7be352f62d12fe4fa2c80fc6ea":[6,0,0,43,2], -"hubloc_8php.html#ad3d0dcfcfcb347744f7617fe6f5de002":[6,0,0,43,1], -"hubloc_8php.html#aebd244b4616ded022cbbee5e82926951":[6,0,0,43,0], -"identity_8php.html":[6,0,0,44], -"identity_8php.html#a1cf83ac2b645de12868edaa3a5718f05":[6,0,0,44,3], -"identity_8php.html#a224710dfb7465b706c91134247c20afa":[6,0,0,44,11], -"identity_8php.html#a2ab5172eabd375869060c9ad68323f5c":[6,0,0,44,17], -"identity_8php.html#a2e6a1cc35887937823ec7fbb90472afe":[6,0,0,44,22], -"identity_8php.html#a332df795f684788002f5a6424abacfd7":[6,0,0,44,10], -"identity_8php.html#a345f4c943d84de502ec6e72d2c813945":[6,0,0,44,2], -"identity_8php.html#a432259b2cf5b6f59be53e71db9f2c7dc":[6,0,0,44,26], -"identity_8php.html#a4751b522ea913d0e7ed43e03d22e9e68":[6,0,0,44,25], -"identity_8php.html#a47d6f53216f23a3484061793bef29854":[6,0,0,44,27], -"identity_8php.html#a490972c02fdb638c52ec0e012a30bfd2":[6,0,0,44,8], -"identity_8php.html#a4e996e44b50330098a04b467367a559f":[6,0,0,44,20], -"identity_8php.html#a4ff59df0f0a668a06a8411f87496aa21":[6,0,0,44,12], -"identity_8php.html#a5650319c799de09d1b6d1076b6f839a4":[6,0,0,44,23], -"identity_8php.html#a5b815330f3d177ab383af37a6c12e532":[6,0,0,44,30], -"identity_8php.html#a680fbafc2db023c5b1309e0180e81315":[6,0,0,44,31], -"identity_8php.html#a77d2237f1846964634b1c99089c27c7d":[6,0,0,44,1], -"identity_8php.html#a78151baf4407a8482d2681a91a9c486b":[6,0,0,44,28], -"identity_8php.html#a9637c557e13d9671f3eeb124ab98212a":[6,0,0,44,19], -"identity_8php.html#aa46321e1cd6a3b8dfde8bf9510112fec":[6,0,0,44,9], -"identity_8php.html#aa4bd4abfcba883f43919e89ec6419025":[6,0,0,44,21], -"identity_8php.html#aa870d2c1f558cfd52bef05bc124e8fa4":[6,0,0,44,0], -"identity_8php.html#aaeb666872995e3ab8da8f7bc5f3b2bd3":[6,0,0,44,14], -"identity_8php.html#aaff86ee3b5984821e7a256c2da5f1a51":[6,0,0,44,13], -"identity_8php.html#ab1485a26b032956e1496fc08c58b83ed":[6,0,0,44,6], -"identity_8php.html#ac73b3e13778c564c877554517a7f51ba":[6,0,0,44,5], -"identity_8php.html#ac9fcd5c4c371998790b5c55c3d0f4633":[6,0,0,44,16], -"identity_8php.html#ad2c97627a313d53df1a1c7b4215ddb51":[6,0,0,44,4], -"identity_8php.html#ad4a2c8caca8f6ae93633ebeca0ed6620":[6,0,0,44,24], -"identity_8php.html#ae2b140df652a55ca11bb6a99005fce35":[6,0,0,44,18], -"identity_8php.html#ae381db3d43f8e7c1da8b15d14ecf5312":[6,0,0,44,7], -"identity_8php.html#af2802bc13a00a17b867bba7978ba8f58":[6,0,0,44,29], -"identity_8php.html#afaedbc8e2d2a70ec8b006162baac5249":[6,0,0,44,15], -"impel_8php.html":[6,0,1,44], -"impel_8php.html#ab7db6fca43b42ea4332cb3e841b3cf7b":[6,0,1,44,0], -"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], +"home_8php.html":[6,0,1,41], +"home_8php.html#aa1cf697851a646755baf537f75334c46":[6,0,1,41,0], +"home_8php.html#ac4642c38b6f23a8d065dd4a75c620bde":[6,0,1,41,1], +"hostxrd_8php.html":[6,0,1,42], +"hostxrd_8php.html#aa37ffc8e7900bc76c4828bd25916db92":[6,0,1,42,0], +"html2bbcode_8php.html":[6,0,0,42], +"html2bbcode_8php.html#a39c662b19d318990fee2ba795a55d7a7":[6,0,0,42,3], +"html2bbcode_8php.html#a5ad726995ac4070213abdb3bd09f4837":[6,0,0,42,1], +"html2bbcode_8php.html#a71a07f135d196ec5943b13f7b2e6a9b2":[6,0,0,42,0], +"html2bbcode_8php.html#ad174afe0ccbd8c475e48f8a6ee2f27d8":[6,0,0,42,2], +"html2plain_8php.html":[6,0,0,43], +"html2plain_8php.html#a3214912e3d00cf0a948072daccf16740":[6,0,0,43,0], +"html2plain_8php.html#a56d29b254333d29abb9d96a9a903a4b0":[6,0,0,43,3], +"html2plain_8php.html#ab3e121fa9f3feb16f9f942e705bc6c04":[6,0,0,43,2], +"html2plain_8php.html#ae1c203d0f089d5678d73a6c64a395201":[6,0,0,43,1], +"hubloc_8php.html":[6,0,0,44], +"hubloc_8php.html#a84c79b7be352f62d12fe4fa2c80fc6ea":[6,0,0,44,3], +"hubloc_8php.html#ad3d0dcfcfcb347744f7617fe6f5de002":[6,0,0,44,2], +"hubloc_8php.html#ad86214b3a74084bd7b54e8d6c919ce4d":[6,0,0,44,0], +"hubloc_8php.html#aebd244b4616ded022cbbee5e82926951":[6,0,0,44,1], +"identity_8php.html":[6,0,0,45], +"identity_8php.html#a1cf83ac2b645de12868edaa3a5718f05":[6,0,0,45,3], +"identity_8php.html#a224710dfb7465b706c91134247c20afa":[6,0,0,45,11], +"identity_8php.html#a2ab5172eabd375869060c9ad68323f5c":[6,0,0,45,17], +"identity_8php.html#a2e6a1cc35887937823ec7fbb90472afe":[6,0,0,45,22], +"identity_8php.html#a332df795f684788002f5a6424abacfd7":[6,0,0,45,10], +"identity_8php.html#a345f4c943d84de502ec6e72d2c813945":[6,0,0,45,2], +"identity_8php.html#a432259b2cf5b6f59be53e71db9f2c7dc":[6,0,0,45,26], +"identity_8php.html#a4751b522ea913d0e7ed43e03d22e9e68":[6,0,0,45,25], +"identity_8php.html#a47d6f53216f23a3484061793bef29854":[6,0,0,45,27], +"identity_8php.html#a490972c02fdb638c52ec0e012a30bfd2":[6,0,0,45,8], +"identity_8php.html#a4e996e44b50330098a04b467367a559f":[6,0,0,45,20], +"identity_8php.html#a4ff59df0f0a668a06a8411f87496aa21":[6,0,0,45,12], +"identity_8php.html#a5650319c799de09d1b6d1076b6f839a4":[6,0,0,45,23], +"identity_8php.html#a5b815330f3d177ab383af37a6c12e532":[6,0,0,45,30], +"identity_8php.html#a680fbafc2db023c5b1309e0180e81315":[6,0,0,45,31], +"identity_8php.html#a77d2237f1846964634b1c99089c27c7d":[6,0,0,45,1], +"identity_8php.html#a78151baf4407a8482d2681a91a9c486b":[6,0,0,45,28], +"identity_8php.html#a9637c557e13d9671f3eeb124ab98212a":[6,0,0,45,19], +"identity_8php.html#aa46321e1cd6a3b8dfde8bf9510112fec":[6,0,0,45,9], +"identity_8php.html#aa4bd4abfcba883f43919e89ec6419025":[6,0,0,45,21], +"identity_8php.html#aa870d2c1f558cfd52bef05bc124e8fa4":[6,0,0,45,0], +"identity_8php.html#aaeb666872995e3ab8da8f7bc5f3b2bd3":[6,0,0,45,14], +"identity_8php.html#aaff86ee3b5984821e7a256c2da5f1a51":[6,0,0,45,13], +"identity_8php.html#ab1485a26b032956e1496fc08c58b83ed":[6,0,0,45,6], +"identity_8php.html#ac73b3e13778c564c877554517a7f51ba":[6,0,0,45,5], +"identity_8php.html#ac9fcd5c4c371998790b5c55c3d0f4633":[6,0,0,45,16], +"identity_8php.html#ad2c97627a313d53df1a1c7b4215ddb51":[6,0,0,45,4], +"identity_8php.html#ad4a2c8caca8f6ae93633ebeca0ed6620":[6,0,0,45,24], +"identity_8php.html#ae2b140df652a55ca11bb6a99005fce35":[6,0,0,45,18], +"identity_8php.html#ae381db3d43f8e7c1da8b15d14ecf5312":[6,0,0,45,7], +"identity_8php.html#af2802bc13a00a17b867bba7978ba8f58":[6,0,0,45,29], +"identity_8php.html#afaedbc8e2d2a70ec8b006162baac5249":[6,0,0,45,15], +"impel_8php.html":[6,0,1,43], +"impel_8php.html#ab7db6fca43b42ea4332cb3e841b3cf7b":[6,0,1,43,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,6], "include_2api_8php.html#a0991f72554f821255397d615e76f3203":[6,0,0,6,12], "include_2api_8php.html#a176c448d79c211ad41c2bbe3124658f5":[6,0,0,6,5], @@ -152,8 +160,6 @@ var NAVTREEINDEX5 = "include_2bookmarks_8php.html":[6,0,0,13], "include_2bookmarks_8php.html#a743763b0ce83af0bbc8a2f7ac16033aa":[6,0,0,13,1], "include_2bookmarks_8php.html#aef1cb2968c41c759f2d106e1088ca323":[6,0,0,13,0], -"include_2chanman_8php.html":[6,0,0,15], -"include_2chanman_8php.html#a21ba9a5c961e866ff27aee3ee67bf99b":[6,0,0,15,0], "include_2chat_8php.html":[6,0,0,16], "include_2chat_8php.html#a1ee1360f7d2549c7549ae07cb5190f0f":[6,0,0,16,4], "include_2chat_8php.html#a26abdccc2a278a59899896dbbfc6f049":[6,0,0,16,6], @@ -176,78 +182,72 @@ var NAVTREEINDEX5 = "include_2config_8php.html#af02c96e6b37335774b548914ede1d22e":[6,0,0,20,3], "include_2config_8php.html#af08b7adb63adfb2eda7c466fba0cce74":[6,0,0,20,4], "include_2config_8php.html#afe117b70f1bba2f6348d9300b601f86e":[6,0,0,20,12], -"include_2directory_8php.html":[6,0,0,32], -"include_2directory_8php.html#aa75d3b0697ca1456aaabdb37a74aa0f0":[6,0,0,32,0], -"include_2follow_8php.html":[6,0,0,38], -"include_2follow_8php.html#ae387d4ae097c23d69f3247e7f08140c7":[6,0,0,38,0], -"include_2group_8php.html":[6,0,0,40], -"include_2group_8php.html#a0122ef312df2c5546b1a46b3e6c7b31b":[6,0,0,40,2], -"include_2group_8php.html#a048f6892bfd28852de1b76470df411de":[6,0,0,40,10], -"include_2group_8php.html#a06ec565d2b64e79044e7c1bf91a2a4ce":[6,0,0,40,1], -"include_2group_8php.html#a22a81875259c7d3d64d4848afea6b345":[6,0,0,40,0], -"include_2group_8php.html#a4118f498bbd1530c1d0136d016d197a5":[6,0,0,40,6], -"include_2group_8php.html#a540e3ef36f47d47532646be4241f6518":[6,0,0,40,7], -"include_2group_8php.html#a5bd191d9692e6c34d48c0ede10810f09":[6,0,0,40,4], -"include_2group_8php.html#a6a69bd7be032fa8ce4e49c43a42cc6e9":[6,0,0,40,8], -"include_2group_8php.html#a90e157b3e1b99c981809cb5a2abd3245":[6,0,0,40,5], -"include_2group_8php.html#ab0e422a0f31c0c64fd9084ca03d85f32":[6,0,0,40,11], -"include_2group_8php.html#abd66a5ea34a07a3422dc2dde6c7b3ecb":[6,0,0,40,3], -"include_2group_8php.html#afb802ae2ce73aae4bc36d157f7b6a92f":[6,0,0,40,9], -"include_2menu_8php.html":[6,0,0,49], -"include_2menu_8php.html#a03a5deed3908543581c074ce333e9d6a":[6,0,0,49,11], -"include_2menu_8php.html#a08a800821721781a8dfffbe31481ff98":[6,0,0,49,1], -"include_2menu_8php.html#a251bf7e15d21627fd92614198e41c485":[6,0,0,49,10], -"include_2menu_8php.html#a32701c4245e78ba9106eef52c08bf33d":[6,0,0,49,9], -"include_2menu_8php.html#a3884bda4d85d84ec99447db9403a68d8":[6,0,0,49,3], -"include_2menu_8php.html#a47447c01ba8ea04cd74af1d4c5b68fc7":[6,0,0,49,8], -"include_2menu_8php.html#a68ebbf492470c930f652013656f9071d":[6,0,0,49,7], -"include_2menu_8php.html#a6a33c6a3db2a7510b16cc656edaec571":[6,0,0,49,5], -"include_2menu_8php.html#a9aa8e0052dd47c1a93f53a983bd4620a":[6,0,0,49,2], -"include_2menu_8php.html#acb66f80ca895a6ccd562b3d9ae7b41aa":[6,0,0,49,6], -"include_2menu_8php.html#ad87f51ce85172bcc3f931aa0cd96a804":[6,0,0,49,4], -"include_2menu_8php.html#add35fae5e9695031b3d46e30ac409eb8":[6,0,0,49,0], -"include_2message_8php.html":[6,0,0,50], -"include_2message_8php.html#a254a756031e4d5e94f85e2939bdb5091":[6,0,0,50,2], -"include_2message_8php.html#a5f8de9847e203329e317ac38dc646898":[6,0,0,50,1], -"include_2message_8php.html#a652973ce47a262f2d238c2fd6233d97e":[6,0,0,50,3], -"include_2message_8php.html#a751ffd6635022b2190f56154ee745752":[6,0,0,50,4], -"include_2message_8php.html#aed272d77c06a309e2836ac79e75613f1":[6,0,0,50,0], -"include_2network_8php.html":[6,0,0,52], -"include_2network_8php.html#a1ff07d9fad93b713b93da0ab77aab7f0":[6,0,0,52,7], -"include_2network_8php.html#a27a951b59d8d622c0b3e7b0673ba74c6":[6,0,0,52,14], -"include_2network_8php.html#a316f318167a039c89719afbd129a8f3c":[6,0,0,52,16], -"include_2network_8php.html#a3e6c751a51de33ad3563f0938296e78a":[6,0,0,52,20], -"include_2network_8php.html#a469b9bd700269cd07d954f1a16c5899b":[6,0,0,52,6], -"include_2network_8php.html#a4c5d50079e089168d9248427018fffd4":[6,0,0,52,12], -"include_2network_8php.html#a4cfb2c05a1c295317283d762440ce0b2":[6,0,0,52,11], -"include_2network_8php.html#a5176176ddc1906d91f186df6fbd87b48":[6,0,0,52,4], -"include_2network_8php.html#a5caa264fab6d2b2344e6bd5b298b08f2":[6,0,0,52,19], -"include_2network_8php.html#a63e62946e194928eb17c5a9f2bbef0fe":[6,0,0,52,5], -"include_2network_8php.html#a78e89557b2fbd344ad790846d761b0c7":[6,0,0,52,10], -"include_2network_8php.html#a850ed5307c6a18076f4b80addc99602d":[6,0,0,52,9], -"include_2network_8php.html#a872bbe72d23826c64c9e0f822180a3ec":[6,0,0,52,13], -"include_2network_8php.html#a897e7112d86eb95526cbd0bff9375f02":[6,0,0,52,18], -"include_2network_8php.html#a8d5a3afb51cc932032b5dcc159efaae0":[6,0,0,52,8], -"include_2network_8php.html#a9129fd55e7fc175b4ea9a195cccc16bc":[6,0,0,52,24], -"include_2network_8php.html#a984708e60d531b31b2d1f88b5f408f7b":[6,0,0,52,25], -"include_2network_8php.html#a99353baabbc3e0584b85eb79ee802cff":[6,0,0,52,21], -"include_2network_8php.html#a9e9da2aafb806c98ecdc318604e60dc6":[6,0,0,52,22], -"include_2network_8php.html#aafd06c0a75402aefb06cfb9f9740fa37":[6,0,0,52,23], -"include_2network_8php.html#ab07ce9d75eae559865ed90aad2154bd7":[6,0,0,52,2], -"include_2network_8php.html#aba38458a2ff2d92d3536488dbb119694":[6,0,0,52,0], -"include_2network_8php.html#acb0bd7f5fe38ff1eaebeae3284525070":[6,0,0,52,17], -"include_2network_8php.html#ad4056d3ce69988f5c1a997a79f503246":[6,0,0,52,3], -"include_2network_8php.html#ae8d9c41a11000fb8667039fc71b4f73f":[6,0,0,52,15], -"include_2network_8php.html#aee35d9ad6b3f872bfb39ba3598936aa7":[6,0,0,52,1], -"include_2notify_8php.html":[6,0,0,54], -"include_2notify_8php.html#a0e61728e487df50c72e6434f911a57d3":[6,0,0,54,0], -"include_2oembed_8php.html":[6,0,0,56], -"include_2oembed_8php.html#a000a62b97113cf95b0e9e00412168172":[6,0,0,56,5], -"include_2oembed_8php.html#a00c4c80deffd9daf8dc97b58d4c64ed0":[6,0,0,56,7], -"include_2oembed_8php.html#a03fa3b7832c98a3d0b4630afeb73d487":[6,0,0,56,1], -"include_2oembed_8php.html#a26bb4c1e330d2f94ea7b6ce2fe970cf3":[6,0,0,56,4], -"include_2oembed_8php.html#a98549b9af8140eda3eceaeedcaabc2c2":[6,0,0,56,3], -"include_2oembed_8php.html#a9e57f3e36a0a0a47e6db79544b701d9a":[6,0,0,56,6], -"include_2oembed_8php.html#ab953a6e7c11bc6498ce01ed73e2ba319":[6,0,0,56,0], -"include_2oembed_8php.html#aba89ae64b355efcb4f706553d3edb6a2":[6,0,0,56,2] +"include_2directory_8php.html":[6,0,0,33], +"include_2directory_8php.html#aa75d3b0697ca1456aaabdb37a74aa0f0":[6,0,0,33,0], +"include_2follow_8php.html":[6,0,0,39], +"include_2follow_8php.html#ae387d4ae097c23d69f3247e7f08140c7":[6,0,0,39,0], +"include_2group_8php.html":[6,0,0,41], +"include_2group_8php.html#a0122ef312df2c5546b1a46b3e6c7b31b":[6,0,0,41,2], +"include_2group_8php.html#a048f6892bfd28852de1b76470df411de":[6,0,0,41,10], +"include_2group_8php.html#a06ec565d2b64e79044e7c1bf91a2a4ce":[6,0,0,41,1], +"include_2group_8php.html#a22a81875259c7d3d64d4848afea6b345":[6,0,0,41,0], +"include_2group_8php.html#a4118f498bbd1530c1d0136d016d197a5":[6,0,0,41,6], +"include_2group_8php.html#a540e3ef36f47d47532646be4241f6518":[6,0,0,41,7], +"include_2group_8php.html#a5bd191d9692e6c34d48c0ede10810f09":[6,0,0,41,4], +"include_2group_8php.html#a6a69bd7be032fa8ce4e49c43a42cc6e9":[6,0,0,41,8], +"include_2group_8php.html#a90e157b3e1b99c981809cb5a2abd3245":[6,0,0,41,5], +"include_2group_8php.html#ab0e422a0f31c0c64fd9084ca03d85f32":[6,0,0,41,11], +"include_2group_8php.html#abd66a5ea34a07a3422dc2dde6c7b3ecb":[6,0,0,41,3], +"include_2group_8php.html#afb802ae2ce73aae4bc36d157f7b6a92f":[6,0,0,41,9], +"include_2menu_8php.html":[6,0,0,50], +"include_2menu_8php.html#a03a5deed3908543581c074ce333e9d6a":[6,0,0,50,11], +"include_2menu_8php.html#a08a800821721781a8dfffbe31481ff98":[6,0,0,50,1], +"include_2menu_8php.html#a251bf7e15d21627fd92614198e41c485":[6,0,0,50,10], +"include_2menu_8php.html#a32701c4245e78ba9106eef52c08bf33d":[6,0,0,50,9], +"include_2menu_8php.html#a3884bda4d85d84ec99447db9403a68d8":[6,0,0,50,3], +"include_2menu_8php.html#a47447c01ba8ea04cd74af1d4c5b68fc7":[6,0,0,50,8], +"include_2menu_8php.html#a68ebbf492470c930f652013656f9071d":[6,0,0,50,7], +"include_2menu_8php.html#a6a33c6a3db2a7510b16cc656edaec571":[6,0,0,50,5], +"include_2menu_8php.html#a9aa8e0052dd47c1a93f53a983bd4620a":[6,0,0,50,2], +"include_2menu_8php.html#acb66f80ca895a6ccd562b3d9ae7b41aa":[6,0,0,50,6], +"include_2menu_8php.html#ad87f51ce85172bcc3f931aa0cd96a804":[6,0,0,50,4], +"include_2menu_8php.html#add35fae5e9695031b3d46e30ac409eb8":[6,0,0,50,0], +"include_2message_8php.html":[6,0,0,51], +"include_2message_8php.html#a254a756031e4d5e94f85e2939bdb5091":[6,0,0,51,2], +"include_2message_8php.html#a5f8de9847e203329e317ac38dc646898":[6,0,0,51,1], +"include_2message_8php.html#a652973ce47a262f2d238c2fd6233d97e":[6,0,0,51,3], +"include_2message_8php.html#a751ffd6635022b2190f56154ee745752":[6,0,0,51,4], +"include_2message_8php.html#aed272d77c06a309e2836ac79e75613f1":[6,0,0,51,0], +"include_2network_8php.html":[6,0,0,53], +"include_2network_8php.html#a1ff07d9fad93b713b93da0ab77aab7f0":[6,0,0,53,7], +"include_2network_8php.html#a27a951b59d8d622c0b3e7b0673ba74c6":[6,0,0,53,14], +"include_2network_8php.html#a316f318167a039c89719afbd129a8f3c":[6,0,0,53,16], +"include_2network_8php.html#a3e6c751a51de33ad3563f0938296e78a":[6,0,0,53,20], +"include_2network_8php.html#a469b9bd700269cd07d954f1a16c5899b":[6,0,0,53,6], +"include_2network_8php.html#a4c5d50079e089168d9248427018fffd4":[6,0,0,53,12], +"include_2network_8php.html#a4cfb2c05a1c295317283d762440ce0b2":[6,0,0,53,11], +"include_2network_8php.html#a5176176ddc1906d91f186df6fbd87b48":[6,0,0,53,4], +"include_2network_8php.html#a5caa264fab6d2b2344e6bd5b298b08f2":[6,0,0,53,19], +"include_2network_8php.html#a63e62946e194928eb17c5a9f2bbef0fe":[6,0,0,53,5], +"include_2network_8php.html#a78e89557b2fbd344ad790846d761b0c7":[6,0,0,53,10], +"include_2network_8php.html#a850ed5307c6a18076f4b80addc99602d":[6,0,0,53,9], +"include_2network_8php.html#a872bbe72d23826c64c9e0f822180a3ec":[6,0,0,53,13], +"include_2network_8php.html#a897e7112d86eb95526cbd0bff9375f02":[6,0,0,53,18], +"include_2network_8php.html#a8d5a3afb51cc932032b5dcc159efaae0":[6,0,0,53,8], +"include_2network_8php.html#a9129fd55e7fc175b4ea9a195cccc16bc":[6,0,0,53,24], +"include_2network_8php.html#a984708e60d531b31b2d1f88b5f408f7b":[6,0,0,53,25], +"include_2network_8php.html#a99353baabbc3e0584b85eb79ee802cff":[6,0,0,53,21], +"include_2network_8php.html#a9e9da2aafb806c98ecdc318604e60dc6":[6,0,0,53,22], +"include_2network_8php.html#aafd06c0a75402aefb06cfb9f9740fa37":[6,0,0,53,23], +"include_2network_8php.html#ab07ce9d75eae559865ed90aad2154bd7":[6,0,0,53,2], +"include_2network_8php.html#aba38458a2ff2d92d3536488dbb119694":[6,0,0,53,0], +"include_2network_8php.html#acb0bd7f5fe38ff1eaebeae3284525070":[6,0,0,53,17], +"include_2network_8php.html#ad4056d3ce69988f5c1a997a79f503246":[6,0,0,53,3], +"include_2network_8php.html#ae8d9c41a11000fb8667039fc71b4f73f":[6,0,0,53,15], +"include_2network_8php.html#aee35d9ad6b3f872bfb39ba3598936aa7":[6,0,0,53,1], +"include_2notify_8php.html":[6,0,0,55], +"include_2notify_8php.html#a0e61728e487df50c72e6434f911a57d3":[6,0,0,55,0], +"include_2oembed_8php.html":[6,0,0,57], +"include_2oembed_8php.html#a000a62b97113cf95b0e9e00412168172":[6,0,0,57,5], +"include_2oembed_8php.html#a00c4c80deffd9daf8dc97b58d4c64ed0":[6,0,0,57,7] }; diff --git a/doc/html/navtreeindex6.js b/doc/html/navtreeindex6.js index 22769b114..7e42a4dcc 100644 --- a/doc/html/navtreeindex6.js +++ b/doc/html/navtreeindex6.js @@ -1,131 +1,139 @@ var NAVTREEINDEX6 = { -"include_2photos_8php.html":[6,0,0,61], -"include_2photos_8php.html#a6c40ef58aefef705a5adc84a40e97109":[6,0,0,61,0], -"include_2photos_8php.html#a7e7abc69872180697c5471dc69349afe":[6,0,0,61,2], -"include_2photos_8php.html#a8e8b7be99e24c2497bc2cb3339280c35":[6,0,0,61,1], -"include_2photos_8php.html#aa27b9e435dcc34e1009f56dc02c7ca51":[6,0,0,61,7], -"include_2photos_8php.html#ab0365f25b22ccea5f085fe7c49e1f4ab":[6,0,0,61,3], -"include_2photos_8php.html#ad648c0c5544fe9263409b6f6e57c6274":[6,0,0,61,6], -"include_2photos_8php.html#aedccaf18282b26899d9549c29bd9d1b9":[6,0,0,61,5], -"include_2photos_8php.html#af24c6aeed28ecc31ec39e7d9a1804979":[6,0,0,61,4], -"include_2probe_8php.html":[6,0,0,64], -"include_2probe_8php.html#a12ea7a0def2f0e07242b5c9ac684e01a":[6,0,0,64,3], -"include_2probe_8php.html#a2b4ac769508f7cfc17fee130279b9cb7":[6,0,0,64,4], -"include_2probe_8php.html#a2daa857942aceca01f956016dbbd139c":[6,0,0,64,1], -"include_2probe_8php.html#a3c02c7a23e8335a79c3c0f5331d11a85":[6,0,0,64,8], -"include_2probe_8php.html#a471851151d8cd7fbb79703e9522eeea8":[6,0,0,64,0], -"include_2probe_8php.html#a950a200372393f706851103cd3fffcba":[6,0,0,64,6], -"include_2probe_8php.html#a9b5eca1e01e52b3e65d64db0c92181e0":[6,0,0,64,2], -"include_2probe_8php.html#aa748dc73a6686c13826b1ee9d16c800d":[6,0,0,64,7], -"include_2probe_8php.html#ab19a52326b27607a0fb8191cc75ba481":[6,0,0,64,5], +"include_2oembed_8php.html#a03fa3b7832c98a3d0b4630afeb73d487":[6,0,0,57,1], +"include_2oembed_8php.html#a26bb4c1e330d2f94ea7b6ce2fe970cf3":[6,0,0,57,4], +"include_2oembed_8php.html#a98549b9af8140eda3eceaeedcaabc2c2":[6,0,0,57,3], +"include_2oembed_8php.html#a9e57f3e36a0a0a47e6db79544b701d9a":[6,0,0,57,6], +"include_2oembed_8php.html#ab953a6e7c11bc6498ce01ed73e2ba319":[6,0,0,57,0], +"include_2oembed_8php.html#aba89ae64b355efcb4f706553d3edb6a2":[6,0,0,57,2], +"include_2photos_8php.html":[6,0,0,62], +"include_2photos_8php.html#a6c40ef58aefef705a5adc84a40e97109":[6,0,0,62,0], +"include_2photos_8php.html#a7e7abc69872180697c5471dc69349afe":[6,0,0,62,2], +"include_2photos_8php.html#a8e8b7be99e24c2497bc2cb3339280c35":[6,0,0,62,1], +"include_2photos_8php.html#aa27b9e435dcc34e1009f56dc02c7ca51":[6,0,0,62,7], +"include_2photos_8php.html#ab0365f25b22ccea5f085fe7c49e1f4ab":[6,0,0,62,3], +"include_2photos_8php.html#ad648c0c5544fe9263409b6f6e57c6274":[6,0,0,62,6], +"include_2photos_8php.html#aedccaf18282b26899d9549c29bd9d1b9":[6,0,0,62,5], +"include_2photos_8php.html#af24c6aeed28ecc31ec39e7d9a1804979":[6,0,0,62,4], +"include_2probe_8php.html":[6,0,0,65], +"include_2probe_8php.html#a12ea7a0def2f0e07242b5c9ac684e01a":[6,0,0,65,3], +"include_2probe_8php.html#a2b4ac769508f7cfc17fee130279b9cb7":[6,0,0,65,4], +"include_2probe_8php.html#a2daa857942aceca01f956016dbbd139c":[6,0,0,65,1], +"include_2probe_8php.html#a3c02c7a23e8335a79c3c0f5331d11a85":[6,0,0,65,8], +"include_2probe_8php.html#a471851151d8cd7fbb79703e9522eeea8":[6,0,0,65,0], +"include_2probe_8php.html#a950a200372393f706851103cd3fffcba":[6,0,0,65,6], +"include_2probe_8php.html#a9b5eca1e01e52b3e65d64db0c92181e0":[6,0,0,65,2], +"include_2probe_8php.html#aa748dc73a6686c13826b1ee9d16c800d":[6,0,0,65,7], +"include_2probe_8php.html#ab19a52326b27607a0fb8191cc75ba481":[6,0,0,65,5], "index.html":[], "interfaceITemplateEngine.html":[5,0,19], "interfaceITemplateEngine.html#aaa7381c8becc3d1c1790b53988a0f243":[5,0,19,1], "interfaceITemplateEngine.html#aaf2698adbf46c073c24b162fe1b1c442":[5,0,19,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,47], -"items_8php.html#a004e89d86b0f29b2c4da20108ecc4091":[6,0,0,47,72], -"items_8php.html#a016dd86c827d08db89061ea81d15c6cb":[6,0,0,47,3], -"items_8php.html#a02ca33c31ed535d24894f8a9a91ce9df":[6,0,0,47,42], -"items_8php.html#a04a35b610acfe54434df08adec39c0c7":[6,0,0,47,30], -"items_8php.html#a0790a4550b829e85504af548623002ca":[6,0,0,47,9], -"items_8php.html#a079e099e15d88d47aeb6ca6d60da7107":[6,0,0,47,35], -"items_8php.html#a09d425596b9f8663472cf7474ad36d96":[6,0,0,47,44], -"items_8php.html#a0cf98bb619f07dd18f602683a55a5f59":[6,0,0,47,27], -"items_8php.html#a1e75047cf175aaee8dd16aa761913ff9":[6,0,0,47,5], -"items_8php.html#a251343637ff40a50cca93452cd530c26":[6,0,0,47,34], -"items_8php.html#a2541e6861a56d145c9281877cc501615":[6,0,0,47,47], -"items_8php.html#a275108c050f7eb18bcbb5018e6b81cf6":[6,0,0,47,4], -"items_8php.html#a2baa9e05f1e8aa3dd61c85803ae39bd6":[6,0,0,47,71], -"items_8php.html#a2c3f97b2109c05df86d97449b3c78ebc":[6,0,0,47,38], -"items_8php.html#a2d840c74ed23d1b6c7daee05cf89dda7":[6,0,0,47,22], -"items_8php.html#a36e656667193c83aa2cc03a024fc131b":[6,0,0,47,0], -"items_8php.html#a37f79991f36811cf847446ff60e8e11f":[6,0,0,47,40], -"items_8php.html#a410f9c743877c125ca06312373346903":[6,0,0,47,54], -"items_8php.html#a49905ea75adfe8a2d110be344d18d6a6":[6,0,0,47,56], -"items_8php.html#a4e6d7639431e0dd8e9f4dba8e1ac408b":[6,0,0,47,59], -"items_8php.html#a52c24114b73c0bdb605a03cd29712223":[6,0,0,47,36], -"items_8php.html#a536d0313b6ffe33b9d2490c4e25c5361":[6,0,0,47,32], -"items_8php.html#a555762e1022a4b8e3c3abd32e7812408":[6,0,0,47,16], -"items_8php.html#a566c601726697e044e75284af7fb6f17":[6,0,0,47,21], -"items_8php.html#a56b0f5d2cb36eb8f4bfca84813884f86":[6,0,0,47,18], -"items_8php.html#a56b2a4abcadfac71175cd50555528cc3":[6,0,0,47,14], -"items_8php.html#a5e5be7bf1f8257dec0b2647e60a3f3f1":[6,0,0,47,29], -"items_8php.html#a5ed782ff5b9cf050bec931e06de12c00":[6,0,0,47,46], -"items_8php.html#a5f690fc2484abec07840b4f9dd525bd9":[6,0,0,47,19], -"items_8php.html#a649dc3e53ed794d0ead4b5d037f8d8d7":[6,0,0,47,45], -"items_8php.html#a668ece2c37f05cc3abe538eb0dabfe55":[6,0,0,47,17], -"items_8php.html#a6bee35961f2e32905f20367a9309d627":[6,0,0,47,39], -"items_8php.html#a6f7e1334af5d684a987fa6a3eb37f4cc":[6,0,0,47,43], -"items_8php.html#a756738301f2ed96be50232500677d58a":[6,0,0,47,49], -"items_8php.html#a77051724d1784074ff187e73a4db93fe":[6,0,0,47,37], -"items_8php.html#a772f0ae77ad77c8ab68ed918a3870946":[6,0,0,47,7], -"items_8php.html#a77da7ce9a117601d49ac4a67c71b514f":[6,0,0,47,52], -"items_8php.html#a78a60e39f6991bd3324a24dcbf9dac5a":[6,0,0,47,60], -"items_8php.html#a81565acf729e629e588d823308448e3c":[6,0,0,47,1], -"items_8php.html#a83a349062945d585edb4b3c5d763ab6e":[6,0,0,47,57], -"items_8php.html#a8675e62674de6fb7c42e4a408c7116cc":[6,0,0,47,53], -"items_8php.html#a87ac9e359591721a824ecd23bbb56296":[6,0,0,47,6], -"items_8php.html#a88c6cf7649ac836fbbed82a7a0315110":[6,0,0,47,67], -"items_8php.html#a8cda98925a4c5c2f6dade70d9586d79a":[6,0,0,47,26], -"items_8php.html#a8f3c85c584ccd2b98c3ca440e45b40f8":[6,0,0,47,12], -"items_8php.html#a94ddb1d6c8fa21dd7433677e85168037":[6,0,0,47,33], -"items_8php.html#a9b449eeae50003414b8b30ca927af434":[6,0,0,47,70], -"items_8php.html#aa2d3caa2f27720762b5c729e07df40fb":[6,0,0,47,51], -"items_8php.html#aa371905f0a211b307cb3f7188c6cba04":[6,0,0,47,68], -"items_8php.html#aa579bc4445d60098b1410961ca8e96b7":[6,0,0,47,11], -"items_8php.html#aa723c0571e314a1853a24c5854b4f54f":[6,0,0,47,23], -"items_8php.html#aa9e99613d38a97b39c8cf5449699c2ee":[6,0,0,47,10], -"items_8php.html#aab9c6bae4c40799867596bdaae9829fd":[6,0,0,47,31], -"items_8php.html#aab9e0c58247427126de0699c729c3b6c":[6,0,0,47,62], -"items_8php.html#aabfaa193b83154c2a81e91284e5d5e59":[6,0,0,47,69], -"items_8php.html#aac8c9eb4338e2a996c43914392c6cfdb":[6,0,0,47,15], -"items_8php.html#ab1bce4261bcf75ad62753b498a144d17":[6,0,0,47,65], -"items_8php.html#aba98fcbbcd7044a7e9ea34edabc14c87":[6,0,0,47,28], -"items_8php.html#abeb7886cde44d9a83dbaf2bc4ab18723":[6,0,0,47,8], -"items_8php.html#abf7a1b73eb352d79acd36309b0dababd":[6,0,0,47,2], -"items_8php.html#ac6673627d289ee4f547de0fe3b7acd0a":[6,0,0,47,20], -"items_8php.html#acf0bf7c9d21ac84f32effb754f7ad484":[6,0,0,47,48], -"items_8php.html#ad2abb4644ff1f20fefbc80326fe01cf0":[6,0,0,47,55], -"items_8php.html#ad34827ed330898456783fb14c7b46154":[6,0,0,47,66], -"items_8php.html#ad4ee16e3ff1eaf60428c61f82ba25e6a":[6,0,0,47,58], -"items_8php.html#adc26e08aa61f5666da04ab5d2a9d68a6":[6,0,0,47,13], -"items_8php.html#adf2b8137dc4ad9ec958de2842f16f3c2":[6,0,0,47,63], -"items_8php.html#adf980098b6de9c3993bc3ff26a8dd6f9":[6,0,0,47,25], -"items_8php.html#ae73794179b62d39bb597ff670ab1c1e5":[6,0,0,47,41], -"items_8php.html#af0a887050dc8d0f51c89890cdaf3145f":[6,0,0,47,64], -"items_8php.html#af6237605c60d69abdd959ddbbee3420c":[6,0,0,47,61], -"items_8php.html#af94c281016c6c912d06e064113336c5c":[6,0,0,47,50], -"items_8php.html#afbcf26dfcf8a83fff952aa858c1b7b67":[6,0,0,47,24], -"lang_8php.html":[6,0,1,49], -"lang_8php.html#a4c5c1140f51a638f224275cd618c2f37":[6,0,1,49,0], -"language_8php.html":[6,0,0,48], -"language_8php.html#a151e5b4689aef86a12642cbb7a00bfe0":[6,0,0,48,7], -"language_8php.html#a43e6ddba9df019c9ac3ab4c94c444ae7":[6,0,0,48,3], -"language_8php.html#a632da17c7ac0d2dc1a00a4706870194b":[6,0,0,48,0], -"language_8php.html#a686bcafa6b0d5c86d37b38a1db5b6997":[6,0,0,48,9], -"language_8php.html#a78bd204955ec4cc3a9ac651285a1689d":[6,0,0,48,5], -"language_8php.html#a7e9904c730bb24ddcb0ff50fc96f6b05":[6,0,0,48,4], -"language_8php.html#a980dee1d8715a98ab02e36b59facf8ed":[6,0,0,48,1], -"language_8php.html#ac6ae482ee54fa2764d5c2e77305aeb96":[6,0,0,48,8], -"language_8php.html#ac9142ef1d01a235c760deb0f16643f5a":[6,0,0,48,6], -"language_8php.html#ace67d6cad57da08d030ad9dc9b8c836e":[6,0,0,48,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], +"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,48], +"items_8php.html#a004e89d86b0f29b2c4da20108ecc4091":[6,0,0,48,72], +"items_8php.html#a016dd86c827d08db89061ea81d15c6cb":[6,0,0,48,3], +"items_8php.html#a02ca33c31ed535d24894f8a9a91ce9df":[6,0,0,48,42], +"items_8php.html#a04a35b610acfe54434df08adec39c0c7":[6,0,0,48,30], +"items_8php.html#a0790a4550b829e85504af548623002ca":[6,0,0,48,9], +"items_8php.html#a079e099e15d88d47aeb6ca6d60da7107":[6,0,0,48,35], +"items_8php.html#a09d425596b9f8663472cf7474ad36d96":[6,0,0,48,44], +"items_8php.html#a0cf98bb619f07dd18f602683a55a5f59":[6,0,0,48,27], +"items_8php.html#a1e75047cf175aaee8dd16aa761913ff9":[6,0,0,48,5], +"items_8php.html#a251343637ff40a50cca93452cd530c26":[6,0,0,48,34], +"items_8php.html#a2541e6861a56d145c9281877cc501615":[6,0,0,48,47], +"items_8php.html#a275108c050f7eb18bcbb5018e6b81cf6":[6,0,0,48,4], +"items_8php.html#a2baa9e05f1e8aa3dd61c85803ae39bd6":[6,0,0,48,71], +"items_8php.html#a2c3f97b2109c05df86d97449b3c78ebc":[6,0,0,48,38], +"items_8php.html#a2d840c74ed23d1b6c7daee05cf89dda7":[6,0,0,48,22], +"items_8php.html#a36e656667193c83aa2cc03a024fc131b":[6,0,0,48,0], +"items_8php.html#a37f79991f36811cf847446ff60e8e11f":[6,0,0,48,40], +"items_8php.html#a410f9c743877c125ca06312373346903":[6,0,0,48,54], +"items_8php.html#a49905ea75adfe8a2d110be344d18d6a6":[6,0,0,48,56], +"items_8php.html#a4e6d7639431e0dd8e9f4dba8e1ac408b":[6,0,0,48,59], +"items_8php.html#a52c24114b73c0bdb605a03cd29712223":[6,0,0,48,36], +"items_8php.html#a536d0313b6ffe33b9d2490c4e25c5361":[6,0,0,48,32], +"items_8php.html#a555762e1022a4b8e3c3abd32e7812408":[6,0,0,48,16], +"items_8php.html#a566c601726697e044e75284af7fb6f17":[6,0,0,48,21], +"items_8php.html#a56b0f5d2cb36eb8f4bfca84813884f86":[6,0,0,48,18], +"items_8php.html#a56b2a4abcadfac71175cd50555528cc3":[6,0,0,48,14], +"items_8php.html#a5e5be7bf1f8257dec0b2647e60a3f3f1":[6,0,0,48,29], +"items_8php.html#a5ed782ff5b9cf050bec931e06de12c00":[6,0,0,48,46], +"items_8php.html#a5f690fc2484abec07840b4f9dd525bd9":[6,0,0,48,19], +"items_8php.html#a649dc3e53ed794d0ead4b5d037f8d8d7":[6,0,0,48,45], +"items_8php.html#a668ece2c37f05cc3abe538eb0dabfe55":[6,0,0,48,17], +"items_8php.html#a6bee35961f2e32905f20367a9309d627":[6,0,0,48,39], +"items_8php.html#a6f7e1334af5d684a987fa6a3eb37f4cc":[6,0,0,48,43], +"items_8php.html#a756738301f2ed96be50232500677d58a":[6,0,0,48,49], +"items_8php.html#a77051724d1784074ff187e73a4db93fe":[6,0,0,48,37], +"items_8php.html#a772f0ae77ad77c8ab68ed918a3870946":[6,0,0,48,7], +"items_8php.html#a77da7ce9a117601d49ac4a67c71b514f":[6,0,0,48,52], +"items_8php.html#a78a60e39f6991bd3324a24dcbf9dac5a":[6,0,0,48,60], +"items_8php.html#a81565acf729e629e588d823308448e3c":[6,0,0,48,1], +"items_8php.html#a83a349062945d585edb4b3c5d763ab6e":[6,0,0,48,57], +"items_8php.html#a8675e62674de6fb7c42e4a408c7116cc":[6,0,0,48,53], +"items_8php.html#a87ac9e359591721a824ecd23bbb56296":[6,0,0,48,6], +"items_8php.html#a88c6cf7649ac836fbbed82a7a0315110":[6,0,0,48,67], +"items_8php.html#a8cda98925a4c5c2f6dade70d9586d79a":[6,0,0,48,26], +"items_8php.html#a8f3c85c584ccd2b98c3ca440e45b40f8":[6,0,0,48,12], +"items_8php.html#a94ddb1d6c8fa21dd7433677e85168037":[6,0,0,48,33], +"items_8php.html#a9b449eeae50003414b8b30ca927af434":[6,0,0,48,70], +"items_8php.html#aa2d3caa2f27720762b5c729e07df40fb":[6,0,0,48,51], +"items_8php.html#aa371905f0a211b307cb3f7188c6cba04":[6,0,0,48,68], +"items_8php.html#aa579bc4445d60098b1410961ca8e96b7":[6,0,0,48,11], +"items_8php.html#aa723c0571e314a1853a24c5854b4f54f":[6,0,0,48,23], +"items_8php.html#aa9e99613d38a97b39c8cf5449699c2ee":[6,0,0,48,10], +"items_8php.html#aab9c6bae4c40799867596bdaae9829fd":[6,0,0,48,31], +"items_8php.html#aab9e0c58247427126de0699c729c3b6c":[6,0,0,48,62], +"items_8php.html#aabfaa193b83154c2a81e91284e5d5e59":[6,0,0,48,69], +"items_8php.html#aac8c9eb4338e2a996c43914392c6cfdb":[6,0,0,48,15], +"items_8php.html#ab1bce4261bcf75ad62753b498a144d17":[6,0,0,48,65], +"items_8php.html#aba98fcbbcd7044a7e9ea34edabc14c87":[6,0,0,48,28], +"items_8php.html#abeb7886cde44d9a83dbaf2bc4ab18723":[6,0,0,48,8], +"items_8php.html#abf7a1b73eb352d79acd36309b0dababd":[6,0,0,48,2], +"items_8php.html#ac6673627d289ee4f547de0fe3b7acd0a":[6,0,0,48,20], +"items_8php.html#acf0bf7c9d21ac84f32effb754f7ad484":[6,0,0,48,48], +"items_8php.html#ad2abb4644ff1f20fefbc80326fe01cf0":[6,0,0,48,55], +"items_8php.html#ad34827ed330898456783fb14c7b46154":[6,0,0,48,66], +"items_8php.html#ad4ee16e3ff1eaf60428c61f82ba25e6a":[6,0,0,48,58], +"items_8php.html#adc26e08aa61f5666da04ab5d2a9d68a6":[6,0,0,48,13], +"items_8php.html#adf2b8137dc4ad9ec958de2842f16f3c2":[6,0,0,48,63], +"items_8php.html#adf980098b6de9c3993bc3ff26a8dd6f9":[6,0,0,48,25], +"items_8php.html#ae73794179b62d39bb597ff670ab1c1e5":[6,0,0,48,41], +"items_8php.html#af0a887050dc8d0f51c89890cdaf3145f":[6,0,0,48,64], +"items_8php.html#af6237605c60d69abdd959ddbbee3420c":[6,0,0,48,61], +"items_8php.html#af94c281016c6c912d06e064113336c5c":[6,0,0,48,50], +"items_8php.html#afbcf26dfcf8a83fff952aa858c1b7b67":[6,0,0,48,24], +"lang_8php.html":[6,0,1,48], +"lang_8php.html#a4c5c1140f51a638f224275cd618c2f37":[6,0,1,48,0], +"language_8php.html":[6,0,0,49], +"language_8php.html#a151e5b4689aef86a12642cbb7a00bfe0":[6,0,0,49,7], +"language_8php.html#a43e6ddba9df019c9ac3ab4c94c444ae7":[6,0,0,49,3], +"language_8php.html#a632da17c7ac0d2dc1a00a4706870194b":[6,0,0,49,0], +"language_8php.html#a686bcafa6b0d5c86d37b38a1db5b6997":[6,0,0,49,9], +"language_8php.html#a78bd204955ec4cc3a9ac651285a1689d":[6,0,0,49,5], +"language_8php.html#a7e9904c730bb24ddcb0ff50fc96f6b05":[6,0,0,49,4], +"language_8php.html#a980dee1d8715a98ab02e36b59facf8ed":[6,0,0,49,1], +"language_8php.html#ac6ae482ee54fa2764d5c2e77305aeb96":[6,0,0,49,8], +"language_8php.html#ac9142ef1d01a235c760deb0f16643f5a":[6,0,0,49,6], +"language_8php.html#ace67d6cad57da08d030ad9dc9b8c836e":[6,0,0,49,2], +"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], +"locs_8php.html":[6,0,1,52], +"locs_8php.html#a6b43654592919ac863d67a1f787a69b9":[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], @@ -166,20 +174,19 @@ var NAVTREEINDEX6 = "mod_2bookmarks_8php.html":[6,0,1,10], "mod_2bookmarks_8php.html#a6b7942f3d27e40f0f47c88704127b9b3":[6,0,1,10,1], "mod_2bookmarks_8php.html#a774364b1c8404529581083631703527a":[6,0,1,10,0], -"mod_2chanman_8php.html":[6,0,1,11], -"mod_2chat_8php.html":[6,0,1,14], -"mod_2chat_8php.html#a8b0b8bee6fef6477e8c64c5e951b1b4f":[6,0,1,14,0], -"mod_2chat_8php.html#a999d594745597c656c9760253ae297ad":[6,0,1,14,2], -"mod_2chat_8php.html#aa9ae4782e9baef0b7314ab9527c2707e":[6,0,1,14,1], -"mod_2directory_8php.html":[6,0,1,23], -"mod_2directory_8php.html#a5ee59c213508b6b9787612a8219cb5bf":[6,0,1,23,1], -"mod_2directory_8php.html#aac79396570d759da2efac24fcedf5b44":[6,0,1,23,0], -"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,39], -"mod_2group_8php.html#a07a64f6c65b0080d8190b3d9728a7a83":[6,0,1,39,0], -"mod_2group_8php.html#aed1f009b1221348021bb34761160ef35":[6,0,1,39,1], +"mod_2chat_8php.html":[6,0,1,13], +"mod_2chat_8php.html#a8b0b8bee6fef6477e8c64c5e951b1b4f":[6,0,1,13,0], +"mod_2chat_8php.html#a999d594745597c656c9760253ae297ad":[6,0,1,13,2], +"mod_2chat_8php.html#aa9ae4782e9baef0b7314ab9527c2707e":[6,0,1,13,1], +"mod_2directory_8php.html":[6,0,1,22], +"mod_2directory_8php.html#a5ee59c213508b6b9787612a8219cb5bf":[6,0,1,22,1], +"mod_2directory_8php.html#aac79396570d759da2efac24fcedf5b44":[6,0,1,22,0], +"mod_2follow_8php.html":[6,0,1,36], +"mod_2follow_8php.html#a171f5b19f50d7738adc3b2e96ec6018a":[6,0,1,36,1], +"mod_2follow_8php.html#a4c540ea4e9f5c581c1a53516ac585592":[6,0,1,36,0], +"mod_2group_8php.html":[6,0,1,38], +"mod_2group_8php.html#a07a64f6c65b0080d8190b3d9728a7a83":[6,0,1,38,0], +"mod_2group_8php.html#aed1f009b1221348021bb34761160ef35":[6,0,1,38,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], @@ -214,8 +221,8 @@ var NAVTREEINDEX6 = "namespaceFriendica.html":[5,0,1], "namespaceRedMatrix.html":[5,0,3], "namespaceRedMatrix.html":[4,0,3], -"namespaceRedMatrix_1_1RedDAV.html":[4,0,3,0], "namespaceRedMatrix_1_1RedDAV.html":[5,0,3,0], +"namespaceRedMatrix_1_1RedDAV.html":[4,0,3,0], "namespaceacl__selectors.html":[5,0,0], "namespaceacl__selectors.html":[4,0,0], "namespacefriendica-to-smarty-tpl.html":[4,0,2], @@ -224,13 +231,13 @@ var NAVTREEINDEX6 = "namespacemembers_func.html":[4,1,1], "namespacemembers_vars.html":[4,1,2], "namespaces.html":[4,0], -"namespaceupdatetpl.html":[4,0,4], "namespaceupdatetpl.html":[5,0,4], -"namespaceutil.html":[5,0,5], +"namespaceupdatetpl.html":[4,0,4], "namespaceutil.html":[4,0,5], -"nav_8php.html":[6,0,0,51], -"nav_8php.html#a43be0df73b90647ea70947ce004e231e":[6,0,0,51,0], -"nav_8php.html#ac3c920ce3ea5b0d9e0678ee37155f06a":[6,0,0,51,1], +"namespaceutil.html":[5,0,5], +"nav_8php.html":[6,0,0,52], +"nav_8php.html#a43be0df73b90647ea70947ce004e231e":[6,0,0,52,0], +"nav_8php.html#ac3c920ce3ea5b0d9e0678ee37155f06a":[6,0,0,52,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], @@ -242,12 +249,5 @@ var NAVTREEINDEX6 = "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], -"notifier_8php.html":[6,0,0,53], -"notifier_8php.html#a568c502f626cff95e344c0748938b85d":[6,0,0,53,0], -"notred_8php.html":[6,0,3,1,3,1,3], -"oauth_8php.html":[6,0,0,55], -"oauth_8php.html#a7a32a5990f113ac9465b03b29175cf16":[6,0,0,55,3], -"oauth_8php.html#ad343cab37aa860d2d14dc86b7f5ca0c6":[6,0,0,55,2], -"oexchange_8php.html":[6,0,1,71] +"notifications_8php.html#aadd0b5525bd8c283a5d8a37982bbfe62":[6,0,1,68,0] }; diff --git a/doc/html/navtreeindex7.js b/doc/html/navtreeindex7.js index bdb21c936..2d9e8f269 100644 --- a/doc/html/navtreeindex7.js +++ b/doc/html/navtreeindex7.js @@ -1,12 +1,19 @@ var NAVTREEINDEX7 = { +"notifier_8php.html":[6,0,0,54], +"notifier_8php.html#a568c502f626cff95e344c0748938b85d":[6,0,0,54,0], +"notred_8php.html":[6,0,3,1,3,1,3], +"oauth_8php.html":[6,0,0,56], +"oauth_8php.html#a7a32a5990f113ac9465b03b29175cf16":[6,0,0,56,3], +"oauth_8php.html#ad343cab37aa860d2d14dc86b7f5ca0c6":[6,0,0,56,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], "olddefault_8php.html":[6,0,3,1,0,2,5], -"onedirsync_8php.html":[6,0,0,57], -"onedirsync_8php.html#a411aedd47c57476099647961e6a86691":[6,0,0,57,0], -"onepoll_8php.html":[6,0,0,58], -"onepoll_8php.html#a72753b2fdec79b37c7f432035c91fb6d":[6,0,0,58,0], +"onedirsync_8php.html":[6,0,0,58], +"onedirsync_8php.html#a411aedd47c57476099647961e6a86691":[6,0,0,58,0], +"onepoll_8php.html":[6,0,0,59], +"onepoll_8php.html#a72753b2fdec79b37c7f432035c91fb6d":[6,0,0,59,0], "online_8php.html":[6,0,1,72], "online_8php.html#a80e107c84eb722b0ca11d0413b96f9f7":[6,0,1,72,0], "openid_8php.html":[6,0,1,73], @@ -18,9 +25,9 @@ var NAVTREEINDEX7 = "page_8php.html":[6,0,1,76], "page_8php.html#a4d89800c0366a239191b1692c09635cf":[6,0,1,76,1], "page_8php.html#a91a5f649f68406149108bded1dc90b22":[6,0,1,76,0], -"page__widgets_8php.html":[6,0,0,59], -"page__widgets_8php.html#a1a1e729da27f252cab6678288a17958f":[6,0,0,59,1], -"page__widgets_8php.html#a39d547771c5f12a17c097436c82f0fa2":[6,0,0,59,0], +"page__widgets_8php.html":[6,0,0,60], +"page__widgets_8php.html#a1a1e729da27f252cab6678288a17958f":[6,0,0,60,1], +"page__widgets_8php.html#a39d547771c5f12a17c097436c82f0fa2":[6,0,0,60,0], "pages.html":[], "parse__url_8php.html":[6,0,1,77], "parse__url_8php.html#a05a9e8944380ba3cf6bbf5893dd4b74b":[6,0,1,77,2], @@ -32,14 +39,14 @@ var NAVTREEINDEX7 = "pdledit_8php.html":[6,0,1,78], "pdledit_8php.html#a59cb550f6b7a4e7d8196fbc9de601619":[6,0,1,78,0], "pdledit_8php.html#a81da3c955d0e3db55d148a31483104c7":[6,0,1,78,1], -"permissions_8php.html":[6,0,0,60], -"permissions_8php.html#a040fd3d3b8517658b1668ae0cd093972":[6,0,0,60,2], -"permissions_8php.html#a0f5bd9f7f4c8fb7ba4b2c1ed048b4dc7":[6,0,0,60,0], -"permissions_8php.html#a50e8099ea8a4d7ed68b2a0a7ea9aa724":[6,0,0,60,5], -"permissions_8php.html#a67ada9ed51e77885b6b0f6a28cee1835":[6,0,0,60,4], -"permissions_8php.html#a9b5f5120566a3699a98efc5ccb0c59fe":[6,0,0,60,3], -"permissions_8php.html#aa8b7b102c653649d7a71b5a1c044d90d":[6,0,0,60,6], -"permissions_8php.html#aeca9b280f3dc3358c89976d81d690008":[6,0,0,60,1], +"permissions_8php.html":[6,0,0,61], +"permissions_8php.html#a040fd3d3b8517658b1668ae0cd093972":[6,0,0,61,2], +"permissions_8php.html#a0f5bd9f7f4c8fb7ba4b2c1ed048b4dc7":[6,0,0,61,0], +"permissions_8php.html#a50e8099ea8a4d7ed68b2a0a7ea9aa724":[6,0,0,61,5], +"permissions_8php.html#a67ada9ed51e77885b6b0f6a28cee1835":[6,0,0,61,4], +"permissions_8php.html#a9b5f5120566a3699a98efc5ccb0c59fe":[6,0,0,61,3], +"permissions_8php.html#aa8b7b102c653649d7a71b5a1c044d90d":[6,0,0,61,6], +"permissions_8php.html#aeca9b280f3dc3358c89976d81d690008":[6,0,0,61,1], "photo_8php.html":[6,0,1,79], "photo_8php.html#a582779d24882b0d31ee909a91d70a448":[6,0,1,79,0], "photo__driver_8php.html":[6,0,0,1,0], @@ -67,34 +74,34 @@ var NAVTREEINDEX7 = "pine_8php.html":[6,0,3,1,0,2,8], "ping_8php.html":[6,0,1,82], "ping_8php.html#a77217b1b190b4c5d8770867b45f0c0a1":[6,0,1,82,0], -"plugin_8php.html":[6,0,0,62], -"plugin_8php.html#a093a9cb98f51e3643634bd8bc6ed6e76":[6,0,0,62,24], -"plugin_8php.html#a0e8c2ea50bfdbc39e17ccccaea21ddc3":[6,0,0,62,22], -"plugin_8php.html#a23c4fccf1eb5fcd63b24783ba1f05f7a":[6,0,0,62,8], -"plugin_8php.html#a326365e48ef94f0b9a0a771b8d75e813":[6,0,0,62,17], -"plugin_8php.html#a425472c5f3afc137268b2ad45652b209":[6,0,0,62,20], -"plugin_8php.html#a48047edfbef770125a5508dcc2f9282f":[6,0,0,62,7], -"plugin_8php.html#a482131013272a1d5d5c1b1469c6c55d5":[6,0,0,62,16], -"plugin_8php.html#a4a0ae7b881e7c8af99a69e3b03f898b4":[6,0,0,62,14], -"plugin_8php.html#a516591850f4fd49fd1425cfa54089db8":[6,0,0,62,9], -"plugin_8php.html#a56f71fe5adf9586ce950523d8180443e":[6,0,0,62,26], -"plugin_8php.html#a65ab52cb1a7030d5190e247211bef2a1":[6,0,0,62,11], -"plugin_8php.html#a65fedcffbe03562ef844cabee37d34e2":[6,0,0,62,23], -"plugin_8php.html#a67ca417634de2d0beffffc54aeb951ff":[6,0,0,62,12], -"plugin_8php.html#a75f7dfed291fd7add7fc85b5c022a1f4":[6,0,0,62,4], -"plugin_8php.html#a7f05de16c0a32602853b09b99dd85e7c":[6,0,0,62,0], -"plugin_8php.html#a855c4fdb38c0fc2714d537752a4347f9":[6,0,0,62,19], -"plugin_8php.html#a9039e15aae27676af7777dcbee5a11d6":[6,0,0,62,1], -"plugin_8php.html#a90538627db68605aeb6db17a8ead6523":[6,0,0,62,25], -"plugin_8php.html#a9ab6caae31935f6cf781ce7872db7cdf":[6,0,0,62,13], -"plugin_8php.html#a9ca9632b7309a65b05c03a3e2f473a3d":[6,0,0,62,18], -"plugin_8php.html#acb63c27d07f6d7dffe95f98a6cef1295":[6,0,0,62,3], -"plugin_8php.html#ad48de9c0fb7f19413a2aa49250d00405":[6,0,0,62,6], -"plugin_8php.html#ad9ff8ba554576383c5911a4bce068c1f":[6,0,0,62,2], -"plugin_8php.html#aeaebe63dcf6fa2794f363ba2bc0b2c6b":[6,0,0,62,15], -"plugin_8php.html#af92789f559b89a380e49d303218aeeca":[6,0,0,62,10], -"plugin_8php.html#af9ac19004dca49adae1ac7a0d9f3b025":[6,0,0,62,21], -"plugin_8php.html#aff0178bd8d0b34a94d5efddc883edd35":[6,0,0,62,5], +"plugin_8php.html":[6,0,0,63], +"plugin_8php.html#a093a9cb98f51e3643634bd8bc6ed6e76":[6,0,0,63,24], +"plugin_8php.html#a0e8c2ea50bfdbc39e17ccccaea21ddc3":[6,0,0,63,22], +"plugin_8php.html#a23c4fccf1eb5fcd63b24783ba1f05f7a":[6,0,0,63,8], +"plugin_8php.html#a326365e48ef94f0b9a0a771b8d75e813":[6,0,0,63,17], +"plugin_8php.html#a425472c5f3afc137268b2ad45652b209":[6,0,0,63,20], +"plugin_8php.html#a48047edfbef770125a5508dcc2f9282f":[6,0,0,63,7], +"plugin_8php.html#a482131013272a1d5d5c1b1469c6c55d5":[6,0,0,63,16], +"plugin_8php.html#a4a0ae7b881e7c8af99a69e3b03f898b4":[6,0,0,63,14], +"plugin_8php.html#a516591850f4fd49fd1425cfa54089db8":[6,0,0,63,9], +"plugin_8php.html#a56f71fe5adf9586ce950523d8180443e":[6,0,0,63,26], +"plugin_8php.html#a65ab52cb1a7030d5190e247211bef2a1":[6,0,0,63,11], +"plugin_8php.html#a65fedcffbe03562ef844cabee37d34e2":[6,0,0,63,23], +"plugin_8php.html#a67ca417634de2d0beffffc54aeb951ff":[6,0,0,63,12], +"plugin_8php.html#a75f7dfed291fd7add7fc85b5c022a1f4":[6,0,0,63,4], +"plugin_8php.html#a7f05de16c0a32602853b09b99dd85e7c":[6,0,0,63,0], +"plugin_8php.html#a855c4fdb38c0fc2714d537752a4347f9":[6,0,0,63,19], +"plugin_8php.html#a9039e15aae27676af7777dcbee5a11d6":[6,0,0,63,1], +"plugin_8php.html#a90538627db68605aeb6db17a8ead6523":[6,0,0,63,25], +"plugin_8php.html#a9ab6caae31935f6cf781ce7872db7cdf":[6,0,0,63,13], +"plugin_8php.html#a9ca9632b7309a65b05c03a3e2f473a3d":[6,0,0,63,18], +"plugin_8php.html#acb63c27d07f6d7dffe95f98a6cef1295":[6,0,0,63,3], +"plugin_8php.html#ad48de9c0fb7f19413a2aa49250d00405":[6,0,0,63,6], +"plugin_8php.html#ad9ff8ba554576383c5911a4bce068c1f":[6,0,0,63,2], +"plugin_8php.html#aeaebe63dcf6fa2794f363ba2bc0b2c6b":[6,0,0,63,15], +"plugin_8php.html#af92789f559b89a380e49d303218aeeca":[6,0,0,63,10], +"plugin_8php.html#af9ac19004dca49adae1ac7a0d9f3b025":[6,0,0,63,21], +"plugin_8php.html#aff0178bd8d0b34a94d5efddc883edd35":[6,0,0,63,5], "po2php_8php.html":[6,0,2,7], "po2php_8php.html#a3b75e36f913198299e99559b175cd8b4":[6,0,2,7,0], "poco_8php.html":[6,0,1,83], @@ -106,8 +113,8 @@ var NAVTREEINDEX7 = "poll_8php.html#a26be9d4f230cb68f5be326198cfc6c77":[6,0,1,85,2], "poll_8php.html#a3314c26bd2ac0ed831cebf3315cd3263":[6,0,1,85,0], "poll_8php.html#ab9ecd5b71af090a5da9c93f34f7ec930":[6,0,1,85,1], -"poller_8php.html":[6,0,0,63], -"poller_8php.html#a5f12df3a4738124b6c039971e87e76da":[6,0,0,63,0], +"poller_8php.html":[6,0,0,64], +"poller_8php.html#a5f12df3a4738124b6c039971e87e76da":[6,0,0,64,0], "post_8php.html":[6,0,1,86], "post_8php.html#af4b48181ce773ef0cdfc972441445c34":[6,0,1,86,0], "post_8php.html#af59e6a1dc22d19d9257b01cd7ccedb75":[6,0,1,86,1], @@ -144,13 +151,13 @@ var NAVTREEINDEX7 = "profile__photo_8php.html#a140631c56438fbfacb61a1eb43067d02":[6,0,1,90,0], "profile__photo_8php.html#a4b80234074bd603221aa5364f330e479":[6,0,1,90,1], "profile__photo_8php.html#a561103564199da56e58061a4196eb102":[6,0,1,90,2], -"profile__selectors_8php.html":[6,0,0,65], -"profile__selectors_8php.html#a3b50b3ea4ea4bdbebebfffc5d1b157c7":[6,0,0,65,4], -"profile__selectors_8php.html#a7473dd095987e1cdcc79d4f0bb5e6798":[6,0,0,65,2], -"profile__selectors_8php.html#a8bfa1ca2d1598a3d65f1f9bb803ca816":[6,0,0,65,1], -"profile__selectors_8php.html#ab0eae5c0ceba77364469f0f580f0d074":[6,0,0,65,5], -"profile__selectors_8php.html#adc79715bd2e102b4583fb530749ec534":[6,0,0,65,3], -"profile__selectors_8php.html#ae2b2c087e6530c61c0b256fd26d52355":[6,0,0,65,0], +"profile__selectors_8php.html":[6,0,0,66], +"profile__selectors_8php.html#a3b50b3ea4ea4bdbebebfffc5d1b157c7":[6,0,0,66,4], +"profile__selectors_8php.html#a7473dd095987e1cdcc79d4f0bb5e6798":[6,0,0,66,2], +"profile__selectors_8php.html#a8bfa1ca2d1598a3d65f1f9bb803ca816":[6,0,0,66,1], +"profile__selectors_8php.html#ab0eae5c0ceba77364469f0f580f0d074":[6,0,0,66,5], +"profile__selectors_8php.html#adc79715bd2e102b4583fb530749ec534":[6,0,0,66,3], +"profile__selectors_8php.html#ae2b2c087e6530c61c0b256fd26d52355":[6,0,0,66,0], "profiles_8php.html":[6,0,1,91], "profiles_8php.html#a36f71405ad536228f8bb84a551b23f7e":[6,0,1,91,1], "profiles_8php.html#a46975783b8b8d70402d51487eb1f0b00":[6,0,1,91,0], @@ -160,11 +167,11 @@ var NAVTREEINDEX7 = "profperm_8php.html#aef015787de2373d9fb3fe3f814fb5023":[6,0,1,92,0], "pubsites_8php.html":[6,0,1,93], "pubsites_8php.html#af614e279aab54065345bda6b03eafdf0":[6,0,1,93,0], -"queue_8php.html":[6,0,0,67], -"queue_8php.html#af8c93de86d866c3200174c8450a0f341":[6,0,0,67,0], -"queue__fn_8php.html":[6,0,0,68], -"queue__fn_8php.html#a4c2876181f75a4a61e85b7f00dfdbba1":[6,0,0,68,1], -"queue__fn_8php.html#a8fe71e981399bbf5d000a6ca42f57b24":[6,0,0,68,0], +"queue_8php.html":[6,0,0,68], +"queue_8php.html#af8c93de86d866c3200174c8450a0f341":[6,0,0,68,0], +"queue__fn_8php.html":[6,0,0,69], +"queue__fn_8php.html#a4c2876181f75a4a61e85b7f00dfdbba1":[6,0,0,69,1], +"queue__fn_8php.html#a8fe71e981399bbf5d000a6ca42f57b24":[6,0,0,69,0], "randprof_8php.html":[6,0,1,94], "randprof_8php.html#abf5dba3c608b9304cbf68327cd31b090":[6,0,1,94,0], "rbmark_8php.html":[6,0,1,95], @@ -180,10 +187,10 @@ var NAVTREEINDEX7 = "redbasic_2php_2theme_8php.html":[6,0,3,1,3,0,2], "redbasic_2php_2theme_8php.html#af6eb813e9fc7e2d76ac1b82bc5c0ed9b":[6,0,3,1,3,0,2,0], "redbasic_8php.html":[6,0,3,1,0,2,9], -"reddav_8php.html":[6,0,0,69], -"reddav_8php.html#a5df0d09893f2e65dc5cf6bbab6cfb266":[6,0,0,69,4], -"reddav_8php.html#a9f531641dfb4e43cd88ac1a9ae7e2088":[6,0,0,69,5], -"reddav_8php.html#ae92ea0df1993f6a7bcd1b6efa6c1fb66":[6,0,0,69,3], +"reddav_8php.html":[6,0,0,70], +"reddav_8php.html#a5df0d09893f2e65dc5cf6bbab6cfb266":[6,0,0,70,1], +"reddav_8php.html#a9f531641dfb4e43cd88ac1a9ae7e2088":[6,0,0,70,2], +"reddav_8php.html#ae92ea0df1993f6a7bcd1b6efa6c1fb66":[6,0,0,70,0], "register_8php.html":[6,0,1,97], "register_8php.html#a0e91f57f111407ea8d3223a05022bb2a":[6,0,1,97,0], "register_8php.html#a51731dcc1917c58a790eb1c0f6132271":[6,0,1,97,2], @@ -211,43 +218,36 @@ var NAVTREEINDEX7 = "search_8php.html#acf19fd30f07f495781ca0d7a0a08b435":[6,0,1,105,1], "search__ac_8php.html":[6,0,1,106], "search__ac_8php.html#a14f90c83a3f2be095e9e2992a8d66138":[6,0,1,106,0], -"security_8php.html":[6,0,0,70], -"security_8php.html#a20f8b9851f23ee8894b8925584ef6821":[6,0,0,70,2], -"security_8php.html#a3ef2be6a7e4928e39d50059d6feb457c":[6,0,0,70,11], -"security_8php.html#a444ac867dfa8c37cf0a7a226412bee28":[6,0,0,70,4], -"security_8php.html#a6126c77a1267e046ac59cf864613f011":[6,0,0,70,10], -"security_8php.html#a77ba0d1889a39cf32434c5ce96fe1433":[6,0,0,70,5], -"security_8php.html#a8d23d2597aae380a3341872fe9513380":[6,0,0,70,1], -"security_8php.html#a9355488460ab11d6058656ff919e5cf9":[6,0,0,70,7], -"security_8php.html#a9c6180e82150a5a9af91a1255d096b5c":[6,0,0,70,3], -"security_8php.html#ab3bdd30dc60d9ee72370b866aa4a2d01":[6,0,0,70,9], -"security_8php.html#acd06ef411116115c2f0a92633700db8a":[6,0,0,70,6], -"security_8php.html#adc7bf51e3b8d67bd80e9348f9ab03733":[6,0,0,70,0], -"security_8php.html#afa683bc025a1d2fe9065e2f6cd71a22f":[6,0,0,70,8], +"security_8php.html":[6,0,0,71], +"security_8php.html#a20f8b9851f23ee8894b8925584ef6821":[6,0,0,71,2], +"security_8php.html#a3ef2be6a7e4928e39d50059d6feb457c":[6,0,0,71,11], +"security_8php.html#a444ac867dfa8c37cf0a7a226412bee28":[6,0,0,71,4], +"security_8php.html#a6126c77a1267e046ac59cf864613f011":[6,0,0,71,10], +"security_8php.html#a77ba0d1889a39cf32434c5ce96fe1433":[6,0,0,71,5], +"security_8php.html#a8d23d2597aae380a3341872fe9513380":[6,0,0,71,1], +"security_8php.html#a9355488460ab11d6058656ff919e5cf9":[6,0,0,71,7], +"security_8php.html#a9c6180e82150a5a9af91a1255d096b5c":[6,0,0,71,3], +"security_8php.html#ab3bdd30dc60d9ee72370b866aa4a2d01":[6,0,0,71,9], +"security_8php.html#acd06ef411116115c2f0a92633700db8a":[6,0,0,71,6], +"security_8php.html#adc7bf51e3b8d67bd80e9348f9ab03733":[6,0,0,71,0], +"security_8php.html#afa683bc025a1d2fe9065e2f6cd71a22f":[6,0,0,71,8], "service__limits_8php.html":[6,0,1,107], "service__limits_8php.html#a653424aac63c5cd05ba70c3c77bf7f8a":[6,0,1,107,0], -"session_8php.html":[6,0,0,71], -"session_8php.html#a26fa1042356d555023cbf15ddd4f8507":[6,0,0,71,4], -"session_8php.html#a4c0ead624f95483e386bc80abf570a8f":[6,0,0,71,0], -"session_8php.html#a5e1c616e02b863d5450317d101366bb7":[6,0,0,71,1], -"session_8php.html#a62e4a6cb26b4bb1b8ddd8277b26090eb":[6,0,0,71,8], -"session_8php.html#a7f0f50576360d9ba52d29364e0b83a8e":[6,0,0,71,5], -"session_8php.html#a96b09cc763572f45280786a7b33feb7e":[6,0,0,71,7], -"session_8php.html#ac4461c1984543d3553e73dba2771568f":[6,0,0,71,6], -"session_8php.html#ac95373f4966862a028033dd2f94d4da1":[6,0,0,71,3], -"session_8php.html#af0100a2642a5268594bbd5742a03d885":[6,0,0,71,9], -"session_8php.html#af230b86bfff7db66c3bdd7e0bbc24052":[6,0,0,71,2], +"session_8php.html":[6,0,0,72], +"session_8php.html#a26fa1042356d555023cbf15ddd4f8507":[6,0,0,72,4], +"session_8php.html#a4c0ead624f95483e386bc80abf570a8f":[6,0,0,72,0], +"session_8php.html#a5e1c616e02b863d5450317d101366bb7":[6,0,0,72,1], +"session_8php.html#a62e4a6cb26b4bb1b8ddd8277b26090eb":[6,0,0,72,8], +"session_8php.html#a7f0f50576360d9ba52d29364e0b83a8e":[6,0,0,72,5], +"session_8php.html#a96b09cc763572f45280786a7b33feb7e":[6,0,0,72,7], +"session_8php.html#ac4461c1984543d3553e73dba2771568f":[6,0,0,72,6], +"session_8php.html#ac95373f4966862a028033dd2f94d4da1":[6,0,0,72,3], +"session_8php.html#af0100a2642a5268594bbd5742a03d885":[6,0,0,72,9], +"session_8php.html#af230b86bfff7db66c3bdd7e0bbc24052":[6,0,0,72,2], "settings_8php.html":[6,0,1,108], "settings_8php.html#a39abc76ff5459c57e3b957664f273f18":[6,0,1,108,0], "settings_8php.html#a3a4cde287482fced008583f54ba2a722":[6,0,1,108,1], "settings_8php.html#aa7ee94d88ac088edb04ccf3a26de3586":[6,0,1,108,2], "setup_8php.html":[6,0,1,109], -"setup_8php.html#a0c3f3b671381f6dccd924b8ecdfc56c4":[6,0,1,109,2], -"setup_8php.html#a13cf286774149a0a7bd8adb8179cec75":[6,0,1,109,14], -"setup_8php.html#a14d208682a88632290c895d20da6e7d6":[6,0,1,109,5], -"setup_8php.html#a267555abd17290e659b4bf44b885e4e0":[6,0,1,109,13], -"setup_8php.html#a2b375ddc555140236fc500135de99371":[6,0,1,109,10], -"setup_8php.html#a5ad92c0857d1dadd6b60a9a557159c9f":[6,0,1,109,3], -"setup_8php.html#a69a450e06dd3771fb51d3e4b0266a35e":[6,0,1,109,1], -"setup_8php.html#a8652788e8589778c5f81634a9d5b9429":[6,0,1,109,8] +"setup_8php.html#a0c3f3b671381f6dccd924b8ecdfc56c4":[6,0,1,109,2] }; diff --git a/doc/html/navtreeindex8.js b/doc/html/navtreeindex8.js index 6a045dd3e..de2843783 100644 --- a/doc/html/navtreeindex8.js +++ b/doc/html/navtreeindex8.js @@ -1,5 +1,12 @@ var NAVTREEINDEX8 = { +"setup_8php.html#a13cf286774149a0a7bd8adb8179cec75":[6,0,1,109,14], +"setup_8php.html#a14d208682a88632290c895d20da6e7d6":[6,0,1,109,5], +"setup_8php.html#a267555abd17290e659b4bf44b885e4e0":[6,0,1,109,13], +"setup_8php.html#a2b375ddc555140236fc500135de99371":[6,0,1,109,10], +"setup_8php.html#a5ad92c0857d1dadd6b60a9a557159c9f":[6,0,1,109,3], +"setup_8php.html#a69a450e06dd3771fb51d3e4b0266a35e":[6,0,1,109,1], +"setup_8php.html#a8652788e8589778c5f81634a9d5b9429":[6,0,1,109,8], "setup_8php.html#a88247384a96e14516f474d7af6a465c1":[6,0,1,109,12], "setup_8php.html#aa3bbb111780da70ba35cc23a306f2c76":[6,0,1,109,4], "setup_8php.html#ab4b71369a25021d59247c917e98d8246":[6,0,1,109,7], @@ -19,161 +26,161 @@ var NAVTREEINDEX8 = "siteinfo_8php.html#a70c09bfb6dd1c86a125a35f62ed53656":[6,0,1,111,0], "sitelist_8php.html":[6,0,1,112], "sitelist_8php.html#a665a59bf60f780b40f32c909f4a473b1":[6,0,1,112,0], -"smarty_8php.html":[6,0,0,72], +"smarty_8php.html":[6,0,0,73], "smilies_8php.html":[6,0,1,113], "smilies_8php.html#ab43b1e9f33a700a830aff14c7b3a617f":[6,0,1,113,0], -"socgraph_8php.html":[6,0,0,73], -"socgraph_8php.html#a16ac51c505d72987ed8d6d6aed0e8586":[6,0,0,73,0], -"socgraph_8php.html#a5ef8bef37161df53718a21e93d02fbd6":[6,0,0,73,6], -"socgraph_8php.html#a76e6fca3d2bc842dcd9e710bb87c8329":[6,0,0,73,7], -"socgraph_8php.html#a790690bb1a1d02483fe31632a160144d":[6,0,0,73,8], -"socgraph_8php.html#a7d34cd58025bcd9e575282f44db75918":[6,0,0,73,1], -"socgraph_8php.html#a887d576f21fd708132a06d0f72f90f84":[6,0,0,73,4], -"socgraph_8php.html#ac343a846241d36cdf046b08f3396cfe9":[6,0,0,73,2], -"socgraph_8php.html#af175807406d94407a5e11742a3287746":[6,0,0,73,5], -"socgraph_8php.html#af29d056beec10b4e38e5209c92452894":[6,0,0,73,3], +"socgraph_8php.html":[6,0,0,74], +"socgraph_8php.html#a16ac51c505d72987ed8d6d6aed0e8586":[6,0,0,74,0], +"socgraph_8php.html#a5ef8bef37161df53718a21e93d02fbd6":[6,0,0,74,6], +"socgraph_8php.html#a76e6fca3d2bc842dcd9e710bb87c8329":[6,0,0,74,7], +"socgraph_8php.html#a790690bb1a1d02483fe31632a160144d":[6,0,0,74,8], +"socgraph_8php.html#a7d34cd58025bcd9e575282f44db75918":[6,0,0,74,1], +"socgraph_8php.html#a887d576f21fd708132a06d0f72f90f84":[6,0,0,74,4], +"socgraph_8php.html#ac343a846241d36cdf046b08f3396cfe9":[6,0,0,74,2], +"socgraph_8php.html#af175807406d94407a5e11742a3287746":[6,0,0,74,5], +"socgraph_8php.html#af29d056beec10b4e38e5209c92452894":[6,0,0,74,3], "sources_8php.html":[6,0,1,114], "sources_8php.html#ac442ccef080ab95772d8929fcafcb4b7":[6,0,1,114,0], "sources_8php.html#ac73298ff162ce7b2de8dcaf3d3305b1e":[6,0,1,114,1], -"spam_8php.html":[6,0,0,74], -"spam_8php.html#a05861201147b9a538d006f0269255cf9":[6,0,0,74,1], -"spam_8php.html#ab8fd81a82c9622cbebb8ceab6b310ca6":[6,0,0,74,0], +"spam_8php.html":[6,0,0,75], +"spam_8php.html#a05861201147b9a538d006f0269255cf9":[6,0,0,75,1], +"spam_8php.html#ab8fd81a82c9622cbebb8ceab6b310ca6":[6,0,0,75,0], "sslify_8php.html":[6,0,1,115], "sslify_8php.html#a75b11e54a3d1fc83e7d4c0e8b4dab316":[6,0,1,115,0], "starred_8php.html":[6,0,1,116], "starred_8php.html#a63024fb418c678e49fd535e3752d349a":[6,0,1,116,0], -"statistics__fns_8php.html":[6,0,0,75], -"statistics__fns_8php.html#a05858927cce81fd367aedf85a94ed90c":[6,0,0,75,2], -"statistics__fns_8php.html#a82726229a961d3bd3d543005c61dd8e6":[6,0,0,75,0], -"statistics__fns_8php.html#a9dd516dda693f17f5ce48a94876f7efa":[6,0,0,75,3], -"statistics__fns_8php.html#ad2b7b595c039c4c2eb0d6cd57a393dfe":[6,0,0,75,1], +"statistics__fns_8php.html":[6,0,0,76], +"statistics__fns_8php.html#a05858927cce81fd367aedf85a94ed90c":[6,0,0,76,2], +"statistics__fns_8php.html#a82726229a961d3bd3d543005c61dd8e6":[6,0,0,76,0], +"statistics__fns_8php.html#a9dd516dda693f17f5ce48a94876f7efa":[6,0,0,76,3], +"statistics__fns_8php.html#ad2b7b595c039c4c2eb0d6cd57a393dfe":[6,0,0,76,1], "subthread_8php.html":[6,0,1,117], "subthread_8php.html#a50368f3d825b77996030528e7fbfa3d3":[6,0,1,117,0], "suggest_8php.html":[6,0,1,118], "suggest_8php.html#a58748a8235d4523f8333847f3e42dd91":[6,0,1,118,0], "suggest_8php.html#a696acf1dd8070e479adcc80c63c6718c":[6,0,1,118,1], -"system__unavailable_8php.html":[6,0,0,76], -"system__unavailable_8php.html#a73751a6bcc17ad3ca503496e2fb020fa":[6,0,0,76,0], +"system__unavailable_8php.html":[6,0,0,77], +"system__unavailable_8php.html#a73751a6bcc17ad3ca503496e2fb020fa":[6,0,0,77,0], "tagger_8php.html":[6,0,1,119], "tagger_8php.html#a0e4a3eb177d1684553c547503d67161c":[6,0,1,119,0], "tagrm_8php.html":[6,0,1,120], "tagrm_8php.html#a1702f40aa53a2fa93deade1f609abe78":[6,0,1,120,1], "tagrm_8php.html#adfd4ea5b4d7fc6d9c9e042af5cd7d49a":[6,0,1,120,0], -"taxonomy_8php.html":[6,0,0,77], -"taxonomy_8php.html#a03f55ee46c5f496e42f3d29db8d09cce":[6,0,0,77,9], -"taxonomy_8php.html#a088371f4bc19155b2291508f5cd63332":[6,0,0,77,0], -"taxonomy_8php.html#a08df5164926d2b31b8e9fcfe919de2b6":[6,0,0,77,2], -"taxonomy_8php.html#a0fb8cf0ac7bcbc8b27d856fe9bf69cd1":[6,0,0,77,6], -"taxonomy_8php.html#a163b5131f388080b0fc82398d3a32fe1":[6,0,0,77,4], -"taxonomy_8php.html#a3299482ac20e9d79453048dd52881d37":[6,0,0,77,3], -"taxonomy_8php.html#a4ba1339b2a7054971178ce194e4440fd":[6,0,0,77,10], -"taxonomy_8php.html#a599ee71dd3194c8127b00dabec77abc1":[6,0,0,77,1], -"taxonomy_8php.html#a7747fa859ac56fbffd4f9782d85505de":[6,0,0,77,7], -"taxonomy_8php.html#a7a913d19c77610da689be48fbbf6734c":[6,0,0,77,14], -"taxonomy_8php.html#aaeded36bcc983b35d9205fe5b6c18c43":[6,0,0,77,13], -"taxonomy_8php.html#aaf90ba8b839d6459065f39a4f1109b8a":[6,0,0,77,11], -"taxonomy_8php.html#ac21d1dff16d569e7d110167aea4e63c2":[6,0,0,77,12], -"taxonomy_8php.html#adfead45e3b8a3dfb2b4a4b9281d0dbe1":[6,0,0,77,5], -"taxonomy_8php.html#af387463d42ffdf7d2ab3d5b22e40a0c7":[6,0,0,77,8], -"template__processor_8php.html":[6,0,0,78], -"template__processor_8php.html#a797745996c7839a93b2ab1af456631ab":[6,0,0,78,3], -"template__processor_8php.html#ab2bcd8738f20f293636a6ae8e1099db5":[6,0,0,78,1], -"template__processor_8php.html#ac635bb19a5f6eadd6b0cddefdd537c1e":[6,0,0,78,2], -"text_8php.html":[6,0,0,79], -"text_8php.html#a0271381208acfa2d4cff36da281e3e23":[6,0,0,79,41], -"text_8php.html#a030fa5ecc64168af0c4f44897a9bce63":[6,0,0,79,47], -"text_8php.html#a070384ec000fd65043fce11d5392d241":[6,0,0,79,6], -"text_8php.html#a0a1f7c0e97f9ecbebf3e5834582b014c":[6,0,0,79,16], -"text_8php.html#a0c65597bb4aed3a039eb795ff540e5e3":[6,0,0,79,11], -"text_8php.html#a10dde167249ed5abf190a7a0986878ea":[6,0,0,79,72], -"text_8php.html#a11255c8c4e5245b6c24f97684826aa54":[6,0,0,79,46], -"text_8php.html#a13286f8a95d2de6b102966ecc270c8d6":[6,0,0,79,5], -"text_8php.html#a1360fed7f918d859daaca1c9f384f9af":[6,0,0,79,83], -"text_8php.html#a138a3a611fa7f4f3630674145fc826bf":[6,0,0,79,34], -"text_8php.html#a1557112a774ec00fa06ed6b6f6495506":[6,0,0,79,37], -"text_8php.html#a1633412120f52bdce5f43e0a127d9293":[6,0,0,79,51], -"text_8php.html#a1af49756c8c71902a66c7e329c462beb":[6,0,0,79,54], -"text_8php.html#a1e510c53624933ce9b7d6715784894db":[6,0,0,79,48], -"text_8php.html#a24d441d30df4b8e6bf6780bf62a5e2c6":[6,0,0,79,49], -"text_8php.html#a2690ad67bb6fb97ef69de3e8d23f2728":[6,0,0,79,44], -"text_8php.html#a273156a6f5cddc6652ad656821cd5805":[6,0,0,79,73], -"text_8php.html#a27cd2c1b3bcb49a0cfb7249e851725ca":[6,0,0,79,4], -"text_8php.html#a29988052f3944111def3b6aaf2c7a8f6":[6,0,0,79,91], -"text_8php.html#a29d6b804e368d3ef359ee295e96ed4c7":[6,0,0,79,80], -"text_8php.html#a2a902f5fdba8646333e997898ac45ea3":[6,0,0,79,50], -"text_8php.html#a2e8d6c402603be3a1256a16605e09c2a":[6,0,0,79,10], -"text_8php.html#a2f2585385530cb935a6325c809d84a4d":[6,0,0,79,77], -"text_8php.html#a2ffd79c60cc87cec24ef76447b905187":[6,0,0,79,93], -"text_8php.html#a3054189cff173977f4216c9a3dd29e1b":[6,0,0,79,24], -"text_8php.html#a324c58f37f6acdf9cd1922aa76077d9f":[6,0,0,79,88], -"text_8php.html#a33bdb5d4bfff2ede7caf61a98ac0a2e9":[6,0,0,79,75], -"text_8php.html#a3972701c5c83624ec4e2d06242f614e7":[6,0,0,79,32], -"text_8php.html#a3999a0b3e22e440f280ee791ce34d384":[6,0,0,79,43], -"text_8php.html#a3a0c432a484c17d7720b8ba2d6bfdd59":[6,0,0,79,26], -"text_8php.html#a3ba47b4dd1248e7e51095572e7b814dc":[6,0,0,79,19], -"text_8php.html#a3d225b253bb9e0f2498c11647d927b0b":[6,0,0,79,74], -"text_8php.html#a3d2793d66db3345fd290b71e2eadf98e":[6,0,0,79,7], -"text_8php.html#a405afe814a23f3bd94d826101aa168ab":[6,0,0,79,89], -"text_8php.html#a436a8de00c942364c2d0fcfc7e1f4b5a":[6,0,0,79,35], -"text_8php.html#a4659fbc4e54ddc700c3aa66b9092c623":[6,0,0,79,33], -"text_8php.html#a47c1e4a5f3f53027daacd8a9db24f285":[6,0,0,79,45], -"text_8php.html#a4841df5beabdd1bdd1ed56781a915d61":[6,0,0,79,63], -"text_8php.html#a4bbb7d00c05cd20b4e043424f322388f":[6,0,0,79,52], -"text_8php.html#a4e4d42b0a805148d9f9a92bcac89bf91":[6,0,0,79,25], -"text_8php.html#a4e7698aca48982512594b274543c3b9b":[6,0,0,79,62], -"text_8php.html#a543447c5ed766535221e2d9636b379ee":[6,0,0,79,85], -"text_8php.html#a55ab893be57feda59c2a7ba1e58ff2d0":[6,0,0,79,9], -"text_8php.html#a63fb21c0bed2fc72eef2c1471ac42b63":[6,0,0,79,14], -"text_8php.html#a6a3d80a6c6fb234fd0bac44203b828eb":[6,0,0,79,84], -"text_8php.html#a71f6952243d3fe1c5a8154f78027e29c":[6,0,0,79,42], -"text_8php.html#a736db13a966b8abaf8c9198faa35911a":[6,0,0,79,29], -"text_8php.html#a740ad03e00459039a2c0992246c4e727":[6,0,0,79,81], -"text_8php.html#a75c243e06341ec16bd5a44b9b1cacd85":[6,0,0,79,1], -"text_8php.html#a75c326298519ed14ebe762194c8a3f2a":[6,0,0,79,36], -"text_8php.html#a76d1b3435c067978d7b484c45f56472b":[6,0,0,79,28], -"text_8php.html#a8264348059abd1d4d5bb521323d3b19a":[6,0,0,79,82], -"text_8php.html#a85e3a4851c16674834010d8419a5d7ca":[6,0,0,79,8], -"text_8php.html#a876e94892867019935b348b573299352":[6,0,0,79,70], -"text_8php.html#a8796f6a9ca592ecdce7b3afc3462aa13":[6,0,0,79,76], -"text_8php.html#a87a3cefc603302c78982f1d8e1245265":[6,0,0,79,15], -"text_8php.html#a89929fa6f70a8ba54d5273fcf622b665":[6,0,0,79,21], -"text_8php.html#a8b0a799341b1fc4cba2c3ede3e3fc9b6":[6,0,0,79,61], -"text_8php.html#a8d8c4a11e53461caca21181ebd72daca":[6,0,0,79,20], -"text_8php.html#a905c3895feb6f276df23f07f16f9bb52":[6,0,0,79,86], -"text_8php.html#a95fd2f8f23a1948414a03ebc963bac57":[6,0,0,79,3], -"text_8php.html#a98fd99dee3da8cf4c148dc04efe782ee":[6,0,0,79,56], -"text_8php.html#a9c6ce4e12a4ac883c5e3f36fed6e1e09":[6,0,0,79,67], -"text_8php.html#a9d6a5ee1290de7a8b483fe78585daade":[6,0,0,79,65], -"text_8php.html#a9fbeae13c9abd6e27cb4d8d1817f969c":[6,0,0,79,69], -"text_8php.html#aa46f941155c2ac1155f2f17ffb0adb66":[6,0,0,79,31], -"text_8php.html#aa5148a0dfea2a1ca64c3d52f10aa2d64":[6,0,0,79,17], -"text_8php.html#aa5528f41533927e1bd2da3618a74a6d7":[6,0,0,79,57], -"text_8php.html#aa6b0aa8afbeab50d1a3058ad21acb74e":[6,0,0,79,38], -"text_8php.html#aac0969ae09853205992ba06ab9f9f61a":[6,0,0,79,30], -"text_8php.html#aad557c054cf2ed915633701018fc7e3f":[6,0,0,79,92], -"text_8php.html#aae91e4d2a2c6f7a9daccd2c186ae3447":[6,0,0,79,71], -"text_8php.html#aaed4413ed8918838b517e3b2fafaea0d":[6,0,0,79,87], -"text_8php.html#ab4a4c3d4700bc219bb84f33b499314f4":[6,0,0,79,90], -"text_8php.html#ac19d2b33a58372a357a43d51eed19162":[6,0,0,79,58], -"text_8php.html#ac1dbf2e37e8069bea2c0f557fdbf203e":[6,0,0,79,39], -"text_8php.html#ac2ff88e800f74b22e9cc091c10809c54":[6,0,0,79,78], -"text_8php.html#ace3c98538c63e09b70a363210b414112":[6,0,0,79,22], -"text_8php.html#acedb584f65114a33f389efb796172a91":[6,0,0,79,2], -"text_8php.html#ad6432621d0fafcbcf3d3b9b49bef7784":[6,0,0,79,13], -"text_8php.html#ad855a32bee22c3f3b9734e3a334b96f2":[6,0,0,79,66], -"text_8php.html#ad8c6e13d6accf057136c5f30a23a5f08":[6,0,0,79,27], -"text_8php.html#adba17ec946f4285285dc100f7860bf51":[6,0,0,79,53], -"text_8php.html#ae17b39d5e321debd3ad16dcbbde842b8":[6,0,0,79,40], -"text_8php.html#ae2126da85966da0e79c6bcbac63b0bda":[6,0,0,79,68], -"text_8php.html#ae4282a39492caa23ccbc2ce98e54f110":[6,0,0,79,18], -"text_8php.html#ae4df74296fbe55051ed3c035e55205e5":[6,0,0,79,59], -"text_8php.html#af8a3e3a66a7b862d4510f145d2e13186":[6,0,0,79,0], -"text_8php.html#af9c9ac3f74c82dc60acfa404d0e9dc53":[6,0,0,79,79], -"text_8php.html#afc998d2796a6b2a08e96f7cc061e7221":[6,0,0,79,64], -"text_8php.html#afdc69fe3f6c09e35e46304dcea63ae28":[6,0,0,79,23], -"text_8php.html#afe18627c4983ee5f7c940a0992818cd5":[6,0,0,79,12], -"text_8php.html#afe54312607d92f7ce9593f5760831f80":[6,0,0,79,60], -"text_8php.html#afe9f178d264d44a94dc1292aaf0fd585":[6,0,0,79,55], +"taxonomy_8php.html":[6,0,0,78], +"taxonomy_8php.html#a03f55ee46c5f496e42f3d29db8d09cce":[6,0,0,78,9], +"taxonomy_8php.html#a088371f4bc19155b2291508f5cd63332":[6,0,0,78,0], +"taxonomy_8php.html#a08df5164926d2b31b8e9fcfe919de2b6":[6,0,0,78,2], +"taxonomy_8php.html#a0fb8cf0ac7bcbc8b27d856fe9bf69cd1":[6,0,0,78,6], +"taxonomy_8php.html#a163b5131f388080b0fc82398d3a32fe1":[6,0,0,78,4], +"taxonomy_8php.html#a3299482ac20e9d79453048dd52881d37":[6,0,0,78,3], +"taxonomy_8php.html#a4ba1339b2a7054971178ce194e4440fd":[6,0,0,78,10], +"taxonomy_8php.html#a599ee71dd3194c8127b00dabec77abc1":[6,0,0,78,1], +"taxonomy_8php.html#a7747fa859ac56fbffd4f9782d85505de":[6,0,0,78,7], +"taxonomy_8php.html#a7a913d19c77610da689be48fbbf6734c":[6,0,0,78,14], +"taxonomy_8php.html#aaeded36bcc983b35d9205fe5b6c18c43":[6,0,0,78,13], +"taxonomy_8php.html#aaf90ba8b839d6459065f39a4f1109b8a":[6,0,0,78,11], +"taxonomy_8php.html#ac21d1dff16d569e7d110167aea4e63c2":[6,0,0,78,12], +"taxonomy_8php.html#adfead45e3b8a3dfb2b4a4b9281d0dbe1":[6,0,0,78,5], +"taxonomy_8php.html#af387463d42ffdf7d2ab3d5b22e40a0c7":[6,0,0,78,8], +"template__processor_8php.html":[6,0,0,79], +"template__processor_8php.html#a797745996c7839a93b2ab1af456631ab":[6,0,0,79,3], +"template__processor_8php.html#ab2bcd8738f20f293636a6ae8e1099db5":[6,0,0,79,1], +"template__processor_8php.html#ac635bb19a5f6eadd6b0cddefdd537c1e":[6,0,0,79,2], +"text_8php.html":[6,0,0,80], +"text_8php.html#a0271381208acfa2d4cff36da281e3e23":[6,0,0,80,41], +"text_8php.html#a030fa5ecc64168af0c4f44897a9bce63":[6,0,0,80,47], +"text_8php.html#a070384ec000fd65043fce11d5392d241":[6,0,0,80,6], +"text_8php.html#a0a1f7c0e97f9ecbebf3e5834582b014c":[6,0,0,80,16], +"text_8php.html#a0c65597bb4aed3a039eb795ff540e5e3":[6,0,0,80,11], +"text_8php.html#a10dde167249ed5abf190a7a0986878ea":[6,0,0,80,72], +"text_8php.html#a11255c8c4e5245b6c24f97684826aa54":[6,0,0,80,46], +"text_8php.html#a13286f8a95d2de6b102966ecc270c8d6":[6,0,0,80,5], +"text_8php.html#a1360fed7f918d859daaca1c9f384f9af":[6,0,0,80,83], +"text_8php.html#a138a3a611fa7f4f3630674145fc826bf":[6,0,0,80,34], +"text_8php.html#a1557112a774ec00fa06ed6b6f6495506":[6,0,0,80,37], +"text_8php.html#a1633412120f52bdce5f43e0a127d9293":[6,0,0,80,51], +"text_8php.html#a1af49756c8c71902a66c7e329c462beb":[6,0,0,80,54], +"text_8php.html#a1e510c53624933ce9b7d6715784894db":[6,0,0,80,48], +"text_8php.html#a24d441d30df4b8e6bf6780bf62a5e2c6":[6,0,0,80,49], +"text_8php.html#a2690ad67bb6fb97ef69de3e8d23f2728":[6,0,0,80,44], +"text_8php.html#a273156a6f5cddc6652ad656821cd5805":[6,0,0,80,73], +"text_8php.html#a27cd2c1b3bcb49a0cfb7249e851725ca":[6,0,0,80,4], +"text_8php.html#a29988052f3944111def3b6aaf2c7a8f6":[6,0,0,80,91], +"text_8php.html#a29d6b804e368d3ef359ee295e96ed4c7":[6,0,0,80,80], +"text_8php.html#a2a902f5fdba8646333e997898ac45ea3":[6,0,0,80,50], +"text_8php.html#a2e8d6c402603be3a1256a16605e09c2a":[6,0,0,80,10], +"text_8php.html#a2f2585385530cb935a6325c809d84a4d":[6,0,0,80,77], +"text_8php.html#a2ffd79c60cc87cec24ef76447b905187":[6,0,0,80,93], +"text_8php.html#a3054189cff173977f4216c9a3dd29e1b":[6,0,0,80,24], +"text_8php.html#a324c58f37f6acdf9cd1922aa76077d9f":[6,0,0,80,88], +"text_8php.html#a33bdb5d4bfff2ede7caf61a98ac0a2e9":[6,0,0,80,75], +"text_8php.html#a3972701c5c83624ec4e2d06242f614e7":[6,0,0,80,32], +"text_8php.html#a3999a0b3e22e440f280ee791ce34d384":[6,0,0,80,43], +"text_8php.html#a3a0c432a484c17d7720b8ba2d6bfdd59":[6,0,0,80,26], +"text_8php.html#a3ba47b4dd1248e7e51095572e7b814dc":[6,0,0,80,19], +"text_8php.html#a3d225b253bb9e0f2498c11647d927b0b":[6,0,0,80,74], +"text_8php.html#a3d2793d66db3345fd290b71e2eadf98e":[6,0,0,80,7], +"text_8php.html#a405afe814a23f3bd94d826101aa168ab":[6,0,0,80,89], +"text_8php.html#a436a8de00c942364c2d0fcfc7e1f4b5a":[6,0,0,80,35], +"text_8php.html#a4659fbc4e54ddc700c3aa66b9092c623":[6,0,0,80,33], +"text_8php.html#a47c1e4a5f3f53027daacd8a9db24f285":[6,0,0,80,45], +"text_8php.html#a4841df5beabdd1bdd1ed56781a915d61":[6,0,0,80,63], +"text_8php.html#a4bbb7d00c05cd20b4e043424f322388f":[6,0,0,80,52], +"text_8php.html#a4e4d42b0a805148d9f9a92bcac89bf91":[6,0,0,80,25], +"text_8php.html#a4e7698aca48982512594b274543c3b9b":[6,0,0,80,62], +"text_8php.html#a543447c5ed766535221e2d9636b379ee":[6,0,0,80,85], +"text_8php.html#a55ab893be57feda59c2a7ba1e58ff2d0":[6,0,0,80,9], +"text_8php.html#a63fb21c0bed2fc72eef2c1471ac42b63":[6,0,0,80,14], +"text_8php.html#a6a3d80a6c6fb234fd0bac44203b828eb":[6,0,0,80,84], +"text_8php.html#a71f6952243d3fe1c5a8154f78027e29c":[6,0,0,80,42], +"text_8php.html#a736db13a966b8abaf8c9198faa35911a":[6,0,0,80,29], +"text_8php.html#a740ad03e00459039a2c0992246c4e727":[6,0,0,80,81], +"text_8php.html#a75c243e06341ec16bd5a44b9b1cacd85":[6,0,0,80,1], +"text_8php.html#a75c326298519ed14ebe762194c8a3f2a":[6,0,0,80,36], +"text_8php.html#a76d1b3435c067978d7b484c45f56472b":[6,0,0,80,28], +"text_8php.html#a8264348059abd1d4d5bb521323d3b19a":[6,0,0,80,82], +"text_8php.html#a85e3a4851c16674834010d8419a5d7ca":[6,0,0,80,8], +"text_8php.html#a876e94892867019935b348b573299352":[6,0,0,80,70], +"text_8php.html#a8796f6a9ca592ecdce7b3afc3462aa13":[6,0,0,80,76], +"text_8php.html#a87a3cefc603302c78982f1d8e1245265":[6,0,0,80,15], +"text_8php.html#a89929fa6f70a8ba54d5273fcf622b665":[6,0,0,80,21], +"text_8php.html#a8b0a799341b1fc4cba2c3ede3e3fc9b6":[6,0,0,80,61], +"text_8php.html#a8d8c4a11e53461caca21181ebd72daca":[6,0,0,80,20], +"text_8php.html#a905c3895feb6f276df23f07f16f9bb52":[6,0,0,80,86], +"text_8php.html#a95fd2f8f23a1948414a03ebc963bac57":[6,0,0,80,3], +"text_8php.html#a98fd99dee3da8cf4c148dc04efe782ee":[6,0,0,80,56], +"text_8php.html#a9c6ce4e12a4ac883c5e3f36fed6e1e09":[6,0,0,80,67], +"text_8php.html#a9d6a5ee1290de7a8b483fe78585daade":[6,0,0,80,65], +"text_8php.html#a9fbeae13c9abd6e27cb4d8d1817f969c":[6,0,0,80,69], +"text_8php.html#aa46f941155c2ac1155f2f17ffb0adb66":[6,0,0,80,31], +"text_8php.html#aa5148a0dfea2a1ca64c3d52f10aa2d64":[6,0,0,80,17], +"text_8php.html#aa5528f41533927e1bd2da3618a74a6d7":[6,0,0,80,57], +"text_8php.html#aa6b0aa8afbeab50d1a3058ad21acb74e":[6,0,0,80,38], +"text_8php.html#aac0969ae09853205992ba06ab9f9f61a":[6,0,0,80,30], +"text_8php.html#aad557c054cf2ed915633701018fc7e3f":[6,0,0,80,92], +"text_8php.html#aae91e4d2a2c6f7a9daccd2c186ae3447":[6,0,0,80,71], +"text_8php.html#aaed4413ed8918838b517e3b2fafaea0d":[6,0,0,80,87], +"text_8php.html#ab4a4c3d4700bc219bb84f33b499314f4":[6,0,0,80,90], +"text_8php.html#ac19d2b33a58372a357a43d51eed19162":[6,0,0,80,58], +"text_8php.html#ac1dbf2e37e8069bea2c0f557fdbf203e":[6,0,0,80,39], +"text_8php.html#ac2ff88e800f74b22e9cc091c10809c54":[6,0,0,80,78], +"text_8php.html#ace3c98538c63e09b70a363210b414112":[6,0,0,80,22], +"text_8php.html#acedb584f65114a33f389efb796172a91":[6,0,0,80,2], +"text_8php.html#ad6432621d0fafcbcf3d3b9b49bef7784":[6,0,0,80,13], +"text_8php.html#ad855a32bee22c3f3b9734e3a334b96f2":[6,0,0,80,66], +"text_8php.html#ad8c6e13d6accf057136c5f30a23a5f08":[6,0,0,80,27], +"text_8php.html#adba17ec946f4285285dc100f7860bf51":[6,0,0,80,53], +"text_8php.html#ae17b39d5e321debd3ad16dcbbde842b8":[6,0,0,80,40], +"text_8php.html#ae2126da85966da0e79c6bcbac63b0bda":[6,0,0,80,68], +"text_8php.html#ae4282a39492caa23ccbc2ce98e54f110":[6,0,0,80,18], +"text_8php.html#ae4df74296fbe55051ed3c035e55205e5":[6,0,0,80,59], +"text_8php.html#af8a3e3a66a7b862d4510f145d2e13186":[6,0,0,80,0], +"text_8php.html#af9c9ac3f74c82dc60acfa404d0e9dc53":[6,0,0,80,79], +"text_8php.html#afc998d2796a6b2a08e96f7cc061e7221":[6,0,0,80,64], +"text_8php.html#afdc69fe3f6c09e35e46304dcea63ae28":[6,0,0,80,23], +"text_8php.html#afe18627c4983ee5f7c940a0992818cd5":[6,0,0,80,12], +"text_8php.html#afe54312607d92f7ce9593f5760831f80":[6,0,0,80,60], +"text_8php.html#afe9f178d264d44a94dc1292aaf0fd585":[6,0,0,80,55], "theme_2apw_2php_2theme__init_8php.html":[6,0,3,1,0,1,4], "theme_2apw_2php_2theme__init_8php.html#a54f32c086fe209c99769a4c4047dd864":[6,0,3,1,0,1,4,0], "theme_2blogga_2php_2default_8php.html":[6,0,3,1,1,0,1], @@ -242,12 +249,5 @@ var NAVTREEINDEX8 = "view_2theme_2blogga_2view_2theme_2blog_2config_8php.html#aa7d5739b72efef9822535b2b32d5364d":[6,0,3,1,1,1,0,0,0,3], "view_2theme_2blogga_2view_2theme_2blog_2config_8php.html#ad29461920cf03b9ce1428e21eb1f4ba6":[6,0,3,1,1,1,0,0,0,4], "view_2theme_2blogga_2view_2theme_2blog_2config_8php.html#aef2da5582b7cb6b5f63e5ca5d69fd30b":[6,0,3,1,1,1,0,0,0,2], -"view_2theme_2redbasic_2php_2config_8php.html":[6,0,3,1,3,0,0], -"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,129], -"view_8php.html#ac168f6c61a91ba2063f13b441c0ae96e":[6,0,1,129,0], -"viewconnections_8php.html":[6,0,1,130], -"viewconnections_8php.html#a00163d50b17568f7b0e48b1ca9ab7330":[6,0,1,130,1] +"view_2theme_2redbasic_2php_2config_8php.html":[6,0,3,1,3,0,0] }; diff --git a/doc/html/navtreeindex9.js b/doc/html/navtreeindex9.js index afe7e6ea7..1e9892a17 100644 --- a/doc/html/navtreeindex9.js +++ b/doc/html/navtreeindex9.js @@ -1,5 +1,12 @@ var NAVTREEINDEX9 = { +"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,129], +"view_8php.html#ac168f6c61a91ba2063f13b441c0ae96e":[6,0,1,129,0], +"viewconnections_8php.html":[6,0,1,130], +"viewconnections_8php.html#a00163d50b17568f7b0e48b1ca9ab7330":[6,0,1,130,1], "viewconnections_8php.html#ab6c4d983e97b3a8a879567ff76507776":[6,0,1,130,0], "viewsrc_8php.html":[6,0,1,131], "viewsrc_8php.html#a6eff3d0c1d7d14b335c4edb785cd60a4":[6,0,1,131,0], @@ -18,37 +25,37 @@ var NAVTREEINDEX9 = "wfinger_8php.html":[6,0,1,137], "wfinger_8php.html#ae21e50c8d0a5f3c9be9f43a4e519acd3":[6,0,1,137,0], "widedarkness_8php.html":[6,0,3,1,0,2,10], -"widgets_8php.html":[6,0,0,80], -"widgets_8php.html#a08035db02ff6a23260146b4c64153422":[6,0,0,80,11], -"widgets_8php.html#a0d404276fedc59f5038cf5c085028326":[6,0,0,80,26], -"widgets_8php.html#a0e2f5179ed1a73b282dfda7270fcabb3":[6,0,0,80,3], -"widgets_8php.html#a145ff35319cfa47a9cc07f9425bd674b":[6,0,0,80,8], -"widgets_8php.html#a268b01ce1ab8fe2cb346cb769b9d1091":[6,0,0,80,9], -"widgets_8php.html#a313a8d10ab81c71357c12e67e4d7efd5":[6,0,0,80,16], -"widgets_8php.html#a3bdfb81bf9a8ddf219924fa7eaf22013":[6,0,0,80,18], -"widgets_8php.html#a45ea061dabe9a8372e4ca3b9e5714256":[6,0,0,80,19], -"widgets_8php.html#a47c72aac42058ea086c9ef8651c259da":[6,0,0,80,5], -"widgets_8php.html#a50b1410238100c8a94c06b0aa63ee3b8":[6,0,0,80,25], -"widgets_8php.html#a5ab3b64496e02cab56429978ad55f1c0":[6,0,0,80,12], -"widgets_8php.html#a6dbc227aac750774284ee39c45f0a200":[6,0,0,80,27], -"widgets_8php.html#a702e2fc0adc9b615999eca18b7311b5e":[6,0,0,80,21], -"widgets_8php.html#a70442dfa079312d9d5e5ee01be51a165":[6,0,0,80,15], -"widgets_8php.html#a7b1e357b5a2027718470b77ec921fc65":[6,0,0,80,2], -"widgets_8php.html#a94203eb9bcd63cbdecbbcb15163598d8":[6,0,0,80,23], -"widgets_8php.html#a95c06bc9be133e89768746302d2ac395":[6,0,0,80,10], -"widgets_8php.html#a999ba893cac7600d3d3b4e7e14cf8c20":[6,0,0,80,20], -"widgets_8php.html#a9d60539db68042e63c0015abd69a6f7a":[6,0,0,80,6], -"widgets_8php.html#aa189a07241246d97efbee29f1c6a6f7f":[6,0,0,80,7], -"widgets_8php.html#aaa73bcf1702eaadd9dcd253502f55e01":[6,0,0,80,24], -"widgets_8php.html#abd2e508a2a0b911c4a838e3cb7599923":[6,0,0,80,22], -"widgets_8php.html#abe03366fd22fd27d683518fa0765da50":[6,0,0,80,29], -"widgets_8php.html#aced5cb177f630b30799c5eab873ee75c":[6,0,0,80,1], -"widgets_8php.html#ad1bf7aa69e8d100d95faba17c7bc91cd":[6,0,0,80,14], -"widgets_8php.html#add9b24d3304e529a7975e96122315554":[6,0,0,80,0], -"widgets_8php.html#ade630b19fb4c622b7b2f6f8ef89eefa2":[6,0,0,80,13], -"widgets_8php.html#ae4ced69d83dbdd9e6b51660d9eba8653":[6,0,0,80,28], -"widgets_8php.html#af37fdad3b2e861d860a4a8c4d8a76c0b":[6,0,0,80,4], -"widgets_8php.html#afa2e55a78f95667a6da082efac7fec74":[6,0,0,80,17], +"widgets_8php.html":[6,0,0,81], +"widgets_8php.html#a08035db02ff6a23260146b4c64153422":[6,0,0,81,11], +"widgets_8php.html#a0d404276fedc59f5038cf5c085028326":[6,0,0,81,26], +"widgets_8php.html#a0e2f5179ed1a73b282dfda7270fcabb3":[6,0,0,81,3], +"widgets_8php.html#a145ff35319cfa47a9cc07f9425bd674b":[6,0,0,81,8], +"widgets_8php.html#a268b01ce1ab8fe2cb346cb769b9d1091":[6,0,0,81,9], +"widgets_8php.html#a313a8d10ab81c71357c12e67e4d7efd5":[6,0,0,81,16], +"widgets_8php.html#a3bdfb81bf9a8ddf219924fa7eaf22013":[6,0,0,81,18], +"widgets_8php.html#a45ea061dabe9a8372e4ca3b9e5714256":[6,0,0,81,19], +"widgets_8php.html#a47c72aac42058ea086c9ef8651c259da":[6,0,0,81,5], +"widgets_8php.html#a50b1410238100c8a94c06b0aa63ee3b8":[6,0,0,81,25], +"widgets_8php.html#a5ab3b64496e02cab56429978ad55f1c0":[6,0,0,81,12], +"widgets_8php.html#a6dbc227aac750774284ee39c45f0a200":[6,0,0,81,27], +"widgets_8php.html#a702e2fc0adc9b615999eca18b7311b5e":[6,0,0,81,21], +"widgets_8php.html#a70442dfa079312d9d5e5ee01be51a165":[6,0,0,81,15], +"widgets_8php.html#a7b1e357b5a2027718470b77ec921fc65":[6,0,0,81,2], +"widgets_8php.html#a94203eb9bcd63cbdecbbcb15163598d8":[6,0,0,81,23], +"widgets_8php.html#a95c06bc9be133e89768746302d2ac395":[6,0,0,81,10], +"widgets_8php.html#a999ba893cac7600d3d3b4e7e14cf8c20":[6,0,0,81,20], +"widgets_8php.html#a9d60539db68042e63c0015abd69a6f7a":[6,0,0,81,6], +"widgets_8php.html#aa189a07241246d97efbee29f1c6a6f7f":[6,0,0,81,7], +"widgets_8php.html#aaa73bcf1702eaadd9dcd253502f55e01":[6,0,0,81,24], +"widgets_8php.html#abd2e508a2a0b911c4a838e3cb7599923":[6,0,0,81,22], +"widgets_8php.html#abe03366fd22fd27d683518fa0765da50":[6,0,0,81,29], +"widgets_8php.html#aced5cb177f630b30799c5eab873ee75c":[6,0,0,81,1], +"widgets_8php.html#ad1bf7aa69e8d100d95faba17c7bc91cd":[6,0,0,81,14], +"widgets_8php.html#add9b24d3304e529a7975e96122315554":[6,0,0,81,0], +"widgets_8php.html#ade630b19fb4c622b7b2f6f8ef89eefa2":[6,0,0,81,13], +"widgets_8php.html#ae4ced69d83dbdd9e6b51660d9eba8653":[6,0,0,81,28], +"widgets_8php.html#af37fdad3b2e861d860a4a8c4d8a76c0b":[6,0,0,81,4], +"widgets_8php.html#afa2e55a78f95667a6da082efac7fec74":[6,0,0,81,17], "xchan_8php.html":[6,0,1,138], "xchan_8php.html#a9853348bf1a35c644460221ba75edc2d":[6,0,1,138,0], "xrd_8php.html":[6,0,1,139], @@ -57,39 +64,39 @@ var NAVTREEINDEX9 = "xref_8php.html#a9bee399213b8de8226b0d60834307473":[6,0,1,140,0], "zfinger_8php.html":[6,0,1,141], "zfinger_8php.html#a8139b83a22ef98869adc10aa224027a0":[6,0,1,141,0], -"zot_8php.html":[6,0,0,81], -"zot_8php.html#a083aec6c900d244e1bfc1406f9461465":[6,0,0,81,15], -"zot_8php.html#a0fc2211c5309d9f925ecc4115e3fdb75":[6,0,0,81,9], -"zot_8php.html#a20750dd2c36961013fd382fb34e1366c":[6,0,0,81,6], -"zot_8php.html#a2657e141d62d5f67ad3c87651b585299":[6,0,0,81,7], -"zot_8php.html#a31aad56acf8ff8f2353e6ff8595544df":[6,0,0,81,18], -"zot_8php.html#a3862b3161b2c8557dc1a95020179bd81":[6,0,0,81,20], -"zot_8php.html#a3bf11286c2619b4ca28e49d5b5ab374a":[6,0,0,81,5], -"zot_8php.html#a4d9e6ca295e443b740d9960c304b3474":[6,0,0,81,11], -"zot_8php.html#a528e97ca5d69c3b7f35c5d954afde315":[6,0,0,81,8], -"zot_8php.html#a55056e863a7860bc0cf922e78fcce073":[6,0,0,81,25], -"zot_8php.html#a5bcdfef419b16075a0eca990956223dc":[6,0,0,81,30], -"zot_8php.html#a61cdc1ec843663c423ed2d8160ae5aea":[6,0,0,81,22], -"zot_8php.html#a703f528ade8382cf374e4119bd6f7859":[6,0,0,81,0], -"zot_8php.html#a7ac30ff51274bf0b6d3eade37972145c":[6,0,0,81,29], -"zot_8php.html#a8e22dbc6f884be3644a892a876cbd972":[6,0,0,81,3], -"zot_8php.html#a8eeefdb0dad4c436bea9d1c06c0a7988":[6,0,0,81,12], -"zot_8php.html#a928f5643ca66ae9635d85aeb2be62e03":[6,0,0,81,28], -"zot_8php.html#a95528377d7303131958c9f0b7158fdce":[6,0,0,81,23], -"zot_8php.html#a9a57b40669351c9791126b925cb7ef3b":[6,0,0,81,14], -"zot_8php.html#aa6ae96db8cbbdbb10e6876d206bbf7cc":[6,0,0,81,13], -"zot_8php.html#aa97b33b619dd7132a9274f852af6ceb5":[6,0,0,81,1], -"zot_8php.html#aad25a3fe0e1566121d6fb8222979bc10":[6,0,0,81,16], -"zot_8php.html#ab15c04e7e5f44edf45ec50dd7d183254":[6,0,0,81,17], -"zot_8php.html#ab22d67660702056bf3f4696dcebf5ce7":[6,0,0,81,27], -"zot_8php.html#ab319d1d9fff9c7775d9daef42d1f33dd":[6,0,0,81,19], -"zot_8php.html#ab3e9b99ddb11353f37f265a05bb42142":[6,0,0,81,31], -"zot_8php.html#ac301c67864917c35922257950ae0f95c":[6,0,0,81,10], -"zot_8php.html#ad149f1e98c0c5b88ff9147e6ee3f330d":[6,0,0,81,4], -"zot_8php.html#adfeb9400ae6b726beec89f8f1e8fde72":[6,0,0,81,2], -"zot_8php.html#ae26ce9f1ad74139193fb6319beac5fca":[6,0,0,81,21], -"zot_8php.html#ae7cec2b417b5858fd4a41070f843d1d7":[6,0,0,81,24], -"zot_8php.html#aeea071f17e306fe3d0c488551906bfab":[6,0,0,81,26], +"zot_8php.html":[6,0,0,82], +"zot_8php.html#a083aec6c900d244e1bfc1406f9461465":[6,0,0,82,15], +"zot_8php.html#a0fc2211c5309d9f925ecc4115e3fdb75":[6,0,0,82,9], +"zot_8php.html#a20750dd2c36961013fd382fb34e1366c":[6,0,0,82,6], +"zot_8php.html#a2657e141d62d5f67ad3c87651b585299":[6,0,0,82,7], +"zot_8php.html#a31aad56acf8ff8f2353e6ff8595544df":[6,0,0,82,18], +"zot_8php.html#a3862b3161b2c8557dc1a95020179bd81":[6,0,0,82,20], +"zot_8php.html#a3bf11286c2619b4ca28e49d5b5ab374a":[6,0,0,82,5], +"zot_8php.html#a4d9e6ca295e443b740d9960c304b3474":[6,0,0,82,11], +"zot_8php.html#a528e97ca5d69c3b7f35c5d954afde315":[6,0,0,82,8], +"zot_8php.html#a55056e863a7860bc0cf922e78fcce073":[6,0,0,82,25], +"zot_8php.html#a5bcdfef419b16075a0eca990956223dc":[6,0,0,82,30], +"zot_8php.html#a61cdc1ec843663c423ed2d8160ae5aea":[6,0,0,82,22], +"zot_8php.html#a703f528ade8382cf374e4119bd6f7859":[6,0,0,82,0], +"zot_8php.html#a7ac30ff51274bf0b6d3eade37972145c":[6,0,0,82,29], +"zot_8php.html#a8e22dbc6f884be3644a892a876cbd972":[6,0,0,82,3], +"zot_8php.html#a8eeefdb0dad4c436bea9d1c06c0a7988":[6,0,0,82,12], +"zot_8php.html#a928f5643ca66ae9635d85aeb2be62e03":[6,0,0,82,28], +"zot_8php.html#a95528377d7303131958c9f0b7158fdce":[6,0,0,82,23], +"zot_8php.html#a9a57b40669351c9791126b925cb7ef3b":[6,0,0,82,14], +"zot_8php.html#aa6ae96db8cbbdbb10e6876d206bbf7cc":[6,0,0,82,13], +"zot_8php.html#aa97b33b619dd7132a9274f852af6ceb5":[6,0,0,82,1], +"zot_8php.html#aad25a3fe0e1566121d6fb8222979bc10":[6,0,0,82,16], +"zot_8php.html#ab15c04e7e5f44edf45ec50dd7d183254":[6,0,0,82,17], +"zot_8php.html#ab22d67660702056bf3f4696dcebf5ce7":[6,0,0,82,27], +"zot_8php.html#ab319d1d9fff9c7775d9daef42d1f33dd":[6,0,0,82,19], +"zot_8php.html#ab3e9b99ddb11353f37f265a05bb42142":[6,0,0,82,31], +"zot_8php.html#ac301c67864917c35922257950ae0f95c":[6,0,0,82,10], +"zot_8php.html#ad149f1e98c0c5b88ff9147e6ee3f330d":[6,0,0,82,4], +"zot_8php.html#adfeb9400ae6b726beec89f8f1e8fde72":[6,0,0,82,2], +"zot_8php.html#ae26ce9f1ad74139193fb6319beac5fca":[6,0,0,82,21], +"zot_8php.html#ae7cec2b417b5858fd4a41070f843d1d7":[6,0,0,82,24], +"zot_8php.html#aeea071f17e306fe3d0c488551906bfab":[6,0,0,82,26], "zotfeed_8php.html":[6,0,1,142], "zotfeed_8php.html#a24dfc23d366e7f840cf2847d0c1c8eac":[6,0,1,142,0], "zping_8php.html":[6,0,1,143], diff --git a/doc/html/permissions_8php.html b/doc/html/permissions_8php.html index b70ba43d6..8ae3220ff 100644 --- a/doc/html/permissions_8php.html +++ b/doc/html/permissions_8php.html @@ -243,7 +243,7 @@ Functions -

    Referenced by connedit_content(), create_identity(), and new_contact().

    +

    Referenced by connedit_content(), create_identity(), foofoo(), and new_contact().

    @@ -277,7 +277,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(), diaspora_asphoto(), diaspora_comment(), diaspora_conversation(), 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(), p_init(), 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(), RedMatrix\RedDAV\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(), RedMatrix\RedDAV\RedDirectory\createDirectory(), RedMatrix\RedDAV\RedDirectory\createFile(), RedMatrix\RedDAV\RedFile\delete(), diaspora_asphoto(), diaspora_comment(), diaspora_conversation(), diaspora_like(), diaspora_photo(), diaspora_post(), diaspora_reshare(), display_content(), editblock_content(), get_feed_for(), RedMatrix\RedDAV\RedDirectory\getChild(), RedMatrix\RedDAV\RedDirectory\getChildren(), item_post(), like_content(), local_dir_update(), p_init(), 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(), RedMatrix\RedDAV\RedBrowser\set_writeable(), RedMatrix\RedDAV\RedFile\setName(), RedMatrix\RedDAV\RedDirectory\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/php2po_8php.html b/doc/html/php2po_8php.html index 3143f7326..40001f325 100644 --- a/doc/html/php2po_8php.html +++ b/doc/html/php2po_8php.html @@ -168,7 +168,7 @@ Variables
    -

    Referenced by App\__construct(), Template\_get_var(), Template\_replcb_for(), activity_sanitise(), aes_encapsulate(), aes_unencapsulate(), app_render(), bb_sanitize_style(), build_sync_packet(), connections_post(), connedit_content(), connedit_post(), construct_page(), contact_poll_interval(), dirprofile_init(), dirsearch_content(), extra_query_args(), RedMatrix\RedDAV\RedBrowser\generateDirectoryIndex(), get_plugin_info(), get_theme_info(), get_things(), guess_image_type(), import_directory_profile(), item_photo_menu(), item_store_update(), load_config(), load_pconfig(), load_xconfig(), local_dir_update(), mail_post(), mood_content(), netgrowth_content(), new_contact(), FKOAuthDataStore\new_request_token(), obj_verb_selector(), openid_content(), parse_app_description(), photos_albums_list(), po2php_run(), poco_init(), poke_content(), private_messages_fetch_conversation(), private_messages_fetch_message(), private_messages_list(), process_channel_sync_delivery(), profile_load(), requestdata(), role_selector(), settings_post(), sslify_init(), startup(), tt(), RedMatrix\RedDAV\RedBrowser\userReadableSize(), vote_post(), x(), zfinger_init(), and zot_refresh().

    +

    Referenced by App\__construct(), Template\_get_var(), Template\_replcb_for(), activity_sanitise(), aes_encapsulate(), aes_unencapsulate(), app_render(), bb_sanitize_style(), build_sync_packet(), connections_post(), connedit_content(), connedit_post(), construct_page(), contact_poll_interval(), dirprofile_init(), dirsearch_content(), extra_query_args(), foofoo(), RedMatrix\RedDAV\RedBrowser\generateDirectoryIndex(), get_plugin_info(), get_theme_info(), get_things(), guess_image_type(), import_directory_profile(), item_photo_menu(), item_store_update(), load_config(), load_pconfig(), load_xconfig(), local_dir_update(), mail_post(), mood_content(), netgrowth_content(), new_contact(), FKOAuthDataStore\new_request_token(), obj_verb_selector(), openid_content(), parse_app_description(), photos_albums_list(), po2php_run(), poco_init(), poke_content(), private_messages_fetch_conversation(), private_messages_fetch_message(), private_messages_list(), process_channel_sync_delivery(), profile_load(), requestdata(), role_selector(), settings_post(), sslify_init(), startup(), tt(), RedMatrix\RedDAV\RedBrowser\userReadableSize(), vote_post(), x(), zfinger_init(), and zot_refresh().

    diff --git a/doc/html/php_2theme__init_8php.html b/doc/html/php_2theme__init_8php.html index ded8b6e17..814d0a7b5 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(), 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(), impel_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(), store_diaspora_comment_sig(), 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_encode_locations(), 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(), impel_init(), import_post(), importelm_post(), invite_content(), is_public_profile(), item_photo_menu(), item_post(), item_store(), item_store_update(), items_fetch(), layouts_content(), locs_post(), 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(), store_diaspora_comment_sig(), 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_encode_locations(), zot_finger(), and zot_refresh().

    diff --git a/doc/html/reddav_8php.html b/doc/html/reddav_8php.html index a6af84519..ac5e204bb 100644 --- a/doc/html/reddav_8php.html +++ b/doc/html/reddav_8php.html @@ -104,27 +104,15 @@ $(document).ready(function(){initNavTree('reddav_8php.html','');});
    -Classes | Functions
    reddav.php File Reference
    -

    DAV related classes from SabreDAV for Red Matrix. +

    some DAV related functions for RedMatrix. More...

    - - - - - - - - - -

    -Classes

    class  RedDirectory
     RedDirectory class. More...
     
    class  RedFile
     
    class  RedBasicAuth
     Authentication backend class for RedDAV. More...
     
    @@ -138,10 +126,11 @@ Functions

    Functions

     RedChannelList (&$auth)
     

    Detailed Description

    -

    DAV related classes from SabreDAV for Red Matrix.

    -

    This file contains the classes from SabreDAV that got extended to adapt it for Red Matrix.

    -

    You find the original SabreDAV classes under vendor/sabre/dav/. We need to use SabreDAV 1.8.x for PHP5.3 compatibility. SabreDAV >= 2.0 requires PHP >= 5.4.

    -
    Todo:
    split up the classes into own files.
    +

    some DAV related functions for RedMatrix.

    +

    This file contains some functions which did not fit into one of the RedDAV classes.

    +

    The extended SabreDAV classes you will find in the RedDAV namespace under includes/RedDAV/. The original SabreDAV classes you can find under vendor/sabre/dav/. We need to use SabreDAV 1.8.x for PHP5.3 compatibility. SabreDAV >= 2.0 requires PHP >= 5.4.

    +
    Todo:
    split up the classes into own files.
    +

    http://opensource.org/licenses/mit-license.php The MIT License (MIT)

    Function Documentation

    @@ -158,15 +147,15 @@ Functions

    Returns an array with viewable channels.

    -

    Get a list of RedDirectory objects with all the channels where the visitor has view_storage perms.

    -
    Todo:
    Is there any reason why this is not inside RedDirectory class?
    +

    Get a list of RedDirectory objects with all the channels where the visitor has view_storage perms.

    +
    Todo:
    Is there any reason why this is not inside RedDirectory class? function name looks like a class name, should we rename it?
    Parameters
    - +
    $auth
    RedBasicAuth&$auth
    -
    Returns
    array containing RedDirectory objects
    +
    Returns
    array RedDirectory[]

    Referenced by RedCollectionData().

    @@ -197,18 +186,25 @@ Functions

    TODO what exactly does this function?

    -

    Array with all RedDirectory and RedFile DAV items for the given path.

    -
    Todo:
    Is there any reason why this is not inside RedDirectory class? Seems only to be used there and we could simplify it a bit there.
    +

    Array with all RedDirectory and RedFile DAV items for the given path.

    +
    Todo:
    Is there any reason why this is not inside RedDirectory class? Seems only to be used there and we could simplify it a bit there. function name looks like a class name, should we rename it?
    Parameters
    - + +
    string$filepath to a directory
    &$auth
    RedBasicAuth&$auth
    +
    +
    +
    Returns
    null|array []
    +
    Exceptions
    + + +
    \Sabre\DAV\Exception\Forbidden
    \Sabre\DAV\Exception\NotFound
    -
    Returns
    array DAV[]
    -

    Referenced by RedDirectory\getChildren().

    +

    Referenced by RedMatrix\RedDAV\RedDirectory\getChildren().

    @@ -243,16 +239,24 @@ Functions

    TODO What exactly is this function for?

    +

    function name looks like a class name, should we rename it?

    Parameters
    - - + +
    string$file
    &$auth
    string$filepath to file or directory
    RedBasicAuth&$auth
    boolean$test(optional) enable test mode
    +
    Returns
    RedFile|RedDirectory|boolean|null
    +
    Exceptions
    + + +
    \Sabre\DAV\Exception\Forbidden
    +
    +
    -

    Referenced by RedDirectory\childExists(), cloud_init(), and RedDirectory\getChild().

    +

    Referenced by RedMatrix\RedDAV\RedDirectory\childExists(), cloud_init(), and RedMatrix\RedDAV\RedDirectory\getChild().

    diff --git a/doc/html/reddav_8php.js b/doc/html/reddav_8php.js index 5281d8c6d..02eaf1811 100644 --- a/doc/html/reddav_8php.js +++ b/doc/html/reddav_8php.js @@ -1,8 +1,5 @@ var reddav_8php = [ - [ "RedDirectory", "classRedDirectory.html", "classRedDirectory" ], - [ "RedFile", "classRedFile.html", "classRedFile" ], - [ "RedBasicAuth", "classRedBasicAuth.html", "classRedBasicAuth" ], [ "RedChannelList", "reddav_8php.html#ae92ea0df1993f6a7bcd1b6efa6c1fb66", null ], [ "RedCollectionData", "reddav_8php.html#a5df0d09893f2e65dc5cf6bbab6cfb266", null ], [ "RedFileData", "reddav_8php.html#a9f531641dfb4e43cd88ac1a9ae7e2088", null ] diff --git a/doc/html/search/all_24.js b/doc/html/search/all_24.js index 7166d3bfb..d4ea06349 100644 --- a/doc/html/search/all_24.js +++ b/doc/html/search/all_24.js @@ -9,18 +9,18 @@ var searchData= ['_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']]], - ['_24auth',['$auth',['../classRedMatrix_1_1RedDAV_1_1RedBrowser.html#ad19179bf4ac7f18fafa7e2e3df800142',1,'RedMatrix\RedDAV\RedBrowser\$auth()'],['../classRedDirectory.html#a9616af16cd19a18a6afebebcc2881c44',1,'RedDirectory\$auth()'],['../classRedFile.html#a4b5d0e33f919c6c175b30a55de6263f2',1,'RedFile\$auth()']]], + ['_24auth',['$auth',['../classRedMatrix_1_1RedDAV_1_1RedBrowser.html#ad19179bf4ac7f18fafa7e2e3df800142',1,'RedMatrix\RedDAV\RedBrowser\$auth()'],['../classRedMatrix_1_1RedDAV_1_1RedDirectory.html#aab6907e7fb7f9f7227f9cd42bdc84eb9',1,'RedMatrix\RedDAV\RedDirectory\$auth()'],['../classRedMatrix_1_1RedDAV_1_1RedFile.html#a21b6e9d420c352f25610a33f57858215',1,'RedMatrix\RedDAV\RedFile\$auth()']]], ['_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']]], + ['_24browser',['$browser',['../classRedMatrix_1_1RedDAV_1_1RedBasicAuth.html#a167ae032bd2ad8e6caa2e1e1a6f1b5d3',1,'RedMatrix::RedDAV::RedBasicAuth']]], ['_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']]], ['_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']]], + ['_24channel_5fhash',['$channel_hash',['../classRedMatrix_1_1RedDAV_1_1RedBasicAuth.html#a112ad78a863dc0e598b5f02c596798c0',1,'RedMatrix::RedDAV::RedBasicAuth']]], + ['_24channel_5fid',['$channel_id',['../classRedMatrix_1_1RedDAV_1_1RedBasicAuth.html#abe1defedb90ac8e3b6487e124e625521',1,'RedMatrix::RedDAV::RedBasicAuth']]], + ['_24channel_5fname',['$channel_name',['../classRedMatrix_1_1RedDAV_1_1RedBasicAuth.html#a76fdb7fd5dd7376155abb5a58cd6fd69',1,'RedMatrix::RedDAV::RedBasicAuth']]], ['_24children',['$children',['../classItem.html#a80dcd0fb7673776c0967839d429c2a0f',1,'Item']]], ['_24cid',['$cid',['../classApp.html#ad1c8eb91a6fd470b94f34b7fdad3a2d0',1,'App']]], ['_24cipher',['$cipher',['../classConversation.html#aa95c1a62af38bdfba7add9549bec083b',1,'Conversation']]], @@ -37,7 +37,7 @@ var searchData= ['_24curl_5fcode',['$curl_code',['../classApp.html#a256360c9184fed6d7556e0bc0a835d7f',1,'App']]], ['_24curl_5fheaders',['$curl_headers',['../classApp.html#af5007c42a693afd9c4899c243b2e1363',1,'App']]], ['_24d',['$d',['../classTemplate.html#a8469ab2988b6be2681516dc4b4e07d38',1,'Template']]], - ['_24data',['$data',['../classApp.html#a0ce85be198e46570366cb3344f3c55b8',1,'App\$data()'],['../classItem.html#aec24e233f9098f902b1e57e60dcb2019',1,'Item\$data()'],['../classRedFile.html#a2ff12032b45538353eded9809d3b7550',1,'RedFile\$data()']]], + ['_24data',['$data',['../classApp.html#a0ce85be198e46570366cb3344f3c55b8',1,'App\$data()'],['../classItem.html#aec24e233f9098f902b1e57e60dcb2019',1,'Item\$data()'],['../classRedMatrix_1_1RedDAV_1_1RedFile.html#a235700e2dfbe21dc41613d36e30e8acc',1,'RedMatrix\RedDAV\RedFile\$data()']]], ['_24db',['$db',['../classApp.html#a330410a288f3393d53772f5e98f857ea',1,'App\$db()'],['../classdba__driver.html#a3033b5f1c2716b52202faeaae2592fe6',1,'dba_driver\$db()']]], ['_24debug',['$debug',['../classdba__driver.html#af48e2afeded5285766bf92e22123ed03',1,'dba_driver\$debug()'],['../classTemplate.html#afc4afb6f89bebcd5480022312a56cb4a',1,'Template\$debug()']]], ['_24dir',['$dir',['../docblox__errorchecker_8php.html#a1659f0a629d408e0f849dbe4ee061e62',1,'docblox_errorchecker.php']]], @@ -46,13 +46,13 @@ var searchData= ['_24dirstack',['$dirstack',['../docblox__errorchecker_8php.html#ab66bc0493d25f39bf8b4dcbb429f04e6',1,'docblox_errorchecker.php']]], ['_24done',['$done',['../classTemplate.html#abda4c8d049f70553338eae7c905e9d5c',1,'Template']]], ['_24error',['$error',['../classApp.html#ac1a8b2cd40609b231a560201a08852ba',1,'App\$error()'],['../classdba__driver.html#a84675d28c7bd9b7290dd37e66dbd216c',1,'dba_driver\$error()']]], - ['_24ext_5fpath',['$ext_path',['../classRedDirectory.html#a0f113244cd85c17848df991001d024f4',1,'RedDirectory']]], + ['_24ext_5fpath',['$ext_path',['../classRedMatrix_1_1RedDAV_1_1RedDirectory.html#adf8735b3118cdf2f42416edaf42b82e9',1,'RedMatrix::RedDAV::RedDirectory']]], ['_24fext',['$fext',['../apw_2php_2style_8php.html#a404171b8f918c116e45a6421c92f0cc9',1,'style.php']]], ['_24filelist',['$filelist',['../docblox__errorchecker_8php.html#a648a570b0f9f6e0e51b7267647c4b09b',1,'docblox_errorchecker.php']]], ['_24filename',['$filename',['../classFriendicaSmarty.html#a33fabbd4d6eef869df496adf357ae690',1,'FriendicaSmarty']]], ['_24files',['$files',['../extract_8php.html#a9590b15215a21e9b42eb546aeef79704',1,'$files(): extract.php'],['../tpldebug_8php.html#a5358407d65f2ca826f96356a6642d149',1,'$files(): tpldebug.php'],['../typo_8php.html#a9590b15215a21e9b42eb546aeef79704',1,'$files(): typo.php']]], ['_24fname',['$fname',['../apw_2php_2style_8php.html#ab9e0f70d44ab67f4334f9883631777fc',1,'style.php']]], - ['_24folder_5fhash',['$folder_hash',['../classRedDirectory.html#aa10254abf177bb2a0e4a88495725e09b',1,'RedDirectory']]], + ['_24folder_5fhash',['$folder_hash',['../classRedMatrix_1_1RedDAV_1_1RedDirectory.html#a2fc4e6b9be2108bbaa1ca1a03fd6d44e',1,'RedMatrix::RedDAV::RedDirectory']]], ['_24force_5fmax_5fitems',['$force_max_items',['../classApp.html#ae3f47830543d0d902f66913def8db66b',1,'App']]], ['_24gc_5fprobability',['$gc_probability',['../session_8php.html#a96b09cc763572f45280786a7b33feb7e',1,'session.php']]], ['_24groups',['$groups',['../classApp.html#ac6e6b1c7d6df408580ff79977fcfa656',1,'App']]], @@ -81,19 +81,19 @@ var searchData= ['_24mode',['$mode',['../classConversation.html#afb03d1648dbfafe62caa1e30f32f2b1a',1,'Conversation']]], ['_24module',['$module',['../classApp.html#a9bf62f8e39585c0aa48fcffc3bf3484d',1,'App']]], ['_24module_5floaded',['$module_loaded',['../classApp.html#a6e4f0fbfa3cf6c11baebe22a03db6165',1,'App']]], - ['_24name',['$name',['../classRedFile.html#acc48c05cd5a70951cb3c615ad84f03ba',1,'RedFile\$name()'],['../classFriendicaSmartyEngine.html#aaba6a42101bc9ae32e36b7fa2e243f02',1,'FriendicaSmartyEngine\$name()'],['../classTemplate.html#a6eb301a51cc94d8b94f4548fbad85eae',1,'Template\$name()']]], + ['_24name',['$name',['../classRedMatrix_1_1RedDAV_1_1RedFile.html#ab722dcb8c4598426c81fa2b2e4fad5f2',1,'RedMatrix\RedDAV\RedFile\$name()'],['../classFriendicaSmartyEngine.html#aaba6a42101bc9ae32e36b7fa2e243f02',1,'FriendicaSmartyEngine\$name()'],['../classTemplate.html#a6eb301a51cc94d8b94f4548fbad85eae',1,'Template\$name()']]], ['_24nav_5fpercent_5fmin_5fopacity',['$nav_percent_min_opacity',['../redbasic_2php_2style_8php.html#a01c151bf47f7da2b979aaa4cb868da4c',1,'style.php']]], ['_24nav_5fsel',['$nav_sel',['../classApp.html#a33a8e90b60ec4438f6fbf299d0f6839c',1,'App']]], ['_24navheight',['$navheight',['../apw_2php_2style_8php.html#a1c8a7c0db8c174239f3909cb931cb872',1,'style.php']]], ['_24needed',['$needed',['../docblox__errorchecker_8php.html#a852004caba0a34390297a079f4aaac73',1,'docblox_errorchecker.php']]], ['_24nodes',['$nodes',['../classTemplate.html#a8f4d17e49f42b876a97364c13fb572d1',1,'Template']]], ['_24obliquemacro',['$obliquemacro',['../apw_2php_2style_8php.html#a2cad82a3ecadbe58dbc4197de1c63da0',1,'style.php']]], - ['_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']]], + ['_24observer',['$observer',['../classApp.html#a4ffe529fb14389f7fedf5fdc5f722e7f',1,'App\$observer()'],['../classConversation.html#a8748445aa26047ebed5141f3c3cbc244',1,'Conversation\$observer()'],['../classRedMatrix_1_1RedDAV_1_1RedBasicAuth.html#a605aa09565a097316b80f0d17d6b5823',1,'RedMatrix\RedDAV\RedBasicAuth\$observer()']]], + ['_24os_5fpath',['$os_path',['../classRedMatrix_1_1RedDAV_1_1RedDirectory.html#a17ea47e34cb76b6e79f36ebed790d76a',1,'RedMatrix::RedDAV::RedDirectory']]], ['_24out',['$out',['../php2po_8php.html#a48cb304902320d173a4eaa41543327b9',1,'php2po.php']]], - ['_24owner_5fid',['$owner_id',['../classRedBasicAuth.html#a09c1488a0b290f5a54dc15180c5690d7',1,'RedBasicAuth']]], + ['_24owner_5fid',['$owner_id',['../classRedMatrix_1_1RedDAV_1_1RedBasicAuth.html#a1a23c349cc4699a8474505972684ea9c',1,'RedMatrix::RedDAV::RedBasicAuth']]], ['_24owner_5fname',['$owner_name',['../classItem.html#a9594df6014b0b6f45364ea7a34510130',1,'Item']]], - ['_24owner_5fnick',['$owner_nick',['../classRedBasicAuth.html#a8d09b8d784cc810a0b3be580d05106a7',1,'RedBasicAuth']]], + ['_24owner_5fnick',['$owner_nick',['../classRedMatrix_1_1RedDAV_1_1RedBasicAuth.html#aad0ef0cc05c407de84dbfbf2050bbbbe',1,'RedMatrix::RedDAV::RedBasicAuth']]], ['_24owner_5fphoto',['$owner_photo',['../classItem.html#a078f95b4134ce3a1df344cf8d386f986',1,'Item']]], ['_24owner_5furl',['$owner_url',['../classItem.html#afa54851df82962c7c42dea3cc9f5c92c',1,'Item']]], ['_24page',['$page',['../classApp.html#a4b67935096f66d1f14b657399a8461ac',1,'App']]], @@ -116,11 +116,11 @@ var searchData= ['_24query_5fstring',['$query_string',['../classApp.html#a2e82da4aecfc2017a8d1d332ca501f9f',1,'App']]], ['_24r',['$r',['../classTemplate.html#aac9a4638f11271e1b1dcc9f247242718',1,'Template']]], ['_24rdelim',['$rdelim',['../classApp.html#a244b2d53b21be269aad2269d23192f95',1,'App']]], - ['_24red_5fpath',['$red_path',['../classRedDirectory.html#acb32b8df27538c57772824a745e751d7',1,'RedDirectory']]], + ['_24red_5fpath',['$red_path',['../classRedMatrix_1_1RedDAV_1_1RedDirectory.html#a4bba2e56bc8ec3e05f05eae46f56f36d',1,'RedMatrix::RedDAV::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']]], - ['_24root_5fdir',['$root_dir',['../classRedDirectory.html#ad87c514a307ec97ba0f1372e9bcfa6a4',1,'RedDirectory']]], + ['_24root_5fdir',['$root_dir',['../classRedMatrix_1_1RedDAV_1_1RedDirectory.html#a438066fb1565fbcffa22c12d5ce23695',1,'RedMatrix::RedDAV::RedDirectory']]], ['_24s',['$s',['../extract_8php.html#a50b05cf2e02ef0b67fcad97106dd7634',1,'extract.php']]], ['_24scheme',['$scheme',['../classApp.html#ad082d63acc078e5bf23825a03bdd6a76',1,'App']]], ['_24search',['$search',['../classTemplate.html#a317d535946dc065c35dd5cd38380e6c6',1,'Template']]], @@ -143,7 +143,7 @@ var searchData= ['_24theme_5fthread_5fallow',['$theme_thread_allow',['../classApp.html#a487332f8de40414ca1a54a4265570b70',1,'App']]], ['_24threaded',['$threaded',['../classItem.html#a1cb6aa8abdf7ea7daca647e40c8ea3a2',1,'Item']]], ['_24threads',['$threads',['../classConversation.html#a41f4a549e6a99f98935c4742addd22c8',1,'Conversation']]], - ['_24timezone',['$timezone',['../classApp.html#ab35b01a366a2ea95725e97af278f87ab',1,'App\$timezone()'],['../classRedBasicAuth.html#a2d0246ed446fd5e55c17938b4ce6ac47',1,'RedBasicAuth\$timezone()']]], + ['_24timezone',['$timezone',['../classApp.html#ab35b01a366a2ea95725e97af278f87ab',1,'App\$timezone()'],['../classRedMatrix_1_1RedDAV_1_1RedBasicAuth.html#a849c99cf0a7ad065d630c8a30106ad5e',1,'RedMatrix\RedDAV\RedBasicAuth\$timezone()']]], ['_24toplevel',['$toplevel',['../classItem.html#a5cfa6cf964f433a917a81cab079ff9d8',1,'Item']]], ['_24type',['$type',['../classphoto__driver.html#a4920ed7cbb1ac735ac84153067537f03',1,'photo_driver']]], ['_24types',['$types',['../classphoto__driver.html#a00cb166c00b7502dbc456c94330e5b03',1,'photo_driver']]], diff --git a/doc/html/search/all_5f.js b/doc/html/search/all_5f.js index 1f5af3f08..419f16ab5 100644 --- a/doc/html/search/all_5f.js +++ b/doc/html/search/all_5f.js @@ -1,6 +1,6 @@ var searchData= [ - ['_5f_5fconstruct',['__construct',['../classApp.html#af6d39f63fb7116bbeb04e51696f99474',1,'App\__construct()'],['../classConversation.html#af84ea6ccd72214c9bb4c504461cc8b09',1,'Conversation\__construct()'],['../classdba__driver.html#af3541d13ccb7a3eddfc03e253c746186',1,'dba_driver\__construct()'],['../classItem.html#a248f45871ecfe82a08d1d4c0769b2eb2',1,'Item\__construct()'],['../classFKOAuth1.html#a2f1276872329a6f0b704ccda1a4b9fa6',1,'FKOAuth1\__construct()'],['../classphoto__driver.html#ac6e85f8e507cab4e755ed7acdec401ae',1,'photo_driver\__construct()'],['../classRedMatrix_1_1RedDAV_1_1RedBrowser.html#a8161f2a0be205412e263c947b5ec46c5',1,'RedMatrix\RedDAV\RedBrowser\__construct()'],['../classRedDirectory.html#a1e35e3cd31d2a15250655e4cafdea180',1,'RedDirectory\__construct()'],['../classRedFile.html#a9a67bdb34c9db6ce144b3f371148b183',1,'RedFile\__construct()'],['../classFriendicaSmarty.html#af12091b920b95eeef1218cbc48066ca6',1,'FriendicaSmarty\__construct()'],['../classFriendicaSmartyEngine.html#ab7c305bd8c386c2944e4dc9136cea5b6',1,'FriendicaSmartyEngine\__construct()']]], + ['_5f_5fconstruct',['__construct',['../classApp.html#af6d39f63fb7116bbeb04e51696f99474',1,'App\__construct()'],['../classConversation.html#af84ea6ccd72214c9bb4c504461cc8b09',1,'Conversation\__construct()'],['../classdba__driver.html#af3541d13ccb7a3eddfc03e253c746186',1,'dba_driver\__construct()'],['../classItem.html#a248f45871ecfe82a08d1d4c0769b2eb2',1,'Item\__construct()'],['../classFKOAuth1.html#a2f1276872329a6f0b704ccda1a4b9fa6',1,'FKOAuth1\__construct()'],['../classphoto__driver.html#ac6e85f8e507cab4e755ed7acdec401ae',1,'photo_driver\__construct()'],['../classRedMatrix_1_1RedDAV_1_1RedBrowser.html#a8161f2a0be205412e263c947b5ec46c5',1,'RedMatrix\RedDAV\RedBrowser\__construct()'],['../classRedMatrix_1_1RedDAV_1_1RedDirectory.html#a76b58fe5223e565c97f1b9af93031a99',1,'RedMatrix\RedDAV\RedDirectory\__construct()'],['../classRedMatrix_1_1RedDAV_1_1RedFile.html#a05798eac84c578152ff21758261c6ac6',1,'RedMatrix\RedDAV\RedFile\__construct()'],['../classFriendicaSmarty.html#af12091b920b95eeef1218cbc48066ca6',1,'FriendicaSmarty\__construct()'],['../classFriendicaSmartyEngine.html#ab7c305bd8c386c2944e4dc9136cea5b6',1,'FriendicaSmartyEngine\__construct()']]], ['_5f_5fdestruct',['__destruct',['../classdba__driver.html#a1a8bc9dc839a6320a0e07d8047a6b721',1,'dba_driver\__destruct()'],['../classphoto__driver.html#ae4501abdc9651359f81d036b63625686',1,'photo_driver\__destruct()']]], ['_5fbuild_5fnodes',['_build_nodes',['../classTemplate.html#ac41c96e1f407b1a910029e5f4b7de8e4',1,'Template']]], ['_5fget_5fvar',['_get_var',['../classTemplate.html#aae9c4d761ea1298e745e8052d7910194',1,'Template']]], diff --git a/doc/html/search/all_62.js b/doc/html/search/all_62.js index 3d9faa8f6..a310a24fc 100644 --- a/doc/html/search/all_62.js +++ b/doc/html/search/all_62.js @@ -6,7 +6,7 @@ var searchData= ['baseobject_2ephp',['BaseObject.php',['../BaseObject_8php.html',1,'']]], ['bb2diaspora',['bb2diaspora',['../bb2diaspora_8php.html#a4f10e0876b27373c762bc1abbe745f5c',1,'bb2diaspora.php']]], ['bb2diaspora_2ephp',['bb2diaspora.php',['../bb2diaspora_8php.html',1,'']]], - ['bb2diaspora_5fitembody',['bb2diaspora_itembody',['../bb2diaspora_8php.html#a2052c66bc1006a42b4c230320c269e47',1,'bb2diaspora.php']]], + ['bb2diaspora_5fitembody',['bb2diaspora_itembody',['../bb2diaspora_8php.html#ab27761069ea1275f0fc4c543099c5519',1,'bb2diaspora.php']]], ['bb2diaspora_5fitemwallwall',['bb2diaspora_itemwallwall',['../bb2diaspora_8php.html#aab32042f8bd63552d3fadeeae9eab083',1,'bb2diaspora.php']]], ['bb2dmention_5fcallback',['bb2dmention_callback',['../bb2diaspora_8php.html#a5258d2f1addeb0a2a6b54c4f9e7d0f34',1,'bb2diaspora.php']]], ['bb_5flocation',['bb_location',['../bbcode_8php.html#a3435c82a6c7693557800cdeb6848d0bd',1,'bbcode.php']]], diff --git a/doc/html/search/all_63.js b/doc/html/search/all_63.js index 18a8d5c4d..d70828864 100644 --- a/doc/html/search/all_63.js +++ b/doc/html/search/all_63.js @@ -11,9 +11,8 @@ var searchData= ['chanlink_5fcid',['chanlink_cid',['../text_8php.html#a85e3a4851c16674834010d8419a5d7ca',1,'text.php']]], ['chanlink_5fhash',['chanlink_hash',['../text_8php.html#a55ab893be57feda59c2a7ba1e58ff2d0',1,'text.php']]], ['chanlink_5furl',['chanlink_url',['../text_8php.html#a2e8d6c402603be3a1256a16605e09c2a',1,'text.php']]], - ['chanman_2ephp',['chanman.php',['../mod_2chanman_8php.html',1,'']]], - ['chanman_2ephp',['chanman.php',['../include_2chanman_8php.html',1,'']]], - ['chanman_5fremove_5feverything_5ffrom_5fnetwork',['chanman_remove_everything_from_network',['../include_2chanman_8php.html#a21ba9a5c961e866ff27aee3ee67bf99b',1,'chanman.php']]], + ['chanman_2ephp',['chanman.php',['../chanman_8php.html',1,'']]], + ['chanman_5fremove_5feverything_5ffrom_5fnetwork',['chanman_remove_everything_from_network',['../chanman_8php.html#a21ba9a5c961e866ff27aee3ee67bf99b',1,'chanman.php']]], ['channel_2ephp',['channel.php',['../channel_8php.html',1,'']]], ['channel_5fcontent',['channel_content',['../channel_8php.html#a9c6a6179e0e626398ebecc6151905ef1',1,'channel.php']]], ['channel_5finit',['channel_init',['../channel_8php.html#ac7c8c7845741baadf87fae6bc279f3dc',1,'channel.php']]], @@ -62,7 +61,7 @@ var searchData= ['check_5fupstream_5fdirectory',['check_upstream_directory',['../dir__fns_8php.html#a2f7d74bb2aea8bcd2537aee5c6708a16',1,'dir_fns.php']]], ['check_5fwall_5fto_5fwall',['check_wall_to_wall',['../classItem.html#abcdb0ea9bcd1576bc99bba9b8f700bb8',1,'Item']]], ['check_5fwebbie',['check_webbie',['../text_8php.html#a0c65597bb4aed3a039eb795ff540e5e3',1,'text.php']]], - ['childexists',['childExists',['../classRedDirectory.html#a5e3fc08b2bf9f61cea4d2ccae0495bec',1,'RedDirectory']]], + ['childexists',['childExists',['../classRedMatrix_1_1RedDAV_1_1RedDirectory.html#a964b13fde1a5da6f76b51ca5519234dc',1,'RedMatrix::RedDAV::RedDirectory']]], ['choklet_2ephp',['choklet.php',['../choklet_8php.html',1,'']]], ['clean_5furls',['clean_urls',['../boot_8php.html#ab79b8b4555cae20d03f8200666d89d63',1,'boot.php']]], ['clear',['clear',['../classCache.html#ab14d0f4bdf7116a94d545c574b38f568',1,'Cache']]], @@ -100,11 +99,11 @@ var searchData= ['compare_5fpermissions',['compare_permissions',['../items_8php.html#a0790a4550b829e85504af548623002ca',1,'items.php']]], ['completeurl',['completeurl',['../parse__url_8php.html#a496f4e3836154f6f32b8e805a7160d3a',1,'parse_url.php']]], ['config_2emd',['config.md',['../config_8md.html',1,'']]], + ['config_2ephp',['config.php',['../include_2config_8php.html',1,'']]], ['config_2ephp',['config.php',['../view_2theme_2apw_2php_2config_8php.html',1,'']]], ['config_2ephp',['config.php',['../view_2theme_2blogga_2php_2config_8php.html',1,'']]], ['config_2ephp',['config.php',['../view_2theme_2blogga_2view_2theme_2blog_2config_8php.html',1,'']]], ['config_2ephp',['config.php',['../view_2theme_2redbasic_2php_2config_8php.html',1,'']]], - ['config_2ephp',['config.php',['../include_2config_8php.html',1,'']]], ['connect',['connect',['../classdba__driver.html#ae533e62a240a793f17aef5ab4ef10edc',1,'dba_driver\connect()'],['../classdba__mysql.html#a1887338627ce0e28786839363014bd0b',1,'dba_mysql\connect()'],['../classdba__mysqli.html#add062bd93961e5f0194d94820e9a51b1',1,'dba_mysqli\connect()']]], ['connect_2ephp',['connect.php',['../connect_8php.html',1,'']]], ['connect_5fcontent',['connect_content',['../connect_8php.html#a489f0a66c660de6ec4d6917b27674f07',1,'connect.php']]], @@ -151,8 +150,8 @@ var searchData= ['create_5faccount',['create_account',['../account_8php.html#a141fe579c351c78209d425473f978eb5',1,'account.php']]], ['create_5fidentity',['create_identity',['../identity_8php.html#a345f4c943d84de502ec6e72d2c813945',1,'identity.php']]], ['create_5fsys_5fchannel',['create_sys_channel',['../identity_8php.html#a1cf83ac2b645de12868edaa3a5718f05',1,'identity.php']]], - ['createdirectory',['createDirectory',['../classRedDirectory.html#a986936910f0216887a25e28916c166c7',1,'RedDirectory']]], - ['createfile',['createFile',['../classRedDirectory.html#a2d12d99d38a6a75fc9a830b2f7fc0bf0',1,'RedDirectory']]], + ['createdirectory',['createDirectory',['../classRedMatrix_1_1RedDAV_1_1RedDirectory.html#aca0e8d574ea66a0e210f571700663c62',1,'RedMatrix::RedDAV::RedDirectory']]], + ['createfile',['createFile',['../classRedMatrix_1_1RedDAV_1_1RedDirectory.html#a58e750256cdc2f0f79fbe8d5463ffefe',1,'RedMatrix::RedDAV::RedDirectory']]], ['cronhooks_2ephp',['cronhooks.php',['../cronhooks_8php.html',1,'']]], ['cronhooks_5frun',['cronhooks_run',['../cronhooks_8php.html#a4c4c1bbec4ecc9a0efa00dd6afd2c0ca',1,'cronhooks.php']]], ['cropimage',['cropImage',['../classphoto__driver.html#a2e6e61f1e356a90bc978f4404a77137e',1,'photo_driver\cropImage()'],['../classphoto__gd.html#ab2232d775c8bacf66773a03308105f0c',1,'photo_gd\cropImage()'],['../classphoto__imagick.html#a2f33a03a89497a2b2768e29736d4a8a4',1,'photo_imagick\cropImage()']]], diff --git a/doc/html/search/all_64.js b/doc/html/search/all_64.js index 1bdc59537..882c7252e 100644 --- a/doc/html/search/all_64.js +++ b/doc/html/search/all_64.js @@ -35,7 +35,7 @@ var searchData= ['del_5fxconfig',['del_xconfig',['../include_2config_8php.html#a9c171def547deee16738dc58fdeb4b72',1,'config.php']]], ['delegate_2ephp',['delegate.php',['../delegate_8php.html',1,'']]], ['delegate_5fcontent',['delegate_content',['../delegate_8php.html#a943eea8996ef348eb845c498f9f354dd',1,'delegate.php']]], - ['delete',['delete',['../classRedFile.html#aef71c9eaac7052be7dc8602eb12171e7',1,'RedFile']]], + ['delete',['delete',['../classRedMatrix_1_1RedDAV_1_1RedFile.html#ab7ab7ba81fab28eb02382cfdfd80ecfe',1,'RedMatrix::RedDAV::RedFile']]], ['delete_5fimported_5fitem',['delete_imported_item',['../zot_8php.html#adfeb9400ae6b726beec89f8f1e8fde72',1,'zot.php']]], ['delete_5fitem_5flowlevel',['delete_item_lowlevel',['../items_8php.html#aac8c9eb4338e2a996c43914392c6cfdb',1,'items.php']]], ['deletenode',['deletenode',['../html2bbcode_8php.html#a71a07f135d196ec5943b13f7b2e6a9b2',1,'html2bbcode.php']]], @@ -84,6 +84,7 @@ var searchData= ['diaspora_5ftransmit',['diaspora_transmit',['../diaspora_8php.html#aa704d6aa2ac77be345c0f501168e6e56',1,'diaspora.php']]], ['diaspora_5ful',['diaspora_ul',['../bb2diaspora_8php.html#adc92ccda5f85ed27e64fcc17712c89cc',1,'bb2diaspora.php']]], ['diaspora_5funshare',['diaspora_unshare',['../diaspora_8php.html#ab736d6f32b5de31c97cb579fc730e200',1,'diaspora.php']]], + ['dimport_2ephp',['dimport.php',['../dimport_8php.html',1,'']]], ['dir_5ffns_2ephp',['dir_fns.php',['../dir__fns_8php.html',1,'']]], ['dir_5fparse_5fquery',['dir_parse_query',['../dirsearch_8php.html#a7d4cd9890d5ed23c3efc58e2a778a305',1,'dirsearch.php']]], ['dir_5fquery_5fbuild',['dir_query_build',['../dirsearch_8php.html#a52bcac49b0e35cc8c6b70066143c2ee2',1,'dirsearch.php']]], diff --git a/doc/html/search/all_66.js b/doc/html/search/all_66.js index 57cf29738..cba5b9135 100644 --- a/doc/html/search/all_66.js +++ b/doc/html/search/all_66.js @@ -48,10 +48,11 @@ 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']]], + ['foofoo',['foofoo',['../dimport_8php.html#a581f040717941ce3e1868b0b5dceefd1',1,'dimport.php']]], ['foreach',['foreach',['../typo_8php.html#a329c9c12217d2c8660c47bbc7c8df4c5',1,'typo.php']]], ['format_5fcategories',['format_categories',['../text_8php.html#a3054189cff173977f4216c9a3dd29e1b',1,'text.php']]], ['format_5fcss_5fif_5fexists',['format_css_if_exists',['../plugin_8php.html#a9039e15aae27676af7777dcbee5a11d6',1,'plugin.php']]], diff --git a/doc/html/search/all_67.js b/doc/html/search/all_67.js index a73da01ad..db91dd09e 100644 --- a/doc/html/search/all_67.js +++ b/doc/html/search/all_67.js @@ -4,7 +4,7 @@ var searchData= ['gender_5fselector',['gender_selector',['../profile__selectors_8php.html#ae2b2c087e6530c61c0b256fd26d52355',1,'profile_selectors.php']]], ['gender_5fselector_5fmin',['gender_selector_min',['../profile__selectors_8php.html#a8bfa1ca2d1598a3d65f1f9bb803ca816',1,'profile_selectors.php']]], ['generatedirectoryindex',['generateDirectoryIndex',['../classRedMatrix_1_1RedDAV_1_1RedBrowser.html#af764d5f14df751f9ec86c34fab300c09',1,'RedMatrix::RedDAV::RedBrowser']]], - ['get',['get',['../classCache.html#a70392b109331897bf9fdd7f1960e21de',1,'Cache\get()'],['../classRedFile.html#a7c868dfcef6c70cd0e24cf3caa2c3535',1,'RedFile\get()']]], + ['get',['get',['../classCache.html#a70392b109331897bf9fdd7f1960e21de',1,'Cache\get()'],['../classRedMatrix_1_1RedDAV_1_1RedFile.html#a7241beecd01f5bb4e74659863dd85bd8',1,'RedMatrix\RedDAV\RedFile\get()']]], ['get_5faccount',['get_account',['../classApp.html#a08bc87aff64f39fbc084e9d6545cee4d',1,'App']]], ['get_5faccount_5fid',['get_account_id',['../boot_8php.html#afe88b920aa285982edb817a0dd44eb37',1,'boot.php']]], ['get_5fall_5fperms',['get_all_perms',['../permissions_8php.html#aeca9b280f3dc3358c89976d81d690008',1,'permissions.php']]], @@ -102,20 +102,20 @@ var searchData= ['get_5fwords',['get_words',['../spam_8php.html#ab8fd81a82c9622cbebb8ceab6b310ca6',1,'spam.php']]], ['get_5fxconfig',['get_xconfig',['../include_2config_8php.html#aa3dc1d3de2d091ac702e675acd3a085e',1,'config.php']]], ['getasseturl',['getAssetUrl',['../classRedMatrix_1_1RedDAV_1_1RedBrowser.html#acaa792c08d24e9dc2919759e92ba037d',1,'RedMatrix::RedDAV::RedBrowser']]], - ['getchild',['getChild',['../classRedDirectory.html#aaa20f0f44da23781917af8170c0a2569',1,'RedDirectory']]], - ['getchildren',['getChildren',['../classRedDirectory.html#aa42d3065f6f065b17db87146a7cb031a',1,'RedDirectory']]], - ['getcontenttype',['getContentType',['../classRedFile.html#a26416827eb68554d033d1e2e5cc6dd3b',1,'RedFile']]], - ['getcurrentuser',['getCurrentUser',['../classRedBasicAuth.html#a4a584de8eb31c786fabd8f6e1a6c8925',1,'RedBasicAuth']]], - ['getdir',['getDir',['../classRedDirectory.html#a70173d4458572d95e586b2037d2fd2f4',1,'RedDirectory']]], - ['getetag',['getETag',['../classRedFile.html#ae96d5caa2db7a461c57b24380fa87e28',1,'RedFile']]], + ['getchild',['getChild',['../classRedMatrix_1_1RedDAV_1_1RedDirectory.html#a1a37850bdd1f188abd6160559698d5d7',1,'RedMatrix::RedDAV::RedDirectory']]], + ['getchildren',['getChildren',['../classRedMatrix_1_1RedDAV_1_1RedDirectory.html#a9b9a0b5bfa4de1f78e6cafaa534b6f6a',1,'RedMatrix::RedDAV::RedDirectory']]], + ['getcontenttype',['getContentType',['../classRedMatrix_1_1RedDAV_1_1RedFile.html#af5c88b75d0c1f590af03755534cb167e',1,'RedMatrix::RedDAV::RedFile']]], + ['getcurrentuser',['getCurrentUser',['../classRedMatrix_1_1RedDAV_1_1RedBasicAuth.html#aa0b2a5fa9186d7dc0e637f1ecb379c42',1,'RedMatrix::RedDAV::RedBasicAuth']]], + ['getdir',['getDir',['../classRedMatrix_1_1RedDAV_1_1RedDirectory.html#a825dc5f3e0f83f50736c16daa6a4809d',1,'RedMatrix::RedDAV::RedDirectory']]], + ['getetag',['getETag',['../classRedMatrix_1_1RedDAV_1_1RedFile.html#a9f14682acf3ccb70df5af5dd0687c689',1,'RedMatrix::RedDAV::RedFile']]], ['getext',['getExt',['../classphoto__driver.html#aa2efb5b2a6af3fd67e3f1c2b9852a5ba',1,'photo_driver']]], ['getheight',['getHeight',['../classphoto__driver.html#af769e9abb144e57002c59aa2aa8f3468',1,'photo_driver']]], ['getimage',['getImage',['../classphoto__driver.html#ab98da263bd7341fc132c4fb6fc76e8d5',1,'photo_driver\getImage()'],['../classphoto__gd.html#a86757ba021fd80d1a5cf8c2f766a8484',1,'photo_gd\getImage()'],['../classphoto__imagick.html#ad07288e0eb3922cb08cc9d33a163decc',1,'photo_imagick\getImage()']]], - ['getlastmodified',['getLastModified',['../classRedDirectory.html#a6c7e08199abc24e6eeb94a4037ef8bfc',1,'RedDirectory\getLastModified()'],['../classRedFile.html#a41562a28007789bbe7fe06d6a20eef47',1,'RedFile\getLastModified()']]], - ['getname',['getName',['../classRedDirectory.html#af6e4475dbd5abcdede00d20b8d388583',1,'RedDirectory\getName()'],['../classRedFile.html#a0c961c5f49544d2502420361fa526437',1,'RedFile\getName()']]], - ['getquotainfo',['getQuotaInfo',['../classRedDirectory.html#a2f7a574f2115f099d6dd103d5b252375',1,'RedDirectory']]], - ['getsize',['getSize',['../classRedFile.html#acb1edbe1848fab05347746fa1ea09d8f',1,'RedFile']]], - ['gettimezone',['getTimezone',['../classRedBasicAuth.html#a9fdd4b890e3e7c7e1ae96ead2301418f',1,'RedBasicAuth']]], + ['getlastmodified',['getLastModified',['../classRedMatrix_1_1RedDAV_1_1RedDirectory.html#a69db5f641f8f5dc999e55cee1832ecd5',1,'RedMatrix\RedDAV\RedDirectory\getLastModified()'],['../classRedMatrix_1_1RedDAV_1_1RedFile.html#ac47016aa0e3f6f1a1c4570bd6fd8cf25',1,'RedMatrix\RedDAV\RedFile\getLastModified()']]], + ['getname',['getName',['../classRedMatrix_1_1RedDAV_1_1RedDirectory.html#a55f7172814a0749b5342f152ab3fa0df',1,'RedMatrix\RedDAV\RedDirectory\getName()'],['../classRedMatrix_1_1RedDAV_1_1RedFile.html#ac945aa782d6c035d339e59974266ec4d',1,'RedMatrix\RedDAV\RedFile\getName()']]], + ['getquotainfo',['getQuotaInfo',['../classRedMatrix_1_1RedDAV_1_1RedDirectory.html#a69db443ed3c84938b4352fe515bf8d68',1,'RedMatrix::RedDAV::RedDirectory']]], + ['getsize',['getSize',['../classRedMatrix_1_1RedDAV_1_1RedFile.html#a07e1b19e7aaf3dcce822e9be8823a87d',1,'RedMatrix::RedDAV::RedFile']]], + ['gettimezone',['getTimezone',['../classRedMatrix_1_1RedDAV_1_1RedBasicAuth.html#a6333c8ce58998bd11bf8102afe3b0748',1,'RedMatrix::RedDAV::RedBasicAuth']]], ['gettype',['getType',['../classphoto__driver.html#a6c6c16dbc4f517ce799f9143ed61f0e3',1,'photo_driver']]], ['getwidth',['getWidth',['../classphoto__driver.html#acc30486acee9e89e32701f44a1738117',1,'photo_driver']]], ['goaway',['goaway',['../boot_8php.html#a5ab6181607a090bcdbaa13b15b85aba1',1,'boot.php']]], diff --git a/doc/html/search/all_68.js b/doc/html/search/all_68.js index 7a3916c8d..d08c52aa0 100644 --- a/doc/html/search/all_68.js +++ b/doc/html/search/all_68.js @@ -31,6 +31,7 @@ var searchData= ['htmlactionspanel',['htmlActionsPanel',['../classRedMatrix_1_1RedDAV_1_1RedBrowser.html#a3bd98af2d1cdfd8f26deb914596176cf',1,'RedMatrix::RedDAV::RedBrowser']]], ['http_5fstatus_5fexit',['http_status_exit',['../include_2network_8php.html#a4cfb2c05a1c295317283d762440ce0b2',1,'network.php']]], ['hubloc_2ephp',['hubloc.php',['../hubloc_8php.html',1,'']]], + ['hubloc_5fchange_5fprimary',['hubloc_change_primary',['../hubloc_8php.html#ad86214b3a74084bd7b54e8d6c919ce4d',1,'hubloc.php']]], ['hubloc_5fflags_5fdeleted',['HUBLOC_FLAGS_DELETED',['../boot_8php.html#a7c286add8961fd2d79216314cd4aadd8',1,'boot.php']]], ['hubloc_5fflags_5forphancheck',['HUBLOC_FLAGS_ORPHANCHECK',['../boot_8php.html#aefe573c3c7b0d37fbff264bbae79d673',1,'boot.php']]], ['hubloc_5fflags_5fprimary',['HUBLOC_FLAGS_PRIMARY',['../boot_8php.html#a3ad9cc5d4354be741fa1de12b96e9955',1,'boot.php']]], diff --git a/doc/html/search/all_6c.js b/doc/html/search/all_6c.js index 33e3593c5..483bab71e 100644 --- a/doc/html/search/all_6c.js +++ b/doc/html/search/all_6c.js @@ -34,7 +34,9 @@ var searchData= ['localize_5fitem',['localize_item',['../conversation_8php.html#a9bd7f9fb6678736c581bcba3b17f471c',1,'conversation.php']]], ['lockview_2ephp',['lockview.php',['../lockview_8php.html',1,'']]], ['lockview_5fcontent',['lockview_content',['../lockview_8php.html#a851e26ab9a1008df5c5ebebea31e9b44',1,'lockview.php']]], - ['log',['log',['../classRedDirectory.html#a11376aed1963b4471eb1592c13c63976',1,'RedDirectory\log()'],['../classRedBasicAuth.html#a2cc8b1eac9c5a799bfb53ea7f287f3f0',1,'RedBasicAuth\log()']]], + ['locs_2ephp',['locs.php',['../locs_8php.html',1,'']]], + ['locs_5fpost',['locs_post',['../locs_8php.html#a6b43654592919ac863d67a1f787a69b9',1,'locs.php']]], + ['log',['log',['../classRedMatrix_1_1RedDAV_1_1RedBasicAuth.html#abf6fe89b0a8239ed93c3b07e1fbce75b',1,'RedMatrix\RedDAV\RedBasicAuth\log()'],['../classRedMatrix_1_1RedDAV_1_1RedDirectory.html#af90a1a74cfd643a5c56b9a17ea250d59',1,'RedMatrix\RedDAV\RedDirectory\log()']]], ['logger',['logger',['../text_8php.html#a030fa5ecc64168af0c4f44897a9bce63',1,'text.php']]], ['logger_5fall',['LOGGER_ALL',['../boot_8php.html#afe63ae69ba55299f813766e54df06ede',1,'boot.php']]], ['logger_5fdata',['LOGGER_DATA',['../boot_8php.html#a6969947145a139ec374ce098224d8e81',1,'boot.php']]], diff --git a/doc/html/search/all_70.js b/doc/html/search/all_70.js index ca08049d4..94227af82 100644 --- a/doc/html/search/all_70.js +++ b/doc/html/search/all_70.js @@ -216,5 +216,5 @@ var searchData= ['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']]], - ['put',['put',['../classRedFile.html#a41a49a583eb276b75626fcf97f4a699c',1,'RedFile']]] + ['put',['put',['../classRedMatrix_1_1RedDAV_1_1RedFile.html#a709ec1288d21ddf1353524435ab916f0',1,'RedMatrix::RedDAV::RedFile']]] ]; diff --git a/doc/html/search/all_72.js b/doc/html/search/all_72.js index 13f0b8e8f..696b63543 100644 --- a/doc/html/search/all_72.js +++ b/doc/html/search/all_72.js @@ -30,15 +30,18 @@ var searchData= ['redbasic_2ephp',['redbasic.php',['../redbasic_8php.html',1,'']]], ['redbasic_5fform',['redbasic_form',['../view_2theme_2redbasic_2php_2config_8php.html#a8574a41fa9735ee391ba57ab24b93793',1,'config.php']]], ['redbasic_5finit',['redbasic_init',['../redbasic_2php_2theme_8php.html#af6eb813e9fc7e2d76ac1b82bc5c0ed9b',1,'theme.php']]], - ['redbasicauth',['RedBasicAuth',['../classRedBasicAuth.html',1,'']]], + ['redbasicauth',['RedBasicAuth',['../classRedMatrix_1_1RedDAV_1_1RedBasicAuth.html',1,'RedMatrix::RedDAV']]], + ['redbasicauth_2ephp',['RedBasicAuth.php',['../RedBasicAuth_8php.html',1,'']]], ['redbrowser',['RedBrowser',['../classRedMatrix_1_1RedDAV_1_1RedBrowser.html',1,'RedMatrix::RedDAV']]], ['redbrowser_2ephp',['RedBrowser.php',['../RedBrowser_8php.html',1,'']]], ['redchannellist',['RedChannelList',['../reddav_8php.html#ae92ea0df1993f6a7bcd1b6efa6c1fb66',1,'reddav.php']]], ['redcollectiondata',['RedCollectionData',['../reddav_8php.html#a5df0d09893f2e65dc5cf6bbab6cfb266',1,'reddav.php']]], ['reddav',['RedDAV',['../namespaceRedMatrix_1_1RedDAV.html',1,'RedMatrix']]], ['reddav_2ephp',['reddav.php',['../reddav_8php.html',1,'']]], - ['reddirectory',['RedDirectory',['../classRedDirectory.html',1,'']]], - ['redfile',['RedFile',['../classRedFile.html',1,'']]], + ['reddirectory',['RedDirectory',['../classRedMatrix_1_1RedDAV_1_1RedDirectory.html',1,'RedMatrix::RedDAV']]], + ['reddirectory_2ephp',['RedDirectory.php',['../RedDirectory_8php.html',1,'']]], + ['redfile',['RedFile',['../classRedMatrix_1_1RedDAV_1_1RedFile.html',1,'RedMatrix::RedDAV']]], + ['redfile_2ephp',['RedFile.php',['../RedFile_8php.html',1,'']]], ['redfiledata',['RedFileData',['../reddav_8php.html#a9f531641dfb4e43cd88ac1a9ae7e2088',1,'reddav.php']]], ['redmatrix',['RedMatrix',['../namespaceRedMatrix.html',1,'']]], ['reduce',['reduce',['../docblox__errorchecker_8php.html#ae9562cf60aa693114603d27b55d2185f',1,'docblox_errorchecker.php']]], diff --git a/doc/html/search/all_73.js b/doc/html/search/all_73.js index ec123194d..03ae80329 100644 --- a/doc/html/search/all_73.js +++ b/doc/html/search/all_73.js @@ -56,12 +56,12 @@ var searchData= ['set_5fwidget',['set_widget',['../classApp.html#a123b903dfe5d3488cc68db3471d36fd2',1,'App']]], ['set_5fwriteable',['set_writeable',['../classRedMatrix_1_1RedDAV_1_1RedBrowser.html#aa1607857cb59738c4dce2fe8e73d8f19',1,'RedMatrix::RedDAV::RedBrowser']]], ['set_5fxconfig',['set_xconfig',['../include_2config_8php.html#afe117b70f1bba2f6348d9300b601f86e',1,'config.php']]], - ['setauthenticated',['setAuthenticated',['../classRedBasicAuth.html#a3ef43177abe0ef72da140a25bc568333',1,'RedBasicAuth']]], - ['setbrowserplugin',['setBrowserPlugin',['../classRedBasicAuth.html#a358ddad4abb5aa8c1382cf49a907adbc',1,'RedBasicAuth']]], - ['setcurrentuser',['setCurrentUser',['../classRedBasicAuth.html#a072e8244a9a7f191b32d3db5ac94f857',1,'RedBasicAuth']]], + ['setauthenticated',['setAuthenticated',['../classRedMatrix_1_1RedDAV_1_1RedBasicAuth.html#a2926fe923baade564f2663632fa8c633',1,'RedMatrix::RedDAV::RedBasicAuth']]], + ['setbrowserplugin',['setBrowserPlugin',['../classRedMatrix_1_1RedDAV_1_1RedBasicAuth.html#adc72f36f0b2b17b20ea4df900afcd697',1,'RedMatrix::RedDAV::RedBasicAuth']]], + ['setcurrentuser',['setCurrentUser',['../classRedMatrix_1_1RedDAV_1_1RedBasicAuth.html#aadce020fb595c7943829d7f995d3f998',1,'RedMatrix::RedDAV::RedBasicAuth']]], ['setdimensions',['setDimensions',['../classphoto__driver.html#ae663867d2c4eaa2fae50d60670920143',1,'photo_driver\setDimensions()'],['../classphoto__gd.html#a1c75304bd15f3b9986f0b315fb59271e',1,'photo_gd\setDimensions()'],['../classphoto__imagick.html#af92901d252c1e6ab5b54eebedbed23bb',1,'photo_imagick\setDimensions()']]], - ['setname',['setName',['../classRedDirectory.html#adc48035679e52c55d9881f83de535553',1,'RedDirectory\setName()'],['../classRedFile.html#a38a82bfc1b30028ea6ac75923e90fa25',1,'RedFile\setName()']]], - ['settimezone',['setTimezone',['../classRedBasicAuth.html#a2f5d4ef7040c65b79b2fdfdf1212395a',1,'RedBasicAuth']]], + ['setname',['setName',['../classRedMatrix_1_1RedDAV_1_1RedDirectory.html#a14ac61d31a031d139956763db4e03956',1,'RedMatrix\RedDAV\RedDirectory\setName()'],['../classRedMatrix_1_1RedDAV_1_1RedFile.html#a0350cb4e0327e1f9922869a48ee04f1d',1,'RedMatrix\RedDAV\RedFile\setName()']]], + ['settimezone',['setTimezone',['../classRedMatrix_1_1RedDAV_1_1RedBasicAuth.html#af6d239fefed05859327ee8db626703f9',1,'RedMatrix::RedDAV::RedBasicAuth']]], ['settings_2ephp',['settings.php',['../settings_8php.html',1,'']]], ['settings_5finit',['settings_init',['../settings_8php.html#a3a4cde287482fced008583f54ba2a722',1,'settings.php']]], ['settings_5fpost',['settings_post',['../settings_8php.html#aa7ee94d88ac088edb04ccf3a26de3586',1,'settings.php']]], diff --git a/doc/html/search/all_76.js b/doc/html/search/all_76.js index 823caf7e5..37f7c54b7 100644 --- a/doc/html/search/all_76.js +++ b/doc/html/search/all_76.js @@ -4,7 +4,7 @@ var searchData= ['validate_5fchannelname',['validate_channelname',['../identity_8php.html#af2802bc13a00a17b867bba7978ba8f58',1,'identity.php']]], ['validate_5femail',['validate_email',['../include_2network_8php.html#a897e7112d86eb95526cbd0bff9375f02',1,'network.php']]], ['validate_5furl',['validate_url',['../include_2network_8php.html#a5caa264fab6d2b2344e6bd5b298b08f2',1,'network.php']]], - ['validateuserpass',['validateUserPass',['../classRedBasicAuth.html#a8dfd9a0953f8884723b421b7c1acf79b',1,'RedBasicAuth']]], + ['validateuserpass',['validateUserPass',['../classRedMatrix_1_1RedDAV_1_1RedBasicAuth.html#a6ece02655b780469e59e204c5979a624',1,'RedMatrix::RedDAV::RedBasicAuth']]], ['var_5freplace',['var_replace',['../classTemplate.html#abbc484016ddf5d818f55b823cae6feb0',1,'Template']]], ['vcard_5ffrom_5fxchan',['vcard_from_xchan',['../Contact_8php.html#a6348a532c9d26cd1c9afbc9aa6aa8960',1,'Contact.php']]], ['verify_5femail_5faddress',['verify_email_address',['../account_8php.html#acd6b8d2124ba5ea4f4794d2c58ae8bf5',1,'account.php']]], diff --git a/doc/html/search/classes_72.js b/doc/html/search/classes_72.js index 83b6c85f7..e437f3cef 100644 --- a/doc/html/search/classes_72.js +++ b/doc/html/search/classes_72.js @@ -1,7 +1,7 @@ var searchData= [ - ['redbasicauth',['RedBasicAuth',['../classRedBasicAuth.html',1,'']]], + ['redbasicauth',['RedBasicAuth',['../classRedMatrix_1_1RedDAV_1_1RedBasicAuth.html',1,'RedMatrix::RedDAV']]], ['redbrowser',['RedBrowser',['../classRedMatrix_1_1RedDAV_1_1RedBrowser.html',1,'RedMatrix::RedDAV']]], - ['reddirectory',['RedDirectory',['../classRedDirectory.html',1,'']]], - ['redfile',['RedFile',['../classRedFile.html',1,'']]] + ['reddirectory',['RedDirectory',['../classRedMatrix_1_1RedDAV_1_1RedDirectory.html',1,'RedMatrix::RedDAV']]], + ['redfile',['RedFile',['../classRedMatrix_1_1RedDAV_1_1RedFile.html',1,'RedMatrix::RedDAV']]] ]; diff --git a/doc/html/search/files_63.js b/doc/html/search/files_63.js index 69fb8fee5..8a197f3c3 100644 --- a/doc/html/search/files_63.js +++ b/doc/html/search/files_63.js @@ -1,8 +1,7 @@ var searchData= [ ['cache_2ephp',['cache.php',['../cache_8php.html',1,'']]], - ['chanman_2ephp',['chanman.php',['../mod_2chanman_8php.html',1,'']]], - ['chanman_2ephp',['chanman.php',['../include_2chanman_8php.html',1,'']]], + ['chanman_2ephp',['chanman.php',['../chanman_8php.html',1,'']]], ['channel_2ephp',['channel.php',['../channel_8php.html',1,'']]], ['chanview_2ephp',['chanview.php',['../chanview_8php.html',1,'']]], ['chat_2ephp',['chat.php',['../mod_2chat_8php.html',1,'']]], @@ -15,11 +14,11 @@ var searchData= ['comanche_2ephp',['comanche.php',['../comanche_8php.html',1,'']]], ['common_2ephp',['common.php',['../common_8php.html',1,'']]], ['config_2emd',['config.md',['../config_8md.html',1,'']]], - ['config_2ephp',['config.php',['../view_2theme_2apw_2php_2config_8php.html',1,'']]], + ['config_2ephp',['config.php',['../view_2theme_2blogga_2php_2config_8php.html',1,'']]], ['config_2ephp',['config.php',['../view_2theme_2blogga_2view_2theme_2blog_2config_8php.html',1,'']]], ['config_2ephp',['config.php',['../view_2theme_2redbasic_2php_2config_8php.html',1,'']]], ['config_2ephp',['config.php',['../include_2config_8php.html',1,'']]], - ['config_2ephp',['config.php',['../view_2theme_2blogga_2php_2config_8php.html',1,'']]], + ['config_2ephp',['config.php',['../view_2theme_2apw_2php_2config_8php.html',1,'']]], ['connect_2ephp',['connect.php',['../connect_8php.html',1,'']]], ['connections_2ephp',['connections.php',['../connections_8php.html',1,'']]], ['connedit_2ephp',['connedit.php',['../connedit_8php.html',1,'']]], diff --git a/doc/html/search/files_64.js b/doc/html/search/files_64.js index a4f523e4a..9f149a278 100644 --- a/doc/html/search/files_64.js +++ b/doc/html/search/files_64.js @@ -9,13 +9,14 @@ var searchData= ['dba_5fdriver_2ephp',['dba_driver.php',['../dba__driver_8php.html',1,'']]], ['dba_5fmysql_2ephp',['dba_mysql.php',['../dba__mysql_8php.html',1,'']]], ['dba_5fmysqli_2ephp',['dba_mysqli.php',['../dba__mysqli_8php.html',1,'']]], + ['default_2ephp',['default.php',['../theme_2blogga_2view_2theme_2blog_2default_8php.html',1,'']]], ['default_2ephp',['default.php',['../php_2default_8php.html',1,'']]], ['default_2ephp',['default.php',['../theme_2blogga_2php_2default_8php.html',1,'']]], - ['default_2ephp',['default.php',['../theme_2blogga_2view_2theme_2blog_2default_8php.html',1,'']]], ['default_2ephp',['default.php',['../theme_2mytheme_2php_2default_8php.html',1,'']]], ['delegate_2ephp',['delegate.php',['../delegate_8php.html',1,'']]], ['deliver_2ephp',['deliver.php',['../deliver_8php.html',1,'']]], ['diaspora_2ephp',['diaspora.php',['../diaspora_8php.html',1,'']]], + ['dimport_2ephp',['dimport.php',['../dimport_8php.html',1,'']]], ['dir_5ffns_2ephp',['dir_fns.php',['../dir__fns_8php.html',1,'']]], ['directory_2ephp',['directory.php',['../mod_2directory_8php.html',1,'']]], ['directory_2ephp',['directory.php',['../include_2directory_8php.html',1,'']]], diff --git a/doc/html/search/files_6c.js b/doc/html/search/files_6c.js index b695ca079..272421a4f 100644 --- a/doc/html/search/files_6c.js +++ b/doc/html/search/files_6c.js @@ -5,6 +5,7 @@ var searchData= ['layouts_2ephp',['layouts.php',['../layouts_8php.html',1,'']]], ['like_2ephp',['like.php',['../like_8php.html',1,'']]], ['lockview_2ephp',['lockview.php',['../lockview_8php.html',1,'']]], + ['locs_2ephp',['locs.php',['../locs_8php.html',1,'']]], ['login_2ephp',['login.php',['../login_8php.html',1,'']]], ['lostpass_2ephp',['lostpass.php',['../lostpass_8php.html',1,'']]] ]; diff --git a/doc/html/search/files_72.js b/doc/html/search/files_72.js index 247488352..0bab1f0eb 100644 --- a/doc/html/search/files_72.js +++ b/doc/html/search/files_72.js @@ -2,13 +2,16 @@ var searchData= [ ['randprof_2ephp',['randprof.php',['../randprof_8php.html',1,'']]], ['rbmark_2ephp',['rbmark.php',['../rbmark_8php.html',1,'']]], - ['readme_2emd',['README.md',['../blogga_2php_2README_8md.html',1,'']]], ['readme_2emd',['README.md',['../apw_2README_8md.html',1,'']]], + ['readme_2emd',['README.md',['../blogga_2php_2README_8md.html',1,'']]], ['receive_2ephp',['receive.php',['../receive_8php.html',1,'']]], ['redable_2ephp',['redable.php',['../redable_8php.html',1,'']]], ['redbasic_2ephp',['redbasic.php',['../redbasic_8php.html',1,'']]], + ['redbasicauth_2ephp',['RedBasicAuth.php',['../RedBasicAuth_8php.html',1,'']]], ['redbrowser_2ephp',['RedBrowser.php',['../RedBrowser_8php.html',1,'']]], ['reddav_2ephp',['reddav.php',['../reddav_8php.html',1,'']]], + ['reddirectory_2ephp',['RedDirectory.php',['../RedDirectory_8php.html',1,'']]], + ['redfile_2ephp',['RedFile.php',['../RedFile_8php.html',1,'']]], ['register_2ephp',['register.php',['../register_8php.html',1,'']]], ['regmod_2ephp',['regmod.php',['../regmod_8php.html',1,'']]], ['regver_2ephp',['regver.php',['../regver_8php.html',1,'']]], diff --git a/doc/html/search/functions_5f.js b/doc/html/search/functions_5f.js index 5767841c8..a25babe06 100644 --- a/doc/html/search/functions_5f.js +++ b/doc/html/search/functions_5f.js @@ -1,6 +1,6 @@ var searchData= [ - ['_5f_5fconstruct',['__construct',['../classApp.html#af6d39f63fb7116bbeb04e51696f99474',1,'App\__construct()'],['../classConversation.html#af84ea6ccd72214c9bb4c504461cc8b09',1,'Conversation\__construct()'],['../classdba__driver.html#af3541d13ccb7a3eddfc03e253c746186',1,'dba_driver\__construct()'],['../classItem.html#a248f45871ecfe82a08d1d4c0769b2eb2',1,'Item\__construct()'],['../classFKOAuth1.html#a2f1276872329a6f0b704ccda1a4b9fa6',1,'FKOAuth1\__construct()'],['../classphoto__driver.html#ac6e85f8e507cab4e755ed7acdec401ae',1,'photo_driver\__construct()'],['../classRedMatrix_1_1RedDAV_1_1RedBrowser.html#a8161f2a0be205412e263c947b5ec46c5',1,'RedMatrix\RedDAV\RedBrowser\__construct()'],['../classRedDirectory.html#a1e35e3cd31d2a15250655e4cafdea180',1,'RedDirectory\__construct()'],['../classRedFile.html#a9a67bdb34c9db6ce144b3f371148b183',1,'RedFile\__construct()'],['../classFriendicaSmarty.html#af12091b920b95eeef1218cbc48066ca6',1,'FriendicaSmarty\__construct()'],['../classFriendicaSmartyEngine.html#ab7c305bd8c386c2944e4dc9136cea5b6',1,'FriendicaSmartyEngine\__construct()']]], + ['_5f_5fconstruct',['__construct',['../classApp.html#af6d39f63fb7116bbeb04e51696f99474',1,'App\__construct()'],['../classConversation.html#af84ea6ccd72214c9bb4c504461cc8b09',1,'Conversation\__construct()'],['../classdba__driver.html#af3541d13ccb7a3eddfc03e253c746186',1,'dba_driver\__construct()'],['../classItem.html#a248f45871ecfe82a08d1d4c0769b2eb2',1,'Item\__construct()'],['../classFKOAuth1.html#a2f1276872329a6f0b704ccda1a4b9fa6',1,'FKOAuth1\__construct()'],['../classphoto__driver.html#ac6e85f8e507cab4e755ed7acdec401ae',1,'photo_driver\__construct()'],['../classRedMatrix_1_1RedDAV_1_1RedBrowser.html#a8161f2a0be205412e263c947b5ec46c5',1,'RedMatrix\RedDAV\RedBrowser\__construct()'],['../classRedMatrix_1_1RedDAV_1_1RedDirectory.html#a76b58fe5223e565c97f1b9af93031a99',1,'RedMatrix\RedDAV\RedDirectory\__construct()'],['../classRedMatrix_1_1RedDAV_1_1RedFile.html#a05798eac84c578152ff21758261c6ac6',1,'RedMatrix\RedDAV\RedFile\__construct()'],['../classFriendicaSmarty.html#af12091b920b95eeef1218cbc48066ca6',1,'FriendicaSmarty\__construct()'],['../classFriendicaSmartyEngine.html#ab7c305bd8c386c2944e4dc9136cea5b6',1,'FriendicaSmartyEngine\__construct()']]], ['_5f_5fdestruct',['__destruct',['../classdba__driver.html#a1a8bc9dc839a6320a0e07d8047a6b721',1,'dba_driver\__destruct()'],['../classphoto__driver.html#ae4501abdc9651359f81d036b63625686',1,'photo_driver\__destruct()']]], ['_5fbuild_5fnodes',['_build_nodes',['../classTemplate.html#ac41c96e1f407b1a910029e5f4b7de8e4',1,'Template']]], ['_5fget_5fvar',['_get_var',['../classTemplate.html#aae9c4d761ea1298e745e8052d7910194',1,'Template']]], diff --git a/doc/html/search/functions_62.js b/doc/html/search/functions_62.js index 949acb675..34fc83be3 100644 --- a/doc/html/search/functions_62.js +++ b/doc/html/search/functions_62.js @@ -3,7 +3,7 @@ var searchData= ['base64url_5fdecode',['base64url_decode',['../text_8php.html#a13286f8a95d2de6b102966ecc270c8d6',1,'text.php']]], ['base64url_5fencode',['base64url_encode',['../text_8php.html#a070384ec000fd65043fce11d5392d241',1,'text.php']]], ['bb2diaspora',['bb2diaspora',['../bb2diaspora_8php.html#a4f10e0876b27373c762bc1abbe745f5c',1,'bb2diaspora.php']]], - ['bb2diaspora_5fitembody',['bb2diaspora_itembody',['../bb2diaspora_8php.html#a2052c66bc1006a42b4c230320c269e47',1,'bb2diaspora.php']]], + ['bb2diaspora_5fitembody',['bb2diaspora_itembody',['../bb2diaspora_8php.html#ab27761069ea1275f0fc4c543099c5519',1,'bb2diaspora.php']]], ['bb2diaspora_5fitemwallwall',['bb2diaspora_itemwallwall',['../bb2diaspora_8php.html#aab32042f8bd63552d3fadeeae9eab083',1,'bb2diaspora.php']]], ['bb2dmention_5fcallback',['bb2dmention_callback',['../bb2diaspora_8php.html#a5258d2f1addeb0a2a6b54c4f9e7d0f34',1,'bb2diaspora.php']]], ['bb_5flocation',['bb_location',['../bbcode_8php.html#a3435c82a6c7693557800cdeb6848d0bd',1,'bbcode.php']]], diff --git a/doc/html/search/functions_63.js b/doc/html/search/functions_63.js index 76b0c59f0..efc89de6b 100644 --- a/doc/html/search/functions_63.js +++ b/doc/html/search/functions_63.js @@ -9,7 +9,7 @@ var searchData= ['chanlink_5fcid',['chanlink_cid',['../text_8php.html#a85e3a4851c16674834010d8419a5d7ca',1,'text.php']]], ['chanlink_5fhash',['chanlink_hash',['../text_8php.html#a55ab893be57feda59c2a7ba1e58ff2d0',1,'text.php']]], ['chanlink_5furl',['chanlink_url',['../text_8php.html#a2e8d6c402603be3a1256a16605e09c2a',1,'text.php']]], - ['chanman_5fremove_5feverything_5ffrom_5fnetwork',['chanman_remove_everything_from_network',['../include_2chanman_8php.html#a21ba9a5c961e866ff27aee3ee67bf99b',1,'chanman.php']]], + ['chanman_5fremove_5feverything_5ffrom_5fnetwork',['chanman_remove_everything_from_network',['../chanman_8php.html#a21ba9a5c961e866ff27aee3ee67bf99b',1,'chanman.php']]], ['channel_5fcontent',['channel_content',['../channel_8php.html#a9c6a6179e0e626398ebecc6151905ef1',1,'channel.php']]], ['channel_5finit',['channel_init',['../channel_8php.html#ac7c8c7845741baadf87fae6bc279f3dc',1,'channel.php']]], ['channel_5fremove',['channel_remove',['../Contact_8php.html#a4e8af0f0525161da74583c04b8b03097',1,'Contact.php']]], @@ -53,7 +53,7 @@ var searchData= ['check_5fupstream_5fdirectory',['check_upstream_directory',['../dir__fns_8php.html#a2f7d74bb2aea8bcd2537aee5c6708a16',1,'dir_fns.php']]], ['check_5fwall_5fto_5fwall',['check_wall_to_wall',['../classItem.html#abcdb0ea9bcd1576bc99bba9b8f700bb8',1,'Item']]], ['check_5fwebbie',['check_webbie',['../text_8php.html#a0c65597bb4aed3a039eb795ff540e5e3',1,'text.php']]], - ['childexists',['childExists',['../classRedDirectory.html#a5e3fc08b2bf9f61cea4d2ccae0495bec',1,'RedDirectory']]], + ['childexists',['childExists',['../classRedMatrix_1_1RedDAV_1_1RedDirectory.html#a964b13fde1a5da6f76b51ca5519234dc',1,'RedMatrix::RedDAV::RedDirectory']]], ['clean_5furls',['clean_urls',['../boot_8php.html#ab79b8b4555cae20d03f8200666d89d63',1,'boot.php']]], ['clear',['clear',['../classCache.html#ab14d0f4bdf7116a94d545c574b38f568',1,'Cache']]], ['cleardiv',['cleardiv',['../text_8php.html#afe18627c4983ee5f7c940a0992818cd5',1,'text.php']]], @@ -115,8 +115,8 @@ var searchData= ['create_5faccount',['create_account',['../account_8php.html#a141fe579c351c78209d425473f978eb5',1,'account.php']]], ['create_5fidentity',['create_identity',['../identity_8php.html#a345f4c943d84de502ec6e72d2c813945',1,'identity.php']]], ['create_5fsys_5fchannel',['create_sys_channel',['../identity_8php.html#a1cf83ac2b645de12868edaa3a5718f05',1,'identity.php']]], - ['createdirectory',['createDirectory',['../classRedDirectory.html#a986936910f0216887a25e28916c166c7',1,'RedDirectory']]], - ['createfile',['createFile',['../classRedDirectory.html#a2d12d99d38a6a75fc9a830b2f7fc0bf0',1,'RedDirectory']]], + ['createdirectory',['createDirectory',['../classRedMatrix_1_1RedDAV_1_1RedDirectory.html#aca0e8d574ea66a0e210f571700663c62',1,'RedMatrix::RedDAV::RedDirectory']]], + ['createfile',['createFile',['../classRedMatrix_1_1RedDAV_1_1RedDirectory.html#a58e750256cdc2f0f79fbe8d5463ffefe',1,'RedMatrix::RedDAV::RedDirectory']]], ['cronhooks_5frun',['cronhooks_run',['../cronhooks_8php.html#a4c4c1bbec4ecc9a0efa00dd6afd2c0ca',1,'cronhooks.php']]], ['cropimage',['cropImage',['../classphoto__driver.html#a2e6e61f1e356a90bc978f4404a77137e',1,'photo_driver\cropImage()'],['../classphoto__gd.html#ab2232d775c8bacf66773a03308105f0c',1,'photo_gd\cropImage()'],['../classphoto__imagick.html#a2f33a03a89497a2b2768e29736d4a8a4',1,'photo_imagick\cropImage()']]], ['crypto_5fencapsulate',['crypto_encapsulate',['../crypto_8php.html#a32fc08d57a5694f94d8543ecbb03323c',1,'crypto.php']]], diff --git a/doc/html/search/functions_64.js b/doc/html/search/functions_64.js index fceeeeb96..96a309f6d 100644 --- a/doc/html/search/functions_64.js +++ b/doc/html/search/functions_64.js @@ -16,7 +16,7 @@ var searchData= ['del_5fpconfig',['del_pconfig',['../include_2config_8php.html#a7ad2081c5f812ac4387fd76f3762d941',1,'config.php']]], ['del_5fxconfig',['del_xconfig',['../include_2config_8php.html#a9c171def547deee16738dc58fdeb4b72',1,'config.php']]], ['delegate_5fcontent',['delegate_content',['../delegate_8php.html#a943eea8996ef348eb845c498f9f354dd',1,'delegate.php']]], - ['delete',['delete',['../classRedFile.html#aef71c9eaac7052be7dc8602eb12171e7',1,'RedFile']]], + ['delete',['delete',['../classRedMatrix_1_1RedDAV_1_1RedFile.html#ab7ab7ba81fab28eb02382cfdfd80ecfe',1,'RedMatrix::RedDAV::RedFile']]], ['delete_5fimported_5fitem',['delete_imported_item',['../zot_8php.html#adfeb9400ae6b726beec89f8f1e8fde72',1,'zot.php']]], ['delete_5fitem_5flowlevel',['delete_item_lowlevel',['../items_8php.html#aac8c9eb4338e2a996c43914392c6cfdb',1,'items.php']]], ['deletenode',['deletenode',['../html2bbcode_8php.html#a71a07f135d196ec5943b13f7b2e6a9b2',1,'html2bbcode.php']]], diff --git a/doc/html/search/functions_66.js b/doc/html/search/functions_66.js index f77811f4e..03ba9058a 100644 --- a/doc/html/search/functions_66.js +++ b/doc/html/search/functions_66.js @@ -38,6 +38,7 @@ var searchData= ['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()']]], ['follow_5fcontent',['follow_content',['../mod_2follow_8php.html#a4c540ea4e9f5c581c1a53516ac585592',1,'follow.php']]], ['follow_5finit',['follow_init',['../mod_2follow_8php.html#a171f5b19f50d7738adc3b2e96ec6018a',1,'follow.php']]], + ['foofoo',['foofoo',['../dimport_8php.html#a581f040717941ce3e1868b0b5dceefd1',1,'dimport.php']]], ['format_5fcategories',['format_categories',['../text_8php.html#a3054189cff173977f4216c9a3dd29e1b',1,'text.php']]], ['format_5fcss_5fif_5fexists',['format_css_if_exists',['../plugin_8php.html#a9039e15aae27676af7777dcbee5a11d6',1,'plugin.php']]], ['format_5fevent_5fbbcode',['format_event_bbcode',['../event_8php.html#abb74206cf42d694307c3d7abb7af9869',1,'event.php']]], diff --git a/doc/html/search/functions_67.js b/doc/html/search/functions_67.js index 3216f9b77..f33095628 100644 --- a/doc/html/search/functions_67.js +++ b/doc/html/search/functions_67.js @@ -4,7 +4,7 @@ var searchData= ['gender_5fselector',['gender_selector',['../profile__selectors_8php.html#ae2b2c087e6530c61c0b256fd26d52355',1,'profile_selectors.php']]], ['gender_5fselector_5fmin',['gender_selector_min',['../profile__selectors_8php.html#a8bfa1ca2d1598a3d65f1f9bb803ca816',1,'profile_selectors.php']]], ['generatedirectoryindex',['generateDirectoryIndex',['../classRedMatrix_1_1RedDAV_1_1RedBrowser.html#af764d5f14df751f9ec86c34fab300c09',1,'RedMatrix::RedDAV::RedBrowser']]], - ['get',['get',['../classCache.html#a70392b109331897bf9fdd7f1960e21de',1,'Cache\get()'],['../classRedFile.html#a7c868dfcef6c70cd0e24cf3caa2c3535',1,'RedFile\get()']]], + ['get',['get',['../classCache.html#a70392b109331897bf9fdd7f1960e21de',1,'Cache\get()'],['../classRedMatrix_1_1RedDAV_1_1RedFile.html#a7241beecd01f5bb4e74659863dd85bd8',1,'RedMatrix\RedDAV\RedFile\get()']]], ['get_5faccount',['get_account',['../classApp.html#a08bc87aff64f39fbc084e9d6545cee4d',1,'App']]], ['get_5faccount_5fid',['get_account_id',['../boot_8php.html#afe88b920aa285982edb817a0dd44eb37',1,'boot.php']]], ['get_5fall_5fperms',['get_all_perms',['../permissions_8php.html#aeca9b280f3dc3358c89976d81d690008',1,'permissions.php']]], @@ -102,20 +102,20 @@ var searchData= ['get_5fwords',['get_words',['../spam_8php.html#ab8fd81a82c9622cbebb8ceab6b310ca6',1,'spam.php']]], ['get_5fxconfig',['get_xconfig',['../include_2config_8php.html#aa3dc1d3de2d091ac702e675acd3a085e',1,'config.php']]], ['getasseturl',['getAssetUrl',['../classRedMatrix_1_1RedDAV_1_1RedBrowser.html#acaa792c08d24e9dc2919759e92ba037d',1,'RedMatrix::RedDAV::RedBrowser']]], - ['getchild',['getChild',['../classRedDirectory.html#aaa20f0f44da23781917af8170c0a2569',1,'RedDirectory']]], - ['getchildren',['getChildren',['../classRedDirectory.html#aa42d3065f6f065b17db87146a7cb031a',1,'RedDirectory']]], - ['getcontenttype',['getContentType',['../classRedFile.html#a26416827eb68554d033d1e2e5cc6dd3b',1,'RedFile']]], - ['getcurrentuser',['getCurrentUser',['../classRedBasicAuth.html#a4a584de8eb31c786fabd8f6e1a6c8925',1,'RedBasicAuth']]], - ['getdir',['getDir',['../classRedDirectory.html#a70173d4458572d95e586b2037d2fd2f4',1,'RedDirectory']]], - ['getetag',['getETag',['../classRedFile.html#ae96d5caa2db7a461c57b24380fa87e28',1,'RedFile']]], + ['getchild',['getChild',['../classRedMatrix_1_1RedDAV_1_1RedDirectory.html#a1a37850bdd1f188abd6160559698d5d7',1,'RedMatrix::RedDAV::RedDirectory']]], + ['getchildren',['getChildren',['../classRedMatrix_1_1RedDAV_1_1RedDirectory.html#a9b9a0b5bfa4de1f78e6cafaa534b6f6a',1,'RedMatrix::RedDAV::RedDirectory']]], + ['getcontenttype',['getContentType',['../classRedMatrix_1_1RedDAV_1_1RedFile.html#af5c88b75d0c1f590af03755534cb167e',1,'RedMatrix::RedDAV::RedFile']]], + ['getcurrentuser',['getCurrentUser',['../classRedMatrix_1_1RedDAV_1_1RedBasicAuth.html#aa0b2a5fa9186d7dc0e637f1ecb379c42',1,'RedMatrix::RedDAV::RedBasicAuth']]], + ['getdir',['getDir',['../classRedMatrix_1_1RedDAV_1_1RedDirectory.html#a825dc5f3e0f83f50736c16daa6a4809d',1,'RedMatrix::RedDAV::RedDirectory']]], + ['getetag',['getETag',['../classRedMatrix_1_1RedDAV_1_1RedFile.html#a9f14682acf3ccb70df5af5dd0687c689',1,'RedMatrix::RedDAV::RedFile']]], ['getext',['getExt',['../classphoto__driver.html#aa2efb5b2a6af3fd67e3f1c2b9852a5ba',1,'photo_driver']]], ['getheight',['getHeight',['../classphoto__driver.html#af769e9abb144e57002c59aa2aa8f3468',1,'photo_driver']]], ['getimage',['getImage',['../classphoto__driver.html#ab98da263bd7341fc132c4fb6fc76e8d5',1,'photo_driver\getImage()'],['../classphoto__gd.html#a86757ba021fd80d1a5cf8c2f766a8484',1,'photo_gd\getImage()'],['../classphoto__imagick.html#ad07288e0eb3922cb08cc9d33a163decc',1,'photo_imagick\getImage()']]], - ['getlastmodified',['getLastModified',['../classRedDirectory.html#a6c7e08199abc24e6eeb94a4037ef8bfc',1,'RedDirectory\getLastModified()'],['../classRedFile.html#a41562a28007789bbe7fe06d6a20eef47',1,'RedFile\getLastModified()']]], - ['getname',['getName',['../classRedDirectory.html#af6e4475dbd5abcdede00d20b8d388583',1,'RedDirectory\getName()'],['../classRedFile.html#a0c961c5f49544d2502420361fa526437',1,'RedFile\getName()']]], - ['getquotainfo',['getQuotaInfo',['../classRedDirectory.html#a2f7a574f2115f099d6dd103d5b252375',1,'RedDirectory']]], - ['getsize',['getSize',['../classRedFile.html#acb1edbe1848fab05347746fa1ea09d8f',1,'RedFile']]], - ['gettimezone',['getTimezone',['../classRedBasicAuth.html#a9fdd4b890e3e7c7e1ae96ead2301418f',1,'RedBasicAuth']]], + ['getlastmodified',['getLastModified',['../classRedMatrix_1_1RedDAV_1_1RedDirectory.html#a69db5f641f8f5dc999e55cee1832ecd5',1,'RedMatrix\RedDAV\RedDirectory\getLastModified()'],['../classRedMatrix_1_1RedDAV_1_1RedFile.html#ac47016aa0e3f6f1a1c4570bd6fd8cf25',1,'RedMatrix\RedDAV\RedFile\getLastModified()']]], + ['getname',['getName',['../classRedMatrix_1_1RedDAV_1_1RedDirectory.html#a55f7172814a0749b5342f152ab3fa0df',1,'RedMatrix\RedDAV\RedDirectory\getName()'],['../classRedMatrix_1_1RedDAV_1_1RedFile.html#ac945aa782d6c035d339e59974266ec4d',1,'RedMatrix\RedDAV\RedFile\getName()']]], + ['getquotainfo',['getQuotaInfo',['../classRedMatrix_1_1RedDAV_1_1RedDirectory.html#a69db443ed3c84938b4352fe515bf8d68',1,'RedMatrix::RedDAV::RedDirectory']]], + ['getsize',['getSize',['../classRedMatrix_1_1RedDAV_1_1RedFile.html#a07e1b19e7aaf3dcce822e9be8823a87d',1,'RedMatrix::RedDAV::RedFile']]], + ['gettimezone',['getTimezone',['../classRedMatrix_1_1RedDAV_1_1RedBasicAuth.html#a6333c8ce58998bd11bf8102afe3b0748',1,'RedMatrix::RedDAV::RedBasicAuth']]], ['gettype',['getType',['../classphoto__driver.html#a6c6c16dbc4f517ce799f9143ed61f0e3',1,'photo_driver']]], ['getwidth',['getWidth',['../classphoto__driver.html#acc30486acee9e89e32701f44a1738117',1,'photo_driver']]], ['goaway',['goaway',['../boot_8php.html#a5ab6181607a090bcdbaa13b15b85aba1',1,'boot.php']]], diff --git a/doc/html/search/functions_68.js b/doc/html/search/functions_68.js index 8260baf97..c047c0a86 100644 --- a/doc/html/search/functions_68.js +++ b/doc/html/search/functions_68.js @@ -23,5 +23,6 @@ var searchData= ['html2bbcode',['html2bbcode',['../html2bbcode_8php.html#a5ad726995ac4070213abdb3bd09f4837',1,'html2bbcode.php']]], ['html2plain',['html2plain',['../html2plain_8php.html#ab3e121fa9f3feb16f9f942e705bc6c04',1,'html2plain.php']]], ['htmlactionspanel',['htmlActionsPanel',['../classRedMatrix_1_1RedDAV_1_1RedBrowser.html#a3bd98af2d1cdfd8f26deb914596176cf',1,'RedMatrix::RedDAV::RedBrowser']]], - ['http_5fstatus_5fexit',['http_status_exit',['../include_2network_8php.html#a4cfb2c05a1c295317283d762440ce0b2',1,'network.php']]] + ['http_5fstatus_5fexit',['http_status_exit',['../include_2network_8php.html#a4cfb2c05a1c295317283d762440ce0b2',1,'network.php']]], + ['hubloc_5fchange_5fprimary',['hubloc_change_primary',['../hubloc_8php.html#ad86214b3a74084bd7b54e8d6c919ce4d',1,'hubloc.php']]] ]; diff --git a/doc/html/search/functions_6c.js b/doc/html/search/functions_6c.js index 40e43fe75..a7e715a07 100644 --- a/doc/html/search/functions_6c.js +++ b/doc/html/search/functions_6c.js @@ -26,7 +26,8 @@ var searchData= ['local_5fuser',['local_user',['../boot_8php.html#ad4c9dc2c8a82e8f52b7404c1655eab44',1,'boot.php']]], ['localize_5fitem',['localize_item',['../conversation_8php.html#a9bd7f9fb6678736c581bcba3b17f471c',1,'conversation.php']]], ['lockview_5fcontent',['lockview_content',['../lockview_8php.html#a851e26ab9a1008df5c5ebebea31e9b44',1,'lockview.php']]], - ['log',['log',['../classRedDirectory.html#a11376aed1963b4471eb1592c13c63976',1,'RedDirectory\log()'],['../classRedBasicAuth.html#a2cc8b1eac9c5a799bfb53ea7f287f3f0',1,'RedBasicAuth\log()']]], + ['locs_5fpost',['locs_post',['../locs_8php.html#a6b43654592919ac863d67a1f787a69b9',1,'locs.php']]], + ['log',['log',['../classRedMatrix_1_1RedDAV_1_1RedBasicAuth.html#abf6fe89b0a8239ed93c3b07e1fbce75b',1,'RedMatrix\RedDAV\RedBasicAuth\log()'],['../classRedMatrix_1_1RedDAV_1_1RedDirectory.html#af90a1a74cfd643a5c56b9a17ea250d59',1,'RedMatrix\RedDAV\RedDirectory\log()']]], ['logger',['logger',['../text_8php.html#a030fa5ecc64168af0c4f44897a9bce63',1,'text.php']]], ['login',['login',['../boot_8php.html#aefecf8599036df7f1b95d6820e0e2fa4',1,'boot.php']]], ['login_5fcontent',['login_content',['../login_8php.html#a1d69ca88eb9005a7026e128b9a645904',1,'login.php']]], diff --git a/doc/html/search/functions_70.js b/doc/html/search/functions_70.js index 20f1737b6..1d14502bf 100644 --- a/doc/html/search/functions_70.js +++ b/doc/html/search/functions_70.js @@ -125,5 +125,5 @@ var searchData= ['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']]], - ['put',['put',['../classRedFile.html#a41a49a583eb276b75626fcf97f4a699c',1,'RedFile']]] + ['put',['put',['../classRedMatrix_1_1RedDAV_1_1RedFile.html#a709ec1288d21ddf1353524435ab916f0',1,'RedMatrix::RedDAV::RedFile']]] ]; diff --git a/doc/html/search/functions_73.js b/doc/html/search/functions_73.js index 10a733a59..ecbf52d43 100644 --- a/doc/html/search/functions_73.js +++ b/doc/html/search/functions_73.js @@ -51,12 +51,12 @@ var searchData= ['set_5fwidget',['set_widget',['../classApp.html#a123b903dfe5d3488cc68db3471d36fd2',1,'App']]], ['set_5fwriteable',['set_writeable',['../classRedMatrix_1_1RedDAV_1_1RedBrowser.html#aa1607857cb59738c4dce2fe8e73d8f19',1,'RedMatrix::RedDAV::RedBrowser']]], ['set_5fxconfig',['set_xconfig',['../include_2config_8php.html#afe117b70f1bba2f6348d9300b601f86e',1,'config.php']]], - ['setauthenticated',['setAuthenticated',['../classRedBasicAuth.html#a3ef43177abe0ef72da140a25bc568333',1,'RedBasicAuth']]], - ['setbrowserplugin',['setBrowserPlugin',['../classRedBasicAuth.html#a358ddad4abb5aa8c1382cf49a907adbc',1,'RedBasicAuth']]], - ['setcurrentuser',['setCurrentUser',['../classRedBasicAuth.html#a072e8244a9a7f191b32d3db5ac94f857',1,'RedBasicAuth']]], + ['setauthenticated',['setAuthenticated',['../classRedMatrix_1_1RedDAV_1_1RedBasicAuth.html#a2926fe923baade564f2663632fa8c633',1,'RedMatrix::RedDAV::RedBasicAuth']]], + ['setbrowserplugin',['setBrowserPlugin',['../classRedMatrix_1_1RedDAV_1_1RedBasicAuth.html#adc72f36f0b2b17b20ea4df900afcd697',1,'RedMatrix::RedDAV::RedBasicAuth']]], + ['setcurrentuser',['setCurrentUser',['../classRedMatrix_1_1RedDAV_1_1RedBasicAuth.html#aadce020fb595c7943829d7f995d3f998',1,'RedMatrix::RedDAV::RedBasicAuth']]], ['setdimensions',['setDimensions',['../classphoto__driver.html#ae663867d2c4eaa2fae50d60670920143',1,'photo_driver\setDimensions()'],['../classphoto__gd.html#a1c75304bd15f3b9986f0b315fb59271e',1,'photo_gd\setDimensions()'],['../classphoto__imagick.html#af92901d252c1e6ab5b54eebedbed23bb',1,'photo_imagick\setDimensions()']]], - ['setname',['setName',['../classRedDirectory.html#adc48035679e52c55d9881f83de535553',1,'RedDirectory\setName()'],['../classRedFile.html#a38a82bfc1b30028ea6ac75923e90fa25',1,'RedFile\setName()']]], - ['settimezone',['setTimezone',['../classRedBasicAuth.html#a2f5d4ef7040c65b79b2fdfdf1212395a',1,'RedBasicAuth']]], + ['setname',['setName',['../classRedMatrix_1_1RedDAV_1_1RedDirectory.html#a14ac61d31a031d139956763db4e03956',1,'RedMatrix\RedDAV\RedDirectory\setName()'],['../classRedMatrix_1_1RedDAV_1_1RedFile.html#a0350cb4e0327e1f9922869a48ee04f1d',1,'RedMatrix\RedDAV\RedFile\setName()']]], + ['settimezone',['setTimezone',['../classRedMatrix_1_1RedDAV_1_1RedBasicAuth.html#af6d239fefed05859327ee8db626703f9',1,'RedMatrix::RedDAV::RedBasicAuth']]], ['settings_5finit',['settings_init',['../settings_8php.html#a3a4cde287482fced008583f54ba2a722',1,'settings.php']]], ['settings_5fpost',['settings_post',['../settings_8php.html#aa7ee94d88ac088edb04ccf3a26de3586',1,'settings.php']]], ['setup_5fcontent',['setup_content',['../setup_8php.html#a88247384a96e14516f474d7af6a465c1',1,'setup.php']]], diff --git a/doc/html/search/functions_76.js b/doc/html/search/functions_76.js index c0f0bd296..7a4c524e4 100644 --- a/doc/html/search/functions_76.js +++ b/doc/html/search/functions_76.js @@ -4,7 +4,7 @@ var searchData= ['validate_5fchannelname',['validate_channelname',['../identity_8php.html#af2802bc13a00a17b867bba7978ba8f58',1,'identity.php']]], ['validate_5femail',['validate_email',['../include_2network_8php.html#a897e7112d86eb95526cbd0bff9375f02',1,'network.php']]], ['validate_5furl',['validate_url',['../include_2network_8php.html#a5caa264fab6d2b2344e6bd5b298b08f2',1,'network.php']]], - ['validateuserpass',['validateUserPass',['../classRedBasicAuth.html#a8dfd9a0953f8884723b421b7c1acf79b',1,'RedBasicAuth']]], + ['validateuserpass',['validateUserPass',['../classRedMatrix_1_1RedDAV_1_1RedBasicAuth.html#a6ece02655b780469e59e204c5979a624',1,'RedMatrix::RedDAV::RedBasicAuth']]], ['var_5freplace',['var_replace',['../classTemplate.html#abbc484016ddf5d818f55b823cae6feb0',1,'Template']]], ['vcard_5ffrom_5fxchan',['vcard_from_xchan',['../Contact_8php.html#a6348a532c9d26cd1c9afbc9aa6aa8960',1,'Contact.php']]], ['verify_5femail_5faddress',['verify_email_address',['../account_8php.html#acd6b8d2124ba5ea4f4794d2c58ae8bf5',1,'account.php']]], diff --git a/doc/html/search/variables_24.js b/doc/html/search/variables_24.js index 7166d3bfb..d4ea06349 100644 --- a/doc/html/search/variables_24.js +++ b/doc/html/search/variables_24.js @@ -9,18 +9,18 @@ var searchData= ['_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']]], - ['_24auth',['$auth',['../classRedMatrix_1_1RedDAV_1_1RedBrowser.html#ad19179bf4ac7f18fafa7e2e3df800142',1,'RedMatrix\RedDAV\RedBrowser\$auth()'],['../classRedDirectory.html#a9616af16cd19a18a6afebebcc2881c44',1,'RedDirectory\$auth()'],['../classRedFile.html#a4b5d0e33f919c6c175b30a55de6263f2',1,'RedFile\$auth()']]], + ['_24auth',['$auth',['../classRedMatrix_1_1RedDAV_1_1RedBrowser.html#ad19179bf4ac7f18fafa7e2e3df800142',1,'RedMatrix\RedDAV\RedBrowser\$auth()'],['../classRedMatrix_1_1RedDAV_1_1RedDirectory.html#aab6907e7fb7f9f7227f9cd42bdc84eb9',1,'RedMatrix\RedDAV\RedDirectory\$auth()'],['../classRedMatrix_1_1RedDAV_1_1RedFile.html#a21b6e9d420c352f25610a33f57858215',1,'RedMatrix\RedDAV\RedFile\$auth()']]], ['_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']]], + ['_24browser',['$browser',['../classRedMatrix_1_1RedDAV_1_1RedBasicAuth.html#a167ae032bd2ad8e6caa2e1e1a6f1b5d3',1,'RedMatrix::RedDAV::RedBasicAuth']]], ['_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']]], ['_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']]], + ['_24channel_5fhash',['$channel_hash',['../classRedMatrix_1_1RedDAV_1_1RedBasicAuth.html#a112ad78a863dc0e598b5f02c596798c0',1,'RedMatrix::RedDAV::RedBasicAuth']]], + ['_24channel_5fid',['$channel_id',['../classRedMatrix_1_1RedDAV_1_1RedBasicAuth.html#abe1defedb90ac8e3b6487e124e625521',1,'RedMatrix::RedDAV::RedBasicAuth']]], + ['_24channel_5fname',['$channel_name',['../classRedMatrix_1_1RedDAV_1_1RedBasicAuth.html#a76fdb7fd5dd7376155abb5a58cd6fd69',1,'RedMatrix::RedDAV::RedBasicAuth']]], ['_24children',['$children',['../classItem.html#a80dcd0fb7673776c0967839d429c2a0f',1,'Item']]], ['_24cid',['$cid',['../classApp.html#ad1c8eb91a6fd470b94f34b7fdad3a2d0',1,'App']]], ['_24cipher',['$cipher',['../classConversation.html#aa95c1a62af38bdfba7add9549bec083b',1,'Conversation']]], @@ -37,7 +37,7 @@ var searchData= ['_24curl_5fcode',['$curl_code',['../classApp.html#a256360c9184fed6d7556e0bc0a835d7f',1,'App']]], ['_24curl_5fheaders',['$curl_headers',['../classApp.html#af5007c42a693afd9c4899c243b2e1363',1,'App']]], ['_24d',['$d',['../classTemplate.html#a8469ab2988b6be2681516dc4b4e07d38',1,'Template']]], - ['_24data',['$data',['../classApp.html#a0ce85be198e46570366cb3344f3c55b8',1,'App\$data()'],['../classItem.html#aec24e233f9098f902b1e57e60dcb2019',1,'Item\$data()'],['../classRedFile.html#a2ff12032b45538353eded9809d3b7550',1,'RedFile\$data()']]], + ['_24data',['$data',['../classApp.html#a0ce85be198e46570366cb3344f3c55b8',1,'App\$data()'],['../classItem.html#aec24e233f9098f902b1e57e60dcb2019',1,'Item\$data()'],['../classRedMatrix_1_1RedDAV_1_1RedFile.html#a235700e2dfbe21dc41613d36e30e8acc',1,'RedMatrix\RedDAV\RedFile\$data()']]], ['_24db',['$db',['../classApp.html#a330410a288f3393d53772f5e98f857ea',1,'App\$db()'],['../classdba__driver.html#a3033b5f1c2716b52202faeaae2592fe6',1,'dba_driver\$db()']]], ['_24debug',['$debug',['../classdba__driver.html#af48e2afeded5285766bf92e22123ed03',1,'dba_driver\$debug()'],['../classTemplate.html#afc4afb6f89bebcd5480022312a56cb4a',1,'Template\$debug()']]], ['_24dir',['$dir',['../docblox__errorchecker_8php.html#a1659f0a629d408e0f849dbe4ee061e62',1,'docblox_errorchecker.php']]], @@ -46,13 +46,13 @@ var searchData= ['_24dirstack',['$dirstack',['../docblox__errorchecker_8php.html#ab66bc0493d25f39bf8b4dcbb429f04e6',1,'docblox_errorchecker.php']]], ['_24done',['$done',['../classTemplate.html#abda4c8d049f70553338eae7c905e9d5c',1,'Template']]], ['_24error',['$error',['../classApp.html#ac1a8b2cd40609b231a560201a08852ba',1,'App\$error()'],['../classdba__driver.html#a84675d28c7bd9b7290dd37e66dbd216c',1,'dba_driver\$error()']]], - ['_24ext_5fpath',['$ext_path',['../classRedDirectory.html#a0f113244cd85c17848df991001d024f4',1,'RedDirectory']]], + ['_24ext_5fpath',['$ext_path',['../classRedMatrix_1_1RedDAV_1_1RedDirectory.html#adf8735b3118cdf2f42416edaf42b82e9',1,'RedMatrix::RedDAV::RedDirectory']]], ['_24fext',['$fext',['../apw_2php_2style_8php.html#a404171b8f918c116e45a6421c92f0cc9',1,'style.php']]], ['_24filelist',['$filelist',['../docblox__errorchecker_8php.html#a648a570b0f9f6e0e51b7267647c4b09b',1,'docblox_errorchecker.php']]], ['_24filename',['$filename',['../classFriendicaSmarty.html#a33fabbd4d6eef869df496adf357ae690',1,'FriendicaSmarty']]], ['_24files',['$files',['../extract_8php.html#a9590b15215a21e9b42eb546aeef79704',1,'$files(): extract.php'],['../tpldebug_8php.html#a5358407d65f2ca826f96356a6642d149',1,'$files(): tpldebug.php'],['../typo_8php.html#a9590b15215a21e9b42eb546aeef79704',1,'$files(): typo.php']]], ['_24fname',['$fname',['../apw_2php_2style_8php.html#ab9e0f70d44ab67f4334f9883631777fc',1,'style.php']]], - ['_24folder_5fhash',['$folder_hash',['../classRedDirectory.html#aa10254abf177bb2a0e4a88495725e09b',1,'RedDirectory']]], + ['_24folder_5fhash',['$folder_hash',['../classRedMatrix_1_1RedDAV_1_1RedDirectory.html#a2fc4e6b9be2108bbaa1ca1a03fd6d44e',1,'RedMatrix::RedDAV::RedDirectory']]], ['_24force_5fmax_5fitems',['$force_max_items',['../classApp.html#ae3f47830543d0d902f66913def8db66b',1,'App']]], ['_24gc_5fprobability',['$gc_probability',['../session_8php.html#a96b09cc763572f45280786a7b33feb7e',1,'session.php']]], ['_24groups',['$groups',['../classApp.html#ac6e6b1c7d6df408580ff79977fcfa656',1,'App']]], @@ -81,19 +81,19 @@ var searchData= ['_24mode',['$mode',['../classConversation.html#afb03d1648dbfafe62caa1e30f32f2b1a',1,'Conversation']]], ['_24module',['$module',['../classApp.html#a9bf62f8e39585c0aa48fcffc3bf3484d',1,'App']]], ['_24module_5floaded',['$module_loaded',['../classApp.html#a6e4f0fbfa3cf6c11baebe22a03db6165',1,'App']]], - ['_24name',['$name',['../classRedFile.html#acc48c05cd5a70951cb3c615ad84f03ba',1,'RedFile\$name()'],['../classFriendicaSmartyEngine.html#aaba6a42101bc9ae32e36b7fa2e243f02',1,'FriendicaSmartyEngine\$name()'],['../classTemplate.html#a6eb301a51cc94d8b94f4548fbad85eae',1,'Template\$name()']]], + ['_24name',['$name',['../classRedMatrix_1_1RedDAV_1_1RedFile.html#ab722dcb8c4598426c81fa2b2e4fad5f2',1,'RedMatrix\RedDAV\RedFile\$name()'],['../classFriendicaSmartyEngine.html#aaba6a42101bc9ae32e36b7fa2e243f02',1,'FriendicaSmartyEngine\$name()'],['../classTemplate.html#a6eb301a51cc94d8b94f4548fbad85eae',1,'Template\$name()']]], ['_24nav_5fpercent_5fmin_5fopacity',['$nav_percent_min_opacity',['../redbasic_2php_2style_8php.html#a01c151bf47f7da2b979aaa4cb868da4c',1,'style.php']]], ['_24nav_5fsel',['$nav_sel',['../classApp.html#a33a8e90b60ec4438f6fbf299d0f6839c',1,'App']]], ['_24navheight',['$navheight',['../apw_2php_2style_8php.html#a1c8a7c0db8c174239f3909cb931cb872',1,'style.php']]], ['_24needed',['$needed',['../docblox__errorchecker_8php.html#a852004caba0a34390297a079f4aaac73',1,'docblox_errorchecker.php']]], ['_24nodes',['$nodes',['../classTemplate.html#a8f4d17e49f42b876a97364c13fb572d1',1,'Template']]], ['_24obliquemacro',['$obliquemacro',['../apw_2php_2style_8php.html#a2cad82a3ecadbe58dbc4197de1c63da0',1,'style.php']]], - ['_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']]], + ['_24observer',['$observer',['../classApp.html#a4ffe529fb14389f7fedf5fdc5f722e7f',1,'App\$observer()'],['../classConversation.html#a8748445aa26047ebed5141f3c3cbc244',1,'Conversation\$observer()'],['../classRedMatrix_1_1RedDAV_1_1RedBasicAuth.html#a605aa09565a097316b80f0d17d6b5823',1,'RedMatrix\RedDAV\RedBasicAuth\$observer()']]], + ['_24os_5fpath',['$os_path',['../classRedMatrix_1_1RedDAV_1_1RedDirectory.html#a17ea47e34cb76b6e79f36ebed790d76a',1,'RedMatrix::RedDAV::RedDirectory']]], ['_24out',['$out',['../php2po_8php.html#a48cb304902320d173a4eaa41543327b9',1,'php2po.php']]], - ['_24owner_5fid',['$owner_id',['../classRedBasicAuth.html#a09c1488a0b290f5a54dc15180c5690d7',1,'RedBasicAuth']]], + ['_24owner_5fid',['$owner_id',['../classRedMatrix_1_1RedDAV_1_1RedBasicAuth.html#a1a23c349cc4699a8474505972684ea9c',1,'RedMatrix::RedDAV::RedBasicAuth']]], ['_24owner_5fname',['$owner_name',['../classItem.html#a9594df6014b0b6f45364ea7a34510130',1,'Item']]], - ['_24owner_5fnick',['$owner_nick',['../classRedBasicAuth.html#a8d09b8d784cc810a0b3be580d05106a7',1,'RedBasicAuth']]], + ['_24owner_5fnick',['$owner_nick',['../classRedMatrix_1_1RedDAV_1_1RedBasicAuth.html#aad0ef0cc05c407de84dbfbf2050bbbbe',1,'RedMatrix::RedDAV::RedBasicAuth']]], ['_24owner_5fphoto',['$owner_photo',['../classItem.html#a078f95b4134ce3a1df344cf8d386f986',1,'Item']]], ['_24owner_5furl',['$owner_url',['../classItem.html#afa54851df82962c7c42dea3cc9f5c92c',1,'Item']]], ['_24page',['$page',['../classApp.html#a4b67935096f66d1f14b657399a8461ac',1,'App']]], @@ -116,11 +116,11 @@ var searchData= ['_24query_5fstring',['$query_string',['../classApp.html#a2e82da4aecfc2017a8d1d332ca501f9f',1,'App']]], ['_24r',['$r',['../classTemplate.html#aac9a4638f11271e1b1dcc9f247242718',1,'Template']]], ['_24rdelim',['$rdelim',['../classApp.html#a244b2d53b21be269aad2269d23192f95',1,'App']]], - ['_24red_5fpath',['$red_path',['../classRedDirectory.html#acb32b8df27538c57772824a745e751d7',1,'RedDirectory']]], + ['_24red_5fpath',['$red_path',['../classRedMatrix_1_1RedDAV_1_1RedDirectory.html#a4bba2e56bc8ec3e05f05eae46f56f36d',1,'RedMatrix::RedDAV::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']]], - ['_24root_5fdir',['$root_dir',['../classRedDirectory.html#ad87c514a307ec97ba0f1372e9bcfa6a4',1,'RedDirectory']]], + ['_24root_5fdir',['$root_dir',['../classRedMatrix_1_1RedDAV_1_1RedDirectory.html#a438066fb1565fbcffa22c12d5ce23695',1,'RedMatrix::RedDAV::RedDirectory']]], ['_24s',['$s',['../extract_8php.html#a50b05cf2e02ef0b67fcad97106dd7634',1,'extract.php']]], ['_24scheme',['$scheme',['../classApp.html#ad082d63acc078e5bf23825a03bdd6a76',1,'App']]], ['_24search',['$search',['../classTemplate.html#a317d535946dc065c35dd5cd38380e6c6',1,'Template']]], @@ -143,7 +143,7 @@ var searchData= ['_24theme_5fthread_5fallow',['$theme_thread_allow',['../classApp.html#a487332f8de40414ca1a54a4265570b70',1,'App']]], ['_24threaded',['$threaded',['../classItem.html#a1cb6aa8abdf7ea7daca647e40c8ea3a2',1,'Item']]], ['_24threads',['$threads',['../classConversation.html#a41f4a549e6a99f98935c4742addd22c8',1,'Conversation']]], - ['_24timezone',['$timezone',['../classApp.html#ab35b01a366a2ea95725e97af278f87ab',1,'App\$timezone()'],['../classRedBasicAuth.html#a2d0246ed446fd5e55c17938b4ce6ac47',1,'RedBasicAuth\$timezone()']]], + ['_24timezone',['$timezone',['../classApp.html#ab35b01a366a2ea95725e97af278f87ab',1,'App\$timezone()'],['../classRedMatrix_1_1RedDAV_1_1RedBasicAuth.html#a849c99cf0a7ad065d630c8a30106ad5e',1,'RedMatrix\RedDAV\RedBasicAuth\$timezone()']]], ['_24toplevel',['$toplevel',['../classItem.html#a5cfa6cf964f433a917a81cab079ff9d8',1,'Item']]], ['_24type',['$type',['../classphoto__driver.html#a4920ed7cbb1ac735ac84153067537f03',1,'photo_driver']]], ['_24types',['$types',['../classphoto__driver.html#a00cb166c00b7502dbc456c94330e5b03',1,'photo_driver']]], diff --git a/doc/html/text_8php.html b/doc/html/text_8php.html index 9474507d0..7ce8da167 100644 --- a/doc/html/text_8php.html +++ b/doc/html/text_8php.html @@ -579,7 +579,7 @@ Variables
    -

    Referenced by create_identity(), and new_channel_init().

    +

    Referenced by create_identity(), foofoo(), and new_channel_init().

    @@ -1339,7 +1339,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(), bb2diaspora_itembody(), bb2diaspora_itemwallwall(), 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_url(), 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_diaspora_reshare_xml(), 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(), impel_init(), import_author_rss(), import_author_unknown(), 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(), process_channel_sync_delivery(), process_delivery(), process_location_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_obsolete_hublocs(), 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(), store_diaspora_comment_sig(), stream_perms_api_uids(), stream_perms_xchans(), subthread_content(), sync_directories(), sync_locations(), 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 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(), bb2diaspora_itembody(), bb2diaspora_itemwallwall(), 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(), cloud_init(), connedit_post(), consume_feed(), conversation(), create_account(), create_identity(), RedMatrix\RedDAV\RedDirectory\createDirectory(), RedMatrix\RedDAV\RedDirectory\createFile(), cronhooks_run(), datetime_convert(), RedMatrix\RedDAV\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_url(), 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(), RedMatrix\RedDAV\RedFile\get(), get_atom_elements(), get_diaspora_key(), get_diaspora_reshare_xml(), get_item_elements(), get_language_name(), Conversation\get_template_data(), RedMatrix\RedDAV\RedDirectory\getChild(), RedMatrix\RedDAV\RedDirectory\getDir(), group_content(), guess_image_type(), http_status_exit(), hubloc_change_primary(), impel_init(), import_author_rss(), import_author_unknown(), 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(), RedMatrix\RedDAV\RedDirectory\log(), RedMatrix\RedDAV\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(), process_channel_sync_delivery(), process_delivery(), process_location_delivery(), process_mail_delivery(), process_profile_delivery(), profile_load(), profile_photo_set_profile_perms(), profile_sidebar(), profiles_content(), prune_hub_reinstalls(), public_recips(), RedMatrix\RedDAV\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_obsolete_hublocs(), remove_queue_item(), scale_external_images(), scrape_feed(), scrape_vcard(), search_ac_init(), enotify\send(), send_reg_approval_email(), Conversation\set_mode(), RedMatrix\RedDAV\RedFile\setName(), RedMatrix\RedDAV\RedDirectory\setName(), start_delivery_chain(), store_diaspora_comment_sig(), stream_perms_api_uids(), stream_perms_xchans(), subthread_content(), sync_directories(), sync_locations(), tag_deliver(), tagger_content(), tgroup_check(), uninstall_plugin(), unload_plugin(), update_directory_entry(), update_feed_item(), update_imported_item(), update_queue_time(), RedMatrix\RedDAV\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().

    @@ -1761,7 +1761,7 @@ Variables
    -

    Referenced by aes_encapsulate(), app_store(), attach_mkdir(), attach_store(), bb_parse_crypt(), bbcode(), build_sync_packet(), create_account(), create_identity(), RedDirectory\createFile(), diaspora_msg_build(), diaspora_transmit(), directory_run(), event_store_event(), fsuggest_post(), group_add(), import_directory_profile(), import_xchan(), item_message_id(), item_store(), local_dir_update(), lostpass_content(), lostpass_post(), magic_init(), mail_store(), notification(), notifier_run(), prepare_body(), profiles_init(), removeaccount_content(), removeme_content(), send_message(), send_reg_approval_email(), settings_post(), setup_post(), thing_init(), and verify_email_address().

    +

    Referenced by aes_encapsulate(), app_store(), attach_mkdir(), attach_store(), bb_parse_crypt(), bbcode(), build_sync_packet(), create_account(), create_identity(), RedMatrix\RedDAV\RedDirectory\createFile(), diaspora_msg_build(), diaspora_transmit(), directory_run(), event_store_event(), fsuggest_post(), group_add(), import_directory_profile(), import_xchan(), item_message_id(), item_store(), local_dir_update(), lostpass_content(), lostpass_post(), magic_init(), mail_store(), notification(), notifier_run(), prepare_body(), process_location_delivery(), profiles_init(), removeaccount_content(), removeme_content(), send_message(), send_reg_approval_email(), settings_post(), setup_post(), thing_init(), and verify_email_address().

    diff --git a/doc/html/todo.html b/doc/html/todo.html index bc05e9751..375fff1d9 100644 --- a/doc/html/todo.html +++ b/doc/html/todo.html @@ -104,18 +104,20 @@ $(document).ready(function(){initNavTree('todo.html','');});
    File config.php
    There are a few places in the code (such as the admin panel) where boolean configurations need to be fixed as of 10/08/2011.
    -
    Member RedChannelList (&$auth)
    -
    Is there any reason why this is not inside RedDirectory class?
    -
    Member RedCollectionData ($file, &$auth)
    -
    Is there any reason why this is not inside RedDirectory class? Seems only to be used there and we could simplify it a bit there.
    -
    File reddav.php
    -
    split up the classes into own files.
    -
    Member RedDirectory::getDir ()
    +
    Member RedChannelList (&$auth)
    +
    Is there any reason why this is not inside RedDirectory class? function name looks like a class name, should we rename it?
    +
    Member RedCollectionData ($file, &$auth)
    +
    Is there any reason why this is not inside RedDirectory class? Seems only to be used there and we could simplify it a bit there. function name looks like a class name, should we rename it?
    +
    File reddav.php
    +
    split up the classes into own files.
    +
    Member RedMatrix::__construct (&$auth)
    +
    disable enablePost by default and only activate if permissions grant edit rights.
    +
    Member RedMatrix::set_writeable ()
    +
    Maybe this whole way of doing this can be solved with some $server->subscribeEvent().
    +
    Member RedMatrix::getDir ()
    add description of what this function does.
    -
    Member RedDirectory::setName ($name)
    -
    handle duplicate directory name
    -
    Member RedMatrix::set_writeable ()
    -
    Maybe this can be solved with some $server->subscribeEvent()?
    +
    Member RedMatrix::setName ($name)
    +
    handle duplicate directory name
    diff --git a/doc/html/typo_8php.html b/doc/html/typo_8php.html index a87780731..4c7a43de7 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(), impel_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(), oexchange_content(), oexchange_init(), onedirsync_run(), onepoll_run(), openid_content(), opensearch_init(), p_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(), send_message(), service_class_allows(), service_class_fetch(), service_limits_content(), 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(), impel_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(), locs_post(), 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(), oexchange_content(), oexchange_init(), onedirsync_run(), onepoll_run(), openid_content(), opensearch_init(), p_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(), send_message(), service_class_allows(), service_class_fetch(), service_limits_content(), 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 5bfa11b54..7ed79000c 100644 --- a/doc/html/zot_8php.html +++ b/doc/html/zot_8php.html @@ -815,7 +815,7 @@ Functions
    -

    Referenced by import_directory_profile(), import_xchan(), and local_dir_update().

    +

    Referenced by import_directory_profile(), import_xchan(), local_dir_update(), and process_location_delivery().

    @@ -1087,7 +1087,7 @@ which will be processed and delivered before this function ultimately returns.
    Returns
    string
    -

    Referenced by create_identity().

    +

    Referenced by create_identity(), and foofoo().

    diff --git a/util/messages.po b/util/messages.po index 7fafa754c..5d00db87b 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 2014-10-10.824\n" +"Project-Id-Version: 2014-10-17.831\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-10 00:03-0700\n" +"POT-Creation-Date: 2014-10-17 00:03-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -85,71 +85,70 @@ msgid "Visible to specific connections." msgstr "" #: ../../include/items.php:3927 ../../mod/display.php:32 -#: ../../mod/filestorage.php:18 ../../mod/admin.php:168 +#: ../../mod/filestorage.php:26 ../../mod/admin.php:168 #: ../../mod/admin.php:898 ../../mod/admin.php:1101 ../../mod/thing.php:76 #: ../../mod/viewsrc.php:20 msgid "Item not found." msgstr "" -#: ../../include/items.php:3989 ../../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:3994 ../../include/attach.php:116 +#: ../../include/attach.php:163 ../../include/attach.php:226 +#: ../../include/attach.php:240 ../../include/attach.php:280 +#: ../../include/attach.php:294 ../../include/attach.php:318 +#: ../../include/attach.php:511 ../../include/attach.php:584 +#: ../../include/photos.php:15 ../../include/chat.php:116 #: ../../mod/mood.php:112 ../../mod/mitem.php:73 ../../mod/achievements.php:30 #: ../../mod/settings.php:496 ../../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/blocks.php:29 ../../mod/blocks.php:44 ../../mod/profiles.php:179 -#: ../../mod/profiles.php:560 ../../mod/webpages.php:40 -#: ../../mod/channel.php:89 ../../mod/channel.php:193 -#: ../../mod/channel.php:236 ../../mod/chat.php:90 ../../mod/chat.php:95 -#: ../../mod/register.php:70 ../../mod/regmod.php:17 ../../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/photos.php:68 ../../mod/photos.php:526 +#: ../../mod/blocks.php:29 ../../mod/blocks.php:44 ../../mod/bookmarks.php:46 +#: ../../mod/profiles.php:179 ../../mod/profiles.php:560 +#: ../../mod/photos.php:68 ../../mod/photos.php:526 ../../mod/channel.php:89 +#: ../../mod/channel.php:193 ../../mod/channel.php:236 ../../mod/chat.php:90 +#: ../../mod/chat.php:95 ../../mod/register.php:70 ../../mod/regmod.php:17 +#: ../../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/bookmarks.php:46 ../../mod/profile_photo.php:263 -#: ../../mod/profile_photo.php:276 ../../mod/sources.php:66 -#: ../../mod/events.php:200 ../../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:247 -#: ../../mod/thing.php:264 ../../mod/thing.php:299 ../../mod/invite.php:13 -#: ../../mod/invite.php:104 ../../mod/item.php:182 ../../mod/item.php:190 -#: ../../mod/item.php:929 ../../mod/layouts.php:27 ../../mod/layouts.php:39 -#: ../../mod/like.php:154 ../../mod/viewconnections.php:22 -#: ../../mod/viewconnections.php:27 ../../mod/viewsrc.php:14 -#: ../../mod/mail.php:111 ../../mod/manage.php:6 ../../mod/menu.php:44 -#: ../../mod/message.php:16 ../../mod/new_channel.php:68 -#: ../../mod/new_channel.php:99 ../../mod/notifications.php:66 -#: ../../mod/appman.php:66 ../../mod/service_limits.php:7 ../../index.php:190 -#: ../../index.php:365 +#: ../../mod/profile_photo.php:263 ../../mod/profile_photo.php:276 +#: ../../mod/sources.php:66 ../../mod/events.php:200 +#: ../../mod/filestorage.php:18 ../../mod/filestorage.php:67 +#: ../../mod/filestorage.php:82 ../../mod/filestorage.php:109 +#: ../../mod/fsuggest.php:78 ../../mod/suggest.php:26 ../../mod/group.php:9 +#: ../../mod/thing.php:247 ../../mod/thing.php:264 ../../mod/thing.php:299 +#: ../../mod/invite.php:13 ../../mod/invite.php:104 ../../mod/item.php:182 +#: ../../mod/item.php:190 ../../mod/item.php:929 ../../mod/layouts.php:27 +#: ../../mod/layouts.php:39 ../../mod/like.php:154 +#: ../../mod/viewconnections.php:22 ../../mod/viewconnections.php:27 +#: ../../mod/viewsrc.php:14 ../../mod/mail.php:111 ../../mod/manage.php:6 +#: ../../mod/menu.php:44 ../../mod/webpages.php:40 ../../mod/message.php:16 +#: ../../mod/new_channel.php:68 ../../mod/new_channel.php:99 +#: ../../mod/notifications.php:66 ../../mod/appman.php:66 +#: ../../mod/service_limits.php:7 ../../index.php:190 ../../index.php:365 msgid "Permission denied." msgstr "" -#: ../../include/items.php:4360 ../../mod/group.php:38 ../../mod/group.php:140 +#: ../../include/items.php:4365 ../../mod/group.php:38 ../../mod/group.php:140 msgid "Collection not found." msgstr "" -#: ../../include/items.php:4375 +#: ../../include/items.php:4380 msgid "Collection is empty." msgstr "" -#: ../../include/items.php:4382 +#: ../../include/items.php:4387 #, php-format msgid "Collection: %s" msgstr "" -#: ../../include/items.php:4393 +#: ../../include/items.php:4398 #, php-format msgid "Connection: %s" msgstr "" -#: ../../include/items.php:4396 +#: ../../include/items.php:4401 msgid "Connection not found." msgstr "" @@ -166,8 +165,8 @@ msgstr "" msgid "Site Admin" msgstr "" -#: ../../include/apps.php:127 ../../include/conversation.php:1566 -#: ../../include/nav.php:116 +#: ../../include/apps.php:127 ../../include/conversation.php:1570 +#: ../../include/nav.php:117 msgid "Bookmarks" msgstr "" @@ -175,65 +174,65 @@ msgstr "" msgid "Address Book" msgstr "" -#: ../../include/apps.php:129 ../../include/nav.php:124 ../../boot.php:1495 +#: ../../include/apps.php:129 ../../include/nav.php:125 ../../boot.php:1496 msgid "Login" msgstr "" -#: ../../include/apps.php:130 ../../include/nav.php:217 +#: ../../include/apps.php:130 ../../include/nav.php:216 #: ../../mod/manage.php:148 msgid "Channel Manager" msgstr "" -#: ../../include/apps.php:131 ../../include/nav.php:191 +#: ../../include/apps.php:131 ../../include/nav.php:190 msgid "Matrix" msgstr "" #: ../../include/apps.php:132 ../../include/widgets.php:521 -#: ../../include/nav.php:219 ../../mod/admin.php:953 ../../mod/admin.php:1158 +#: ../../include/nav.php:218 ../../mod/admin.php:953 ../../mod/admin.php:1158 msgid "Settings" msgstr "" -#: ../../include/apps.php:133 ../../include/conversation.php:1542 -#: ../../include/nav.php:105 ../../include/RedDAV/RedBrowser.php:238 +#: ../../include/apps.php:133 ../../include/conversation.php:1546 +#: ../../include/RedDAV/RedBrowser.php:241 ../../include/nav.php:106 #: ../../mod/fbrowser.php:114 msgid "Files" msgstr "" -#: ../../include/apps.php:134 ../../include/conversation.php:1577 -#: ../../include/nav.php:120 ../../mod/webpages.php:86 +#: ../../include/apps.php:134 ../../include/conversation.php:1581 +#: ../../include/nav.php:121 ../../mod/webpages.php:129 msgid "Webpages" msgstr "" -#: ../../include/apps.php:135 ../../include/nav.php:194 +#: ../../include/apps.php:135 ../../include/nav.php:193 msgid "Channel Home" msgstr "" -#: ../../include/apps.php:136 ../../include/identity.php:1111 -#: ../../include/identity.php:1229 ../../mod/profperm.php:112 +#: ../../include/apps.php:136 ../../include/identity.php:1112 +#: ../../include/identity.php:1230 ../../mod/profperm.php:112 msgid "Profile" msgstr "" -#: ../../include/apps.php:137 ../../include/conversation.php:1533 -#: ../../include/nav.php:104 ../../mod/fbrowser.php:25 +#: ../../include/apps.php:137 ../../include/conversation.php:1537 +#: ../../include/nav.php:105 ../../mod/fbrowser.php:25 msgid "Photos" msgstr "" -#: ../../include/apps.php:138 ../../include/nav.php:213 +#: ../../include/apps.php:138 ../../include/nav.php:212 #: ../../mod/events.php:436 msgid "Events" msgstr "" -#: ../../include/apps.php:139 ../../include/nav.php:177 +#: ../../include/apps.php:139 ../../include/nav.php:176 #: ../../mod/directory.php:226 msgid "Directory" msgstr "" -#: ../../include/apps.php:140 ../../include/nav.php:169 ../../mod/help.php:60 +#: ../../include/apps.php:140 ../../include/nav.php:168 ../../mod/help.php:60 #: ../../mod/help.php:65 msgid "Help" msgstr "" -#: ../../include/apps.php:141 ../../include/nav.php:205 +#: ../../include/apps.php:141 ../../include/nav.php:204 msgid "Mail" msgstr "" @@ -241,16 +240,16 @@ msgstr "" msgid "Mood" msgstr "" -#: ../../include/apps.php:143 ../../include/conversation.php:947 +#: ../../include/apps.php:143 ../../include/conversation.php:951 msgid "Poke" msgstr "" -#: ../../include/apps.php:144 ../../include/nav.php:110 +#: ../../include/apps.php:144 ../../include/nav.php:111 msgid "Chat" msgstr "" #: ../../include/apps.php:145 ../../include/text.php:822 -#: ../../include/text.php:834 ../../include/nav.php:174 +#: ../../include/text.php:834 ../../include/nav.php:173 #: ../../mod/search.php:30 msgid "Search" msgstr "" @@ -301,65 +300,123 @@ msgid "Purchase" msgstr "" #: ../../include/apps.php:249 ../../include/page_widgets.php:8 -#: ../../include/page_widgets.php:36 ../../include/RedDAV/RedBrowser.php:247 +#: ../../include/page_widgets.php:36 ../../include/RedDAV/RedBrowser.php:250 #: ../../include/menu.php:42 ../../include/ItemObject.php:100 #: ../../mod/settings.php:581 ../../mod/blocks.php:99 -#: ../../mod/webpages.php:133 ../../mod/connections.php:381 -#: ../../mod/connections.php:394 ../../mod/connections.php:413 -#: ../../mod/editblock.php:111 ../../mod/editlayout.php:106 -#: ../../mod/editpost.php:112 ../../mod/editwebpage.php:143 -#: ../../mod/thing.php:233 ../../mod/layouts.php:121 ../../mod/menu.php:59 +#: ../../mod/connections.php:381 ../../mod/connections.php:394 +#: ../../mod/connections.php:413 ../../mod/editblock.php:111 +#: ../../mod/editlayout.php:106 ../../mod/editpost.php:112 +#: ../../mod/editwebpage.php:143 ../../mod/thing.php:233 +#: ../../mod/layouts.php:121 ../../mod/menu.php:59 ../../mod/webpages.php:131 msgid "Edit" msgstr "" #: ../../include/apps.php:250 ../../include/conversation.php:638 -#: ../../include/RedDAV/RedBrowser.php:248 ../../include/ItemObject.php:120 -#: ../../mod/settings.php:582 ../../mod/connedit.php:462 -#: ../../mod/photos.php:1064 ../../mod/group.php:176 ../../mod/admin.php:732 +#: ../../include/RedDAV/RedBrowser.php:251 ../../include/ItemObject.php:120 +#: ../../mod/settings.php:582 ../../mod/photos.php:1064 +#: ../../mod/connedit.php:462 ../../mod/group.php:176 ../../mod/admin.php:732 #: ../../mod/admin.php:863 ../../mod/thing.php:234 msgid "Delete" msgstr "" #: ../../include/apps.php:331 ../../include/apps.php:382 -#: ../../include/conversation.php:999 ../../include/RedDAV/RedBrowser.php:160 +#: ../../include/conversation.php:1003 ../../include/RedDAV/RedBrowser.php:163 #: ../../mod/connedit.php:498 msgid "Unknown" msgstr "" +#: ../../include/attach.php:221 ../../include/attach.php:275 +msgid "Item was not found." +msgstr "" + +#: ../../include/attach.php:331 +msgid "No source file." +msgstr "" + +#: ../../include/attach.php:348 +msgid "Cannot locate file to replace" +msgstr "" + +#: ../../include/attach.php:366 +msgid "Cannot locate file to revise/update" +msgstr "" + +#: ../../include/attach.php:377 +#, php-format +msgid "File exceeds size limit of %d" +msgstr "" + +#: ../../include/attach.php:389 +#, php-format +msgid "You have reached your limit of %1$.0f Mbytes attachment storage." +msgstr "" + +#: ../../include/attach.php:472 +msgid "File upload failed. Possible system limit or action terminated." +msgstr "" + +#: ../../include/attach.php:484 +msgid "Stored file could not be verified. Upload failed." +msgstr "" + +#: ../../include/attach.php:526 ../../include/attach.php:543 +msgid "Path not available." +msgstr "" + +#: ../../include/attach.php:589 +msgid "Empty pathname" +msgstr "" + +#: ../../include/attach.php:605 +msgid "duplicate filename or path" +msgstr "" + +#: ../../include/attach.php:629 +msgid "Path not found." +msgstr "" + +#: ../../include/attach.php:680 +msgid "mkdir failed." +msgstr "" + +#: ../../include/attach.php:684 +msgid "database storage failed." +msgstr "" + #: ../../include/page_widgets.php:6 msgid "New Page" msgstr "" #: ../../include/page_widgets.php:39 ../../mod/blocks.php:102 -#: ../../mod/webpages.php:136 ../../mod/layouts.php:125 +#: ../../mod/layouts.php:125 ../../mod/webpages.php:134 msgid "View" msgstr "" -#: ../../include/page_widgets.php:40 ../../include/conversation.php:1110 -#: ../../include/ItemObject.php:606 ../../mod/webpages.php:137 -#: ../../mod/photos.php:1015 ../../mod/editblock.php:141 -#: ../../mod/editlayout.php:135 ../../mod/editpost.php:140 -#: ../../mod/editwebpage.php:174 +#: ../../include/page_widgets.php:40 ../../include/conversation.php:1114 +#: ../../include/ItemObject.php:608 ../../mod/photos.php:1015 +#: ../../mod/editblock.php:141 ../../mod/editlayout.php:135 +#: ../../mod/editpost.php:140 ../../mod/editwebpage.php:174 +#: ../../mod/webpages.php:135 msgid "Preview" msgstr "" -#: ../../include/page_widgets.php:41 ../../mod/webpages.php:138 +#: ../../include/page_widgets.php:41 ../../mod/webpages.php:136 msgid "Actions" msgstr "" -#: ../../include/page_widgets.php:42 ../../mod/webpages.php:139 +#: ../../include/page_widgets.php:42 ../../mod/webpages.php:137 msgid "Page Link" msgstr "" -#: ../../include/page_widgets.php:43 ../../mod/webpages.php:140 +#: ../../include/page_widgets.php:43 ../../mod/webpages.php:138 msgid "Title" msgstr "" -#: ../../include/page_widgets.php:44 ../../mod/webpages.php:141 +#: ../../include/page_widgets.php:44 ../../mod/webpages.php:139 msgid "Created" msgstr "" -#: ../../include/page_widgets.php:45 ../../mod/webpages.php:142 +#: ../../include/page_widgets.php:45 ../../mod/webpages.php:140 msgid "Edited" msgstr "" @@ -373,7 +430,7 @@ msgstr "" msgid "Categories" msgstr "" -#: ../../include/widgets.php:86 ../../include/nav.php:172 +#: ../../include/widgets.php:86 ../../include/nav.php:171 #: ../../mod/apps.php:33 msgid "Apps" msgstr "" @@ -382,7 +439,7 @@ msgstr "" msgid "System" msgstr "" -#: ../../include/widgets.php:89 ../../include/conversation.php:1445 +#: ../../include/widgets.php:89 ../../include/conversation.php:1449 msgid "Personal" msgstr "" @@ -395,7 +452,7 @@ msgid "Edit Personal App" msgstr "" #: ../../include/widgets.php:135 ../../include/widgets.php:175 -#: ../../include/conversation.php:944 ../../include/identity.php:831 +#: ../../include/conversation.php:948 ../../include/identity.php:832 #: ../../include/Contact.php:107 ../../mod/directory.php:183 #: ../../mod/dirprofile.php:164 ../../mod/suggest.php:51 #: ../../mod/match.php:62 @@ -479,8 +536,8 @@ msgstr "" msgid "Best Friends" msgstr "" -#: ../../include/widgets.php:407 ../../include/identity.php:380 -#: ../../include/identity.php:381 ../../include/identity.php:388 +#: ../../include/widgets.php:407 ../../include/identity.php:381 +#: ../../include/identity.php:382 ../../include/identity.php:389 #: ../../include/profile_selectors.php:80 ../../mod/connedit.php:495 msgid "Friends" msgstr "" @@ -555,7 +612,7 @@ msgstr "" msgid "Check Mail" msgstr "" -#: ../../include/widgets.php:545 ../../include/nav.php:210 +#: ../../include/widgets.php:545 ../../include/nav.php:209 msgid "New Message" msgstr "" @@ -571,15 +628,15 @@ msgstr "" msgid "Suggested Chatrooms" msgstr "" -#: ../../include/zot.php:654 +#: ../../include/zot.php:655 msgid "Invalid data packet" msgstr "" -#: ../../include/zot.php:670 +#: ../../include/zot.php:671 msgid "Unable to verify channel signature" msgstr "" -#: ../../include/zot.php:1741 +#: ../../include/zot.php:1757 #, php-format msgid "Unable to verify site signature for %s" msgstr "" @@ -601,7 +658,7 @@ msgstr "" msgid "Photo storage failed." msgstr "" -#: ../../include/photos.php:340 ../../include/conversation.php:1536 +#: ../../include/photos.php:340 ../../include/conversation.php:1540 msgid "Photo Albums" msgstr "" @@ -621,13 +678,13 @@ msgstr "" msgid "Don't show" msgstr "" -#: ../../include/acl_selectors.php:248 ../../mod/chat.php:209 -#: ../../mod/photos.php:604 ../../mod/photos.php:970 -#: ../../mod/filestorage.php:128 +#: ../../include/acl_selectors.php:248 ../../mod/photos.php:604 +#: ../../mod/photos.php:970 ../../mod/chat.php:209 ../../mod/events.php:585 +#: ../../mod/filestorage.php:137 msgid "Permissions" msgstr "" -#: ../../include/acl_selectors.php:249 ../../include/ItemObject.php:303 +#: ../../include/acl_selectors.php:249 ../../include/ItemObject.php:305 msgid "Close" msgstr "" @@ -654,68 +711,10 @@ msgstr "" msgid "%1$s has an updated %2$s, changing %3$s." msgstr "" -#: ../../include/api.php:1069 +#: ../../include/api.php:1072 msgid "Public Timeline" msgstr "" -#: ../../include/attach.php:224 ../../include/attach.php:278 -msgid "Item was not found." -msgstr "" - -#: ../../include/attach.php:335 -msgid "No source file." -msgstr "" - -#: ../../include/attach.php:352 -msgid "Cannot locate file to replace" -msgstr "" - -#: ../../include/attach.php:370 -msgid "Cannot locate file to revise/update" -msgstr "" - -#: ../../include/attach.php:381 -#, php-format -msgid "File exceeds size limit of %d" -msgstr "" - -#: ../../include/attach.php:393 -#, php-format -msgid "You have reached your limit of %1$.0f Mbytes attachment storage." -msgstr "" - -#: ../../include/attach.php:475 -msgid "File upload failed. Possible system limit or action terminated." -msgstr "" - -#: ../../include/attach.php:487 -msgid "Stored file could not be verified. Upload failed." -msgstr "" - -#: ../../include/attach.php:528 ../../include/attach.php:545 -msgid "Path not available." -msgstr "" - -#: ../../include/attach.php:590 -msgid "Empty pathname" -msgstr "" - -#: ../../include/attach.php:606 -msgid "duplicate filename or path" -msgstr "" - -#: ../../include/attach.php:630 -msgid "Path not found." -msgstr "" - -#: ../../include/attach.php:681 -msgid "mkdir failed." -msgstr "" - -#: ../../include/attach.php:685 -msgid "database storage failed." -msgstr "" - #: ../../include/conversation.php:120 ../../include/text.php:1743 #: ../../include/diaspora.php:1924 ../../mod/subthread.php:72 #: ../../mod/subthread.php:174 ../../mod/tagger.php:45 ../../mod/like.php:294 @@ -783,392 +782,396 @@ msgid "Private Message" msgstr "" #: ../../include/conversation.php:652 ../../include/ItemObject.php:194 -msgid "Message is verified" +msgid "Message signature validated" msgstr "" -#: ../../include/conversation.php:671 +#: ../../include/conversation.php:653 ../../include/ItemObject.php:195 +msgid "Message signature incorrect" +msgstr "" + +#: ../../include/conversation.php:674 #, php-format msgid "View %s's profile @ %s" msgstr "" -#: ../../include/conversation.php:685 +#: ../../include/conversation.php:689 msgid "Categories:" msgstr "" -#: ../../include/conversation.php:686 +#: ../../include/conversation.php:690 msgid "Filed under:" msgstr "" -#: ../../include/conversation.php:694 ../../include/ItemObject.php:264 +#: ../../include/conversation.php:698 ../../include/ItemObject.php:265 #, php-format msgid " from %s" msgstr "" -#: ../../include/conversation.php:697 ../../include/ItemObject.php:267 +#: ../../include/conversation.php:701 ../../include/ItemObject.php:268 #, php-format msgid "last edited: %s" msgstr "" -#: ../../include/conversation.php:698 ../../include/ItemObject.php:268 +#: ../../include/conversation.php:702 ../../include/ItemObject.php:269 #, php-format msgid "Expires: %s" msgstr "" -#: ../../include/conversation.php:713 +#: ../../include/conversation.php:717 msgid "View in context" msgstr "" -#: ../../include/conversation.php:715 ../../include/conversation.php:1149 -#: ../../include/ItemObject.php:308 ../../mod/photos.php:995 +#: ../../include/conversation.php:719 ../../include/conversation.php:1153 +#: ../../include/ItemObject.php:310 ../../mod/photos.php:995 #: ../../mod/editblock.php:120 ../../mod/editlayout.php:115 #: ../../mod/editpost.php:121 ../../mod/editwebpage.php:152 #: ../../mod/mail.php:234 ../../mod/mail.php:349 msgid "Please wait" msgstr "" -#: ../../include/conversation.php:839 +#: ../../include/conversation.php:843 msgid "remove" msgstr "" -#: ../../include/conversation.php:843 ../../include/nav.php:258 +#: ../../include/conversation.php:847 ../../include/nav.php:257 msgid "Loading..." msgstr "" -#: ../../include/conversation.php:844 +#: ../../include/conversation.php:848 msgid "Delete Selected Items" msgstr "" -#: ../../include/conversation.php:938 +#: ../../include/conversation.php:942 msgid "View Source" msgstr "" -#: ../../include/conversation.php:939 +#: ../../include/conversation.php:943 msgid "Follow Thread" msgstr "" -#: ../../include/conversation.php:940 +#: ../../include/conversation.php:944 msgid "View Status" msgstr "" -#: ../../include/conversation.php:941 ../../include/nav.php:98 +#: ../../include/conversation.php:945 ../../include/nav.php:99 #: ../../mod/connedit.php:415 ../../mod/connedit.php:529 msgid "View Profile" msgstr "" -#: ../../include/conversation.php:942 +#: ../../include/conversation.php:946 msgid "View Photos" msgstr "" -#: ../../include/conversation.php:943 +#: ../../include/conversation.php:947 msgid "Matrix Activity" msgstr "" -#: ../../include/conversation.php:945 +#: ../../include/conversation.php:949 msgid "Edit Contact" msgstr "" -#: ../../include/conversation.php:946 +#: ../../include/conversation.php:950 msgid "Send PM" msgstr "" -#: ../../include/conversation.php:1020 +#: ../../include/conversation.php:1024 #, php-format msgid "%s likes this." msgstr "" -#: ../../include/conversation.php:1020 +#: ../../include/conversation.php:1024 #, php-format msgid "%s doesn't like this." msgstr "" -#: ../../include/conversation.php:1024 +#: ../../include/conversation.php:1028 #, php-format msgid "%2$d people like this." msgid_plural "%2$d people like this." msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1026 +#: ../../include/conversation.php:1030 #, 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:1032 +#: ../../include/conversation.php:1036 msgid "and" msgstr "" -#: ../../include/conversation.php:1035 +#: ../../include/conversation.php:1039 #, php-format msgid ", and %d other people" msgid_plural ", and %d other people" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1036 +#: ../../include/conversation.php:1040 #, php-format msgid "%s like this." msgstr "" -#: ../../include/conversation.php:1036 +#: ../../include/conversation.php:1040 #, php-format msgid "%s don't like this." msgstr "" -#: ../../include/conversation.php:1093 +#: ../../include/conversation.php:1097 msgid "Visible to everybody" msgstr "" -#: ../../include/conversation.php:1094 ../../mod/mail.php:170 +#: ../../include/conversation.php:1098 ../../mod/mail.php:170 #: ../../mod/mail.php:282 msgid "Please enter a link URL:" msgstr "" -#: ../../include/conversation.php:1095 +#: ../../include/conversation.php:1099 msgid "Please enter a video link/URL:" msgstr "" -#: ../../include/conversation.php:1096 +#: ../../include/conversation.php:1100 msgid "Please enter an audio link/URL:" msgstr "" -#: ../../include/conversation.php:1097 +#: ../../include/conversation.php:1101 msgid "Tag term:" msgstr "" -#: ../../include/conversation.php:1098 ../../mod/filer.php:49 +#: ../../include/conversation.php:1102 ../../mod/filer.php:49 msgid "Save to Folder:" msgstr "" -#: ../../include/conversation.php:1099 +#: ../../include/conversation.php:1103 msgid "Where are you right now?" msgstr "" -#: ../../include/conversation.php:1100 ../../mod/editpost.php:52 +#: ../../include/conversation.php:1104 ../../mod/editpost.php:52 #: ../../mod/mail.php:171 ../../mod/mail.php:283 msgid "Expires YYYY-MM-DD HH:MM" msgstr "" -#: ../../include/conversation.php:1124 ../../mod/photos.php:994 +#: ../../include/conversation.php:1128 ../../mod/photos.php:994 #: ../../mod/editblock.php:168 ../../mod/editlayout.php:161 #: ../../mod/editwebpage.php:201 ../../mod/layouts.php:122 msgid "Share" msgstr "" -#: ../../include/conversation.php:1126 ../../mod/editwebpage.php:139 +#: ../../include/conversation.php:1130 ../../mod/editwebpage.php:139 msgid "Page link title" msgstr "" -#: ../../include/conversation.php:1129 +#: ../../include/conversation.php:1133 msgid "Post as" msgstr "" -#: ../../include/conversation.php:1130 ../../mod/editblock.php:112 +#: ../../include/conversation.php:1134 ../../mod/editblock.php:112 #: ../../mod/editlayout.php:107 ../../mod/editpost.php:113 #: ../../mod/editwebpage.php:144 ../../mod/mail.php:231 ../../mod/mail.php:345 msgid "Upload photo" msgstr "" -#: ../../include/conversation.php:1131 +#: ../../include/conversation.php:1135 msgid "upload photo" msgstr "" -#: ../../include/conversation.php:1132 ../../mod/editblock.php:113 +#: ../../include/conversation.php:1136 ../../mod/editblock.php:113 #: ../../mod/editlayout.php:108 ../../mod/editpost.php:114 #: ../../mod/editwebpage.php:145 ../../mod/mail.php:232 ../../mod/mail.php:346 msgid "Attach file" msgstr "" -#: ../../include/conversation.php:1133 +#: ../../include/conversation.php:1137 msgid "attach file" msgstr "" -#: ../../include/conversation.php:1134 ../../mod/editblock.php:114 +#: ../../include/conversation.php:1138 ../../mod/editblock.php:114 #: ../../mod/editlayout.php:109 ../../mod/editpost.php:115 #: ../../mod/editwebpage.php:146 ../../mod/mail.php:233 ../../mod/mail.php:347 msgid "Insert web link" msgstr "" -#: ../../include/conversation.php:1135 +#: ../../include/conversation.php:1139 msgid "web link" msgstr "" -#: ../../include/conversation.php:1136 +#: ../../include/conversation.php:1140 msgid "Insert video link" msgstr "" -#: ../../include/conversation.php:1137 +#: ../../include/conversation.php:1141 msgid "video link" msgstr "" -#: ../../include/conversation.php:1138 +#: ../../include/conversation.php:1142 msgid "Insert audio link" msgstr "" -#: ../../include/conversation.php:1139 +#: ../../include/conversation.php:1143 msgid "audio link" msgstr "" -#: ../../include/conversation.php:1140 ../../mod/editblock.php:118 +#: ../../include/conversation.php:1144 ../../mod/editblock.php:118 #: ../../mod/editlayout.php:113 ../../mod/editpost.php:119 #: ../../mod/editwebpage.php:150 msgid "Set your location" msgstr "" -#: ../../include/conversation.php:1141 +#: ../../include/conversation.php:1145 msgid "set location" msgstr "" -#: ../../include/conversation.php:1142 ../../mod/editblock.php:119 +#: ../../include/conversation.php:1146 ../../mod/editblock.php:119 #: ../../mod/editlayout.php:114 ../../mod/editpost.php:120 #: ../../mod/editwebpage.php:151 msgid "Clear browser location" msgstr "" -#: ../../include/conversation.php:1143 +#: ../../include/conversation.php:1147 msgid "clear location" msgstr "" -#: ../../include/conversation.php:1145 ../../mod/editblock.php:132 +#: ../../include/conversation.php:1149 ../../mod/editblock.php:132 #: ../../mod/editlayout.php:126 ../../mod/editpost.php:132 #: ../../mod/editwebpage.php:167 msgid "Set title" msgstr "" -#: ../../include/conversation.php:1148 ../../mod/editblock.php:135 +#: ../../include/conversation.php:1152 ../../mod/editblock.php:135 #: ../../mod/editlayout.php:129 ../../mod/editpost.php:134 #: ../../mod/editwebpage.php:169 ../../mod/events.php:560 msgid "Categories (comma-separated list)" msgstr "" -#: ../../include/conversation.php:1150 ../../mod/editblock.php:121 +#: ../../include/conversation.php:1154 ../../mod/editblock.php:121 #: ../../mod/editlayout.php:116 ../../mod/editpost.php:122 #: ../../mod/editwebpage.php:153 msgid "Permission settings" msgstr "" -#: ../../include/conversation.php:1151 +#: ../../include/conversation.php:1155 msgid "permissions" msgstr "" -#: ../../include/conversation.php:1158 ../../mod/editblock.php:129 +#: ../../include/conversation.php:1162 ../../mod/editblock.php:129 #: ../../mod/editlayout.php:123 ../../mod/editpost.php:129 #: ../../mod/editwebpage.php:162 msgid "Public post" msgstr "" -#: ../../include/conversation.php:1160 ../../mod/editblock.php:136 +#: ../../include/conversation.php:1164 ../../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:1173 ../../mod/editblock.php:146 +#: ../../include/conversation.php:1177 ../../mod/editblock.php:146 #: ../../mod/editlayout.php:140 ../../mod/editpost.php:146 #: ../../mod/editwebpage.php:179 ../../mod/mail.php:238 ../../mod/mail.php:352 msgid "Set expiration date" msgstr "" -#: ../../include/conversation.php:1175 ../../include/ItemObject.php:609 +#: ../../include/conversation.php:1179 ../../include/ItemObject.php:611 #: ../../mod/editpost.php:148 ../../mod/mail.php:240 ../../mod/mail.php:354 msgid "Encrypt text" msgstr "" -#: ../../include/conversation.php:1177 ../../mod/editpost.php:150 +#: ../../include/conversation.php:1181 ../../mod/editpost.php:150 #: ../../mod/events.php:567 msgid "OK" msgstr "" -#: ../../include/conversation.php:1178 ../../mod/settings.php:520 +#: ../../include/conversation.php:1182 ../../mod/settings.php:520 #: ../../mod/settings.php:546 ../../mod/editpost.php:151 #: ../../mod/fbrowser.php:82 ../../mod/fbrowser.php:117 #: ../../mod/events.php:566 ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 msgid "Cancel" msgstr "" -#: ../../include/conversation.php:1422 +#: ../../include/conversation.php:1426 msgid "Discover" msgstr "" -#: ../../include/conversation.php:1425 +#: ../../include/conversation.php:1429 msgid "Imported public streams" msgstr "" -#: ../../include/conversation.php:1430 +#: ../../include/conversation.php:1434 msgid "Commented Order" msgstr "" -#: ../../include/conversation.php:1433 +#: ../../include/conversation.php:1437 msgid "Sort by Comment Date" msgstr "" -#: ../../include/conversation.php:1437 +#: ../../include/conversation.php:1441 msgid "Posted Order" msgstr "" -#: ../../include/conversation.php:1440 +#: ../../include/conversation.php:1444 msgid "Sort by Post Date" msgstr "" -#: ../../include/conversation.php:1448 +#: ../../include/conversation.php:1452 msgid "Posts that mention or involve you" msgstr "" -#: ../../include/conversation.php:1454 ../../mod/connections.php:211 +#: ../../include/conversation.php:1458 ../../mod/connections.php:211 #: ../../mod/connections.php:224 ../../mod/menu.php:61 msgid "New" msgstr "" -#: ../../include/conversation.php:1457 +#: ../../include/conversation.php:1461 msgid "Activity Stream - by date" msgstr "" -#: ../../include/conversation.php:1463 +#: ../../include/conversation.php:1467 msgid "Starred" msgstr "" -#: ../../include/conversation.php:1466 +#: ../../include/conversation.php:1470 msgid "Favourite Posts" msgstr "" -#: ../../include/conversation.php:1473 +#: ../../include/conversation.php:1477 msgid "Spam" msgstr "" -#: ../../include/conversation.php:1476 +#: ../../include/conversation.php:1480 msgid "Posts flagged as SPAM" msgstr "" -#: ../../include/conversation.php:1512 ../../mod/admin.php:867 +#: ../../include/conversation.php:1516 ../../mod/admin.php:867 msgid "Channel" msgstr "" -#: ../../include/conversation.php:1515 +#: ../../include/conversation.php:1519 msgid "Status Messages and Posts" msgstr "" -#: ../../include/conversation.php:1524 +#: ../../include/conversation.php:1528 msgid "About" msgstr "" -#: ../../include/conversation.php:1527 +#: ../../include/conversation.php:1531 msgid "Profile Details" msgstr "" -#: ../../include/conversation.php:1545 +#: ../../include/conversation.php:1549 msgid "Files and Storage" msgstr "" -#: ../../include/conversation.php:1554 ../../include/conversation.php:1557 +#: ../../include/conversation.php:1558 ../../include/conversation.php:1561 msgid "Chatrooms" msgstr "" -#: ../../include/conversation.php:1569 +#: ../../include/conversation.php:1573 msgid "Saved Bookmarks" msgstr "" -#: ../../include/conversation.php:1580 +#: ../../include/conversation.php:1584 msgid "Manage Webpages" msgstr "" @@ -1520,7 +1523,7 @@ msgstr "" msgid "wants" msgstr "" -#: ../../include/taxonomy.php:254 ../../include/ItemObject.php:220 +#: ../../include/taxonomy.php:254 ../../include/ItemObject.php:221 msgid "like" msgstr "" @@ -1528,7 +1531,7 @@ msgstr "" msgid "likes" msgstr "" -#: ../../include/taxonomy.php:255 ../../include/ItemObject.php:221 +#: ../../include/taxonomy.php:255 ../../include/ItemObject.php:222 msgid "dislike" msgstr "" @@ -1536,7 +1539,7 @@ msgstr "" msgid "dislikes" msgstr "" -#: ../../include/taxonomy.php:338 ../../include/identity.php:1137 +#: ../../include/taxonomy.php:338 ../../include/identity.php:1138 #: ../../include/ItemObject.php:146 msgctxt "noun" msgid "Like" @@ -1548,351 +1551,166 @@ msgstr[1] "" msgid "Default" msgstr "" -#: ../../include/nav.php:94 ../../include/nav.php:126 ../../boot.php:1494 -msgid "Logout" +#: ../../include/contact_selectors.php:56 +msgid "Frequently" msgstr "" -#: ../../include/nav.php:94 ../../include/nav.php:126 -msgid "End this session" +#: ../../include/contact_selectors.php:57 +msgid "Hourly" msgstr "" -#: ../../include/nav.php:97 ../../include/nav.php:160 -msgid "Home" +#: ../../include/contact_selectors.php:58 +msgid "Twice daily" msgstr "" -#: ../../include/nav.php:97 -msgid "Your posts and conversations" +#: ../../include/contact_selectors.php:59 +msgid "Daily" msgstr "" -#: ../../include/nav.php:98 -msgid "Your profile page" +#: ../../include/contact_selectors.php:60 +msgid "Weekly" msgstr "" -#: ../../include/nav.php:100 -msgid "Edit Profiles" +#: ../../include/contact_selectors.php:61 +msgid "Monthly" msgstr "" -#: ../../include/nav.php:100 -msgid "Manage/Edit profiles" +#: ../../include/contact_selectors.php:76 +msgid "Friendica" msgstr "" -#: ../../include/nav.php:102 ../../include/identity.php:855 -msgid "Edit Profile" +#: ../../include/contact_selectors.php:77 +msgid "OStatus" msgstr "" -#: ../../include/nav.php:102 -msgid "Edit your profile" +#: ../../include/contact_selectors.php:78 +msgid "RSS/Atom" msgstr "" -#: ../../include/nav.php:104 -msgid "Your photos" +#: ../../include/contact_selectors.php:79 ../../mod/admin.php:728 +#: ../../mod/admin.php:737 ../../boot.php:1498 +msgid "Email" msgstr "" -#: ../../include/nav.php:105 -msgid "Your files" +#: ../../include/contact_selectors.php:80 +msgid "Diaspora" msgstr "" -#: ../../include/nav.php:110 -msgid "Your chatrooms" +#: ../../include/contact_selectors.php:81 +msgid "Facebook" msgstr "" -#: ../../include/nav.php:116 -msgid "Your bookmarks" +#: ../../include/contact_selectors.php:82 +msgid "Zot!" msgstr "" -#: ../../include/nav.php:120 -msgid "Your webpages" +#: ../../include/contact_selectors.php:83 +msgid "LinkedIn" msgstr "" -#: ../../include/nav.php:124 -msgid "Sign in" +#: ../../include/contact_selectors.php:84 +msgid "XMPP/IM" msgstr "" -#: ../../include/nav.php:141 -#, php-format -msgid "%s - click to logout" +#: ../../include/contact_selectors.php:85 +msgid "MySpace" msgstr "" -#: ../../include/nav.php:146 -msgid "Click to authenticate to your home hub" -msgstr "" +#: ../../include/contact_widgets.php:14 +#, php-format +msgid "%d invitation available" +msgid_plural "%d invitations available" +msgstr[0] "" +msgstr[1] "" -#: ../../include/nav.php:160 -msgid "Home Page" +#: ../../include/contact_widgets.php:19 ../../mod/admin.php:418 +msgid "Advanced" msgstr "" -#: ../../include/nav.php:164 ../../mod/register.php:220 ../../boot.php:1471 -msgid "Register" +#: ../../include/contact_widgets.php:22 +msgid "Find Channels" msgstr "" -#: ../../include/nav.php:164 -msgid "Create an account" +#: ../../include/contact_widgets.php:23 +msgid "Enter name or interest" msgstr "" -#: ../../include/nav.php:169 -msgid "Help and documentation" +#: ../../include/contact_widgets.php:24 +msgid "Connect/Follow" msgstr "" -#: ../../include/nav.php:172 -msgid "Applications, utilities, links, games" +#: ../../include/contact_widgets.php:25 +msgid "Examples: Robert Morgenstein, Fishing" msgstr "" -#: ../../include/nav.php:174 -msgid "Search site content" +#: ../../include/contact_widgets.php:26 ../../mod/connections.php:412 +#: ../../mod/directory.php:222 ../../mod/directory.php:227 +msgid "Find" msgstr "" -#: ../../include/nav.php:177 -msgid "Channel Locator" +#: ../../include/contact_widgets.php:27 ../../mod/suggest.php:59 +msgid "Channel Suggestions" msgstr "" -#: ../../include/nav.php:191 -msgid "Your matrix" +#: ../../include/contact_widgets.php:29 +msgid "Random Profile" msgstr "" -#: ../../include/nav.php:192 -msgid "Mark all matrix notifications seen" +#: ../../include/contact_widgets.php:30 +msgid "Invite Friends" msgstr "" -#: ../../include/nav.php:194 -msgid "Channel home" +#: ../../include/contact_widgets.php:32 +msgid "Exammple: name=fred and country=iceland" msgstr "" -#: ../../include/nav.php:195 -msgid "Mark all channel notifications seen" +#: ../../include/contact_widgets.php:33 +msgid "Advanced Find" msgstr "" -#: ../../include/nav.php:198 ../../mod/connections.php:406 -msgid "Connections" +#: ../../include/contact_widgets.php:126 +#, php-format +msgid "%d connection in common" +msgid_plural "%d connections in common" +msgstr[0] "" +msgstr[1] "" + +#: ../../include/contact_widgets.php:131 +msgid "show more" msgstr "" -#: ../../include/nav.php:201 -msgid "Notices" +#: ../../include/event.php:11 ../../include/bb2diaspora.php:439 +msgid "l F d, Y \\@ g:i A" msgstr "" -#: ../../include/nav.php:201 -msgid "Notifications" +#: ../../include/event.php:20 ../../include/bb2diaspora.php:445 +msgid "Starts:" msgstr "" -#: ../../include/nav.php:202 -msgid "See all notifications" +#: ../../include/event.php:30 ../../include/bb2diaspora.php:453 +msgid "Finishes:" msgstr "" -#: ../../include/nav.php:203 ../../mod/notifications.php:99 -msgid "Mark all system notifications seen" +#: ../../include/event.php:40 ../../include/bb2diaspora.php:461 +#: ../../include/identity.php:883 ../../mod/directory.php:156 +#: ../../mod/dirprofile.php:105 ../../mod/events.php:579 +msgid "Location:" msgstr "" -#: ../../include/nav.php:205 -msgid "Private mail" +#: ../../include/event.php:326 +msgid "This event has been added to your calendar." msgstr "" -#: ../../include/nav.php:206 -msgid "See all private messages" +#: ../../include/account.php:23 +msgid "Not a valid email address" msgstr "" -#: ../../include/nav.php:207 -msgid "Mark all private messages seen" +#: ../../include/account.php:25 +msgid "Your email domain is not among those allowed on this site" msgstr "" -#: ../../include/nav.php:208 -msgid "Inbox" -msgstr "" - -#: ../../include/nav.php:209 -msgid "Outbox" -msgstr "" - -#: ../../include/nav.php:213 -msgid "Event Calendar" -msgstr "" - -#: ../../include/nav.php:214 -msgid "See all events" -msgstr "" - -#: ../../include/nav.php:215 -msgid "Mark all events seen" -msgstr "" - -#: ../../include/nav.php:217 -msgid "Manage Your Channels" -msgstr "" - -#: ../../include/nav.php:219 -msgid "Account/Channel Settings" -msgstr "" - -#: ../../include/nav.php:227 ../../mod/admin.php:123 -msgid "Admin" -msgstr "" - -#: ../../include/nav.php:227 -msgid "Site Setup and Configuration" -msgstr "" - -#: ../../include/nav.php:263 -msgid "Please wait..." -msgstr "" - -#: ../../include/contact_selectors.php:56 -msgid "Frequently" -msgstr "" - -#: ../../include/contact_selectors.php:57 -msgid "Hourly" -msgstr "" - -#: ../../include/contact_selectors.php:58 -msgid "Twice daily" -msgstr "" - -#: ../../include/contact_selectors.php:59 -msgid "Daily" -msgstr "" - -#: ../../include/contact_selectors.php:60 -msgid "Weekly" -msgstr "" - -#: ../../include/contact_selectors.php:61 -msgid "Monthly" -msgstr "" - -#: ../../include/contact_selectors.php:76 -msgid "Friendica" -msgstr "" - -#: ../../include/contact_selectors.php:77 -msgid "OStatus" -msgstr "" - -#: ../../include/contact_selectors.php:78 -msgid "RSS/Atom" -msgstr "" - -#: ../../include/contact_selectors.php:79 ../../mod/admin.php:728 -#: ../../mod/admin.php:737 ../../boot.php:1497 -msgid "Email" -msgstr "" - -#: ../../include/contact_selectors.php:80 -msgid "Diaspora" -msgstr "" - -#: ../../include/contact_selectors.php:81 -msgid "Facebook" -msgstr "" - -#: ../../include/contact_selectors.php:82 -msgid "Zot!" -msgstr "" - -#: ../../include/contact_selectors.php:83 -msgid "LinkedIn" -msgstr "" - -#: ../../include/contact_selectors.php:84 -msgid "XMPP/IM" -msgstr "" - -#: ../../include/contact_selectors.php:85 -msgid "MySpace" -msgstr "" - -#: ../../include/contact_widgets.php:14 -#, php-format -msgid "%d invitation available" -msgid_plural "%d invitations available" -msgstr[0] "" -msgstr[1] "" - -#: ../../include/contact_widgets.php:19 ../../mod/admin.php:418 -msgid "Advanced" -msgstr "" - -#: ../../include/contact_widgets.php:22 -msgid "Find Channels" -msgstr "" - -#: ../../include/contact_widgets.php:23 -msgid "Enter name or interest" -msgstr "" - -#: ../../include/contact_widgets.php:24 -msgid "Connect/Follow" -msgstr "" - -#: ../../include/contact_widgets.php:25 -msgid "Examples: Robert Morgenstein, Fishing" -msgstr "" - -#: ../../include/contact_widgets.php:26 ../../mod/connections.php:412 -#: ../../mod/directory.php:222 ../../mod/directory.php:227 -msgid "Find" -msgstr "" - -#: ../../include/contact_widgets.php:27 ../../mod/suggest.php:59 -msgid "Channel Suggestions" -msgstr "" - -#: ../../include/contact_widgets.php:29 -msgid "Random Profile" -msgstr "" - -#: ../../include/contact_widgets.php:30 -msgid "Invite Friends" -msgstr "" - -#: ../../include/contact_widgets.php:32 -msgid "Exammple: name=fred and country=iceland" -msgstr "" - -#: ../../include/contact_widgets.php:33 -msgid "Advanced Find" -msgstr "" - -#: ../../include/contact_widgets.php:126 -#, php-format -msgid "%d connection in common" -msgid_plural "%d connections in common" -msgstr[0] "" -msgstr[1] "" - -#: ../../include/contact_widgets.php:131 -msgid "show more" -msgstr "" - -#: ../../include/event.php:11 ../../include/bb2diaspora.php:439 -msgid "l F d, Y \\@ g:i A" -msgstr "" - -#: ../../include/event.php:20 ../../include/bb2diaspora.php:445 -msgid "Starts:" -msgstr "" - -#: ../../include/event.php:30 ../../include/bb2diaspora.php:453 -msgid "Finishes:" -msgstr "" - -#: ../../include/event.php:40 ../../include/bb2diaspora.php:461 -#: ../../include/identity.php:882 ../../mod/directory.php:156 -#: ../../mod/dirprofile.php:105 ../../mod/events.php:579 -msgid "Location:" -msgstr "" - -#: ../../include/event.php:326 -msgid "This event has been added to your calendar." -msgstr "" - -#: ../../include/account.php:23 -msgid "Not a valid email address" -msgstr "" - -#: ../../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." +#: ../../include/account.php:31 +msgid "Your email address is already registered at this site." msgstr "" #: ../../include/account.php:64 @@ -2629,81 +2447,81 @@ msgstr "" msgid "$1 wrote:" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:103 -#: ../../include/RedDAV/RedBrowser.php:246 +#: ../../include/RedDAV/RedBrowser.php:106 +#: ../../include/RedDAV/RedBrowser.php:249 msgid "parent" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:127 +#: ../../include/RedDAV/RedBrowser.php:130 msgid "Collection" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:130 +#: ../../include/RedDAV/RedBrowser.php:133 msgid "Principal" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:133 +#: ../../include/RedDAV/RedBrowser.php:136 msgid "Addressbook" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:136 +#: ../../include/RedDAV/RedBrowser.php:139 msgid "Calendar" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:139 +#: ../../include/RedDAV/RedBrowser.php:142 msgid "Schedule Inbox" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:142 +#: ../../include/RedDAV/RedBrowser.php:145 msgid "Schedule Outbox" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:220 +#: ../../include/RedDAV/RedBrowser.php:223 #, php-format msgid "%1$s used" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:225 +#: ../../include/RedDAV/RedBrowser.php:228 #, php-format msgid "%1$s used of %2$s (%3$s%)" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:242 ../../mod/settings.php:521 +#: ../../include/RedDAV/RedBrowser.php:245 ../../mod/settings.php:521 #: ../../mod/settings.php:547 ../../mod/admin.php:868 msgid "Name" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:243 +#: ../../include/RedDAV/RedBrowser.php:246 msgid "Type" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:244 +#: ../../include/RedDAV/RedBrowser.php:247 msgid "Size" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:245 +#: ../../include/RedDAV/RedBrowser.php:248 msgid "Last Modified" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:249 +#: ../../include/RedDAV/RedBrowser.php:252 msgid "Total" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:293 +#: ../../include/RedDAV/RedBrowser.php:304 msgid "Create new folder" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:294 ../../mod/mitem.php:142 +#: ../../include/RedDAV/RedBrowser.php:305 ../../mod/mitem.php:142 #: ../../mod/menu.php:84 ../../mod/new_channel.php:122 msgid "Create" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:295 +#: ../../include/RedDAV/RedBrowser.php:306 msgid "Upload file" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:296 ../../mod/photos.php:745 -#: ../../mod/photos.php:1225 ../../mod/profile_photo.php:361 +#: ../../include/RedDAV/RedBrowser.php:307 ../../mod/photos.php:745 +#: ../../mod/photos.php:1226 ../../mod/profile_photo.php:361 msgid "Upload" msgstr "" @@ -2731,7 +2549,7 @@ msgstr "" msgid "Reserved nickname. Please choose another." msgstr "" -#: ../../include/identity.php:200 +#: ../../include/identity.php:200 ../../include/dimport.php:34 msgid "" "Nickname has unsupported characters or is already being used on this site." msgstr "" @@ -2740,205 +2558,209 @@ msgstr "" msgid "Unable to retrieve created identity" msgstr "" -#: ../../include/identity.php:341 +#: ../../include/identity.php:342 msgid "Default Profile" msgstr "" -#: ../../include/identity.php:634 +#: ../../include/identity.php:635 msgid "Requested channel is not available." msgstr "" -#: ../../include/identity.php:682 ../../mod/achievements.php:11 -#: ../../mod/profile.php:16 ../../mod/blocks.php:10 ../../mod/webpages.php:8 -#: ../../mod/connect.php:13 ../../mod/filestorage.php:40 -#: ../../mod/layouts.php:8 ../../mod/hcard.php:8 +#: ../../include/identity.php:683 ../../mod/achievements.php:11 +#: ../../mod/profile.php:16 ../../mod/blocks.php:10 ../../mod/connect.php:13 +#: ../../mod/filestorage.php:48 ../../mod/layouts.php:8 +#: ../../mod/webpages.php:8 ../../mod/hcard.php:8 msgid "Requested profile is not available." msgstr "" -#: ../../include/identity.php:845 ../../mod/profiles.php:750 +#: ../../include/identity.php:846 ../../mod/profiles.php:750 msgid "Change profile photo" msgstr "" -#: ../../include/identity.php:851 +#: ../../include/identity.php:852 msgid "Profiles" msgstr "" -#: ../../include/identity.php:851 +#: ../../include/identity.php:852 msgid "Manage/edit profiles" msgstr "" -#: ../../include/identity.php:852 ../../mod/profiles.php:751 +#: ../../include/identity.php:853 ../../mod/profiles.php:751 msgid "Create New Profile" msgstr "" -#: ../../include/identity.php:866 ../../mod/profiles.php:762 +#: ../../include/identity.php:856 ../../include/nav.php:103 +msgid "Edit Profile" +msgstr "" + +#: ../../include/identity.php:867 ../../mod/profiles.php:762 msgid "Profile Image" msgstr "" -#: ../../include/identity.php:869 +#: ../../include/identity.php:870 msgid "visible to everybody" msgstr "" -#: ../../include/identity.php:870 ../../mod/profiles.php:645 +#: ../../include/identity.php:871 ../../mod/profiles.php:645 #: ../../mod/profiles.php:766 msgid "Edit visibility" msgstr "" -#: ../../include/identity.php:884 ../../include/identity.php:1121 +#: ../../include/identity.php:885 ../../include/identity.php:1122 #: ../../mod/directory.php:158 msgid "Gender:" msgstr "" -#: ../../include/identity.php:885 ../../include/identity.php:1165 +#: ../../include/identity.php:886 ../../include/identity.php:1166 #: ../../mod/directory.php:160 msgid "Status:" msgstr "" -#: ../../include/identity.php:886 ../../include/identity.php:1176 +#: ../../include/identity.php:887 ../../include/identity.php:1177 #: ../../mod/directory.php:162 msgid "Homepage:" msgstr "" -#: ../../include/identity.php:887 ../../mod/dirprofile.php:151 +#: ../../include/identity.php:888 ../../mod/dirprofile.php:151 msgid "Online Now" msgstr "" -#: ../../include/identity.php:965 ../../include/identity.php:1045 +#: ../../include/identity.php:966 ../../include/identity.php:1046 #: ../../mod/ping.php:298 msgid "g A l F d" msgstr "" -#: ../../include/identity.php:966 ../../include/identity.php:1046 +#: ../../include/identity.php:967 ../../include/identity.php:1047 msgid "F d" msgstr "" -#: ../../include/identity.php:1011 ../../include/identity.php:1086 +#: ../../include/identity.php:1012 ../../include/identity.php:1087 #: ../../mod/ping.php:320 msgid "[today]" msgstr "" -#: ../../include/identity.php:1023 +#: ../../include/identity.php:1024 msgid "Birthday Reminders" msgstr "" -#: ../../include/identity.php:1024 +#: ../../include/identity.php:1025 msgid "Birthdays this week:" msgstr "" -#: ../../include/identity.php:1079 +#: ../../include/identity.php:1080 msgid "[No description]" msgstr "" -#: ../../include/identity.php:1097 +#: ../../include/identity.php:1098 msgid "Event Reminders" msgstr "" -#: ../../include/identity.php:1098 +#: ../../include/identity.php:1099 msgid "Events this week:" msgstr "" -#: ../../include/identity.php:1119 ../../mod/settings.php:953 +#: ../../include/identity.php:1120 ../../mod/settings.php:953 msgid "Full Name:" msgstr "" -#: ../../include/identity.php:1126 +#: ../../include/identity.php:1127 msgid "Like this channel" msgstr "" -#: ../../include/identity.php:1150 +#: ../../include/identity.php:1151 msgid "j F, Y" msgstr "" -#: ../../include/identity.php:1151 +#: ../../include/identity.php:1152 msgid "j F" msgstr "" -#: ../../include/identity.php:1158 +#: ../../include/identity.php:1159 msgid "Birthday:" msgstr "" -#: ../../include/identity.php:1162 +#: ../../include/identity.php:1163 msgid "Age:" msgstr "" -#: ../../include/identity.php:1171 +#: ../../include/identity.php:1172 #, php-format msgid "for %1$d %2$s" msgstr "" -#: ../../include/identity.php:1174 ../../mod/profiles.php:667 +#: ../../include/identity.php:1175 ../../mod/profiles.php:667 msgid "Sexual Preference:" msgstr "" -#: ../../include/identity.php:1178 ../../mod/profiles.php:669 +#: ../../include/identity.php:1179 ../../mod/profiles.php:669 msgid "Hometown:" msgstr "" -#: ../../include/identity.php:1180 +#: ../../include/identity.php:1181 msgid "Tags:" msgstr "" -#: ../../include/identity.php:1182 ../../mod/profiles.php:670 +#: ../../include/identity.php:1183 ../../mod/profiles.php:670 msgid "Political Views:" msgstr "" -#: ../../include/identity.php:1184 +#: ../../include/identity.php:1185 msgid "Religion:" msgstr "" -#: ../../include/identity.php:1186 ../../mod/directory.php:164 +#: ../../include/identity.php:1187 ../../mod/directory.php:164 msgid "About:" msgstr "" -#: ../../include/identity.php:1188 +#: ../../include/identity.php:1189 msgid "Hobbies/Interests:" msgstr "" -#: ../../include/identity.php:1190 ../../mod/profiles.php:673 +#: ../../include/identity.php:1191 ../../mod/profiles.php:673 msgid "Likes:" msgstr "" -#: ../../include/identity.php:1192 ../../mod/profiles.php:674 +#: ../../include/identity.php:1193 ../../mod/profiles.php:674 msgid "Dislikes:" msgstr "" -#: ../../include/identity.php:1195 +#: ../../include/identity.php:1196 msgid "Contact information and Social Networks:" msgstr "" -#: ../../include/identity.php:1197 +#: ../../include/identity.php:1198 msgid "My other channels:" msgstr "" -#: ../../include/identity.php:1199 +#: ../../include/identity.php:1200 msgid "Musical interests:" msgstr "" -#: ../../include/identity.php:1201 +#: ../../include/identity.php:1202 msgid "Books, literature:" msgstr "" -#: ../../include/identity.php:1203 +#: ../../include/identity.php:1204 msgid "Television:" msgstr "" -#: ../../include/identity.php:1205 +#: ../../include/identity.php:1206 msgid "Film/dance/culture/entertainment:" msgstr "" -#: ../../include/identity.php:1207 +#: ../../include/identity.php:1208 msgid "Love/Romance:" msgstr "" -#: ../../include/identity.php:1209 +#: ../../include/identity.php:1210 msgid "Work/employment:" msgstr "" -#: ../../include/identity.php:1211 +#: ../../include/identity.php:1212 msgid "School/education:" msgstr "" -#: ../../include/identity.php:1231 +#: ../../include/identity.php:1232 msgid "Like this thing" msgstr "" @@ -2989,97 +2811,97 @@ msgstr "" msgid "starred" msgstr "" -#: ../../include/ItemObject.php:202 +#: ../../include/ItemObject.php:203 msgid "Add Tag" msgstr "" -#: ../../include/ItemObject.php:220 ../../mod/photos.php:992 +#: ../../include/ItemObject.php:221 ../../mod/photos.php:992 msgid "I like this (toggle)" msgstr "" -#: ../../include/ItemObject.php:221 ../../mod/photos.php:993 +#: ../../include/ItemObject.php:222 ../../mod/photos.php:993 msgid "I don't like this (toggle)" msgstr "" -#: ../../include/ItemObject.php:225 +#: ../../include/ItemObject.php:226 msgid "Share This" msgstr "" -#: ../../include/ItemObject.php:225 +#: ../../include/ItemObject.php:226 msgid "share" msgstr "" -#: ../../include/ItemObject.php:248 ../../include/ItemObject.php:249 +#: ../../include/ItemObject.php:249 ../../include/ItemObject.php:250 #, php-format msgid "View %s's profile - %s" msgstr "" -#: ../../include/ItemObject.php:250 +#: ../../include/ItemObject.php:251 msgid "to" msgstr "" -#: ../../include/ItemObject.php:251 +#: ../../include/ItemObject.php:252 msgid "via" msgstr "" -#: ../../include/ItemObject.php:252 +#: ../../include/ItemObject.php:253 msgid "Wall-to-Wall" msgstr "" -#: ../../include/ItemObject.php:253 +#: ../../include/ItemObject.php:254 msgid "via Wall-To-Wall:" msgstr "" -#: ../../include/ItemObject.php:288 +#: ../../include/ItemObject.php:290 msgid "Save Bookmarks" msgstr "" -#: ../../include/ItemObject.php:289 +#: ../../include/ItemObject.php:291 msgid "Add to Calendar" msgstr "" -#: ../../include/ItemObject.php:297 +#: ../../include/ItemObject.php:299 msgctxt "noun" msgid "Likes" msgstr "" -#: ../../include/ItemObject.php:298 +#: ../../include/ItemObject.php:300 msgctxt "noun" msgid "Dislikes" msgstr "" -#: ../../include/ItemObject.php:329 +#: ../../include/ItemObject.php:331 #, php-format msgid "%d comment" msgid_plural "%d comments" msgstr[0] "" msgstr[1] "" -#: ../../include/ItemObject.php:330 ../../include/js_strings.php:7 +#: ../../include/ItemObject.php:332 ../../include/js_strings.php:7 msgid "[+] show all" msgstr "" -#: ../../include/ItemObject.php:594 ../../mod/photos.php:1011 +#: ../../include/ItemObject.php:596 ../../mod/photos.php:1011 #: ../../mod/photos.php:1098 msgid "This is you" msgstr "" -#: ../../include/ItemObject.php:596 ../../include/js_strings.php:6 +#: ../../include/ItemObject.php:598 ../../include/js_strings.php:6 #: ../../mod/photos.php:1013 ../../mod/photos.php:1100 msgid "Comment" msgstr "" -#: ../../include/ItemObject.php:597 ../../mod/mood.php:135 +#: ../../include/ItemObject.php:599 ../../mod/mood.php:135 #: ../../mod/settings.php:519 ../../mod/settings.php:631 #: ../../mod/settings.php:660 ../../mod/settings.php:684 #: ../../mod/settings.php:760 ../../mod/settings.php:945 -#: ../../mod/poke.php:166 ../../mod/profiles.php:643 ../../mod/chat.php:177 -#: ../../mod/chat.php:211 ../../mod/connect.php:92 ../../mod/connedit.php:540 -#: ../../mod/photos.php:563 ../../mod/photos.php:672 ../../mod/photos.php:974 -#: ../../mod/photos.php:1014 ../../mod/photos.php:1101 ../../mod/setup.php:307 +#: ../../mod/poke.php:166 ../../mod/profiles.php:643 ../../mod/photos.php:563 +#: ../../mod/photos.php:672 ../../mod/photos.php:974 ../../mod/photos.php:1014 +#: ../../mod/photos.php:1101 ../../mod/chat.php:177 ../../mod/chat.php:211 +#: ../../mod/connect.php:92 ../../mod/connedit.php:540 ../../mod/setup.php:307 #: ../../mod/setup.php:350 ../../mod/pdledit.php:58 ../../mod/sources.php:104 -#: ../../mod/sources.php:138 ../../mod/events.php:586 -#: ../../mod/filestorage.php:137 ../../mod/fsuggest.php:108 +#: ../../mod/sources.php:138 ../../mod/events.php:587 +#: ../../mod/filestorage.php:146 ../../mod/fsuggest.php:108 #: ../../mod/group.php:81 ../../mod/admin.php:414 ../../mod/admin.php:725 #: ../../mod/admin.php:861 ../../mod/admin.php:994 ../../mod/admin.php:1193 #: ../../mod/admin.php:1280 ../../mod/thing.php:284 ../../mod/thing.php:327 @@ -3088,39 +2910,39 @@ msgstr "" #: ../../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:101 +#: ../../view/theme/redbasic/php/config.php:99 msgid "Submit" msgstr "" -#: ../../include/ItemObject.php:598 +#: ../../include/ItemObject.php:600 msgid "Bold" msgstr "" -#: ../../include/ItemObject.php:599 +#: ../../include/ItemObject.php:601 msgid "Italic" msgstr "" -#: ../../include/ItemObject.php:600 +#: ../../include/ItemObject.php:602 msgid "Underline" msgstr "" -#: ../../include/ItemObject.php:601 +#: ../../include/ItemObject.php:603 msgid "Quote" msgstr "" -#: ../../include/ItemObject.php:602 +#: ../../include/ItemObject.php:604 msgid "Code" msgstr "" -#: ../../include/ItemObject.php:603 +#: ../../include/ItemObject.php:605 msgid "Image" msgstr "" -#: ../../include/ItemObject.php:604 +#: ../../include/ItemObject.php:606 msgid "Link" msgstr "" -#: ../../include/ItemObject.php:605 +#: ../../include/ItemObject.php:607 msgid "Video" msgstr "" @@ -3623,36 +3445,221 @@ msgstr "" msgid "Custom/Expert Mode" msgstr "" -#: ../../mod/mood.php:132 -msgid "Set your current mood and tell your friends" +#: ../../include/nav.php:95 ../../include/nav.php:128 ../../boot.php:1495 +msgid "Logout" msgstr "" -#: ../../mod/mitem.php:14 ../../mod/menu.php:92 -msgid "Menu not found." +#: ../../include/nav.php:95 ../../include/nav.php:128 +msgid "End this session" msgstr "" -#: ../../mod/mitem.php:47 -msgid "Menu element updated." +#: ../../include/nav.php:98 ../../include/nav.php:159 +msgid "Home" msgstr "" -#: ../../mod/mitem.php:51 -msgid "Unable to update menu element." +#: ../../include/nav.php:98 +msgid "Your posts and conversations" msgstr "" -#: ../../mod/mitem.php:57 -msgid "Menu element added." +#: ../../include/nav.php:99 +msgid "Your profile page" msgstr "" -#: ../../mod/mitem.php:61 -msgid "Unable to add menu element." +#: ../../include/nav.php:101 +msgid "Edit Profiles" msgstr "" -#: ../../mod/mitem.php:78 ../../mod/dirprofile.php:175 ../../mod/menu.php:120 -#: ../../mod/xchan.php:38 -msgid "Not found." +#: ../../include/nav.php:101 +msgid "Manage/Edit profiles" msgstr "" -#: ../../mod/mitem.php:96 +#: ../../include/nav.php:103 +msgid "Edit your profile" +msgstr "" + +#: ../../include/nav.php:105 +msgid "Your photos" +msgstr "" + +#: ../../include/nav.php:106 +msgid "Your files" +msgstr "" + +#: ../../include/nav.php:111 +msgid "Your chatrooms" +msgstr "" + +#: ../../include/nav.php:117 +msgid "Your bookmarks" +msgstr "" + +#: ../../include/nav.php:121 +msgid "Your webpages" +msgstr "" + +#: ../../include/nav.php:125 +msgid "Sign in" +msgstr "" + +#: ../../include/nav.php:142 +#, php-format +msgid "%s - click to logout" +msgstr "" + +#: ../../include/nav.php:145 +msgid "Remote login" +msgstr "" + +#: ../../include/nav.php:145 +msgid "Click to authenticate to your home hub" +msgstr "" + +#: ../../include/nav.php:159 +msgid "Home Page" +msgstr "" + +#: ../../include/nav.php:163 ../../mod/register.php:220 ../../boot.php:1472 +msgid "Register" +msgstr "" + +#: ../../include/nav.php:163 +msgid "Create an account" +msgstr "" + +#: ../../include/nav.php:168 +msgid "Help and documentation" +msgstr "" + +#: ../../include/nav.php:171 +msgid "Applications, utilities, links, games" +msgstr "" + +#: ../../include/nav.php:173 +msgid "Search site content" +msgstr "" + +#: ../../include/nav.php:176 +msgid "Channel Locator" +msgstr "" + +#: ../../include/nav.php:190 +msgid "Your matrix" +msgstr "" + +#: ../../include/nav.php:191 +msgid "Mark all matrix notifications seen" +msgstr "" + +#: ../../include/nav.php:193 +msgid "Channel home" +msgstr "" + +#: ../../include/nav.php:194 +msgid "Mark all channel notifications seen" +msgstr "" + +#: ../../include/nav.php:197 ../../mod/connections.php:406 +msgid "Connections" +msgstr "" + +#: ../../include/nav.php:200 +msgid "Notices" +msgstr "" + +#: ../../include/nav.php:200 +msgid "Notifications" +msgstr "" + +#: ../../include/nav.php:201 +msgid "See all notifications" +msgstr "" + +#: ../../include/nav.php:202 ../../mod/notifications.php:99 +msgid "Mark all system notifications seen" +msgstr "" + +#: ../../include/nav.php:204 +msgid "Private mail" +msgstr "" + +#: ../../include/nav.php:205 +msgid "See all private messages" +msgstr "" + +#: ../../include/nav.php:206 +msgid "Mark all private messages seen" +msgstr "" + +#: ../../include/nav.php:207 +msgid "Inbox" +msgstr "" + +#: ../../include/nav.php:208 +msgid "Outbox" +msgstr "" + +#: ../../include/nav.php:212 +msgid "Event Calendar" +msgstr "" + +#: ../../include/nav.php:213 +msgid "See all events" +msgstr "" + +#: ../../include/nav.php:214 +msgid "Mark all events seen" +msgstr "" + +#: ../../include/nav.php:216 +msgid "Manage Your Channels" +msgstr "" + +#: ../../include/nav.php:218 +msgid "Account/Channel Settings" +msgstr "" + +#: ../../include/nav.php:226 ../../mod/admin.php:123 +msgid "Admin" +msgstr "" + +#: ../../include/nav.php:226 +msgid "Site Setup and Configuration" +msgstr "" + +#: ../../include/nav.php:262 +msgid "Please wait..." +msgstr "" + +#: ../../mod/mood.php:132 +msgid "Set your current mood and tell your friends" +msgstr "" + +#: ../../mod/mitem.php:14 ../../mod/menu.php:92 +msgid "Menu not found." +msgstr "" + +#: ../../mod/mitem.php:47 +msgid "Menu element updated." +msgstr "" + +#: ../../mod/mitem.php:51 +msgid "Unable to update menu element." +msgstr "" + +#: ../../mod/mitem.php:57 +msgid "Menu element added." +msgstr "" + +#: ../../mod/mitem.php:61 +msgid "Unable to add menu element." +msgstr "" + +#: ../../mod/mitem.php:78 ../../mod/dirprofile.php:175 ../../mod/menu.php:120 +#: ../../mod/xchan.php:38 +msgid "Not found." +msgstr "" + +#: ../../mod/mitem.php:96 msgid "Manage Menu Elements" msgstr "" @@ -4307,44 +4314,44 @@ msgstr "" msgid "Version %s" msgstr "" -#: ../../mod/siteinfo.php:109 +#: ../../mod/siteinfo.php:111 msgid "Installed plugins/addons/apps:" msgstr "" -#: ../../mod/siteinfo.php:122 +#: ../../mod/siteinfo.php:124 msgid "No installed plugins/addons/apps" msgstr "" -#: ../../mod/siteinfo.php:130 +#: ../../mod/siteinfo.php:132 msgid "Red" msgstr "" -#: ../../mod/siteinfo.php:131 +#: ../../mod/siteinfo.php:133 msgid "" "This is a hub of the Red Matrix - a global cooperative network of " "decentralized privacy enhanced websites." msgstr "" -#: ../../mod/siteinfo.php:134 +#: ../../mod/siteinfo.php:137 msgid "Running at web location" msgstr "" -#: ../../mod/siteinfo.php:135 +#: ../../mod/siteinfo.php:138 msgid "" "Please visit GetZot.com to learn more " "about the Red Matrix." msgstr "" -#: ../../mod/siteinfo.php:136 +#: ../../mod/siteinfo.php:139 msgid "Bug reports and issues: please visit" msgstr "" -#: ../../mod/siteinfo.php:139 +#: ../../mod/siteinfo.php:142 msgid "" "Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot com" msgstr "" -#: ../../mod/siteinfo.php:141 +#: ../../mod/siteinfo.php:144 msgid "Site Administrators" msgstr "" @@ -4352,6 +4359,18 @@ msgstr "" msgid "Block Name" msgstr "" +#: ../../mod/bookmarks.php:38 +msgid "Bookmark added" +msgstr "" + +#: ../../mod/bookmarks.php:60 +msgid "My Bookmarks" +msgstr "" + +#: ../../mod/bookmarks.php:71 +msgid "My Connections Bookmarks" +msgstr "" + #: ../../mod/profiles.php:18 ../../mod/profiles.php:165 #: ../../mod/profiles.php:222 ../../mod/profiles.php:575 msgid "Profile not found." @@ -4603,36 +4622,177 @@ msgstr "" msgid "Age: " msgstr "" -#: ../../mod/profiles.php:747 -msgid "Edit/Manage Profiles" +#: ../../mod/profiles.php:747 +msgid "Edit/Manage Profiles" +msgstr "" + +#: ../../mod/profiles.php:748 +msgid "Add profile things" +msgstr "" + +#: ../../mod/profiles.php:749 +msgid "Include desirable objects in your profile" +msgstr "" + +#: ../../mod/profperm.php:29 ../../mod/profperm.php:58 +msgid "Invalid profile identifier." +msgstr "" + +#: ../../mod/profperm.php:110 +msgid "Profile Visibility Editor" +msgstr "" + +#: ../../mod/profperm.php:114 +msgid "Click on a contact to add or remove." +msgstr "" + +#: ../../mod/profperm.php:123 +msgid "Visible To" +msgstr "" + +#: ../../mod/profperm.php:139 ../../mod/connections.php:279 +msgid "All Connections" +msgstr "" + +#: ../../mod/photos.php:77 +msgid "Page owner information could not be retrieved." +msgstr "" + +#: ../../mod/photos.php:97 +msgid "Album not found." +msgstr "" + +#: ../../mod/photos.php:119 ../../mod/photos.php:673 +msgid "Delete Album" +msgstr "" + +#: ../../mod/photos.php:159 ../../mod/photos.php:975 +msgid "Delete Photo" +msgstr "" + +#: ../../mod/photos.php:443 ../../mod/search.php:13 ../../mod/directory.php:15 +#: ../../mod/dirprofile.php:9 ../../mod/display.php:9 +#: ../../mod/viewconnections.php:17 +msgid "Public access denied." +msgstr "" + +#: ../../mod/photos.php:453 +msgid "No photos selected" +msgstr "" + +#: ../../mod/photos.php:500 +msgid "Access to this item is restricted." +msgstr "" + +#: ../../mod/photos.php:574 +#, php-format +msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage." +msgstr "" + +#: ../../mod/photos.php:577 +#, php-format +msgid "You have used %1$.2f Mbytes of photo storage." +msgstr "" + +#: ../../mod/photos.php:596 +msgid "Upload Photos" +msgstr "" + +#: ../../mod/photos.php:600 ../../mod/photos.php:668 +msgid "New album name: " +msgstr "" + +#: ../../mod/photos.php:601 +msgid "or existing album name: " +msgstr "" + +#: ../../mod/photos.php:602 +msgid "Do not show a status post for this upload" +msgstr "" + +#: ../../mod/photos.php:622 +msgid "Album name could not be decoded" +msgstr "" + +#: ../../mod/photos.php:657 ../../mod/photos.php:679 ../../mod/photos.php:1148 +#: ../../mod/photos.php:1163 +msgid "Contact Photos" +msgstr "" + +#: ../../mod/photos.php:681 +msgid "Edit Album" +msgstr "" + +#: ../../mod/photos.php:687 +msgid "Show Newest First" +msgstr "" + +#: ../../mod/photos.php:689 +msgid "Show Oldest First" +msgstr "" + +#: ../../mod/photos.php:716 ../../mod/photos.php:1195 +msgid "View Photo" +msgstr "" + +#: ../../mod/photos.php:794 +msgid "Permission denied. Access to this item may be restricted." +msgstr "" + +#: ../../mod/photos.php:796 +msgid "Photo not available" +msgstr "" + +#: ../../mod/photos.php:856 +msgid "Use as profile photo" +msgstr "" + +#: ../../mod/photos.php:880 +msgid "View Full Size" +msgstr "" + +#: ../../mod/photos.php:924 ../../mod/delegate.php:130 ../../mod/tagrm.php:93 +msgid "Remove" +msgstr "" + +#: ../../mod/photos.php:958 +msgid "Edit photo" +msgstr "" + +#: ../../mod/photos.php:960 +msgid "Rotate CW (right)" msgstr "" -#: ../../mod/profiles.php:748 -msgid "Add profile things" +#: ../../mod/photos.php:961 +msgid "Rotate CCW (left)" msgstr "" -#: ../../mod/profiles.php:749 -msgid "Include desirable objects in your profile" +#: ../../mod/photos.php:964 +msgid "New album name" msgstr "" -#: ../../mod/profperm.php:29 ../../mod/profperm.php:58 -msgid "Invalid profile identifier." +#: ../../mod/photos.php:967 +msgid "Caption" msgstr "" -#: ../../mod/profperm.php:110 -msgid "Profile Visibility Editor" +#: ../../mod/photos.php:969 +msgid "Add a Tag" msgstr "" -#: ../../mod/profperm.php:114 -msgid "Click on a contact to add or remove." +#: ../../mod/photos.php:972 +msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" msgstr "" -#: ../../mod/profperm.php:123 -msgid "Visible To" +#: ../../mod/photos.php:1125 +msgid "In This Photo:" msgstr "" -#: ../../mod/profperm.php:139 ../../mod/connections.php:279 -msgid "All Connections" +#: ../../mod/photos.php:1201 +msgid "View Album" +msgstr "" + +#: ../../mod/photos.php:1224 +msgid "Recent Photos" msgstr "" #: ../../mod/pubsites.php:16 @@ -4815,10 +4975,6 @@ msgstr "" msgid "Please login." msgstr "" -#: ../../mod/cloud.php:130 -msgid "RedMatrix - Guests: Username: {your email address}, Password: +++" -msgstr "" - #: ../../mod/removeme.php:29 msgid "" "Channel removals are not allowed within 48 hours of changing the account " @@ -5394,10 +5550,6 @@ msgstr "" msgid "Potential Delegates" msgstr "" -#: ../../mod/delegate.php:130 ../../mod/photos.php:924 ../../mod/tagrm.php:93 -msgid "Remove" -msgstr "" - #: ../../mod/delegate.php:131 msgid "Add" msgstr "" @@ -5406,12 +5558,6 @@ msgstr "" msgid "No entries." msgstr "" -#: ../../mod/search.php:13 ../../mod/directory.php:15 -#: ../../mod/dirprofile.php:9 ../../mod/photos.php:443 ../../mod/display.php:9 -#: ../../mod/viewconnections.php:17 -msgid "Public access denied." -msgstr "" - #: ../../mod/directory.php:146 ../../mod/dirprofile.php:95 msgid "Gender: " msgstr "" @@ -5460,137 +5606,6 @@ msgstr "" msgid "This site is not a directory server" msgstr "" -#: ../../mod/photos.php:77 -msgid "Page owner information could not be retrieved." -msgstr "" - -#: ../../mod/photos.php:97 -msgid "Album not found." -msgstr "" - -#: ../../mod/photos.php:119 ../../mod/photos.php:673 -msgid "Delete Album" -msgstr "" - -#: ../../mod/photos.php:159 ../../mod/photos.php:975 -msgid "Delete Photo" -msgstr "" - -#: ../../mod/photos.php:453 -msgid "No photos selected" -msgstr "" - -#: ../../mod/photos.php:500 -msgid "Access to this item is restricted." -msgstr "" - -#: ../../mod/photos.php:574 -#, php-format -msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage." -msgstr "" - -#: ../../mod/photos.php:577 -#, php-format -msgid "You have used %1$.2f Mbytes of photo storage." -msgstr "" - -#: ../../mod/photos.php:596 -msgid "Upload Photos" -msgstr "" - -#: ../../mod/photos.php:600 ../../mod/photos.php:668 -msgid "New album name: " -msgstr "" - -#: ../../mod/photos.php:601 -msgid "or existing album name: " -msgstr "" - -#: ../../mod/photos.php:602 -msgid "Do not show a status post for this upload" -msgstr "" - -#: ../../mod/photos.php:622 -msgid "Album name could not be decoded" -msgstr "" - -#: ../../mod/photos.php:657 ../../mod/photos.php:679 ../../mod/photos.php:1147 -#: ../../mod/photos.php:1162 -msgid "Contact Photos" -msgstr "" - -#: ../../mod/photos.php:681 -msgid "Edit Album" -msgstr "" - -#: ../../mod/photos.php:687 -msgid "Show Newest First" -msgstr "" - -#: ../../mod/photos.php:689 -msgid "Show Oldest First" -msgstr "" - -#: ../../mod/photos.php:716 ../../mod/photos.php:1194 -msgid "View Photo" -msgstr "" - -#: ../../mod/photos.php:794 -msgid "Permission denied. Access to this item may be restricted." -msgstr "" - -#: ../../mod/photos.php:796 -msgid "Photo not available" -msgstr "" - -#: ../../mod/photos.php:856 -msgid "Use as profile photo" -msgstr "" - -#: ../../mod/photos.php:880 -msgid "View Full Size" -msgstr "" - -#: ../../mod/photos.php:958 -msgid "Edit photo" -msgstr "" - -#: ../../mod/photos.php:960 -msgid "Rotate CW (right)" -msgstr "" - -#: ../../mod/photos.php:961 -msgid "Rotate CCW (left)" -msgstr "" - -#: ../../mod/photos.php:964 -msgid "New album name" -msgstr "" - -#: ../../mod/photos.php:967 -msgid "Caption" -msgstr "" - -#: ../../mod/photos.php:969 -msgid "Add a Tag" -msgstr "" - -#: ../../mod/photos.php:972 -msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" -msgstr "" - -#: ../../mod/photos.php:1125 -msgid "In This Photo:" -msgstr "" - -#: ../../mod/photos.php:1200 -msgid "View Album" -msgstr "" - -#: ../../mod/photos.php:1223 -msgid "Recent Photos" -msgstr "" - #: ../../mod/setup.php:162 msgid "Red Matrix Server - Setup" msgstr "" @@ -6057,16 +6072,8 @@ msgstr "" msgid "Delete Webpage" msgstr "" -#: ../../mod/bookmarks.php:38 -msgid "Bookmark added" -msgstr "" - -#: ../../mod/bookmarks.php:60 -msgid "My Bookmarks" -msgstr "" - -#: ../../mod/bookmarks.php:71 -msgid "My Connections Bookmarks" +#: ../../mod/cloud.php:130 +msgid "RedMatrix - Guests: Username: {your email address}, Password: +++" msgstr "" #: ../../mod/profile_photo.php:108 @@ -6282,35 +6289,35 @@ msgstr "" msgid "Share this event" msgstr "" -#: ../../mod/filestorage.php:68 +#: ../../mod/filestorage.php:76 msgid "Permission Denied." msgstr "" -#: ../../mod/filestorage.php:85 +#: ../../mod/filestorage.php:92 msgid "File not found." msgstr "" -#: ../../mod/filestorage.php:122 +#: ../../mod/filestorage.php:131 msgid "Edit file permissions" msgstr "" -#: ../../mod/filestorage.php:131 +#: ../../mod/filestorage.php:140 msgid "Set/edit permissions" msgstr "" -#: ../../mod/filestorage.php:132 +#: ../../mod/filestorage.php:141 msgid "Include all files and sub folders" msgstr "" -#: ../../mod/filestorage.php:133 +#: ../../mod/filestorage.php:142 msgid "Return to file list" msgstr "" -#: ../../mod/filestorage.php:135 +#: ../../mod/filestorage.php:144 msgid "Copy/paste this code to attach file to a post" msgstr "" -#: ../../mod/filestorage.php:136 +#: ../../mod/filestorage.php:145 msgid "Copy/paste this URL to link file from a web page" msgstr "" @@ -7397,7 +7404,7 @@ msgid "" "Password reset failed." msgstr "" -#: ../../mod/lostpass.php:85 ../../boot.php:1505 +#: ../../mod/lostpass.php:85 ../../boot.php:1506 msgid "Password Reset" msgstr "" @@ -7862,6 +7869,14 @@ msgstr "" msgid "%s element installed" msgstr "" +#: ../../mod/locs.php:47 ../../mod/locs.php:74 +msgid "Location not found." +msgstr "" + +#: ../../mod/locs.php:78 +msgid "Primary location cannot be removed." +msgstr "" + #: ../../view/theme/apw/php/config.php:202 #: ../../view/theme/apw/php/config.php:236 msgid "Schema Default" @@ -7878,17 +7893,17 @@ msgstr "" #: ../../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:104 +#: ../../view/theme/redbasic/php/config.php:102 msgid "Theme settings" msgstr "" #: ../../view/theme/apw/php/config.php:260 -#: ../../view/theme/redbasic/php/config.php:105 +#: ../../view/theme/redbasic/php/config.php:103 msgid "Set scheme" msgstr "" #: ../../view/theme/apw/php/config.php:261 -#: ../../view/theme/redbasic/php/config.php:127 +#: ../../view/theme/redbasic/php/config.php:124 msgid "Set font-size for posts and comments" msgstr "" @@ -8023,169 +8038,165 @@ msgstr "" msgid "Header image only on profile pages" msgstr "" -#: ../../view/theme/redbasic/php/config.php:86 +#: ../../view/theme/redbasic/php/config.php:84 msgid "Light (Red Matrix default)" msgstr "" -#: ../../view/theme/redbasic/php/config.php:106 +#: ../../view/theme/redbasic/php/config.php:104 msgid "Narrow navbar" msgstr "" -#: ../../view/theme/redbasic/php/config.php:107 +#: ../../view/theme/redbasic/php/config.php:105 msgid "Navigation bar background color" msgstr "" -#: ../../view/theme/redbasic/php/config.php:108 +#: ../../view/theme/redbasic/php/config.php:106 msgid "Navigation bar gradient top color" msgstr "" -#: ../../view/theme/redbasic/php/config.php:109 +#: ../../view/theme/redbasic/php/config.php:107 msgid "Navigation bar gradient bottom color" msgstr "" -#: ../../view/theme/redbasic/php/config.php:110 +#: ../../view/theme/redbasic/php/config.php:108 msgid "Navigation active button gradient top color" msgstr "" -#: ../../view/theme/redbasic/php/config.php:111 +#: ../../view/theme/redbasic/php/config.php:109 msgid "Navigation active button gradient bottom color" msgstr "" -#: ../../view/theme/redbasic/php/config.php:112 +#: ../../view/theme/redbasic/php/config.php:110 msgid "Navigation bar border color " msgstr "" -#: ../../view/theme/redbasic/php/config.php:113 +#: ../../view/theme/redbasic/php/config.php:111 msgid "Navigation bar icon color " msgstr "" -#: ../../view/theme/redbasic/php/config.php:114 +#: ../../view/theme/redbasic/php/config.php:112 msgid "Navigation bar active icon color " msgstr "" -#: ../../view/theme/redbasic/php/config.php:115 +#: ../../view/theme/redbasic/php/config.php:113 msgid "link color" msgstr "" -#: ../../view/theme/redbasic/php/config.php:116 +#: ../../view/theme/redbasic/php/config.php:114 msgid "Set font-color for banner" msgstr "" -#: ../../view/theme/redbasic/php/config.php:117 +#: ../../view/theme/redbasic/php/config.php:115 msgid "Set the background color" msgstr "" -#: ../../view/theme/redbasic/php/config.php:118 +#: ../../view/theme/redbasic/php/config.php:116 msgid "Set the background image" msgstr "" -#: ../../view/theme/redbasic/php/config.php:119 +#: ../../view/theme/redbasic/php/config.php:117 msgid "Set the background color of items" msgstr "" -#: ../../view/theme/redbasic/php/config.php:120 +#: ../../view/theme/redbasic/php/config.php:118 msgid "Set the background color of comments" msgstr "" -#: ../../view/theme/redbasic/php/config.php:121 +#: ../../view/theme/redbasic/php/config.php:119 msgid "Set the border color of comments" msgstr "" -#: ../../view/theme/redbasic/php/config.php:122 +#: ../../view/theme/redbasic/php/config.php:120 msgid "Set the indent for comments" msgstr "" -#: ../../view/theme/redbasic/php/config.php:123 +#: ../../view/theme/redbasic/php/config.php:121 msgid "Set the basic color for item icons" msgstr "" -#: ../../view/theme/redbasic/php/config.php:124 +#: ../../view/theme/redbasic/php/config.php:122 msgid "Set the hover color for item icons" msgstr "" -#: ../../view/theme/redbasic/php/config.php:125 -msgid "Set the background color of other content" -msgstr "" - -#: ../../view/theme/redbasic/php/config.php:126 +#: ../../view/theme/redbasic/php/config.php:123 msgid "Set font-size for the entire application" msgstr "" -#: ../../view/theme/redbasic/php/config.php:128 +#: ../../view/theme/redbasic/php/config.php:125 msgid "Set font-color for posts and comments" msgstr "" -#: ../../view/theme/redbasic/php/config.php:129 +#: ../../view/theme/redbasic/php/config.php:126 msgid "Set radius of corners" msgstr "" -#: ../../view/theme/redbasic/php/config.php:130 +#: ../../view/theme/redbasic/php/config.php:127 msgid "Set shadow depth of photos" msgstr "" -#: ../../view/theme/redbasic/php/config.php:131 +#: ../../view/theme/redbasic/php/config.php:128 msgid "Set maximum width of conversation regions" msgstr "" -#: ../../view/theme/redbasic/php/config.php:132 +#: ../../view/theme/redbasic/php/config.php:129 msgid "Center conversation regions" msgstr "" -#: ../../view/theme/redbasic/php/config.php:133 +#: ../../view/theme/redbasic/php/config.php:130 msgid "Set minimum opacity of nav bar - to hide it" msgstr "" -#: ../../view/theme/redbasic/php/config.php:134 +#: ../../view/theme/redbasic/php/config.php:131 msgid "Set size of conversation author photo" msgstr "" -#: ../../view/theme/redbasic/php/config.php:135 +#: ../../view/theme/redbasic/php/config.php:132 msgid "Set size of followup author photos" msgstr "" -#: ../../view/theme/redbasic/php/config.php:136 +#: ../../view/theme/redbasic/php/config.php:133 msgid "Sloppy photo albums" msgstr "" -#: ../../view/theme/redbasic/php/config.php:136 +#: ../../view/theme/redbasic/php/config.php:133 msgid "Are you a clean desk or a messy desk person?" msgstr "" -#: ../../boot.php:1293 +#: ../../boot.php:1294 #, php-format msgid "Update %s failed. See error logs." msgstr "" -#: ../../boot.php:1296 +#: ../../boot.php:1297 #, php-format msgid "Update Error at %s" msgstr "" -#: ../../boot.php:1470 +#: ../../boot.php:1471 msgid "" "Create an account to access services and applications within the Red Matrix" msgstr "" -#: ../../boot.php:1498 +#: ../../boot.php:1499 msgid "Password" msgstr "" -#: ../../boot.php:1499 +#: ../../boot.php:1500 msgid "Remember me" msgstr "" -#: ../../boot.php:1504 +#: ../../boot.php:1505 msgid "Forgot your password?" msgstr "" -#: ../../boot.php:1569 +#: ../../boot.php:1570 msgid "permission denied" msgstr "" -#: ../../boot.php:1570 +#: ../../boot.php:1571 msgid "Got Zot?" msgstr "" -#: ../../boot.php:2000 +#: ../../boot.php:2001 msgid "toggle mobile" msgstr "" diff --git a/version.inc b/version.inc index ab083bbd8..89d0ecd1c 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2014-10-16.830 +2014-10-19.833 -- cgit v1.2.3 From 88d63d1b779b5409b400d6635681b0f445849088 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 19 Oct 2014 15:55:22 -0700 Subject: new doc added to doc checkin --- doc/html/RedBasicAuth_8php.html | 127 ++++ doc/html/RedDirectory_8php.html | 127 ++++ doc/html/RedFile_8php.html | 127 ++++ doc/html/chanman_8php.js | 4 + ...edMatrix_1_1RedDAV_1_1RedBasicAuth-members.html | 133 +++++ .../classRedMatrix_1_1RedDAV_1_1RedBasicAuth.html | 519 +++++++++++++++++ .../classRedMatrix_1_1RedDAV_1_1RedBasicAuth.js | 19 + .../classRedMatrix_1_1RedDAV_1_1RedBasicAuth.png | Bin 0 -> 957 bytes ...edMatrix_1_1RedDAV_1_1RedDirectory-members.html | 135 +++++ .../classRedMatrix_1_1RedDAV_1_1RedDirectory.html | 642 +++++++++++++++++++++ .../classRedMatrix_1_1RedDAV_1_1RedDirectory.js | 21 + .../classRedMatrix_1_1RedDAV_1_1RedDirectory.png | Bin 0 -> 1601 bytes ...lassRedMatrix_1_1RedDAV_1_1RedFile-members.html | 130 +++++ doc/html/classRedMatrix_1_1RedDAV_1_1RedFile.html | 479 +++++++++++++++ doc/html/classRedMatrix_1_1RedDAV_1_1RedFile.js | 16 + doc/html/classRedMatrix_1_1RedDAV_1_1RedFile.png | Bin 0 -> 1155 bytes doc/html/dimport_8php.html | 136 +++++ doc/html/dimport_8php.js | 4 + doc/html/locs_8php.html | 167 ++++++ doc/html/locs_8php.js | 4 + 20 files changed, 2790 insertions(+) create mode 100644 doc/html/RedBasicAuth_8php.html create mode 100644 doc/html/RedDirectory_8php.html create mode 100644 doc/html/RedFile_8php.html create mode 100644 doc/html/chanman_8php.js create mode 100644 doc/html/classRedMatrix_1_1RedDAV_1_1RedBasicAuth-members.html create mode 100644 doc/html/classRedMatrix_1_1RedDAV_1_1RedBasicAuth.html create mode 100644 doc/html/classRedMatrix_1_1RedDAV_1_1RedBasicAuth.js create mode 100644 doc/html/classRedMatrix_1_1RedDAV_1_1RedBasicAuth.png create mode 100644 doc/html/classRedMatrix_1_1RedDAV_1_1RedDirectory-members.html create mode 100644 doc/html/classRedMatrix_1_1RedDAV_1_1RedDirectory.html create mode 100644 doc/html/classRedMatrix_1_1RedDAV_1_1RedDirectory.js create mode 100644 doc/html/classRedMatrix_1_1RedDAV_1_1RedDirectory.png create mode 100644 doc/html/classRedMatrix_1_1RedDAV_1_1RedFile-members.html create mode 100644 doc/html/classRedMatrix_1_1RedDAV_1_1RedFile.html create mode 100644 doc/html/classRedMatrix_1_1RedDAV_1_1RedFile.js create mode 100644 doc/html/classRedMatrix_1_1RedDAV_1_1RedFile.png create mode 100644 doc/html/dimport_8php.html create mode 100644 doc/html/dimport_8php.js create mode 100644 doc/html/locs_8php.html create mode 100644 doc/html/locs_8php.js diff --git a/doc/html/RedBasicAuth_8php.html b/doc/html/RedBasicAuth_8php.html new file mode 100644 index 000000000..86984219c --- /dev/null +++ b/doc/html/RedBasicAuth_8php.html @@ -0,0 +1,127 @@ + + + + + + +The Red Matrix: include/RedDAV/RedBasicAuth.php File Reference + + + + + + + + + + + + + +
    +
    + + + + + + + +
    +
    The Red Matrix +
    +
    +
    + + + + + +
    +
    + +
    +
    +
    + +
    + + + + +
    + +
    + +
    +
    +Classes | +Namespaces
    +
    +
    RedBasicAuth.php File Reference
    +
    +
    + + + + + +

    +Classes

    class  RedMatrix\RedDAV\RedBasicAuth
     Authentication backend class for RedDAV. More...
     
    + + + +

    +Namespaces

    namespace  RedMatrix\RedDAV
     
    +
    +
    + diff --git a/doc/html/RedDirectory_8php.html b/doc/html/RedDirectory_8php.html new file mode 100644 index 000000000..e0e081164 --- /dev/null +++ b/doc/html/RedDirectory_8php.html @@ -0,0 +1,127 @@ + + + + + + +The Red Matrix: include/RedDAV/RedDirectory.php File Reference + + + + + + + + + + + + + +
    +
    + + + + + + + +
    +
    The Red Matrix +
    +
    +
    + + + + + +
    +
    + +
    +
    +
    + +
    + + + + +
    + +
    + +
    +
    +Classes | +Namespaces
    +
    +
    RedDirectory.php File Reference
    +
    +
    + + + + + +

    +Classes

    class  RedMatrix\RedDAV\RedDirectory
     RedDirectory class. More...
     
    + + + +

    +Namespaces

    namespace  RedMatrix\RedDAV
     
    +
    +
    + diff --git a/doc/html/RedFile_8php.html b/doc/html/RedFile_8php.html new file mode 100644 index 000000000..218102ecc --- /dev/null +++ b/doc/html/RedFile_8php.html @@ -0,0 +1,127 @@ + + + + + + +The Red Matrix: include/RedDAV/RedFile.php File Reference + + + + + + + + + + + + + +
    +
    + + + + + + + +
    +
    The Red Matrix +
    +
    +
    + + + + + +
    +
    + +
    +
    +
    + +
    + + + + +
    + +
    + +
    +
    +Classes | +Namespaces
    +
    +
    RedFile.php File Reference
    +
    +
    + + + + + +

    +Classes

    class  RedMatrix\RedDAV\RedFile
     This class represents a file in DAV. More...
     
    + + + +

    +Namespaces

    namespace  RedMatrix\RedDAV
     
    +
    +
    + diff --git a/doc/html/chanman_8php.js b/doc/html/chanman_8php.js new file mode 100644 index 000000000..803e97f0b --- /dev/null +++ b/doc/html/chanman_8php.js @@ -0,0 +1,4 @@ +var chanman_8php = +[ + [ "chanman_remove_everything_from_network", "chanman_8php.html#a21ba9a5c961e866ff27aee3ee67bf99b", null ] +]; \ No newline at end of file diff --git a/doc/html/classRedMatrix_1_1RedDAV_1_1RedBasicAuth-members.html b/doc/html/classRedMatrix_1_1RedDAV_1_1RedBasicAuth-members.html new file mode 100644 index 000000000..f2f77b15f --- /dev/null +++ b/doc/html/classRedMatrix_1_1RedDAV_1_1RedBasicAuth-members.html @@ -0,0 +1,133 @@ + + + + + + +The Red Matrix: Member List + + + + + + + + + + + + + +
    +
    + + + + + + + +
    +
    The Red Matrix +
    +
    +
    + + + + + +
    +
    + +
    +
    +
    + +
    + + + + +
    + +
    + +
    +
    +
    RedMatrix\RedDAV\RedBasicAuth Member List
    +
    +
    + +

    This is the complete list of members for RedMatrix\RedDAV\RedBasicAuth, including all inherited members.

    + + + + + + + + + + + + + + + + + +
    $browserRedMatrix\RedDAV\RedBasicAuth
    $channel_hashRedMatrix\RedDAV\RedBasicAuth
    $channel_idRedMatrix\RedDAV\RedBasicAuth
    $channel_nameRedMatrix\RedDAV\RedBasicAuthprotected
    $observerRedMatrix\RedDAV\RedBasicAuth
    $owner_idRedMatrix\RedDAV\RedBasicAuth
    $owner_nickRedMatrix\RedDAV\RedBasicAuth
    $timezoneRedMatrix\RedDAV\RedBasicAuthprotected
    getCurrentUser()RedMatrix\RedDAV\RedBasicAuth
    getTimezone()RedMatrix\RedDAV\RedBasicAuth
    log()RedMatrix\RedDAV\RedBasicAuth
    setAuthenticated($r)RedMatrix\RedDAV\RedBasicAuthprotected
    setBrowserPlugin($browser)RedMatrix\RedDAV\RedBasicAuth
    setCurrentUser($name)RedMatrix\RedDAV\RedBasicAuth
    setTimezone($timezone)RedMatrix\RedDAV\RedBasicAuth
    validateUserPass($username, $password)RedMatrix\RedDAV\RedBasicAuthprotected
    +
    + diff --git a/doc/html/classRedMatrix_1_1RedDAV_1_1RedBasicAuth.html b/doc/html/classRedMatrix_1_1RedDAV_1_1RedBasicAuth.html new file mode 100644 index 000000000..9cd342a8d --- /dev/null +++ b/doc/html/classRedMatrix_1_1RedDAV_1_1RedBasicAuth.html @@ -0,0 +1,519 @@ + + + + + + +The Red Matrix: RedMatrix\RedDAV\RedBasicAuth Class Reference + + + + + + + + + + + + + +
    +
    + + + + + + + +
    +
    The Red Matrix +
    +
    +
    + + + + + +
    +
    + +
    +
    +
    + +
    + + + + +
    + +
    + +
    +
    +Public Member Functions | +Public Attributes | +Protected Member Functions | +Protected Attributes | +List of all members
    +
    +
    RedMatrix\RedDAV\RedBasicAuth Class Reference
    +
    +
    + +

    Authentication backend class for RedDAV. + More...

    +
    +Inheritance diagram for RedMatrix\RedDAV\RedBasicAuth:
    +
    +
    + + + +
    + + + + + + + + + + + + + + + + + + +

    +Public Member Functions

     setCurrentUser ($name)
     
     getCurrentUser ()
     
     setTimezone ($timezone)
     Sets the timezone from the channel in RedBasicAuth. More...
     
     getTimezone ()
     Returns the timezone. More...
     
     setBrowserPlugin ($browser)
     Set browser plugin for SabreDAV. More...
     
     log ()
     Prints out all RedBasicAuth variables to logger(). More...
     
    + + + + + + + + + + + + + +

    +Public Attributes

     $channel_id = 0
     
     $channel_hash = ''
     
     $observer = ''
     
     $browser
     
     $owner_id = 0
     
     $owner_nick = ''
     
    + + + + + + + +

    +Protected Member Functions

     validateUserPass ($username, $password)
     Validates a username and password. More...
     
     setAuthenticated ($r)
     Sets variables and session parameters after successfull authentication. More...
     
    + + + + + +

    +Protected Attributes

     $channel_name = null
     
     $timezone = ''
     
    +

    Detailed Description

    +

    Authentication backend class for RedDAV.

    +

    This class also contains some data which is not necessary for authentication like timezone settings.

    +

    http://opensource.org/licenses/mit-license.php The MIT License (MIT)

    +

    Member Function Documentation

    + +
    +
    + + + + + + + +
    RedMatrix\RedDAV\RedBasicAuth::getCurrentUser ()
    +
    +

    Returns information about the currently logged-in channel.

    +

    If nobody is currently logged in, this method should return null.

    +
    See Also
    ::getCurrentUser
    +
    Returns
    string|null
    + +
    +
    + +
    +
    + + + + + + + +
    RedMatrix\RedDAV\RedBasicAuth::getTimezone ()
    +
    + +

    Returns the timezone.

    +
    Returns
    string Return the channel's timezone.
    + +
    +
    + +
    +
    + + + + + + + +
    RedMatrix\RedDAV\RedBasicAuth::log ()
    +
    + +

    Prints out all RedBasicAuth variables to logger().

    +
    Returns
    void
    + +
    +
    + +
    +
    + + + + + +
    + + + + + + + + +
    RedMatrix\RedDAV\RedBasicAuth::setAuthenticated ( $r)
    +     		+protected
    +
    + +

    Sets variables and session parameters after successfull authentication.

    +
    Parameters
    + + +
    array$rArray with the values for the authenticated channel.
    +
    +
    +
    Returns
    bool
    + +

    Referenced by RedMatrix\RedDAV\RedBasicAuth\validateUserPass().

    + +
    +
    + +
    +
    + + + + + + + + +
    RedMatrix\RedDAV\RedBasicAuth::setBrowserPlugin ( $browser)
    +
    + +

    Set browser plugin for SabreDAV.

    +
    See Also
    RedBrowser::set_writeable()
    +
    Parameters
    + + +
    \Sabre\DAV\Browser\Plugin$browser
    +
    +
    + +
    +
    + +
    +
    + + + + + + + + +
    RedMatrix\RedDAV\RedBasicAuth::setCurrentUser ( $name)
    +
    +

    Sets the channel_name from the currently logged-in channel.

    +
    Parameters
    + + +
    string$nameThe channel's name
    +
    +
    + +
    +
    + +
    +
    + + + + + + + + +
    RedMatrix\RedDAV\RedBasicAuth::setTimezone ( $timezone)
    +
    + +

    Sets the timezone from the channel in RedBasicAuth.

    +

    Set in mod/cloud.php if the channel has a timezone set.

    +
    Parameters
    + + +
    string$timezoneThe channel's timezone.
    +
    +
    +
    Returns
    void
    + +
    +
    + +
    +
    + + + + + +
    + + + + + + + + + + + + + + + + + + +
    RedMatrix\RedDAV\RedBasicAuth::validateUserPass ( $username,
     $password 
    )
    +     		+protected
    +
    + +

    Validates a username and password.

    +

    Guest access is granted with the password "+++".

    +
    See Also
    ::validateUserPass
    +
    Parameters
    + + + +
    string$username
    string$password
    +
    +
    +
    Returns
    bool
    + +
    +
    +

    Member Data Documentation

    + +
    +
    + + + + +
    RedMatrix\RedDAV\RedBasicAuth::$browser
    +
    + +

    Referenced by RedMatrix\RedDAV\RedBasicAuth\setBrowserPlugin().

    + +
    +
    + +
    +
    + + + + +
    RedMatrix\RedDAV\RedBasicAuth::$channel_hash = ''
    +
    + +
    +
    + +
    +
    + + + + +
    RedMatrix\RedDAV\RedBasicAuth::$channel_id = 0
    +
    + +
    +
    + +
    +
    + + + + + +
    + + + + +
    RedMatrix\RedDAV\RedBasicAuth::$channel_name = null
    +     		+protected
    +
    + +

    Referenced by RedMatrix\RedDAV\RedBasicAuth\getCurrentUser().

    + +
    +
    + +
    +
    + + + + +
    RedMatrix\RedDAV\RedBasicAuth::$observer = ''
    +
    + +
    +
    + +
    +
    + + + + +
    RedMatrix\RedDAV\RedBasicAuth::$owner_id = 0
    +
    + +
    +
    + +
    +
    + + + + +
    RedMatrix\RedDAV\RedBasicAuth::$owner_nick = ''
    +
    + +
    +
    + +
    +
    + + + + + +
    + + + + +
    RedMatrix\RedDAV\RedBasicAuth::$timezone = ''
    +     		+protected
    +
    + +

    Referenced by RedMatrix\RedDAV\RedBasicAuth\getTimezone(), and RedMatrix\RedDAV\RedBasicAuth\setTimezone().

    + +
    +
    +
    The documentation for this class was generated from the following file: +
    +
    + diff --git a/doc/html/classRedMatrix_1_1RedDAV_1_1RedBasicAuth.js b/doc/html/classRedMatrix_1_1RedDAV_1_1RedBasicAuth.js new file mode 100644 index 000000000..b48393cea --- /dev/null +++ b/doc/html/classRedMatrix_1_1RedDAV_1_1RedBasicAuth.js @@ -0,0 +1,19 @@ +var classRedMatrix_1_1RedDAV_1_1RedBasicAuth = +[ + [ "getCurrentUser", "classRedMatrix_1_1RedDAV_1_1RedBasicAuth.html#aa0b2a5fa9186d7dc0e637f1ecb379c42", null ], + [ "getTimezone", "classRedMatrix_1_1RedDAV_1_1RedBasicAuth.html#a6333c8ce58998bd11bf8102afe3b0748", null ], + [ "log", "classRedMatrix_1_1RedDAV_1_1RedBasicAuth.html#abf6fe89b0a8239ed93c3b07e1fbce75b", null ], + [ "setAuthenticated", "classRedMatrix_1_1RedDAV_1_1RedBasicAuth.html#a2926fe923baade564f2663632fa8c633", null ], + [ "setBrowserPlugin", "classRedMatrix_1_1RedDAV_1_1RedBasicAuth.html#adc72f36f0b2b17b20ea4df900afcd697", null ], + [ "setCurrentUser", "classRedMatrix_1_1RedDAV_1_1RedBasicAuth.html#aadce020fb595c7943829d7f995d3f998", null ], + [ "setTimezone", "classRedMatrix_1_1RedDAV_1_1RedBasicAuth.html#af6d239fefed05859327ee8db626703f9", null ], + [ "validateUserPass", "classRedMatrix_1_1RedDAV_1_1RedBasicAuth.html#a6ece02655b780469e59e204c5979a624", null ], + [ "$browser", "classRedMatrix_1_1RedDAV_1_1RedBasicAuth.html#a167ae032bd2ad8e6caa2e1e1a6f1b5d3", null ], + [ "$channel_hash", "classRedMatrix_1_1RedDAV_1_1RedBasicAuth.html#a112ad78a863dc0e598b5f02c596798c0", null ], + [ "$channel_id", "classRedMatrix_1_1RedDAV_1_1RedBasicAuth.html#abe1defedb90ac8e3b6487e124e625521", null ], + [ "$channel_name", "classRedMatrix_1_1RedDAV_1_1RedBasicAuth.html#a76fdb7fd5dd7376155abb5a58cd6fd69", null ], + [ "$observer", "classRedMatrix_1_1RedDAV_1_1RedBasicAuth.html#a605aa09565a097316b80f0d17d6b5823", null ], + [ "$owner_id", "classRedMatrix_1_1RedDAV_1_1RedBasicAuth.html#a1a23c349cc4699a8474505972684ea9c", null ], + [ "$owner_nick", "classRedMatrix_1_1RedDAV_1_1RedBasicAuth.html#aad0ef0cc05c407de84dbfbf2050bbbbe", null ], + [ "$timezone", "classRedMatrix_1_1RedDAV_1_1RedBasicAuth.html#a849c99cf0a7ad065d630c8a30106ad5e", null ] +]; \ No newline at end of file diff --git a/doc/html/classRedMatrix_1_1RedDAV_1_1RedBasicAuth.png b/doc/html/classRedMatrix_1_1RedDAV_1_1RedBasicAuth.png new file mode 100644 index 000000000..f361b604b Binary files /dev/null and b/doc/html/classRedMatrix_1_1RedDAV_1_1RedBasicAuth.png differ diff --git a/doc/html/classRedMatrix_1_1RedDAV_1_1RedDirectory-members.html b/doc/html/classRedMatrix_1_1RedDAV_1_1RedDirectory-members.html new file mode 100644 index 000000000..b6cf43ad2 --- /dev/null +++ b/doc/html/classRedMatrix_1_1RedDAV_1_1RedDirectory-members.html @@ -0,0 +1,135 @@ + + + + + + +The Red Matrix: Member List + + + + + + + + + + + + + +
    +
    + + + + + + + +
    +
    The Red Matrix +
    +
    +
    + + + + + +
    +
    + +
    +
    +
    + +
    + + + + +
    + +
    + +
    +
    +
    RedMatrix\RedDAV\RedDirectory Member List
    +
    +
    + +

    This is the complete list of members for RedMatrix\RedDAV\RedDirectory, including all inherited members.

    + + + + + + + + + + + + + + + + + + + +
    $authRedMatrix\RedDAV\RedDirectoryprivate
    $ext_pathRedMatrix\RedDAV\RedDirectoryprivate
    $folder_hashRedMatrix\RedDAV\RedDirectoryprivate
    $os_pathRedMatrix\RedDAV\RedDirectoryprivate
    $red_pathRedMatrix\RedDAV\RedDirectoryprivate
    $root_dirRedMatrix\RedDAV\RedDirectoryprivate
    __construct($ext_path, &$auth_plugin)RedMatrix\RedDAV\RedDirectory
    childExists($name)RedMatrix\RedDAV\RedDirectory
    createDirectory($name)RedMatrix\RedDAV\RedDirectory
    createFile($name, $data=null)RedMatrix\RedDAV\RedDirectory
    getChild($name)RedMatrix\RedDAV\RedDirectory
    getChildren()RedMatrix\RedDAV\RedDirectory
    getDir()RedMatrix\RedDAV\RedDirectory
    getLastModified()RedMatrix\RedDAV\RedDirectory
    getName()RedMatrix\RedDAV\RedDirectory
    getQuotaInfo()RedMatrix\RedDAV\RedDirectory
    log()RedMatrix\RedDAV\RedDirectoryprivate
    setName($name)RedMatrix\RedDAV\RedDirectory
    +
    + diff --git a/doc/html/classRedMatrix_1_1RedDAV_1_1RedDirectory.html b/doc/html/classRedMatrix_1_1RedDAV_1_1RedDirectory.html new file mode 100644 index 000000000..5f07edc7d --- /dev/null +++ b/doc/html/classRedMatrix_1_1RedDAV_1_1RedDirectory.html @@ -0,0 +1,642 @@ + + + + + + +The Red Matrix: RedMatrix\RedDAV\RedDirectory Class Reference + + + + + + + + + + + + + +
    +
    + + + + + + + +
    +
    The Red Matrix +
    +
    +
    + + + + + +
    +
    + +
    +
    +
    + +
    + + + + +
    + +
    + +
    +
    +Public Member Functions | +Private Member Functions | +Private Attributes | +List of all members
    +
    +
    RedMatrix\RedDAV\RedDirectory Class Reference
    +
    +
    + +

    RedDirectory class. + More...

    +
    +Inheritance diagram for RedMatrix\RedDAV\RedDirectory:
    +
    +
    + + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

    +Public Member Functions

     __construct ($ext_path, &$auth_plugin)
     Sets up the directory node, expects a full path. More...
     
     getChildren ()
     Returns an array with all the child nodes. More...
     
     getChild ($name)
     Returns a child by name. More...
     
     getName ()
     Returns the name of the directory. More...
     
     setName ($name)
     Renames the directory. More...
     
     createFile ($name, $data=null)
     Creates a new file in the directory. More...
     
     createDirectory ($name)
     Creates a new subdirectory. More...
     
     childExists ($name)
     Checks if a child exists. More...
     
     getDir ()
     
     getLastModified ()
     Returns the last modification time for the directory, as a UNIX timestamp. More...
     
     getQuotaInfo ()
     Return quota usage. More...
     
    + + + +

    +Private Member Functions

     log ()
     
    + + + + + + + + + + + + + +

    +Private Attributes

     $red_path
     
     $folder_hash
     
     $ext_path
     
     $root_dir = ''
     
     $auth
     
     $os_path = ''
     
    +

    Detailed Description

    +

    RedDirectory class.

    +

    A class that represents a directory.

    +

    http://opensource.org/licenses/mit-license.php The MIT License (MIT)

    +

    Constructor & Destructor Documentation

    + +
    +
    + + + + + + + + + + + + + + + + + + +
    RedMatrix\RedDAV\RedDirectory::__construct ( $ext_path,
    & $auth_plugin 
    )
    +
    + +

    Sets up the directory node, expects a full path.

    +
    Parameters
    + + + +
    string$ext_patha full path
    RedBasicAuth&$auth_plugin
    +
    +
    + +
    +
    +

    Member Function Documentation

    + +
    +
    + + + + + + + + +
    RedMatrix\RedDAV\RedDirectory::childExists ( $name)
    +
    + +

    Checks if a child exists.

    +
    Parameters
    + + +
    string$nameThe name to check if it exists.
    +
    +
    +
    Returns
    boolean
    + +
    +
    + +
    +
    + + + + + + + + +
    RedMatrix\RedDAV\RedDirectory::createDirectory ( $name)
    +
    + +

    Creates a new subdirectory.

    +
    Parameters
    + + +
    string$namethe directory to create
    +
    +
    +
    Returns
    void
    + +
    +
    + +
    +
    + + + + + + + + + + + + + + + + + + +
    RedMatrix\RedDAV\RedDirectory::createFile ( $name,
     $data = null 
    )
    +
    + +

    Creates a new file in the directory.

    +

    Data will either be supplied as a stream resource, or in certain cases as a string. Keep in mind that you may have to support either.

    +

    After successful creation of the file, you may choose to return the ETag of the new file here.

    +
    Exceptions
    + + +
    \Sabre\DAV\Exception\Forbidden
    +
    +
    +
    Parameters
    + + + +
    string$nameName of the file
    resource | string$dataInitial payload
    +
    +
    +
    Returns
    null|string ETag
    + +
    +
    + +
    +
    + + + + + + + + +
    RedMatrix\RedDAV\RedDirectory::getChild ( $name)
    +
    + +

    Returns a child by name.

    +
    Exceptions
    + + + +
    \Sabre\DAV\Exception\Forbidden
    \Sabre\DAV\Exception\NotFound
    +
    +
    +
    Parameters
    + + +
    string$name
    +
    +
    + +
    +
    + +
    +
    + + + + + + + +
    RedMatrix\RedDAV\RedDirectory::getChildren ()
    +
    + +

    Returns an array with all the child nodes.

    +
    Exceptions
    + + +
    \Sabre\DAV\Exception\Forbidden
    +
    +
    +
    Returns
    array []
    + +
    +
    + +
    +
    + + + + + + + +
    RedMatrix\RedDAV\RedDirectory::getDir ()
    +
    +
    Todo:
    add description of what this function does.
    +
    Exceptions
    + + +
    \Sabre\DAV\Exception\NotFound
    +
    +
    +
    Returns
    void
    + +

    Referenced by RedMatrix\RedDAV\RedDirectory\__construct().

    + +
    +
    + +
    +
    + + + + + + + +
    RedMatrix\RedDAV\RedDirectory::getLastModified ()
    +
    + +

    Returns the last modification time for the directory, as a UNIX timestamp.

    +

    It looks for the last edited file in the folder. If it is an empty folder it returns the lastmodified time of the folder itself, to prevent zero timestamps.

    +
    Returns
    int last modification time in UNIX timestamp
    + +
    +
    + +
    +
    + + + + + + + +
    RedMatrix\RedDAV\RedDirectory::getName ()
    +
    + +

    Returns the name of the directory.

    +
    Returns
    string
    + +
    +
    + +
    +
    + + + + + + + +
    RedMatrix\RedDAV\RedDirectory::getQuotaInfo ()
    +
    + +

    Return quota usage.

    +

    Should guests relly see the used/free values from filesystem of the complete store directory?

    +
    Returns
    array with used and free values in bytes.
    + +
    +
    + +
    +
    + + + + + +
    + + + + + + + +
    RedMatrix\RedDAV\RedDirectory::log ()
    +     		+private
    +
    + +

    Referenced by RedMatrix\RedDAV\RedDirectory\getChildren().

    + +
    +
    + +
    +
    + + + + + + + + +
    RedMatrix\RedDAV\RedDirectory::setName ( $name)
    +
    + +

    Renames the directory.

    +
    Todo:
    handle duplicate directory name
    +
    Exceptions
    + + +
    \Sabre\DAV\Exception\Forbidden
    +
    +
    +
    Parameters
    + + +
    string$nameThe new name of the directory.
    +
    +
    +
    Returns
    void
    + +
    +
    +

    Member Data Documentation

    + +
    +
    + + + + + +
    + + + + +
    RedMatrix\RedDAV\RedDirectory::$auth
    +     		+private
    +
    + +
    +
    + +
    +
    + + + + + +
    + + + + +
    RedMatrix\RedDAV\RedDirectory::$ext_path
    +     		+private
    +
    + +

    Referenced by RedMatrix\RedDAV\RedDirectory\__construct(), and RedMatrix\RedDAV\RedDirectory\getDir().

    + +
    +
    + +
    +
    + + + + + +
    + + + + +
    RedMatrix\RedDAV\RedDirectory::$folder_hash
    +     		+private
    +
    + +
    +
    + +
    +
    + + + + + +
    + + + + +
    RedMatrix\RedDAV\RedDirectory::$os_path = ''
    +     		+private
    +
    + +

    Referenced by RedMatrix\RedDAV\RedDirectory\createFile(), and RedMatrix\RedDAV\RedDirectory\getDir().

    + +
    +
    + +
    +
    + + + + + +
    + + + + +
    RedMatrix\RedDAV\RedDirectory::$red_path
    +     		+private
    +
    + +
    +
    + +
    +
    + + + + + +
    + + + + +
    RedMatrix\RedDAV\RedDirectory::$root_dir = ''
    +     		+private
    +
    + +
    +
    +
    The documentation for this class was generated from the following file: +
    +
    + diff --git a/doc/html/classRedMatrix_1_1RedDAV_1_1RedDirectory.js b/doc/html/classRedMatrix_1_1RedDAV_1_1RedDirectory.js new file mode 100644 index 000000000..bbb92425f --- /dev/null +++ b/doc/html/classRedMatrix_1_1RedDAV_1_1RedDirectory.js @@ -0,0 +1,21 @@ +var classRedMatrix_1_1RedDAV_1_1RedDirectory = +[ + [ "__construct", "classRedMatrix_1_1RedDAV_1_1RedDirectory.html#a76b58fe5223e565c97f1b9af93031a99", null ], + [ "childExists", "classRedMatrix_1_1RedDAV_1_1RedDirectory.html#a964b13fde1a5da6f76b51ca5519234dc", null ], + [ "createDirectory", "classRedMatrix_1_1RedDAV_1_1RedDirectory.html#aca0e8d574ea66a0e210f571700663c62", null ], + [ "createFile", "classRedMatrix_1_1RedDAV_1_1RedDirectory.html#a58e750256cdc2f0f79fbe8d5463ffefe", null ], + [ "getChild", "classRedMatrix_1_1RedDAV_1_1RedDirectory.html#a1a37850bdd1f188abd6160559698d5d7", null ], + [ "getChildren", "classRedMatrix_1_1RedDAV_1_1RedDirectory.html#a9b9a0b5bfa4de1f78e6cafaa534b6f6a", null ], + [ "getDir", "classRedMatrix_1_1RedDAV_1_1RedDirectory.html#a825dc5f3e0f83f50736c16daa6a4809d", null ], + [ "getLastModified", "classRedMatrix_1_1RedDAV_1_1RedDirectory.html#a69db5f641f8f5dc999e55cee1832ecd5", null ], + [ "getName", "classRedMatrix_1_1RedDAV_1_1RedDirectory.html#a55f7172814a0749b5342f152ab3fa0df", null ], + [ "getQuotaInfo", "classRedMatrix_1_1RedDAV_1_1RedDirectory.html#a69db443ed3c84938b4352fe515bf8d68", null ], + [ "log", "classRedMatrix_1_1RedDAV_1_1RedDirectory.html#af90a1a74cfd643a5c56b9a17ea250d59", null ], + [ "setName", "classRedMatrix_1_1RedDAV_1_1RedDirectory.html#a14ac61d31a031d139956763db4e03956", null ], + [ "$auth", "classRedMatrix_1_1RedDAV_1_1RedDirectory.html#aab6907e7fb7f9f7227f9cd42bdc84eb9", null ], + [ "$ext_path", "classRedMatrix_1_1RedDAV_1_1RedDirectory.html#adf8735b3118cdf2f42416edaf42b82e9", null ], + [ "$folder_hash", "classRedMatrix_1_1RedDAV_1_1RedDirectory.html#a2fc4e6b9be2108bbaa1ca1a03fd6d44e", null ], + [ "$os_path", "classRedMatrix_1_1RedDAV_1_1RedDirectory.html#a17ea47e34cb76b6e79f36ebed790d76a", null ], + [ "$red_path", "classRedMatrix_1_1RedDAV_1_1RedDirectory.html#a4bba2e56bc8ec3e05f05eae46f56f36d", null ], + [ "$root_dir", "classRedMatrix_1_1RedDAV_1_1RedDirectory.html#a438066fb1565fbcffa22c12d5ce23695", null ] +]; \ No newline at end of file diff --git a/doc/html/classRedMatrix_1_1RedDAV_1_1RedDirectory.png b/doc/html/classRedMatrix_1_1RedDAV_1_1RedDirectory.png new file mode 100644 index 000000000..e3eeebb23 Binary files /dev/null and b/doc/html/classRedMatrix_1_1RedDAV_1_1RedDirectory.png differ diff --git a/doc/html/classRedMatrix_1_1RedDAV_1_1RedFile-members.html b/doc/html/classRedMatrix_1_1RedDAV_1_1RedFile-members.html new file mode 100644 index 000000000..2206f8cbf --- /dev/null +++ b/doc/html/classRedMatrix_1_1RedDAV_1_1RedFile-members.html @@ -0,0 +1,130 @@ + + + + + + +The Red Matrix: Member List + + + + + + + + + + + + + +
    +
    + + + + + + + +
    +
    The Red Matrix +
    +
    +
    + + + + + +
    +
    + +
    +
    +
    + +
    + + + + +
    + +
    + +
    +
    +
    RedMatrix\RedDAV\RedFile Member List
    +
    +
    + +

    This is the complete list of members for RedMatrix\RedDAV\RedFile, including all inherited members.

    + + + + + + + + + + + + + + +
    $authRedMatrix\RedDAV\RedFileprivate
    $dataRedMatrix\RedDAV\RedFileprivate
    $nameRedMatrix\RedDAV\RedFileprivate
    __construct($name, $data, &$auth)RedMatrix\RedDAV\RedFile
    delete()RedMatrix\RedDAV\RedFile
    get()RedMatrix\RedDAV\RedFile
    getContentType()RedMatrix\RedDAV\RedFile
    getETag()RedMatrix\RedDAV\RedFile
    getLastModified()RedMatrix\RedDAV\RedFile
    getName()RedMatrix\RedDAV\RedFile
    getSize()RedMatrix\RedDAV\RedFile
    put($data)RedMatrix\RedDAV\RedFile
    setName($newName)RedMatrix\RedDAV\RedFile
    +
    + diff --git a/doc/html/classRedMatrix_1_1RedDAV_1_1RedFile.html b/doc/html/classRedMatrix_1_1RedDAV_1_1RedFile.html new file mode 100644 index 000000000..1f48aa7b7 --- /dev/null +++ b/doc/html/classRedMatrix_1_1RedDAV_1_1RedFile.html @@ -0,0 +1,479 @@ + + + + + + +The Red Matrix: RedMatrix\RedDAV\RedFile Class Reference + + + + + + + + + + + + + +
    +
    + + + + + + + +
    +
    The Red Matrix +
    +
    +
    + + + + + +
    +
    + +
    +
    +
    + +
    + + + + +
    + +
    + +
    +
    +Public Member Functions | +Private Attributes | +List of all members
    +
    +
    RedMatrix\RedDAV\RedFile Class Reference
    +
    +
    + +

    This class represents a file in DAV. + More...

    +
    +Inheritance diagram for RedMatrix\RedDAV\RedFile:
    +
    +
    + + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

    +Public Member Functions

     __construct ($name, $data, &$auth)
     
     getName ()
     Returns the name of the file. More...
     
     setName ($newName)
     Renames the file. More...
     
     put ($data)
     Updates the data of the file. More...
     
     get ()
     Returns the raw data. More...
     
     getETag ()
     Returns the ETag for a file. More...
     
     getContentType ()
     Returns the mime-type for a file. More...
     
     getSize ()
     Returns the size of the node, in bytes. More...
     
     getLastModified ()
     Returns the last modification time for the file, as a unix timestamp. More...
     
     delete ()
     Delete the file. More...
     
    + + + + + + + +

    +Private Attributes

     $data
     
     $auth
     
     $name
     
    +

    Detailed Description

    +

    This class represents a file in DAV.

    +

    It provides all functions to work with files in Red's cloud through DAV protocol.

    +

    http://opensource.org/licenses/mit-license.php The MIT License (MIT)

    +

    Constructor & Destructor Documentation

    + +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + +
    RedMatrix\RedDAV\RedFile::__construct ( $name,
     $data,
    & $auth 
    )
    +
    +

    Sets up the node, expects a full path name.

    +
    Parameters
    + + + + +
    string$name
    array$datafrom attach table
    &$auth
    +
    +
    + +
    +
    +

    Member Function Documentation

    + +
    +
    + + + + + + + +
    RedMatrix\RedDAV\RedFile::delete ()
    +
    + +

    Delete the file.

    +

    This method checks the permissions and then calls attach_delete() function to actually remove the file.

    +
    Exceptions
    + + +
    \Sabre\DAV\Exception\Forbidden
    +
    +
    + +
    +
    + +
    +
    + + + + + + + +
    RedMatrix\RedDAV\RedFile::get ()
    +
    + +

    Returns the raw data.

    +
    Returns
    string
    + +
    +
    + +
    +
    + + + + + + + +
    RedMatrix\RedDAV\RedFile::getContentType ()
    +
    + +

    Returns the mime-type for a file.

    +

    If null is returned, we'll assume application/octet-stream

    +
    Returns
    mixed
    + +
    +
    + +
    +
    + + + + + + + +
    RedMatrix\RedDAV\RedFile::getETag ()
    +
    + +

    Returns the ETag for a file.

    +

    An ETag is a unique identifier representing the current version of the file. If the file changes, the ETag MUST change. The ETag is an arbitrary string, but MUST be surrounded by double-quotes.

    +

    Return null if the ETag can not effectively be determined.

    +
    Returns
    null|string
    + +
    +
    + +
    +
    + + + + + + + +
    RedMatrix\RedDAV\RedFile::getLastModified ()
    +
    + +

    Returns the last modification time for the file, as a unix timestamp.

    +
    Returns
    int last modification time in UNIX timestamp
    + +
    +
    + +
    +
    + + + + + + + +
    RedMatrix\RedDAV\RedFile::getName ()
    +
    + +

    Returns the name of the file.

    +
    Returns
    string
    + +
    +
    + +
    +
    + + + + + + + +
    RedMatrix\RedDAV\RedFile::getSize ()
    +
    + +

    Returns the size of the node, in bytes.

    +
    Returns
    int filesize in bytes
    + +
    +
    + +
    +
    + + + + + + + + +
    RedMatrix\RedDAV\RedFile::put ( $data)
    +
    + +

    Updates the data of the file.

    +
    Parameters
    + + +
    resource$data
    +
    +
    +
    Returns
    void
    + +
    +
    + +
    +
    + + + + + + + + +
    RedMatrix\RedDAV\RedFile::setName ( $newName)
    +
    + +

    Renames the file.

    +
    Exceptions
    + + +
    Sabre\DAV\Exception\Forbidden
    +
    +
    +
    Parameters
    + + +
    string$nameThe new name of the file.
    +
    +
    +
    Returns
    void
    + +
    +
    +

    Member Data Documentation

    + +
    +
    + + + + + +
    + + + + +
    RedMatrix\RedDAV\RedFile::$auth
    +     		+private
    +
    + +

    Referenced by RedMatrix\RedDAV\RedFile\__construct().

    + +
    +
    + +
    +
    + + + + + +
    + + + + +
    RedMatrix\RedDAV\RedFile::$data
    +     		+private
    +
    + +

    Referenced by RedMatrix\RedDAV\RedFile\__construct(), and RedMatrix\RedDAV\RedFile\put().

    + +
    +
    + +
    +
    + + + + + +
    + + + + +
    RedMatrix\RedDAV\RedFile::$name
    +     		+private
    +
    + +

    Referenced by RedMatrix\RedDAV\RedFile\__construct().

    + +
    +
    +
    The documentation for this class was generated from the following file: +
    +
    + diff --git a/doc/html/classRedMatrix_1_1RedDAV_1_1RedFile.js b/doc/html/classRedMatrix_1_1RedDAV_1_1RedFile.js new file mode 100644 index 000000000..c65382641 --- /dev/null +++ b/doc/html/classRedMatrix_1_1RedDAV_1_1RedFile.js @@ -0,0 +1,16 @@ +var classRedMatrix_1_1RedDAV_1_1RedFile = +[ + [ "__construct", "classRedMatrix_1_1RedDAV_1_1RedFile.html#a05798eac84c578152ff21758261c6ac6", null ], + [ "delete", "classRedMatrix_1_1RedDAV_1_1RedFile.html#ab7ab7ba81fab28eb02382cfdfd80ecfe", null ], + [ "get", "classRedMatrix_1_1RedDAV_1_1RedFile.html#a7241beecd01f5bb4e74659863dd85bd8", null ], + [ "getContentType", "classRedMatrix_1_1RedDAV_1_1RedFile.html#af5c88b75d0c1f590af03755534cb167e", null ], + [ "getETag", "classRedMatrix_1_1RedDAV_1_1RedFile.html#a9f14682acf3ccb70df5af5dd0687c689", null ], + [ "getLastModified", "classRedMatrix_1_1RedDAV_1_1RedFile.html#ac47016aa0e3f6f1a1c4570bd6fd8cf25", null ], + [ "getName", "classRedMatrix_1_1RedDAV_1_1RedFile.html#ac945aa782d6c035d339e59974266ec4d", null ], + [ "getSize", "classRedMatrix_1_1RedDAV_1_1RedFile.html#a07e1b19e7aaf3dcce822e9be8823a87d", null ], + [ "put", "classRedMatrix_1_1RedDAV_1_1RedFile.html#a709ec1288d21ddf1353524435ab916f0", null ], + [ "setName", "classRedMatrix_1_1RedDAV_1_1RedFile.html#a0350cb4e0327e1f9922869a48ee04f1d", null ], + [ "$auth", "classRedMatrix_1_1RedDAV_1_1RedFile.html#a21b6e9d420c352f25610a33f57858215", null ], + [ "$data", "classRedMatrix_1_1RedDAV_1_1RedFile.html#a235700e2dfbe21dc41613d36e30e8acc", null ], + [ "$name", "classRedMatrix_1_1RedDAV_1_1RedFile.html#ab722dcb8c4598426c81fa2b2e4fad5f2", null ] +]; \ No newline at end of file diff --git a/doc/html/classRedMatrix_1_1RedDAV_1_1RedFile.png b/doc/html/classRedMatrix_1_1RedDAV_1_1RedFile.png new file mode 100644 index 000000000..9a1837e1c Binary files /dev/null and b/doc/html/classRedMatrix_1_1RedDAV_1_1RedFile.png differ diff --git a/doc/html/dimport_8php.html b/doc/html/dimport_8php.html new file mode 100644 index 000000000..925e95097 --- /dev/null +++ b/doc/html/dimport_8php.html @@ -0,0 +1,136 @@ + + + + + + +The Red Matrix: include/dimport.php File Reference + + + + + + + + + + + + + +
    +
    + + + + + + + +
    +
    The Red Matrix +
    +
    +
    + + + + + +
    +
    + +
    +
    +
    + +
    + + + + +
    + +
    + +
    +
    +Functions
    +
    +
    dimport.php File Reference
    +
    +
    + + + + +

    +Functions

     foofoo ()
     
    +

    Function Documentation

    + +
    +
    + + + + + + + +
    foofoo ()
    +
    + +
    +
    +
    +
    + diff --git a/doc/html/dimport_8php.js b/doc/html/dimport_8php.js new file mode 100644 index 000000000..1f463fb3d --- /dev/null +++ b/doc/html/dimport_8php.js @@ -0,0 +1,4 @@ +var dimport_8php = +[ + [ "foofoo", "dimport_8php.html#a581f040717941ce3e1868b0b5dceefd1", null ] +]; \ No newline at end of file diff --git a/doc/html/locs_8php.html b/doc/html/locs_8php.html new file mode 100644 index 000000000..86cc0d2a8 --- /dev/null +++ b/doc/html/locs_8php.html @@ -0,0 +1,167 @@ + + + + + + +The Red Matrix: mod/locs.php File Reference + + + + + + + + + + + + + +
    +
    + + + + + + + +
    +
    The Red Matrix +
    +
    +
    + + + + + +
    +
    + +
    +
    +
    + +
    + + + + +
    + +
    + +
    +
    +Functions
    +
    +
    locs.php File Reference
    +
    +
    + + + + +

    +Functions

     locs_post (&$a)
     
    +

    Function Documentation

    + +
    +
    + + + + + + + + +
    locs_post (& $a)
    +
    +

    Placeholder file at present. This is going to involve a bit of work.

    +

    This file will deal with the deletion of channels and management of hublocs.

    +

    We need to provide the following functionality:

    +
      +
    • Delete my account and all channels from the entire network
      • +
    +
      +
    • Delete my account and all channels from this server
      • +
    +
      +
    • Delete a channel from the entire network
      • +
    +
      +
    • Delete a channel from this server
      • +
    +
      +
    • List all hub locations for this channel
      • +
    +
      +
    • Remove this/some hub location from this channel
      • +
    +
      +
    • promote this/some hub location to primary
      • +
    +
      +
    • Remove hub location 'xyz' from this channel, (this should possibly only be allowed if that hub has been down for a period of time)
      • +
    +
      +
    • Some of these actions should probably require email verification
      • +
    + +
    +
    +
    +
    + diff --git a/doc/html/locs_8php.js b/doc/html/locs_8php.js new file mode 100644 index 000000000..475fc5dd6 --- /dev/null +++ b/doc/html/locs_8php.js @@ -0,0 +1,4 @@ +var locs_8php = +[ + [ "locs_post", "locs_8php.html#a6b43654592919ac863d67a1f787a69b9", null ] +]; \ No newline at end of file -- cgit v1.2.3 From 6d3619c8b15afdbf228cc0ca71de68efc0557fb1 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 19 Oct 2014 16:08:21 -0700 Subject: string update --- util/messages.po | 742 +++++++++++++++++++++++++++---------------------------- 1 file changed, 368 insertions(+), 374 deletions(-) diff --git a/util/messages.po b/util/messages.po index 5d00db87b..ada12b442 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 2014-10-17.831\n" +"Project-Id-Version: 2014-10-19.833\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-17 00:03-0700\n" +"POT-Creation-Date: 2014-10-19 16:08-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -102,18 +102,18 @@ msgstr "" #: ../../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/blocks.php:29 ../../mod/blocks.php:44 ../../mod/bookmarks.php:46 -#: ../../mod/profiles.php:179 ../../mod/profiles.php:560 +#: ../../mod/profiles.php:179 ../../mod/profiles.php:532 #: ../../mod/photos.php:68 ../../mod/photos.php:526 ../../mod/channel.php:89 #: ../../mod/channel.php:193 ../../mod/channel.php:236 ../../mod/chat.php:90 #: ../../mod/chat.php:95 ../../mod/register.php:70 ../../mod/regmod.php:17 #: ../../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/profile_photo.php:263 ../../mod/profile_photo.php:276 -#: ../../mod/sources.php:66 ../../mod/events.php:200 +#: ../../mod/events.php:190 ../../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/profile_photo.php:263 +#: ../../mod/profile_photo.php:276 ../../mod/sources.php:66 #: ../../mod/filestorage.php:18 ../../mod/filestorage.php:67 #: ../../mod/filestorage.php:82 ../../mod/filestorage.php:109 #: ../../mod/fsuggest.php:78 ../../mod/suggest.php:26 ../../mod/group.php:9 @@ -193,7 +193,7 @@ msgid "Settings" msgstr "" #: ../../include/apps.php:133 ../../include/conversation.php:1546 -#: ../../include/RedDAV/RedBrowser.php:241 ../../include/nav.php:106 +#: ../../include/nav.php:106 ../../include/RedDAV/RedBrowser.php:241 #: ../../mod/fbrowser.php:114 msgid "Files" msgstr "" @@ -218,7 +218,7 @@ msgid "Photos" msgstr "" #: ../../include/apps.php:138 ../../include/nav.php:212 -#: ../../mod/events.php:436 +#: ../../mod/events.php:426 msgid "Events" msgstr "" @@ -679,7 +679,7 @@ msgid "Don't show" msgstr "" #: ../../include/acl_selectors.php:248 ../../mod/photos.php:604 -#: ../../mod/photos.php:970 ../../mod/chat.php:209 ../../mod/events.php:585 +#: ../../mod/photos.php:970 ../../mod/chat.php:209 ../../mod/events.php:566 #: ../../mod/filestorage.php:137 msgid "Permissions" msgstr "" @@ -1039,9 +1039,9 @@ msgstr "" msgid "Set title" msgstr "" -#: ../../include/conversation.php:1152 ../../mod/editblock.php:135 -#: ../../mod/editlayout.php:129 ../../mod/editpost.php:134 -#: ../../mod/editwebpage.php:169 ../../mod/events.php:560 +#: ../../include/conversation.php:1152 ../../mod/events.php:544 +#: ../../mod/editblock.php:135 ../../mod/editlayout.php:129 +#: ../../mod/editpost.php:134 ../../mod/editwebpage.php:169 msgid "Categories (comma-separated list)" msgstr "" @@ -1078,15 +1078,15 @@ msgstr "" msgid "Encrypt text" msgstr "" -#: ../../include/conversation.php:1181 ../../mod/editpost.php:150 -#: ../../mod/events.php:567 +#: ../../include/conversation.php:1181 ../../mod/events.php:550 +#: ../../mod/editpost.php:150 msgid "OK" msgstr "" #: ../../include/conversation.php:1182 ../../mod/settings.php:520 -#: ../../mod/settings.php:546 ../../mod/editpost.php:151 -#: ../../mod/fbrowser.php:82 ../../mod/fbrowser.php:117 -#: ../../mod/events.php:566 ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 +#: ../../mod/settings.php:546 ../../mod/events.php:549 +#: ../../mod/editpost.php:151 ../../mod/fbrowser.php:82 +#: ../../mod/fbrowser.php:117 ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 msgid "Cancel" msgstr "" @@ -1450,7 +1450,7 @@ msgstr "" msgid "Click to open/close" msgstr "" -#: ../../include/text.php:1523 ../../mod/events.php:414 +#: ../../include/text.php:1523 ../../mod/events.php:404 msgid "Link to Source" msgstr "" @@ -1693,7 +1693,7 @@ msgstr "" #: ../../include/event.php:40 ../../include/bb2diaspora.php:461 #: ../../include/identity.php:883 ../../mod/directory.php:156 -#: ../../mod/dirprofile.php:105 ../../mod/events.php:579 +#: ../../mod/dirprofile.php:105 ../../mod/events.php:560 msgid "Location:" msgstr "" @@ -1778,87 +1778,193 @@ msgstr "" msgid "This action is not available under your subscription plan." msgstr "" -#: ../../include/datetime.php:43 ../../include/datetime.php:45 -msgid "Miscellaneous" +#: ../../include/nav.php:95 ../../include/nav.php:128 ../../boot.php:1495 +msgid "Logout" msgstr "" -#: ../../include/datetime.php:152 ../../include/datetime.php:284 -msgid "year" +#: ../../include/nav.php:95 ../../include/nav.php:128 +msgid "End this session" msgstr "" -#: ../../include/datetime.php:157 ../../include/datetime.php:285 -msgid "month" +#: ../../include/nav.php:98 ../../include/nav.php:159 +msgid "Home" msgstr "" -#: ../../include/datetime.php:162 ../../include/datetime.php:287 -msgid "day" +#: ../../include/nav.php:98 +msgid "Your posts and conversations" msgstr "" -#: ../../include/datetime.php:275 -msgid "never" +#: ../../include/nav.php:99 +msgid "Your profile page" msgstr "" -#: ../../include/datetime.php:281 -msgid "less than a second ago" +#: ../../include/nav.php:101 +msgid "Edit Profiles" msgstr "" -#: ../../include/datetime.php:284 -msgid "years" +#: ../../include/nav.php:101 +msgid "Manage/Edit profiles" msgstr "" -#: ../../include/datetime.php:285 -msgid "months" +#: ../../include/nav.php:103 ../../include/identity.php:856 +msgid "Edit Profile" msgstr "" -#: ../../include/datetime.php:286 -msgid "week" +#: ../../include/nav.php:103 +msgid "Edit your profile" msgstr "" -#: ../../include/datetime.php:286 -msgid "weeks" +#: ../../include/nav.php:105 +msgid "Your photos" msgstr "" -#: ../../include/datetime.php:287 -msgid "days" +#: ../../include/nav.php:106 +msgid "Your files" msgstr "" -#: ../../include/datetime.php:288 -msgid "hour" +#: ../../include/nav.php:111 +msgid "Your chatrooms" msgstr "" -#: ../../include/datetime.php:288 -msgid "hours" +#: ../../include/nav.php:117 +msgid "Your bookmarks" msgstr "" -#: ../../include/datetime.php:289 -msgid "minute" +#: ../../include/nav.php:121 +msgid "Your webpages" msgstr "" -#: ../../include/datetime.php:289 -msgid "minutes" +#: ../../include/nav.php:125 +msgid "Sign in" msgstr "" -#: ../../include/datetime.php:290 -msgid "second" +#: ../../include/nav.php:142 +#, php-format +msgid "%s - click to logout" msgstr "" -#: ../../include/datetime.php:290 -msgid "seconds" +#: ../../include/nav.php:145 +msgid "Remote authentication" msgstr "" -#: ../../include/datetime.php:299 -#, php-format -msgid "%1$d %2$s ago" +#: ../../include/nav.php:145 +msgid "Click to authenticate to your home hub" msgstr "" -#: ../../include/datetime.php:504 -#, php-format -msgid "%1$s's birthday" +#: ../../include/nav.php:159 +msgid "Home Page" msgstr "" -#: ../../include/datetime.php:505 -#, php-format -msgid "Happy Birthday %1$s" +#: ../../include/nav.php:163 ../../mod/register.php:220 ../../boot.php:1472 +msgid "Register" +msgstr "" + +#: ../../include/nav.php:163 +msgid "Create an account" +msgstr "" + +#: ../../include/nav.php:168 +msgid "Help and documentation" +msgstr "" + +#: ../../include/nav.php:171 +msgid "Applications, utilities, links, games" +msgstr "" + +#: ../../include/nav.php:173 +msgid "Search site content" +msgstr "" + +#: ../../include/nav.php:176 +msgid "Channel Locator" +msgstr "" + +#: ../../include/nav.php:190 +msgid "Your matrix" +msgstr "" + +#: ../../include/nav.php:191 +msgid "Mark all matrix notifications seen" +msgstr "" + +#: ../../include/nav.php:193 +msgid "Channel home" +msgstr "" + +#: ../../include/nav.php:194 +msgid "Mark all channel notifications seen" +msgstr "" + +#: ../../include/nav.php:197 ../../mod/connections.php:406 +msgid "Connections" +msgstr "" + +#: ../../include/nav.php:200 +msgid "Notices" +msgstr "" + +#: ../../include/nav.php:200 +msgid "Notifications" +msgstr "" + +#: ../../include/nav.php:201 +msgid "See all notifications" +msgstr "" + +#: ../../include/nav.php:202 ../../mod/notifications.php:99 +msgid "Mark all system notifications seen" +msgstr "" + +#: ../../include/nav.php:204 +msgid "Private mail" +msgstr "" + +#: ../../include/nav.php:205 +msgid "See all private messages" +msgstr "" + +#: ../../include/nav.php:206 +msgid "Mark all private messages seen" +msgstr "" + +#: ../../include/nav.php:207 +msgid "Inbox" +msgstr "" + +#: ../../include/nav.php:208 +msgid "Outbox" +msgstr "" + +#: ../../include/nav.php:212 +msgid "Event Calendar" +msgstr "" + +#: ../../include/nav.php:213 +msgid "See all events" +msgstr "" + +#: ../../include/nav.php:214 +msgid "Mark all events seen" +msgstr "" + +#: ../../include/nav.php:216 +msgid "Manage Your Channels" +msgstr "" + +#: ../../include/nav.php:218 +msgid "Account/Channel Settings" +msgstr "" + +#: ../../include/nav.php:226 ../../mod/admin.php:123 +msgid "Admin" +msgstr "" + +#: ../../include/nav.php:226 +msgid "Site Setup and Configuration" +msgstr "" + +#: ../../include/nav.php:262 +msgid "Please wait..." msgstr "" #: ../../include/dir_fns.php:56 @@ -2573,7 +2679,7 @@ msgstr "" msgid "Requested profile is not available." msgstr "" -#: ../../include/identity.php:846 ../../mod/profiles.php:750 +#: ../../include/identity.php:846 ../../mod/profiles.php:722 msgid "Change profile photo" msgstr "" @@ -2585,15 +2691,11 @@ msgstr "" msgid "Manage/edit profiles" msgstr "" -#: ../../include/identity.php:853 ../../mod/profiles.php:751 +#: ../../include/identity.php:853 ../../mod/profiles.php:723 msgid "Create New Profile" msgstr "" -#: ../../include/identity.php:856 ../../include/nav.php:103 -msgid "Edit Profile" -msgstr "" - -#: ../../include/identity.php:867 ../../mod/profiles.php:762 +#: ../../include/identity.php:867 ../../mod/profiles.php:734 msgid "Profile Image" msgstr "" @@ -2601,8 +2703,8 @@ msgstr "" msgid "visible to everybody" msgstr "" -#: ../../include/identity.php:871 ../../mod/profiles.php:645 -#: ../../mod/profiles.php:766 +#: ../../include/identity.php:871 ../../mod/profiles.php:617 +#: ../../mod/profiles.php:738 msgid "Edit visibility" msgstr "" @@ -2688,11 +2790,11 @@ msgstr "" msgid "for %1$d %2$s" msgstr "" -#: ../../include/identity.php:1175 ../../mod/profiles.php:667 +#: ../../include/identity.php:1175 ../../mod/profiles.php:639 msgid "Sexual Preference:" msgstr "" -#: ../../include/identity.php:1179 ../../mod/profiles.php:669 +#: ../../include/identity.php:1179 ../../mod/profiles.php:641 msgid "Hometown:" msgstr "" @@ -2700,7 +2802,7 @@ msgstr "" msgid "Tags:" msgstr "" -#: ../../include/identity.php:1183 ../../mod/profiles.php:670 +#: ../../include/identity.php:1183 ../../mod/profiles.php:642 msgid "Political Views:" msgstr "" @@ -2716,11 +2818,11 @@ msgstr "" msgid "Hobbies/Interests:" msgstr "" -#: ../../include/identity.php:1191 ../../mod/profiles.php:673 +#: ../../include/identity.php:1191 ../../mod/profiles.php:645 msgid "Likes:" msgstr "" -#: ../../include/identity.php:1193 ../../mod/profiles.php:674 +#: ../../include/identity.php:1193 ../../mod/profiles.php:646 msgid "Dislikes:" msgstr "" @@ -2895,18 +2997,18 @@ msgstr "" #: ../../mod/settings.php:519 ../../mod/settings.php:631 #: ../../mod/settings.php:660 ../../mod/settings.php:684 #: ../../mod/settings.php:760 ../../mod/settings.php:945 -#: ../../mod/poke.php:166 ../../mod/profiles.php:643 ../../mod/photos.php:563 +#: ../../mod/poke.php:166 ../../mod/profiles.php:615 ../../mod/photos.php:563 #: ../../mod/photos.php:672 ../../mod/photos.php:974 ../../mod/photos.php:1014 #: ../../mod/photos.php:1101 ../../mod/chat.php:177 ../../mod/chat.php:211 -#: ../../mod/connect.php:92 ../../mod/connedit.php:540 ../../mod/setup.php:307 -#: ../../mod/setup.php:350 ../../mod/pdledit.php:58 ../../mod/sources.php:104 -#: ../../mod/sources.php:138 ../../mod/events.php:587 -#: ../../mod/filestorage.php:146 ../../mod/fsuggest.php:108 -#: ../../mod/group.php:81 ../../mod/admin.php:414 ../../mod/admin.php:725 -#: ../../mod/admin.php:861 ../../mod/admin.php:994 ../../mod/admin.php:1193 -#: ../../mod/admin.php:1280 ../../mod/thing.php:284 ../../mod/thing.php:327 -#: ../../mod/import.php:480 ../../mod/invite.php:142 ../../mod/mail.php:348 -#: ../../mod/appman.php:99 ../../mod/poll.php:68 +#: ../../mod/connect.php:92 ../../mod/connedit.php:540 +#: ../../mod/events.php:568 ../../mod/setup.php:307 ../../mod/setup.php:350 +#: ../../mod/pdledit.php:58 ../../mod/sources.php:104 +#: ../../mod/sources.php:138 ../../mod/filestorage.php:146 +#: ../../mod/fsuggest.php:108 ../../mod/group.php:81 ../../mod/admin.php:414 +#: ../../mod/admin.php:725 ../../mod/admin.php:861 ../../mod/admin.php:994 +#: ../../mod/admin.php:1193 ../../mod/admin.php:1280 ../../mod/thing.php:284 +#: ../../mod/thing.php:327 ../../mod/import.php:480 ../../mod/invite.php:142 +#: ../../mod/mail.php:348 ../../mod/appman.php:99 ../../mod/poll.php:68 #: ../../view/theme/apw/php/config.php:256 #: ../../view/theme/blogga/php/config.php:67 #: ../../view/theme/blogga/view/theme/blog/config.php:67 @@ -3445,189 +3547,87 @@ msgstr "" msgid "Custom/Expert Mode" msgstr "" -#: ../../include/nav.php:95 ../../include/nav.php:128 ../../boot.php:1495 -msgid "Logout" -msgstr "" - -#: ../../include/nav.php:95 ../../include/nav.php:128 -msgid "End this session" -msgstr "" - -#: ../../include/nav.php:98 ../../include/nav.php:159 -msgid "Home" -msgstr "" - -#: ../../include/nav.php:98 -msgid "Your posts and conversations" -msgstr "" - -#: ../../include/nav.php:99 -msgid "Your profile page" -msgstr "" - -#: ../../include/nav.php:101 -msgid "Edit Profiles" -msgstr "" - -#: ../../include/nav.php:101 -msgid "Manage/Edit profiles" -msgstr "" - -#: ../../include/nav.php:103 -msgid "Edit your profile" -msgstr "" - -#: ../../include/nav.php:105 -msgid "Your photos" -msgstr "" - -#: ../../include/nav.php:106 -msgid "Your files" -msgstr "" - -#: ../../include/nav.php:111 -msgid "Your chatrooms" -msgstr "" - -#: ../../include/nav.php:117 -msgid "Your bookmarks" -msgstr "" - -#: ../../include/nav.php:121 -msgid "Your webpages" -msgstr "" - -#: ../../include/nav.php:125 -msgid "Sign in" -msgstr "" - -#: ../../include/nav.php:142 -#, php-format -msgid "%s - click to logout" -msgstr "" - -#: ../../include/nav.php:145 -msgid "Remote login" -msgstr "" - -#: ../../include/nav.php:145 -msgid "Click to authenticate to your home hub" -msgstr "" - -#: ../../include/nav.php:159 -msgid "Home Page" -msgstr "" - -#: ../../include/nav.php:163 ../../mod/register.php:220 ../../boot.php:1472 -msgid "Register" -msgstr "" - -#: ../../include/nav.php:163 -msgid "Create an account" -msgstr "" - -#: ../../include/nav.php:168 -msgid "Help and documentation" -msgstr "" - -#: ../../include/nav.php:171 -msgid "Applications, utilities, links, games" -msgstr "" - -#: ../../include/nav.php:173 -msgid "Search site content" -msgstr "" - -#: ../../include/nav.php:176 -msgid "Channel Locator" -msgstr "" - -#: ../../include/nav.php:190 -msgid "Your matrix" -msgstr "" - -#: ../../include/nav.php:191 -msgid "Mark all matrix notifications seen" -msgstr "" - -#: ../../include/nav.php:193 -msgid "Channel home" +#: ../../include/datetime.php:43 ../../include/datetime.php:45 +msgid "Miscellaneous" msgstr "" -#: ../../include/nav.php:194 -msgid "Mark all channel notifications seen" +#: ../../include/datetime.php:238 +msgid "never" msgstr "" -#: ../../include/nav.php:197 ../../mod/connections.php:406 -msgid "Connections" +#: ../../include/datetime.php:244 +msgid "less than a second ago" msgstr "" -#: ../../include/nav.php:200 -msgid "Notices" +#: ../../include/datetime.php:247 +msgid "year" msgstr "" -#: ../../include/nav.php:200 -msgid "Notifications" +#: ../../include/datetime.php:247 +msgid "years" msgstr "" -#: ../../include/nav.php:201 -msgid "See all notifications" +#: ../../include/datetime.php:248 +msgid "month" msgstr "" -#: ../../include/nav.php:202 ../../mod/notifications.php:99 -msgid "Mark all system notifications seen" +#: ../../include/datetime.php:248 +msgid "months" msgstr "" -#: ../../include/nav.php:204 -msgid "Private mail" +#: ../../include/datetime.php:249 +msgid "week" msgstr "" -#: ../../include/nav.php:205 -msgid "See all private messages" +#: ../../include/datetime.php:249 +msgid "weeks" msgstr "" -#: ../../include/nav.php:206 -msgid "Mark all private messages seen" +#: ../../include/datetime.php:250 +msgid "day" msgstr "" -#: ../../include/nav.php:207 -msgid "Inbox" +#: ../../include/datetime.php:250 +msgid "days" msgstr "" -#: ../../include/nav.php:208 -msgid "Outbox" +#: ../../include/datetime.php:251 +msgid "hour" msgstr "" -#: ../../include/nav.php:212 -msgid "Event Calendar" +#: ../../include/datetime.php:251 +msgid "hours" msgstr "" -#: ../../include/nav.php:213 -msgid "See all events" +#: ../../include/datetime.php:252 +msgid "minute" msgstr "" -#: ../../include/nav.php:214 -msgid "Mark all events seen" +#: ../../include/datetime.php:252 +msgid "minutes" msgstr "" -#: ../../include/nav.php:216 -msgid "Manage Your Channels" +#: ../../include/datetime.php:253 +msgid "second" msgstr "" -#: ../../include/nav.php:218 -msgid "Account/Channel Settings" +#: ../../include/datetime.php:253 +msgid "seconds" msgstr "" -#: ../../include/nav.php:226 ../../mod/admin.php:123 -msgid "Admin" +#: ../../include/datetime.php:262 +#, php-format +msgid "%1$d %2$s ago" msgstr "" -#: ../../include/nav.php:226 -msgid "Site Setup and Configuration" +#: ../../include/datetime.php:467 +#, php-format +msgid "%1$s's birthday" msgstr "" -#: ../../include/nav.php:262 -msgid "Please wait..." +#: ../../include/datetime.php:468 +#, php-format +msgid "Happy Birthday %1$s" msgstr "" #: ../../mod/mood.php:132 @@ -4019,13 +4019,13 @@ msgid "Publish your default profile in the network directory" msgstr "" #: ../../mod/settings.php:891 ../../mod/settings.php:896 -#: ../../mod/settings.php:973 ../../mod/api.php:106 ../../mod/profiles.php:602 +#: ../../mod/settings.php:973 ../../mod/api.php:106 ../../mod/profiles.php:574 #: ../../mod/admin.php:392 msgid "No" msgstr "" #: ../../mod/settings.php:891 ../../mod/settings.php:896 -#: ../../mod/settings.php:973 ../../mod/api.php:105 ../../mod/profiles.php:601 +#: ../../mod/settings.php:973 ../../mod/api.php:105 ../../mod/profiles.php:573 #: ../../mod/admin.php:394 msgid "Yes" msgstr "" @@ -4372,7 +4372,7 @@ msgid "My Connections Bookmarks" msgstr "" #: ../../mod/profiles.php:18 ../../mod/profiles.php:165 -#: ../../mod/profiles.php:222 ../../mod/profiles.php:575 +#: ../../mod/profiles.php:222 ../../mod/profiles.php:547 msgid "Profile not found." msgstr "" @@ -4400,237 +4400,236 @@ msgstr "" msgid "Profile Name is required." msgstr "" -#: ../../mod/profiles.php:390 +#: ../../mod/profiles.php:362 msgid "Marital Status" msgstr "" -#: ../../mod/profiles.php:394 +#: ../../mod/profiles.php:366 msgid "Romantic Partner" msgstr "" -#: ../../mod/profiles.php:398 +#: ../../mod/profiles.php:370 msgid "Likes" msgstr "" -#: ../../mod/profiles.php:402 +#: ../../mod/profiles.php:374 msgid "Dislikes" msgstr "" -#: ../../mod/profiles.php:406 +#: ../../mod/profiles.php:378 msgid "Work/Employment" msgstr "" -#: ../../mod/profiles.php:409 +#: ../../mod/profiles.php:381 msgid "Religion" msgstr "" -#: ../../mod/profiles.php:413 +#: ../../mod/profiles.php:385 msgid "Political Views" msgstr "" -#: ../../mod/profiles.php:417 +#: ../../mod/profiles.php:389 msgid "Gender" msgstr "" -#: ../../mod/profiles.php:421 +#: ../../mod/profiles.php:393 msgid "Sexual Preference" msgstr "" -#: ../../mod/profiles.php:425 +#: ../../mod/profiles.php:397 msgid "Homepage" msgstr "" -#: ../../mod/profiles.php:429 +#: ../../mod/profiles.php:401 msgid "Interests" msgstr "" -#: ../../mod/profiles.php:433 ../../mod/admin.php:868 +#: ../../mod/profiles.php:405 ../../mod/admin.php:868 msgid "Address" msgstr "" -#: ../../mod/profiles.php:440 ../../mod/pubsites.php:25 +#: ../../mod/profiles.php:412 ../../mod/pubsites.php:25 msgid "Location" msgstr "" -#: ../../mod/profiles.php:523 +#: ../../mod/profiles.php:495 msgid "Profile updated." msgstr "" -#: ../../mod/profiles.php:600 +#: ../../mod/profiles.php:572 msgid "Hide your contact/friend list from viewers of this profile?" msgstr "" -#: ../../mod/profiles.php:642 +#: ../../mod/profiles.php:614 msgid "Edit Profile Details" msgstr "" -#: ../../mod/profiles.php:644 +#: ../../mod/profiles.php:616 msgid "View this profile" msgstr "" -#: ../../mod/profiles.php:646 +#: ../../mod/profiles.php:618 msgid "Change Profile Photo" msgstr "" -#: ../../mod/profiles.php:647 +#: ../../mod/profiles.php:619 msgid "Create a new profile using these settings" msgstr "" -#: ../../mod/profiles.php:648 +#: ../../mod/profiles.php:620 msgid "Clone this profile" msgstr "" -#: ../../mod/profiles.php:649 +#: ../../mod/profiles.php:621 msgid "Delete this profile" msgstr "" -#: ../../mod/profiles.php:651 +#: ../../mod/profiles.php:623 msgid "Import profile from file" msgstr "" -#: ../../mod/profiles.php:652 +#: ../../mod/profiles.php:624 msgid "Export profile to file" msgstr "" -#: ../../mod/profiles.php:653 +#: ../../mod/profiles.php:625 msgid "Profile Name:" msgstr "" -#: ../../mod/profiles.php:654 +#: ../../mod/profiles.php:626 msgid "Your Full Name:" msgstr "" -#: ../../mod/profiles.php:655 +#: ../../mod/profiles.php:627 msgid "Title/Description:" msgstr "" -#: ../../mod/profiles.php:656 +#: ../../mod/profiles.php:628 msgid "Your Gender:" msgstr "" -#: ../../mod/profiles.php:657 -#, php-format -msgid "Birthday (%s):" +#: ../../mod/profiles.php:629 +msgid "Birthday :" msgstr "" -#: ../../mod/profiles.php:658 +#: ../../mod/profiles.php:630 msgid "Street Address:" msgstr "" -#: ../../mod/profiles.php:659 +#: ../../mod/profiles.php:631 msgid "Locality/City:" msgstr "" -#: ../../mod/profiles.php:660 +#: ../../mod/profiles.php:632 msgid "Postal/Zip Code:" msgstr "" -#: ../../mod/profiles.php:661 +#: ../../mod/profiles.php:633 msgid "Country:" msgstr "" -#: ../../mod/profiles.php:662 +#: ../../mod/profiles.php:634 msgid "Region/State:" msgstr "" -#: ../../mod/profiles.php:663 +#: ../../mod/profiles.php:635 msgid "♥ Marital Status:" msgstr "" -#: ../../mod/profiles.php:664 +#: ../../mod/profiles.php:636 msgid "Who: (if applicable)" msgstr "" -#: ../../mod/profiles.php:665 +#: ../../mod/profiles.php:637 msgid "Examples: cathy123, Cathy Williams, cathy@example.com" msgstr "" -#: ../../mod/profiles.php:666 +#: ../../mod/profiles.php:638 msgid "Since [date]:" msgstr "" -#: ../../mod/profiles.php:668 +#: ../../mod/profiles.php:640 msgid "Homepage URL:" msgstr "" -#: ../../mod/profiles.php:671 +#: ../../mod/profiles.php:643 msgid "Religious Views:" msgstr "" -#: ../../mod/profiles.php:672 +#: ../../mod/profiles.php:644 msgid "Keywords:" msgstr "" -#: ../../mod/profiles.php:675 +#: ../../mod/profiles.php:647 msgid "Example: fishing photography software" msgstr "" -#: ../../mod/profiles.php:676 +#: ../../mod/profiles.php:648 msgid "Used in directory listings" msgstr "" -#: ../../mod/profiles.php:677 +#: ../../mod/profiles.php:649 msgid "Tell us about yourself..." msgstr "" -#: ../../mod/profiles.php:678 +#: ../../mod/profiles.php:650 msgid "Hobbies/Interests" msgstr "" -#: ../../mod/profiles.php:679 +#: ../../mod/profiles.php:651 msgid "Contact information and Social Networks" msgstr "" -#: ../../mod/profiles.php:680 +#: ../../mod/profiles.php:652 msgid "My other channels" msgstr "" -#: ../../mod/profiles.php:681 +#: ../../mod/profiles.php:653 msgid "Musical interests" msgstr "" -#: ../../mod/profiles.php:682 +#: ../../mod/profiles.php:654 msgid "Books, literature" msgstr "" -#: ../../mod/profiles.php:683 +#: ../../mod/profiles.php:655 msgid "Television" msgstr "" -#: ../../mod/profiles.php:684 +#: ../../mod/profiles.php:656 msgid "Film/dance/culture/entertainment" msgstr "" -#: ../../mod/profiles.php:685 +#: ../../mod/profiles.php:657 msgid "Love/romance" msgstr "" -#: ../../mod/profiles.php:686 +#: ../../mod/profiles.php:658 msgid "Work/employment" msgstr "" -#: ../../mod/profiles.php:687 +#: ../../mod/profiles.php:659 msgid "School/education" msgstr "" -#: ../../mod/profiles.php:693 +#: ../../mod/profiles.php:665 msgid "This is your default profile." msgstr "" -#: ../../mod/profiles.php:704 ../../mod/directory.php:143 +#: ../../mod/profiles.php:676 ../../mod/directory.php:143 #: ../../mod/dirprofile.php:92 msgid "Age: " msgstr "" -#: ../../mod/profiles.php:747 +#: ../../mod/profiles.php:719 msgid "Edit/Manage Profiles" msgstr "" -#: ../../mod/profiles.php:748 +#: ../../mod/profiles.php:720 msgid "Add profile things" msgstr "" -#: ../../mod/profiles.php:749 +#: ../../mod/profiles.php:721 msgid "Include desirable objects in your profile" msgstr "" @@ -5606,6 +5605,79 @@ msgstr "" msgid "This site is not a directory server" msgstr "" +#: ../../mod/events.php:71 +msgid "Event can not end before it has started." +msgstr "" + +#: ../../mod/events.php:81 +msgid "Event title and start time are required." +msgstr "" + +#: ../../mod/events.php:95 +msgid "Event not found." +msgstr "" + +#: ../../mod/events.php:359 +msgid "l, F j" +msgstr "" + +#: ../../mod/events.php:381 +msgid "Edit event" +msgstr "" + +#: ../../mod/events.php:427 +msgid "Create New Event" +msgstr "" + +#: ../../mod/events.php:428 +msgid "Previous" +msgstr "" + +#: ../../mod/events.php:429 ../../mod/setup.php:261 +msgid "Next" +msgstr "" + +#: ../../mod/events.php:541 +msgid "Event details" +msgstr "" + +#: ../../mod/events.php:542 +msgid "Starting date and Title are required." +msgstr "" + +#: ../../mod/events.php:546 +msgid "Event Starts:" +msgstr "" + +#: ../../mod/events.php:546 ../../mod/events.php:562 ../../mod/appman.php:91 +#: ../../mod/appman.php:92 +msgid "Required" +msgstr "" + +#: ../../mod/events.php:552 +msgid "Finish date/time is not known or not relevant" +msgstr "" + +#: ../../mod/events.php:554 +msgid "Event Finishes:" +msgstr "" + +#: ../../mod/events.php:556 +msgid "Adjust for viewer timezone" +msgstr "" + +#: ../../mod/events.php:558 +msgid "Description:" +msgstr "" + +#: ../../mod/events.php:562 +msgid "Title:" +msgstr "" + +#: ../../mod/events.php:564 +msgid "Share this event" +msgstr "" + #: ../../mod/setup.php:162 msgid "Red Matrix Server - Setup" msgstr "" @@ -5642,10 +5714,6 @@ msgstr "" msgid "System check" msgstr "" -#: ../../mod/setup.php:261 ../../mod/events.php:439 -msgid "Next" -msgstr "" - #: ../../mod/setup.php:262 msgid "Check again" msgstr "" @@ -6215,80 +6283,6 @@ msgstr "" msgid "- select -" msgstr "" -#: ../../mod/events.php:91 -msgid "Event title and start time are required." -msgstr "" - -#: ../../mod/events.php:105 -msgid "Event not found." -msgstr "" - -#: ../../mod/events.php:369 -msgid "l, F j" -msgstr "" - -#: ../../mod/events.php:391 -msgid "Edit event" -msgstr "" - -#: ../../mod/events.php:437 -msgid "Create New Event" -msgstr "" - -#: ../../mod/events.php:438 -msgid "Previous" -msgstr "" - -#: ../../mod/events.php:536 -msgid "hour:minute" -msgstr "" - -#: ../../mod/events.php:556 -msgid "Event details" -msgstr "" - -#: ../../mod/events.php:557 -#, php-format -msgid "Format is %s %s." -msgstr "" - -#: ../../mod/events.php:558 -msgid "Starting date and Title are required." -msgstr "" - -#: ../../mod/events.php:562 -msgid "Event Starts:" -msgstr "" - -#: ../../mod/events.php:562 ../../mod/events.php:581 ../../mod/appman.php:91 -#: ../../mod/appman.php:92 -msgid "Required" -msgstr "" - -#: ../../mod/events.php:570 -msgid "Finish date/time is not known or not relevant" -msgstr "" - -#: ../../mod/events.php:572 -msgid "Event Finishes:" -msgstr "" - -#: ../../mod/events.php:575 -msgid "Adjust for viewer timezone" -msgstr "" - -#: ../../mod/events.php:577 -msgid "Description:" -msgstr "" - -#: ../../mod/events.php:581 -msgid "Title:" -msgstr "" - -#: ../../mod/events.php:583 -msgid "Share this event" -msgstr "" - #: ../../mod/filestorage.php:76 msgid "Permission Denied." msgstr "" -- cgit v1.2.3 From bae3029c639bf6f9469dd93bfedc3dce0d8510d7 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 19 Oct 2014 16:12:05 -0700 Subject: merge madness --- doc/AdvancedSearch.md | 5 +- doc/Hooks.md | 2 + doc/about.bb | 2 +- doc/account_basics.bb | 2 + doc/accounts.bb | 2 +- doc/accounts_profiles_channels_basics.bb | 2 +- doc/addons.bb | 2 +- doc/addons_gnusocial.bb | 2 +- doc/api_functions.bb | 2 +- doc/bbcode.html | 2 +- doc/campaign.bb | 2 +- doc/channels.bb | 2 +- doc/checking_account_quota_usage.bb | 2 +- doc/cloud.bb | 2 +- doc/cloud_desktop_clients.bb | 2 +- doc/comanche.bb | 20 +- doc/connecting_to_channels.bb | 2 +- doc/credits.bb | 76 ++ doc/dav_dolphin.bb | 2 +- doc/dav_konqueror.bb | 3 +- doc/dav_mount.bb | 2 +- doc/dav_nautilus.bb | 2 +- doc/dav_nemo.bb | 4 +- doc/dav_windows.bb | 2 +- doc/debian_install.bb | 2 +- doc/dev-function-overview.md | 2 +- doc/developer_function_primer.bb | 2 +- doc/developers.bb | 2 +- doc/external-resource-links.bb | 4 +- doc/extra_features.bb | 2 +- doc/faq_admins.bb | 2 +- doc/faq_developers.bb | 5 +- doc/faq_members.bb | 15 + doc/faq_users.bb | 17 - doc/features.bb | 2 +- doc/git_for_non_developers.bb | 2 +- doc/hidden_configs.bb | 4 +- doc/install.bb | 3 + doc/intro_for_developers.bb | 2 +- doc/macros/addons_footer.bb | 2 + doc/macros/cloud_footer.bb | 2 + doc/macros/main_footer.bb | 1 + doc/macros/troubleshooting_footer.bb | 2 + doc/main.bb | 2 +- doc/permissions.bb | 2 +- doc/plugins.bb | 2 +- doc/problems-following-an-update.bb | 3 +- doc/profiles.bb | 2 +- doc/red2pi.bb | 2 +- doc/registration.bb | 3 +- doc/remove_account.bb | 4 +- doc/schema_development.bb | 2 +- doc/tags_and_mentions.bb | 3 +- doc/troubleshooting.bb | 2 +- doc/webpages.bb | 3 +- doc/what_is_zot.bb | 2 +- include/datetime.php | 181 ++- include/nav.php | 2 +- mod/events.php | 31 +- mod/photos.php | 4 +- mod/profiles.php | 32 +- util/messages.po | 1847 +++++++++++++++--------------- view/tpl/event_form.tpl | 92 +- view/tpl/nav.tpl | 2 +- view/tpl/photo_view.tpl | 16 +- 65 files changed, 1191 insertions(+), 1267 deletions(-) create mode 100644 doc/credits.bb create mode 100644 doc/faq_members.bb delete mode 100644 doc/faq_users.bb create mode 100644 doc/macros/addons_footer.bb create mode 100644 doc/macros/cloud_footer.bb create mode 100644 doc/macros/main_footer.bb create mode 100644 doc/macros/troubleshooting_footer.bb diff --git a/doc/AdvancedSearch.md b/doc/AdvancedSearch.md index 5a9a5a3bc..df4a87482 100644 --- a/doc/AdvancedSearch.md +++ b/doc/AdvancedSearch.md @@ -51,7 +51,4 @@ Example: name="charlie brown" and country=canada and not gender=female - - - - +#include doc/macros/main_footer.bb; diff --git a/doc/Hooks.md b/doc/Hooks.md index 350068314..d7998a8e7 100644 --- a/doc/Hooks.md +++ b/doc/Hooks.md @@ -133,3 +133,5 @@ Hooks - Complete List * $a->module . '_pre_' . $selname * $a->module . '_pre_' . $selname +#include doc/macros/main_footer.bb; + diff --git a/doc/about.bb b/doc/about.bb index aa4fde54d..bd91970f6 100644 --- a/doc/about.bb +++ b/doc/about.bb @@ -20,5 +20,5 @@ Along the way, Red offers a number of unique goodies: [b]Privacy:[/b] Red identities (Zot IDs) can be deleted, backed up/downloaded, and cloned. The user is in full control of their data. Should you decide to delete all your content and erase your Zot ID, all you have to do is click on a link and it's immediately deleted from the hub. No questions, no fuss. -Return to the [zrl=[baseurl]/help/main]Main documentation page[/zrl] +#include doc/macros/main_footer.bb; diff --git a/doc/account_basics.bb b/doc/account_basics.bb index 3c5d28fbc..a8fd6e5fd 100644 --- a/doc/account_basics.bb +++ b/doc/account_basics.bb @@ -31,3 +31,5 @@ See Also [zrl=[baseurl]/help/permissions]Permissions[/zrl] [zrl=[baseurl]/help/profiles]Profiles[/zrl] [zrl=[baseurl]/help/remove_account]Remove Account[/zrl] + +#include doc/macros/main_footer.bb; diff --git a/doc/accounts.bb b/doc/accounts.bb index bf57f1234..7c0378504 100644 --- a/doc/accounts.bb +++ b/doc/accounts.bb @@ -1,4 +1,4 @@ This one still needs to be written. -Return to the [zrl=[baseurl]/help/main]Main documentation page[/zrl] +#include doc/macros/main_footer.bb; diff --git a/doc/accounts_profiles_channels_basics.bb b/doc/accounts_profiles_channels_basics.bb index f803f25e9..c064e99f1 100644 --- a/doc/accounts_profiles_channels_basics.bb +++ b/doc/accounts_profiles_channels_basics.bb @@ -15,5 +15,5 @@ Unlike other services Red Matrix offers you the advantage of creating [i]many mo During the registration you created your first [i]channel[/i]. Yes, besides several profiles you are able to have several channels. This might be a bit confusing in the beginning, but let's clear things up. You already have created one channel. You can use this one for the public, to communicate with people about every day life. But perhaps you are an avid book reader and many people are bored by that. So you open a [i]second channel[/i] just for the book lovers, where you all can talk about books as much as you like. Obviously this is a new stream of posts, with a new profile (... or new profile[i]s[/i] ...) and completely different contacts. Some connections might exist in both channels, but there will be some that are exclusive to only one of both. You yourself just switch between both of them just like you would in real life switch when talking to people you meet on the street or people you meet specially to talk about books. You can even connect to yourself, or better: to your other channel. :) [i]Think of a channel as different spaces dedicated to different topics where you meet with different people.[/i] -Return to the [zrl=[baseurl]/help/main]Main documentation page[/zrl] +#include doc/macros/main_footer.bb; diff --git a/doc/addons.bb b/doc/addons.bb index a4b76929b..726b437ed 100644 --- a/doc/addons.bb +++ b/doc/addons.bb @@ -1,5 +1,5 @@ * [zrl=[baseurl]/help/addons_gnusocial]Posting To Gnu Social[/zrl] -Return to the [zrl=[baseurl]/help/main]Main documentation page[/zrl] +#include doc/macros/main_footer.bb; diff --git a/doc/addons_gnusocial.bb b/doc/addons_gnusocial.bb index 664f1df39..339add5a9 100644 --- a/doc/addons_gnusocial.bb +++ b/doc/addons_gnusocial.bb @@ -60,5 +60,5 @@ If you don't choose this option, you will have an option to send a post to your If all goes well, you have just cross-posted your RedMatrix post to your account on a GNUsocial instance. -Return to the [zrl=[baseurl]/help/main]Main documentation page[/zrl] +#include doc/macros/addons_footer.bb; diff --git a/doc/api_functions.bb b/doc/api_functions.bb index ade6efd42..c9d90c716 100644 --- a/doc/api_functions.bb +++ b/doc/api_functions.bb @@ -129,5 +129,5 @@ Red proposed API extensions to the Twitter API api/albums/destroy (R),J api/friends/permissions (R),J -Return to the [zrl=[baseurl]/help/main]Main documentation page[/zrl] +#include doc/macros/main_footer.bb; diff --git a/doc/bbcode.html b/doc/bbcode.html index 97a0bbc6c..0f070eaa2 100644 --- a/doc/bbcode.html +++ b/doc/bbcode.html @@ -66,8 +66,8 @@
  • [rpost=title]Text to post[/rpost] The observer will be returned to their home hub to enter a post with the specified title and body. Both are optional
  • [qr]text to post[/qr] - create a QR code.

    -Return to the Main documentation page[/a] +#include doc/macros/main_footer.bb; diff --git a/doc/campaign.bb b/doc/campaign.bb index f3d23baa6..b05846a0b 100644 --- a/doc/campaign.bb +++ b/doc/campaign.bb @@ -233,5 +233,5 @@ Raising more than our initial goal of funds, will speed up our development effor Awesome. We'd be more than happy to chat. You can find us {HERE} -Return to the [url=[baseurl]/help/main]Main documentation page[/url] +#include doc/macros/main_footer.bb; diff --git a/doc/channels.bb b/doc/channels.bb index 42253a664..82b70630c 100644 --- a/doc/channels.bb +++ b/doc/channels.bb @@ -26,5 +26,5 @@ The "Matrix" page contains all recent posts from across the matrix, ag As mentioned at the start, many other kinds of channel are possible, however, the creation procedure is the same. The difference between channels lies primarily in the permissions assigned. For example, a channel for sharing documents with colleagues at work would probably want more permissive settings for "Can write to my "public" file storage" than a personal account. For more information, see the permissions section. -Return to the [zrl=[baseurl]/help/main]Main documentation page[/zrl] +#include doc/macros/main_footer.bb; diff --git a/doc/checking_account_quota_usage.bb b/doc/checking_account_quota_usage.bb index 5bf5b3163..60d84005e 100644 --- a/doc/checking_account_quota_usage.bb +++ b/doc/checking_account_quota_usage.bb @@ -14,4 +14,4 @@ Visit the following URL in your browser: Example: [observer.baseurl]/filestorage/[observer.webname] -Return to the [zrl=[baseurl]/help/main]Main documentation page[/zrl] +#include doc/macros/main_footer.bb; diff --git a/doc/cloud.bb b/doc/cloud.bb index e71da78e8..92b97a21c 100644 --- a/doc/cloud.bb +++ b/doc/cloud.bb @@ -24,4 +24,4 @@ See: [zrl=[baseurl]/help/cloud_desktop_clients]Cloud Desktop Clients[/zrl] When using WebDAV, the file is created with your channel's default file permissions and this cannot be changed from within the operating system. It also may not be as restrictive as you would like. What we've found is that the preferred method of making files private is to first create folders or directories; then visit "filestorage/{{username}}"; select the directory and change the permissions. Do this before you put anything into the directory. The directory permissions take precedence so you can then put files or other folders into that container and they will be protected from unwanted viewers by the directory permissions. It is common for folks to create a "personal" or "private" folder which is restricted to themselves. You can use this as a personal cloud to store anything from anywhere on the web or any computer and it is protected from others. You might also create folders for "family" and "friends" with permission granted to appropriate collections of channels. -Return to the [zrl=[baseurl]/help/main]Main documentation page[/zrl] +#include doc/macros/main_footer.bb; diff --git a/doc/cloud_desktop_clients.bb b/doc/cloud_desktop_clients.bb index 557acb472..2f099527f 100644 --- a/doc/cloud_desktop_clients.bb +++ b/doc/cloud_desktop_clients.bb @@ -18,4 +18,4 @@ Note: There have been reported issues with clients that use "chunked transfer encoding", which includes Apple iOS services, and also the "AnyClient" and "CyberDuck" tools. These work fine for downloads, but uploads often end up with files of zero size. This is caused by an incorrect implemention of chunked encoding in some current FCGI (fast-cgi) implementations. Apache running with PHP as a module does not have these issues, but when running under FCGI you may need to use alternative clients or use the web uploader. At the time of this writing the issue has been open and no updates provided for at least a year. If you encounter zero size files with other clients, please check the client notes; as there are occasional configuration issues which can also produce these symptoms. -Return to the [zrl=[baseurl]/help/main]Main documentation page[/zrl] \ No newline at end of file +#include doc/macros/cloud_footer.bb; diff --git a/doc/comanche.bb b/doc/comanche.bb index d329cc34b..19a74833e 100644 --- a/doc/comanche.bb +++ b/doc/comanche.bb @@ -28,10 +28,10 @@ Currently there are three layout templates, unless your site provides additional edgestwo - two column layout with fixed side margins edgesthree - three column layout with fixed side margins full - three column layout with fixed side margins and adds a "header" region beneath the navigation bar - - redable - - A template for reading longer texts. Three columns: aside, content and right_aside. For maximum readability it is advised to only use the middle content column. + + redable + + A template for reading longer texts. Three columns: aside, content and right_aside. For maximum readability it is advised to only use the middle content column. [/code] @@ -45,11 +45,11 @@ To choose a layout template, use the 'template' tag. To choose the "choklet" template with the "three" flavour: [code] - [template=three]choklet[/template] -[/code] - -Or the "redable" (sic) template: - + [template=three]choklet[/template] +[/code] + +Or the "redable" (sic) template: + [code] [template]redable[/template] [/code] @@ -188,4 +188,4 @@ The 'comment' tag is used to delimit comments. These comments will not appear on [/region] [/code] -Return to the [url=[baseurl]/help/main]Main documentation page[/url] +#include doc/macros/main_footer.bb; diff --git a/doc/connecting_to_channels.bb b/doc/connecting_to_channels.bb index a067b6cf2..901565ad3 100644 --- a/doc/connecting_to_channels.bb +++ b/doc/connecting_to_channels.bb @@ -16,4 +16,4 @@ You may also connect with any channel by visiting the "Connections" pa Some channels are designated "Premium Channels" and may require some action on your part before a connection can be established. The Connect button will for these channels will take you to a page which lists in detail what terms the channel owner has set. If the terms are accepted, the connection will then proceed normally. In some cases, such as with celebrities and world-reknowned publishers, this may involve payment. If you do not agree to the terms, the connection will not proceed, or it may proceed but with reduced permissions allowed on your interactions with that channel. -Return to the [url=[baseurl]/help/main]Main documentation page[/url] +#include doc/macros/main_footer.bb; diff --git a/doc/credits.bb b/doc/credits.bb new file mode 100644 index 000000000..d13b99bdd --- /dev/null +++ b/doc/credits.bb @@ -0,0 +1,76 @@ +[b]Credits[/b] + +Mike Macgirvin +Thomas Willingham +Fabio Comuni +Simon L'nu +marijus +Tobias Diekershoff +fabrixxm +tommy tomson +Simon +zottel +Christian Vogeley +jeroenpraat +Michael Vogel +erik +Zach Prezkuta +Paolo T +Michael Meer +Michael +Abinoam P. Marques Jr +Tobias Hößl +Alexander Kampmann +Olaf Conradi +Paolo Tacconi +tobiasd +Devlon Duthie +Zvi ben Yaakov (a.k.a rdc) +Alexandre Hannud Abdo +Olivier Migeot +Chris Case +Klaus Weidenbach +Michael Johnston +olivierm +Vasudev Kamath +pixelroot +Max Weller +duthied +Martin Schmitt +Sebastian Egbers +Erkan Yilmaz +sasiflo +Stefan Parviainen +Haakon Meland Eriksen +Oliver Hartmann (23n) +Erik Lundin +habeascodice +sirius +Charles +Tony Baldwin +Hauke Zuehl +Keith Fernie +toclimb +Daniel Frank +Matthew Exon +Michal Supler +Tobias Luther +U-SOUND\mike +mrjive +nostupidzone +tonnerkiller +Antoine G +Christian Drechsler +Ludovic Grossard +RedMatrixCanada +Stanislav Lechev [0xAF] +aweiher +bufalo1973 +dsp1986 +felixgilles +ike +maase2 +mycocham +ndurchx +pafcu +Simó Albert i Beltran diff --git a/doc/dav_dolphin.bb b/doc/dav_dolphin.bb index 4429303d3..a1ebba394 100644 --- a/doc/dav_dolphin.bb +++ b/doc/dav_dolphin.bb @@ -6,4 +6,4 @@ When prompted for a username and password, enter your username (the first part o Note, if you are already logged in to the web interface via Konqueror, you will not be prompted for further authentication. -Return to the [zrl=[baseurl]/help/main]Main documentation page[/zrl] \ No newline at end of file +#include doc/macros/cloud_footer.bb; diff --git a/doc/dav_konqueror.bb b/doc/dav_konqueror.bb index f44c11fb2..79108e1d0 100644 --- a/doc/dav_konqueror.bb +++ b/doc/dav_konqueror.bb @@ -8,4 +8,5 @@ Additionally, if one has authenticated at a different hub during their normal br This functionality is normally restricted to the web interface, and is not available to any desktop software other than KDE. -Return to the [zrl=[baseurl]/help/main]Main documentation page[/zrl] \ No newline at end of file +#include doc/macros/cloud_footer.bb; + diff --git a/doc/dav_mount.bb b/doc/dav_mount.bb index 62edc09d0..d8cb2e08e 100644 --- a/doc/dav_mount.bb +++ b/doc/dav_mount.bb @@ -82,5 +82,5 @@ If that still doesn't work, disable the cache. Note that this has a performance If it [i]still[/i] doesn't work, there is one more thing you can try. (This one is caused by a bug in older versions of dav2fs itself, so updating to a new version may also help). Enable weak etag dropping by setting [code]drop_weak_etags 1[/code]. Unmount and remount your filesystem to apply the changes. +#include doc/macros/cloud_footer.bb; -Return to the [zrl=[baseurl]/help/main]Main documentation page[/zrl] diff --git a/doc/dav_nautilus.bb b/doc/dav_nautilus.bb index d3c478aa0..51663b6de 100644 --- a/doc/dav_nautilus.bb +++ b/doc/dav_nautilus.bb @@ -6,4 +6,4 @@ 4. You will be prompted for your username (same as above) and password 5. Your personal DAV directory will be shown in the window -Return to the [zrl=[baseurl]/help/main]Main documentation page[/zrl] \ No newline at end of file +#include doc/macros/cloud_footer.bb; diff --git a/doc/dav_nemo.bb b/doc/dav_nemo.bb index a2553c1d5..2c88b0782 100644 --- a/doc/dav_nemo.bb +++ b/doc/dav_nemo.bb @@ -15,5 +15,5 @@ Fill the dialog - Passwort: yourpasswort Once open you can set a bookmark. - -Return to the [zrl=[baseurl]/help/main]Main documentation page[/zrl] \ No newline at end of file + +#include doc/macros/cloud_footer.bb; diff --git a/doc/dav_windows.bb b/doc/dav_windows.bb index 600944b68..0eaffd4d0 100644 --- a/doc/dav_windows.bb +++ b/doc/dav_windows.bb @@ -8,4 +8,4 @@ RedDav using Windows 7 graphical user interface wizard: 5. Type your Red account's user name. IMPORTANT - NO at-sign or domain name. 6. Type your Red password -Return to the [zrl=[baseurl]/help/main]Main documentation page[/zrl] \ No newline at end of file +#include doc/macros/cloud_footer.bb; diff --git a/doc/debian_install.bb b/doc/debian_install.bb index f441025ae..f4e901dc6 100644 --- a/doc/debian_install.bb +++ b/doc/debian_install.bb @@ -29,4 +29,4 @@ To install Red for domain example.com, after the initial server setup run [code]bash setup-debian.sh red example.com[/code] -Return to the [zrl=[baseurl]/help/main]Main documentation page[/zrl] +#include doc/macros/main_footer.bb; diff --git a/doc/dev-function-overview.md b/doc/dev-function-overview.md index 3cda8f7c4..ecf9186ca 100644 --- a/doc/dev-function-overview.md +++ b/doc/dev-function-overview.md @@ -48,5 +48,5 @@ Returns the translated variant of $string for the current language or $string (d Shorthand test to see if variable $var is set and is not empty. Tests vary by type. Returns false if $var or $key is not set. If variable is set, returns 1 if has 'non-zero' value, otherwise returns 0. -- e.g. x('') or x(0) returns 0; -Return to the [url=[baseurl]/help/main]Main documentation page[/url] +#include doc/macros/main_footer.bb; diff --git a/doc/developer_function_primer.bb b/doc/developer_function_primer.bb index 144664615..3d5fe82a9 100644 --- a/doc/developer_function_primer.bb +++ b/doc/developer_function_primer.bb @@ -44,4 +44,4 @@ Returns the translated variant of $string for the current language or $string (d Shorthand test to see if variable $var is set and is not empty. Tests vary by type. Returns false if $var or $key is not set. If variable is set, returns 1 if has 'non-zero' value, otherwise returns 0. -- e.g. x('') or x(0) returns 0; -Return to the [url=[baseurl]/help/main]Main documentation page[/url] +#include doc/macros/main_footer.bb; diff --git a/doc/developers.bb b/doc/developers.bb index a29a848e0..18e39c4ea 100644 --- a/doc/developers.bb +++ b/doc/developers.bb @@ -64,4 +64,4 @@ In the interests of consistency we adopt the following code styling. We may acce [li] Generally speaking, opening braces go on the same line as the thing which opens the brace. They are the last character on the line. Closing braces are on a line by themselves. [/li] -Return to the [url=[baseurl]/help/main]Main documentation page[/url] +#include doc/macros/main_footer.bb; diff --git a/doc/external-resource-links.bb b/doc/external-resource-links.bb index 70dfd2fcc..29eabce74 100644 --- a/doc/external-resource-links.bb +++ b/doc/external-resource-links.bb @@ -19,6 +19,6 @@ [*][url=https://github.com/zzottel/feed2red]feed2red.pl (posts Atom/RSS feeds to channel)[/url] [b]Utilities[/b] -[*][url=http://beardyunixer.com:1234/?p=debian-install-script;a=tree]Debian Install Script[/url] +[*][url=http://gitweb.whogotzot.com/debian-install-script]Debian Install Script[/url] -Return to the [url=[baseurl]/help/main]Main documentation page[/url] +#include doc/macros/main_footer.bb; diff --git a/doc/extra_features.bb b/doc/extra_features.bb index 372ac6bbe..2e877375e 100644 --- a/doc/extra_features.bb +++ b/doc/extra_features.bb @@ -94,4 +94,4 @@ Ability to mark special posts with a star indicator Provide a personal tag cloud on your channel page -Return to the [zrl=[baseurl]/help/main]Main documentation page[/zrl] +#include doc/macros/main_footer.bb; diff --git a/doc/faq_admins.bb b/doc/faq_admins.bb index 1679ec246..60c1be5a8 100644 --- a/doc/faq_admins.bb +++ b/doc/faq_admins.bb @@ -45,4 +45,4 @@ valid SSL certificate rather than disabling port 443. [/ul] -Return to the [zrl=[baseurl]/help/main]Main documentation page[/zrl] +#include doc/macros/main_footer.bb; diff --git a/doc/faq_developers.bb b/doc/faq_developers.bb index 192dcb5c5..61843648a 100644 --- a/doc/faq_developers.bb +++ b/doc/faq_developers.bb @@ -1,6 +1,5 @@ [size=large][b]Frequently Asked Questions For Developers[/b][/size] -(...) still needs to be written (...) [ul] [*][b]What does $a mean?[/b] @@ -26,3 +25,7 @@ function foo() { } [/code] [/ul] + + +#include doc/macros/main_footer.bb; + diff --git a/doc/faq_members.bb b/doc/faq_members.bb new file mode 100644 index 000000000..a089b8b0c --- /dev/null +++ b/doc/faq_members.bb @@ -0,0 +1,15 @@ +[size=large][b]The Red Matrix FAQ[/b][/size] + +[ul] +[*][b]I am able to edit a post's text after I saved it, but is there a way to change the permissions?[/b] +Short anser: No, there isn't. There are reasons. You are able to change permissons to your files, photos and the likes, but not to posts after you have saved them. The main reason is: Once you have saved a post it is being distributed either to the public channel and from there to other Red Matrix servers or to those you intended it to go. Just like you cannot reclaim something you gave to another person, you cannot change permissions to Red Matrix posts. We would need to track everywhere your posting goes, keep track of everyone you allowed to see it and then keep track of from whom to delete it. +If a posting is public this is even harder, as the Red Matrix is a global network and there is no way to follow a post, let alone reclaim it reliably. Other networks that may receive your post have no reliable way to delete or reclaim the post. +[*][b]I downloaded my channel and imported it (cloned my identity) to another site but there is no content, no posts, no photos. What is wrong???[/b] +To be honest: Nothing. That's the way it is right now. Technically it is surely possible to take at least your own posts and maybe even files with you, but this has simply put not implemented yet. When creating this feature we thought that keeping all your contacts was more important. Your friends have already seen your old content. Once we find someone willing to implement this, it will be done. :) +[*][b]I can't see private resources[/b] +You have probably disabled third party cookies. You need to enable them for remote authentication to work. +[*][b]There are a lot of foreign language posts. Let's auto-translate them.[/b] +There are also a lot of [b]private[/b] foreign language posts and auto-translation services would require us to transmit these private messages to the translation service; and we don't know what they will do with them on their servers. Actually we do know thanks to Edward Snowden. Our best bet is a project called [b][i]Apertium[/i][/b] which is an open source translator we can install locally. It is currently missing German translations - which are the most requested translation in the matrix. Once again, this will be implemented when we find somebody who really wants to make it happen. +[/ul] + +#include doc/macros/main_footer.bb; diff --git a/doc/faq_users.bb b/doc/faq_users.bb deleted file mode 100644 index aac4a114c..000000000 --- a/doc/faq_users.bb +++ /dev/null @@ -1,17 +0,0 @@ -[size=large][b]The Red Matrix FAQ[/b][/size] - -[ul] -[*][b]I am able to edit a post's text after I saved it, but is there a way to change the permissions?[/b] -Short anser: No, there isn't. There are reasons. You are able to change permissons to your files, photos and the likes, but not to posts after you have saved them. The main reason is: Once you have saved a post it is being distributed either to the public channel and from there to other Red Matrix servers or to those you intended it to go. Just like you cannot reclaim something you gave to another person, you cannot change permissions to Red Matrix posts. We would need to track everywhere your posting goes, keep track of everyone you allowed to see it and then keep track of from whom to delete it. -If a posting is public this is even harder, as the Red Matrix is a global network and there is no way to follow a post, let alone reclaim it reliably. Other networks that may receive your post have no reliable way to delete or reclaim the post. -[*][b]I downloaded my channel and imported it (cloned my identity) to another site but there is no content, no posts, no photos. What is wrong???[/b] -To be honest: Nothing. That's the way it is right now. Technically it is surely possible to take at least your own posts and maybe even files with you, but this has simply put not implemented yet. When creating this feature we thought that keeping all your contacts was more important. Your friends have already seen your old content. Once we find someone willing to implement this, it will be done. :) -[*][b]I can't see private resources[/b] -You have probably disabled third party cookies. You need to enable them for remote authentication to work. -[*][b]There are a lot of foreign language posts. Let's auto-translate them.[/b] -There are also a lot of [b]private[/b] foreign language posts and auto-translation services would require us to transmit these private messages to the translation service; and we don't know what they will do with them on their servers. Actually we do know thanks to Edward Snowden. Our best bet is a project called [b][i]Apertium[/i][/b] which is an open source translator we can install locally. It is currently missing German translations - which are the most requested translation in the matrix. Once again, this will be implemented when we find somebody who really wants to make it happen. -[/ul] - - - -Return to the [zrl=[baseurl]/help/main]Main documentation page[/zrl] diff --git a/doc/features.bb b/doc/features.bb index 388f9bc91..fc977fcc1 100644 --- a/doc/features.bb +++ b/doc/features.bb @@ -108,4 +108,4 @@ Similar to any other modern blogging system, social network, or a micro-blogging [b][color=white]Previewing[/color][/b] Post can be previewed prior to sending. -Return to the [url=[baseurl]/help/main]Main documentation page[/url] \ No newline at end of file +#include doc/macros/main_footer.bb; diff --git a/doc/git_for_non_developers.bb b/doc/git_for_non_developers.bb index aa87fba69..029a6eb77 100644 --- a/doc/git_for_non_developers.bb +++ b/doc/git_for_non_developers.bb @@ -68,4 +68,4 @@ git request-pull master https://example.com/project And simply send the output to the project maintainer. -Return to the [url=[baseurl]/help/main]Main documentation page[/url] +#include doc/macros/main_footer.bb; diff --git a/doc/hidden_configs.bb b/doc/hidden_configs.bb index 0fc04b766..7b7a688c4 100644 --- a/doc/hidden_configs.bb +++ b/doc/hidden_configs.bb @@ -100,4 +100,6 @@ This document assumes you're an administrator. the main logs as well. [b]system > hide_in_statistics[/b] Tell the red statistics servers to completely hide this hub in hub lists. - \ No newline at end of file + +#include doc/macros/main_footer.bb; + diff --git a/doc/install.bb b/doc/install.bb index 1a35537aa..e68b4a230 100644 --- a/doc/install.bb +++ b/doc/install.bb @@ -1 +1,4 @@ #include install/INSTALL.txt; + +#include doc/macros/main_footer.bb; + diff --git a/doc/intro_for_developers.bb b/doc/intro_for_developers.bb index b44095d3d..50aedd0e2 100644 --- a/doc/intro_for_developers.bb +++ b/doc/intro_for_developers.bb @@ -109,4 +109,4 @@ At that point, if you need to add javascript or css files, add them to /js or /c Now you'll probably want to alter a template. These can be found in in /view/tpl OR view//tpl. All you should have to do is copy whatever you want to tweak from the first place to your theme's own tpl directory. -Return to the [url=[baseurl]/help/main]Main documentation page[/url] +#include doc/macros/main_footer.bb; diff --git a/doc/macros/addons_footer.bb b/doc/macros/addons_footer.bb new file mode 100644 index 000000000..f6b687a23 --- /dev/null +++ b/doc/macros/addons_footer.bb @@ -0,0 +1,2 @@ +Return to the [zrl=[baseurl]/help/addons]Addons documentation[/zrl] +Return to the [zrl=[baseurl]/help/addons]Main documentation[/zrl] diff --git a/doc/macros/cloud_footer.bb b/doc/macros/cloud_footer.bb new file mode 100644 index 000000000..798cc9ea6 --- /dev/null +++ b/doc/macros/cloud_footer.bb @@ -0,0 +1,2 @@ +Return to the [zrl=[baseurl]/help/cloud]Cloud documentation[/zrl] +Return to the [zrl=[baseurl]/help/main]Main documentation page[/zrl] diff --git a/doc/macros/main_footer.bb b/doc/macros/main_footer.bb new file mode 100644 index 000000000..08f671ded --- /dev/null +++ b/doc/macros/main_footer.bb @@ -0,0 +1 @@ +Return to the [zrl=[baseurl]/help/main]Main documentation page[/zrl] diff --git a/doc/macros/troubleshooting_footer.bb b/doc/macros/troubleshooting_footer.bb new file mode 100644 index 000000000..c7603a62b --- /dev/null +++ b/doc/macros/troubleshooting_footer.bb @@ -0,0 +1,2 @@ +[zrl=[baseurl]/help/troubleshooting]Troubleshooting documentation[/zrl] +[zrl=[baseurl]/help/troubleshooting]Documentation Main Page[/zrl] diff --git a/doc/main.bb b/doc/main.bb index 06559c327..5502db67d 100644 --- a/doc/main.bb +++ b/doc/main.bb @@ -36,7 +36,7 @@ Zot is the great new communicaton protocol invented especially for the Red Matri [zrl=[baseurl]/help/diaspora_compat]Diaspora Communications Compatibility (Diaspora and Friendica)[/zrl] [size=large][b]Frequently Asked Questions For Members[/b][/size] -[zrl=[baseurl]/help/faq_users]FAQ For Members[/zrl] +[zrl=[baseurl]/help/faq_members]FAQ For Members[/zrl] [size=large][b]For Hub Administrators[/b][/size] [zrl=[baseurl]/help/install]Install[/zrl] diff --git a/doc/permissions.bb b/doc/permissions.bb index c893ed84f..232ea9e96 100644 --- a/doc/permissions.bb +++ b/doc/permissions.bb @@ -107,4 +107,4 @@ The connection edit screen offers a slider to select a degree of friendship with The slider on the matrix page has both a minimum and maximum value. Posts will only be shown from people who fall between this range. Affinity has no relation to permissions, and is only useful in conjunction with the affinity tool feature. -Return to the [url=[baseurl]/help/main]Main documentation page[/url] +#include doc/macros/main_footer.bb; diff --git a/doc/plugins.bb b/doc/plugins.bb index 7709976c4..06801eb20 100644 --- a/doc/plugins.bb +++ b/doc/plugins.bb @@ -261,4 +261,4 @@ The Red Matrix has _install and _uninstall functions but these are used differen Changing these will often allow your plugin to function, but please double check all your permission and identity code because the concepts behind it are completely different in the Red Matrix. Many structured data names (especially DB schema columns) are also quite different. -Return to the [url=[baseurl]/help/main]Main documentation page[/url] +#include doc/macros/main_footer.bb; diff --git a/doc/problems-following-an-update.bb b/doc/problems-following-an-update.bb index 0b2c2e11a..a8a764cf1 100644 --- a/doc/problems-following-an-update.bb +++ b/doc/problems-following-an-update.bb @@ -34,4 +34,5 @@ Redbasic uses a few javascript libraries that are done differently, or entirely Should you report an issue with the theme developers then? No. Theme developers use their themes. Chances are, they know. Give them two or three days to catch up and [i]then[/i] report the issue if it's still not fixed. There are two workarounds for this situation. Firstly, you can temporarily use Redbasic. Secondly, most themes are open source too - open a pull request and make yourself a friend. -Return to the [url=[baseurl]/help/troubleshooting]Troubleshooting documentation page[/url] \ No newline at end of file +#include doc/macros/troubleshooting_footer.bb; + diff --git a/doc/profiles.bb b/doc/profiles.bb index 63b161962..5fcf5245a 100644 --- a/doc/profiles.bb +++ b/doc/profiles.bb @@ -32,4 +32,4 @@ On the directory page, you may search for people with published profiles. Curren On your Connnections page and in the directory there is a link to "Suggestions" or "Channel Suggestions", respectively. This will find channels who have matching and/or similar keywords. The more keywords you provide, the more relevant the search results that are returned. These are sorted by relevance. -Return to the [url=[baseurl]/help/main]Main documentation page[/url] +#include doc/macros/main_footer.bb; diff --git a/doc/red2pi.bb b/doc/red2pi.bb index 4ca58a382..d05cc57dd 100644 --- a/doc/red2pi.bb +++ b/doc/red2pi.bb @@ -342,4 +342,4 @@ Save and exit. Follow the instructions here: [url=https://github.com/friendica/friendica/wiki/Running-Friendica-with-SSL]https://github.com/friendica/friendica/wiki/Running-Friendica-with-SSL[/url] -Return to the [zrl=[baseurl]/help/main]Main documentation page[/zrl] +#include doc/macros/main_footer.bb; diff --git a/doc/registration.bb b/doc/registration.bb index 0aaa679c2..c507a86a6 100644 --- a/doc/registration.bb +++ b/doc/registration.bb @@ -31,4 +31,5 @@ See Also [zrl=[baseurl]/help/permissions]Permissions[/zrl] [zrl=[baseurl]/help/remove_account]Remove Account[/zrl] -Return to the [url=[baseurl]/help/main]Main documentation page[/url] +#include doc/macros/main_footer.bb; + diff --git a/doc/remove_account.bb b/doc/remove_account.bb index adc08d8f9..feb3f249a 100644 --- a/doc/remove_account.bb +++ b/doc/remove_account.bb @@ -24,6 +24,4 @@ This is irreversible. All your channels will be deleted. If you have identity clones on other sites this only removes by default the channels instances which exists on this site. - - -Return to the [url=[baseurl]/help/main]Main documentation page[/url] +#include doc/macros/main_footer.bb; diff --git a/doc/schema_development.bb b/doc/schema_development.bb index 2890d5454..c92536d7a 100644 --- a/doc/schema_development.bb +++ b/doc/schema_development.bb @@ -73,4 +73,4 @@ theme are as follows: [li] sloppy_photos Determins whether photos are "sloppy" or aligned. Set or unset (1 or '')[/li] -Return to the [url=[baseurl]/help/main]Main documentation page[/url] +#include doc/macros/main_footer.bb; diff --git a/doc/tags_and_mentions.bb b/doc/tags_and_mentions.bb index 477fbe291..d638492bb 100644 --- a/doc/tags_and_mentions.bb +++ b/doc/tags_and_mentions.bb @@ -66,5 +66,4 @@ will tag Robert Johnson, but we can only match one space. If the name was "Blind [/code] are both equivalent. - -Return to the [url=[baseurl]/help/main]Main documentation page[/url] +#include doc/macros/main_footer.bb; diff --git a/doc/troubleshooting.bb b/doc/troubleshooting.bb index f5572c6ed..d71b5f576 100644 --- a/doc/troubleshooting.bb +++ b/doc/troubleshooting.bb @@ -3,4 +3,4 @@ [li][zrl=[baseurl]/help/technical_faq]Technical FAQ[/zrl][/li] [li][zrl=[baseurl]/help/problems-following-an-update]Problems following an update[/zrl][/li] -Return to the [url=[baseurl]/help/main]Main documentation page[/url] +#include doc/macros/main_footer.bb; diff --git a/doc/webpages.bb b/doc/webpages.bb index 2bf7af762..780bde45c 100644 --- a/doc/webpages.bb +++ b/doc/webpages.bb @@ -10,6 +10,5 @@ The "page link title" box allows a user to specify the "pagelinkt Beneath the page creation box, a list of existing pages will appear with an "edit" link. Clicking this will take you to an editor, similar to that of the post editor, where you can make changes to your webpages. -If you are the admin of a site, you can specify a channel whose webpages we will use at key points around the site. Presently, the only place this is implemented is the home page. If you specify the channel "admin" and then the channel called "admin" creates a webpage called "home", we will display it's content on your websites home page. We expect this functionality to be extended to other areas in future. +#include doc/macros/main_footer.bb; -Return to the [url=[baseurl]/help/main]Main documentation page[/url] diff --git a/doc/what_is_zot.bb b/doc/what_is_zot.bb index 0e59d2d4c..67c0159e3 100644 --- a/doc/what_is_zot.bb +++ b/doc/what_is_zot.bb @@ -58,4 +58,4 @@ For more detailed, technical information about Zot, check out the following link - [url=https://github.com/friendica/red/blob/master/include/zot.php]Zot reference implementation in PHP[/url] -Return to the [url=[baseurl]/help/main]Main documentation page[/url] \ No newline at end of file +#include doc/macros/main_footer.bb; diff --git a/include/datetime.php b/include/datetime.php index 84ab1e2fa..fe0f29c7a 100644 --- a/include/datetime.php +++ b/include/datetime.php @@ -130,135 +130,98 @@ function datetime_convert($from = 'UTC', $to = 'UTC', $s = 'now', $fmt = "Y-m-d function dob($dob) { list($year,$month,$day) = sscanf($dob,'%4d-%2d-%2d'); - $y = datetime_convert('UTC',date_default_timezone_get(),'now','Y'); $f = get_config('system','birthday_input_format'); if(! $f) $f = 'ymd'; - $o = datesel($f,'',1920,$y,true,$year,$month,$day); - return $o; -} - -function datesel_format($f) { - - $o = ''; + $o = datesel($f,mktime(0,0,0,0,0,1900),mktime(),mktime(0,0,0,$month,$day,$year),'dob'); - if(strlen($f)) { - for($x = 0; $x < strlen($f); $x ++) { - switch($f[$x]) { - case 'y': - if(strlen($o)) - $o .= '-'; - $o .= t('year'); - break; - case 'm': - if(strlen($o)) - $o .= '-'; - $o .= t('month'); - break; - case 'd': - if(strlen($o)) - $o .= '-'; - $o .= t('day'); - break; - default: - break; - } - } - } return $o; } -// returns a date selector. -// $f = format string, e.g. 'ymd' or 'mdy' -// $pre = prefix (if needed) for HTML name and class fields -// $ymin = first year shown in selector dropdown -// $ymax = last year shown in selector dropdown -// $allow_blank = allow an empty response on any field -// $y = already selected year -// $m = already selected month -// $d = already selected day - +/** + * returns a date selector + * @param $format + * format string, e.g. 'ymd' or 'mdy'. Not currently supported + * @param $min + * unix timestamp of minimum date + * @param $max + * unix timestap of maximum date + * @param $default + * unix timestamp of default date + * @param $id + * id and name of datetimepicker (defaults to "datetimepicker") + */ +function datesel($format, $min, $max, $default,$id = 'datepicker') { + return datetimesel($format,$min,$max,$default,$id,true,false); +} -function datesel($f,$pre,$ymin,$ymax,$allow_blank,$y,$m,$d) { +/** + * returns a date selector + * @param $format + * format string, e.g. 'ymd' or 'mdy'. Not currently supported + * @param $h + * already selected hour + * @param $m + * already selected minute + * @param $id + * id and name of datetimepicker (defaults to "timepicker") + */ +function timesel($format,$h,$m,$id='timepicker') { + return datetimesel($format,mktime(),mktime(),mktime($h,$m),$id,false,true); +} +/** + * returns a datetime selector + * @param $format + * format string, e.g. 'ymd' or 'mdy'. Not currently supported + * @param $min + * unix timestamp of minimum date + * @param $max + * unix timestap of maximum date + * @param $default + * unix timestamp of default date + * @param $id + * id and name of datetimepicker (defaults to "datetimepicker") + * @param $pickdate + * true to show date picker (default) + * @param $picktime + * true to show time picker (default) + * @param $minfrom + * set minimum date from picker with id $minfrom (none by default) + * @param $maxfrom + * set maximum date from picker with id $maxfrom (none by default) + */ +function datetimesel($format, $min, $max, $default, $id = 'datetimepicker', $pickdate = true, $picktime = true, $minfrom = '', $maxfrom = '') { $o = ''; - if(strlen($f)) { - for($z = 0; $z < strlen($f); $z ++) { - if($f[$z] === 'y') { - - $o .= " "; - return $o; -} + $mindate = $min ? "new Date($min*1000)" : ''; + $maxdate = $max ? "new Date($max*1000)" : ''; + + $defaultDate = $default ? ", defaultDate: new Date($default*1000)" : ''; + $pickers = ''; + if(!$pickdate) $pickers .= 'pickDate: false,'; + if(!$picktime) $pickers .= 'pickTime: false,'; -function timesel($pre,$h,$m) { + $extra_js = ''; + if($minfrom != '') + $extra_js .= "\$('#$minfrom').on('dp.change',function (e) { \$('#$id').data('DateTimePicker').setMinDate(e.date); });"; - $o = ''; - $o .= " : "; + $o .= "
    "; + $o .= ""; return $o; } - - - - - - - // implements "3 seconds ago" etc. // based on $posted_date, (UTC). // Results relative to current timezone @@ -516,4 +479,4 @@ function update_birthdays() { } } } -} \ No newline at end of file +} diff --git a/include/nav.php b/include/nav.php index ba817648b..f1f89db20 100644 --- a/include/nav.php +++ b/include/nav.php @@ -142,7 +142,7 @@ EOT; sprintf( t('%s - click to logout'), $observer['xchan_addr'])); } else { - $nav['loginmenu'][] = Array('rmagic',t('Remote login'),'',t('Click to authenticate to your home hub')); + $nav['loginmenu'][] = Array('rmagic',t('Remote authentication'),'',t('Click to authenticate to your home hub')); } /** diff --git a/mod/events.php b/mod/events.php index d24f84d44..86a2286b2 100755 --- a/mod/events.php +++ b/mod/events.php @@ -18,18 +18,6 @@ function events_post(&$a) { $start_text = escape_tags($_REQUEST['start_text']); $finish_text = escape_tags($_REQUEST['finish_text']); - $startyear = intval($_POST['startyear']); - $startmonth = intval($_POST['startmonth']); - $startday = intval($_POST['startday']); - $starthour = intval($_POST['starthour']); - $startminute = intval($_POST['startminute']); - - $finishyear = intval($_POST['finishyear']); - $finishmonth = intval($_POST['finishmonth']); - $finishday = intval($_POST['finishday']); - $finishhour = intval($_POST['finishhour']); - $finishminute = intval($_POST['finishminute']); - $adjust = intval($_POST['adjust']); $nofinish = intval($_POST['nofinish']); @@ -79,8 +67,10 @@ function events_post(&$a) { // and we'll waste a bunch of time responding to it. Time that // could've been spent doing something else. - if(strcmp($finish,$start) < 0) - $finish = $start; + if(strcmp($finish,$start) < 0) { + notice( t('Event can not end before it has started.') . EOL); + goaway($a->get_baseurl() . '/events/new'); + } $summary = escape_tags(trim($_POST['summary'])); $desc = escape_tags(trim($_POST['desc'])); @@ -530,11 +520,6 @@ function events_content(&$a) { } } - - - $dateformat = datesel_format($f); - $timeformat = t('hour:minute'); - require_once('include/acl_selectors.php'); $perm_defaults = array( @@ -554,24 +539,20 @@ function events_content(&$a) { '$mid' => $mid, '$title' => t('Event details'), - '$format_desc' => sprintf( t('Format is %s %s.'),$dateformat,$timeformat), '$desc' => t('Starting date and Title are required.'), '$catsenabled' => $catsenabled, '$placeholdercategory' => t('Categories (comma-separated list)'), '$category' => $category, '$s_text' => t('Event Starts:') . ' *', - '$bootstrap' => 1, '$stext' => $stext, '$ftext' => $ftext, '$ModalCANCEL' => t('Cancel'), '$ModalOK' => t('OK'), - '$s_dsel' => datesel($f,'start',$syear+5,$syear,false,$syear,$smonth,$sday), - '$s_tsel' => timesel('start',$shour,$sminute), + '$s_dsel' => datetimesel($f,mktime(),mktime(0,0,0,0,0,$syear+5),mktime(),'start_text'), '$n_text' => t('Finish date/time is not known or not relevant'), '$n_checked' => $n_checked, '$f_text' => t('Event Finishes:'), - '$f_dsel' => datesel($f,'finish',$fyear+5,$fyear,false,$fyear,$fmonth,$fday), - '$f_tsel' => timesel('finish',$fhour,$fminute), + '$f_dsel' => datetimesel($f,mktime(),mktime(0,0,0,0,0,$fyear+5),mktime(),'finish_text',true,true,'start_text'), '$a_text' => t('Adjust for viewer timezone'), '$a_checked' => $a_checked, '$d_text' => t('Description:'), diff --git a/mod/photos.php b/mod/photos.php index 2b859b7f1..4c52c7ef7 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -956,7 +956,7 @@ function photos_content(&$a) { $edit = array( 'edit' => t('Edit photo'), - 'id' => $ph[0]['id'], + 'id' => $link_item['id'], //$ph[0]['id'], 'rotatecw' => t('Rotate CW (right)'), 'rotateccw' => t('Rotate CCW (left)'), 'albums' => $albums['albums'], @@ -1114,7 +1114,7 @@ function photos_content(&$a) { $photo_tpl = get_markup_template('photo_view.tpl'); $o .= replace_macros($photo_tpl, array( - '$id' => $ph[0]['id'], + '$id' => $link_item['id'], //$ph[0]['id'], '$album' => $album_e, '$tools' => $tools, '$lock' => $lock, diff --git a/mod/profiles.php b/mod/profiles.php index 5d0416e9a..14f24c5cf 100644 --- a/mod/profiles.php +++ b/mod/profiles.php @@ -233,41 +233,13 @@ function profiles_post(&$a) { return; } - if($_POST['dob']) { - $year = substr($_POST['dob'],0,4); - $month = substr($_POST['dob'],5,2); - $day = substr($_POST['dob'],8,2); - } - - $year = intval($_POST['year']); - if($year < 1900 || $year > 2100 || $year < 0) - $year = 0; - $month = intval($_POST['month']); - if(($month > 12) || ($month < 0)) - $month = 0; - $mtab = array(0,31,29,31,30,31,30,31,31,30,31,30,31); - $day = intval($_POST['day']); - if(($day > $mtab[$month]) || ($day < 0)) - $day = 0; - -// if($year && (! ($month && $day))) { -// $month = 1; $day = 1; -// } - - - $dob = '0000-00-00'; - $dob = sprintf('%04d-%02d-%02d',$year,$month,$day); - + $dob = $_POST['dob'] ? escape_tags(trim($_POST['dob'])) : '0000-00-00'; // FIXME: Needs to be validated? $name = escape_tags(trim($_POST['name'])); if($orig[0]['name'] != $name) $namechanged = true; - - - - $pdesc = escape_tags(trim($_POST['pdesc'])); $gender = escape_tags(trim($_POST['gender'])); $address = escape_tags(trim($_POST['address'])); @@ -654,7 +626,7 @@ logger('extra_fields: ' . print_r($extra_fields,true)); '$lbl_fullname' => t('Your Full Name:'), '$lbl_title' => t('Title/Description:'), '$lbl_gender' => t('Your Gender:'), - '$lbl_bd' => sprintf( t("Birthday \x28%s\x29:"),datesel_format($f)), + '$lbl_bd' => t("Birthday :"), '$lbl_address' => t('Street Address:'), '$lbl_city' => t('Locality/City:'), '$lbl_zip' => t('Postal/Zip Code:'), diff --git a/util/messages.po b/util/messages.po index ada12b442..7fafa754c 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 2014-10-19.833\n" +"Project-Id-Version: 2014-10-10.824\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-19 16:08-0700\n" +"POT-Creation-Date: 2014-10-10 00:03-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -85,70 +85,71 @@ msgid "Visible to specific connections." msgstr "" #: ../../include/items.php:3927 ../../mod/display.php:32 -#: ../../mod/filestorage.php:26 ../../mod/admin.php:168 +#: ../../mod/filestorage.php:18 ../../mod/admin.php:168 #: ../../mod/admin.php:898 ../../mod/admin.php:1101 ../../mod/thing.php:76 #: ../../mod/viewsrc.php:20 msgid "Item not found." msgstr "" -#: ../../include/items.php:3994 ../../include/attach.php:116 -#: ../../include/attach.php:163 ../../include/attach.php:226 -#: ../../include/attach.php:240 ../../include/attach.php:280 -#: ../../include/attach.php:294 ../../include/attach.php:318 -#: ../../include/attach.php:511 ../../include/attach.php:584 -#: ../../include/photos.php:15 ../../include/chat.php:116 +#: ../../include/items.php:3989 ../../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 #: ../../mod/mood.php:112 ../../mod/mitem.php:73 ../../mod/achievements.php:30 #: ../../mod/settings.php:496 ../../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/blocks.php:29 ../../mod/blocks.php:44 ../../mod/bookmarks.php:46 -#: ../../mod/profiles.php:179 ../../mod/profiles.php:532 -#: ../../mod/photos.php:68 ../../mod/photos.php:526 ../../mod/channel.php:89 -#: ../../mod/channel.php:193 ../../mod/channel.php:236 ../../mod/chat.php:90 -#: ../../mod/chat.php:95 ../../mod/register.php:70 ../../mod/regmod.php:17 -#: ../../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/events.php:190 ../../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/profile_photo.php:263 +#: ../../mod/blocks.php:29 ../../mod/blocks.php:44 ../../mod/profiles.php:179 +#: ../../mod/profiles.php:560 ../../mod/webpages.php:40 +#: ../../mod/channel.php:89 ../../mod/channel.php:193 +#: ../../mod/channel.php:236 ../../mod/chat.php:90 ../../mod/chat.php:95 +#: ../../mod/register.php:70 ../../mod/regmod.php:17 ../../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/photos.php:68 ../../mod/photos.php:526 +#: ../../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/bookmarks.php:46 ../../mod/profile_photo.php:263 #: ../../mod/profile_photo.php:276 ../../mod/sources.php:66 -#: ../../mod/filestorage.php:18 ../../mod/filestorage.php:67 -#: ../../mod/filestorage.php:82 ../../mod/filestorage.php:109 -#: ../../mod/fsuggest.php:78 ../../mod/suggest.php:26 ../../mod/group.php:9 -#: ../../mod/thing.php:247 ../../mod/thing.php:264 ../../mod/thing.php:299 -#: ../../mod/invite.php:13 ../../mod/invite.php:104 ../../mod/item.php:182 -#: ../../mod/item.php:190 ../../mod/item.php:929 ../../mod/layouts.php:27 -#: ../../mod/layouts.php:39 ../../mod/like.php:154 -#: ../../mod/viewconnections.php:22 ../../mod/viewconnections.php:27 -#: ../../mod/viewsrc.php:14 ../../mod/mail.php:111 ../../mod/manage.php:6 -#: ../../mod/menu.php:44 ../../mod/webpages.php:40 ../../mod/message.php:16 -#: ../../mod/new_channel.php:68 ../../mod/new_channel.php:99 -#: ../../mod/notifications.php:66 ../../mod/appman.php:66 -#: ../../mod/service_limits.php:7 ../../index.php:190 ../../index.php:365 +#: ../../mod/events.php:200 ../../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:247 +#: ../../mod/thing.php:264 ../../mod/thing.php:299 ../../mod/invite.php:13 +#: ../../mod/invite.php:104 ../../mod/item.php:182 ../../mod/item.php:190 +#: ../../mod/item.php:929 ../../mod/layouts.php:27 ../../mod/layouts.php:39 +#: ../../mod/like.php:154 ../../mod/viewconnections.php:22 +#: ../../mod/viewconnections.php:27 ../../mod/viewsrc.php:14 +#: ../../mod/mail.php:111 ../../mod/manage.php:6 ../../mod/menu.php:44 +#: ../../mod/message.php:16 ../../mod/new_channel.php:68 +#: ../../mod/new_channel.php:99 ../../mod/notifications.php:66 +#: ../../mod/appman.php:66 ../../mod/service_limits.php:7 ../../index.php:190 +#: ../../index.php:365 msgid "Permission denied." msgstr "" -#: ../../include/items.php:4365 ../../mod/group.php:38 ../../mod/group.php:140 +#: ../../include/items.php:4360 ../../mod/group.php:38 ../../mod/group.php:140 msgid "Collection not found." msgstr "" -#: ../../include/items.php:4380 +#: ../../include/items.php:4375 msgid "Collection is empty." msgstr "" -#: ../../include/items.php:4387 +#: ../../include/items.php:4382 #, php-format msgid "Collection: %s" msgstr "" -#: ../../include/items.php:4398 +#: ../../include/items.php:4393 #, php-format msgid "Connection: %s" msgstr "" -#: ../../include/items.php:4401 +#: ../../include/items.php:4396 msgid "Connection not found." msgstr "" @@ -165,8 +166,8 @@ msgstr "" msgid "Site Admin" msgstr "" -#: ../../include/apps.php:127 ../../include/conversation.php:1570 -#: ../../include/nav.php:117 +#: ../../include/apps.php:127 ../../include/conversation.php:1566 +#: ../../include/nav.php:116 msgid "Bookmarks" msgstr "" @@ -174,65 +175,65 @@ msgstr "" msgid "Address Book" msgstr "" -#: ../../include/apps.php:129 ../../include/nav.php:125 ../../boot.php:1496 +#: ../../include/apps.php:129 ../../include/nav.php:124 ../../boot.php:1495 msgid "Login" msgstr "" -#: ../../include/apps.php:130 ../../include/nav.php:216 +#: ../../include/apps.php:130 ../../include/nav.php:217 #: ../../mod/manage.php:148 msgid "Channel Manager" msgstr "" -#: ../../include/apps.php:131 ../../include/nav.php:190 +#: ../../include/apps.php:131 ../../include/nav.php:191 msgid "Matrix" msgstr "" #: ../../include/apps.php:132 ../../include/widgets.php:521 -#: ../../include/nav.php:218 ../../mod/admin.php:953 ../../mod/admin.php:1158 +#: ../../include/nav.php:219 ../../mod/admin.php:953 ../../mod/admin.php:1158 msgid "Settings" msgstr "" -#: ../../include/apps.php:133 ../../include/conversation.php:1546 -#: ../../include/nav.php:106 ../../include/RedDAV/RedBrowser.php:241 +#: ../../include/apps.php:133 ../../include/conversation.php:1542 +#: ../../include/nav.php:105 ../../include/RedDAV/RedBrowser.php:238 #: ../../mod/fbrowser.php:114 msgid "Files" msgstr "" -#: ../../include/apps.php:134 ../../include/conversation.php:1581 -#: ../../include/nav.php:121 ../../mod/webpages.php:129 +#: ../../include/apps.php:134 ../../include/conversation.php:1577 +#: ../../include/nav.php:120 ../../mod/webpages.php:86 msgid "Webpages" msgstr "" -#: ../../include/apps.php:135 ../../include/nav.php:193 +#: ../../include/apps.php:135 ../../include/nav.php:194 msgid "Channel Home" msgstr "" -#: ../../include/apps.php:136 ../../include/identity.php:1112 -#: ../../include/identity.php:1230 ../../mod/profperm.php:112 +#: ../../include/apps.php:136 ../../include/identity.php:1111 +#: ../../include/identity.php:1229 ../../mod/profperm.php:112 msgid "Profile" msgstr "" -#: ../../include/apps.php:137 ../../include/conversation.php:1537 -#: ../../include/nav.php:105 ../../mod/fbrowser.php:25 +#: ../../include/apps.php:137 ../../include/conversation.php:1533 +#: ../../include/nav.php:104 ../../mod/fbrowser.php:25 msgid "Photos" msgstr "" -#: ../../include/apps.php:138 ../../include/nav.php:212 -#: ../../mod/events.php:426 +#: ../../include/apps.php:138 ../../include/nav.php:213 +#: ../../mod/events.php:436 msgid "Events" msgstr "" -#: ../../include/apps.php:139 ../../include/nav.php:176 +#: ../../include/apps.php:139 ../../include/nav.php:177 #: ../../mod/directory.php:226 msgid "Directory" msgstr "" -#: ../../include/apps.php:140 ../../include/nav.php:168 ../../mod/help.php:60 +#: ../../include/apps.php:140 ../../include/nav.php:169 ../../mod/help.php:60 #: ../../mod/help.php:65 msgid "Help" msgstr "" -#: ../../include/apps.php:141 ../../include/nav.php:204 +#: ../../include/apps.php:141 ../../include/nav.php:205 msgid "Mail" msgstr "" @@ -240,16 +241,16 @@ msgstr "" msgid "Mood" msgstr "" -#: ../../include/apps.php:143 ../../include/conversation.php:951 +#: ../../include/apps.php:143 ../../include/conversation.php:947 msgid "Poke" msgstr "" -#: ../../include/apps.php:144 ../../include/nav.php:111 +#: ../../include/apps.php:144 ../../include/nav.php:110 msgid "Chat" msgstr "" #: ../../include/apps.php:145 ../../include/text.php:822 -#: ../../include/text.php:834 ../../include/nav.php:173 +#: ../../include/text.php:834 ../../include/nav.php:174 #: ../../mod/search.php:30 msgid "Search" msgstr "" @@ -300,123 +301,65 @@ msgid "Purchase" msgstr "" #: ../../include/apps.php:249 ../../include/page_widgets.php:8 -#: ../../include/page_widgets.php:36 ../../include/RedDAV/RedBrowser.php:250 +#: ../../include/page_widgets.php:36 ../../include/RedDAV/RedBrowser.php:247 #: ../../include/menu.php:42 ../../include/ItemObject.php:100 #: ../../mod/settings.php:581 ../../mod/blocks.php:99 -#: ../../mod/connections.php:381 ../../mod/connections.php:394 -#: ../../mod/connections.php:413 ../../mod/editblock.php:111 -#: ../../mod/editlayout.php:106 ../../mod/editpost.php:112 -#: ../../mod/editwebpage.php:143 ../../mod/thing.php:233 -#: ../../mod/layouts.php:121 ../../mod/menu.php:59 ../../mod/webpages.php:131 +#: ../../mod/webpages.php:133 ../../mod/connections.php:381 +#: ../../mod/connections.php:394 ../../mod/connections.php:413 +#: ../../mod/editblock.php:111 ../../mod/editlayout.php:106 +#: ../../mod/editpost.php:112 ../../mod/editwebpage.php:143 +#: ../../mod/thing.php:233 ../../mod/layouts.php:121 ../../mod/menu.php:59 msgid "Edit" msgstr "" #: ../../include/apps.php:250 ../../include/conversation.php:638 -#: ../../include/RedDAV/RedBrowser.php:251 ../../include/ItemObject.php:120 -#: ../../mod/settings.php:582 ../../mod/photos.php:1064 -#: ../../mod/connedit.php:462 ../../mod/group.php:176 ../../mod/admin.php:732 +#: ../../include/RedDAV/RedBrowser.php:248 ../../include/ItemObject.php:120 +#: ../../mod/settings.php:582 ../../mod/connedit.php:462 +#: ../../mod/photos.php:1064 ../../mod/group.php:176 ../../mod/admin.php:732 #: ../../mod/admin.php:863 ../../mod/thing.php:234 msgid "Delete" msgstr "" #: ../../include/apps.php:331 ../../include/apps.php:382 -#: ../../include/conversation.php:1003 ../../include/RedDAV/RedBrowser.php:163 +#: ../../include/conversation.php:999 ../../include/RedDAV/RedBrowser.php:160 #: ../../mod/connedit.php:498 msgid "Unknown" msgstr "" -#: ../../include/attach.php:221 ../../include/attach.php:275 -msgid "Item was not found." -msgstr "" - -#: ../../include/attach.php:331 -msgid "No source file." -msgstr "" - -#: ../../include/attach.php:348 -msgid "Cannot locate file to replace" -msgstr "" - -#: ../../include/attach.php:366 -msgid "Cannot locate file to revise/update" -msgstr "" - -#: ../../include/attach.php:377 -#, php-format -msgid "File exceeds size limit of %d" -msgstr "" - -#: ../../include/attach.php:389 -#, php-format -msgid "You have reached your limit of %1$.0f Mbytes attachment storage." -msgstr "" - -#: ../../include/attach.php:472 -msgid "File upload failed. Possible system limit or action terminated." -msgstr "" - -#: ../../include/attach.php:484 -msgid "Stored file could not be verified. Upload failed." -msgstr "" - -#: ../../include/attach.php:526 ../../include/attach.php:543 -msgid "Path not available." -msgstr "" - -#: ../../include/attach.php:589 -msgid "Empty pathname" -msgstr "" - -#: ../../include/attach.php:605 -msgid "duplicate filename or path" -msgstr "" - -#: ../../include/attach.php:629 -msgid "Path not found." -msgstr "" - -#: ../../include/attach.php:680 -msgid "mkdir failed." -msgstr "" - -#: ../../include/attach.php:684 -msgid "database storage failed." -msgstr "" - #: ../../include/page_widgets.php:6 msgid "New Page" msgstr "" #: ../../include/page_widgets.php:39 ../../mod/blocks.php:102 -#: ../../mod/layouts.php:125 ../../mod/webpages.php:134 +#: ../../mod/webpages.php:136 ../../mod/layouts.php:125 msgid "View" msgstr "" -#: ../../include/page_widgets.php:40 ../../include/conversation.php:1114 -#: ../../include/ItemObject.php:608 ../../mod/photos.php:1015 -#: ../../mod/editblock.php:141 ../../mod/editlayout.php:135 -#: ../../mod/editpost.php:140 ../../mod/editwebpage.php:174 -#: ../../mod/webpages.php:135 +#: ../../include/page_widgets.php:40 ../../include/conversation.php:1110 +#: ../../include/ItemObject.php:606 ../../mod/webpages.php:137 +#: ../../mod/photos.php:1015 ../../mod/editblock.php:141 +#: ../../mod/editlayout.php:135 ../../mod/editpost.php:140 +#: ../../mod/editwebpage.php:174 msgid "Preview" msgstr "" -#: ../../include/page_widgets.php:41 ../../mod/webpages.php:136 +#: ../../include/page_widgets.php:41 ../../mod/webpages.php:138 msgid "Actions" msgstr "" -#: ../../include/page_widgets.php:42 ../../mod/webpages.php:137 +#: ../../include/page_widgets.php:42 ../../mod/webpages.php:139 msgid "Page Link" msgstr "" -#: ../../include/page_widgets.php:43 ../../mod/webpages.php:138 +#: ../../include/page_widgets.php:43 ../../mod/webpages.php:140 msgid "Title" msgstr "" -#: ../../include/page_widgets.php:44 ../../mod/webpages.php:139 +#: ../../include/page_widgets.php:44 ../../mod/webpages.php:141 msgid "Created" msgstr "" -#: ../../include/page_widgets.php:45 ../../mod/webpages.php:140 +#: ../../include/page_widgets.php:45 ../../mod/webpages.php:142 msgid "Edited" msgstr "" @@ -430,7 +373,7 @@ msgstr "" msgid "Categories" msgstr "" -#: ../../include/widgets.php:86 ../../include/nav.php:171 +#: ../../include/widgets.php:86 ../../include/nav.php:172 #: ../../mod/apps.php:33 msgid "Apps" msgstr "" @@ -439,7 +382,7 @@ msgstr "" msgid "System" msgstr "" -#: ../../include/widgets.php:89 ../../include/conversation.php:1449 +#: ../../include/widgets.php:89 ../../include/conversation.php:1445 msgid "Personal" msgstr "" @@ -452,7 +395,7 @@ msgid "Edit Personal App" msgstr "" #: ../../include/widgets.php:135 ../../include/widgets.php:175 -#: ../../include/conversation.php:948 ../../include/identity.php:832 +#: ../../include/conversation.php:944 ../../include/identity.php:831 #: ../../include/Contact.php:107 ../../mod/directory.php:183 #: ../../mod/dirprofile.php:164 ../../mod/suggest.php:51 #: ../../mod/match.php:62 @@ -536,8 +479,8 @@ msgstr "" msgid "Best Friends" msgstr "" -#: ../../include/widgets.php:407 ../../include/identity.php:381 -#: ../../include/identity.php:382 ../../include/identity.php:389 +#: ../../include/widgets.php:407 ../../include/identity.php:380 +#: ../../include/identity.php:381 ../../include/identity.php:388 #: ../../include/profile_selectors.php:80 ../../mod/connedit.php:495 msgid "Friends" msgstr "" @@ -612,7 +555,7 @@ msgstr "" msgid "Check Mail" msgstr "" -#: ../../include/widgets.php:545 ../../include/nav.php:209 +#: ../../include/widgets.php:545 ../../include/nav.php:210 msgid "New Message" msgstr "" @@ -628,15 +571,15 @@ msgstr "" msgid "Suggested Chatrooms" msgstr "" -#: ../../include/zot.php:655 +#: ../../include/zot.php:654 msgid "Invalid data packet" msgstr "" -#: ../../include/zot.php:671 +#: ../../include/zot.php:670 msgid "Unable to verify channel signature" msgstr "" -#: ../../include/zot.php:1757 +#: ../../include/zot.php:1741 #, php-format msgid "Unable to verify site signature for %s" msgstr "" @@ -658,7 +601,7 @@ msgstr "" msgid "Photo storage failed." msgstr "" -#: ../../include/photos.php:340 ../../include/conversation.php:1540 +#: ../../include/photos.php:340 ../../include/conversation.php:1536 msgid "Photo Albums" msgstr "" @@ -678,13 +621,13 @@ msgstr "" msgid "Don't show" msgstr "" -#: ../../include/acl_selectors.php:248 ../../mod/photos.php:604 -#: ../../mod/photos.php:970 ../../mod/chat.php:209 ../../mod/events.php:566 -#: ../../mod/filestorage.php:137 +#: ../../include/acl_selectors.php:248 ../../mod/chat.php:209 +#: ../../mod/photos.php:604 ../../mod/photos.php:970 +#: ../../mod/filestorage.php:128 msgid "Permissions" msgstr "" -#: ../../include/acl_selectors.php:249 ../../include/ItemObject.php:305 +#: ../../include/acl_selectors.php:249 ../../include/ItemObject.php:303 msgid "Close" msgstr "" @@ -711,10 +654,68 @@ msgstr "" msgid "%1$s has an updated %2$s, changing %3$s." msgstr "" -#: ../../include/api.php:1072 +#: ../../include/api.php:1069 msgid "Public Timeline" msgstr "" +#: ../../include/attach.php:224 ../../include/attach.php:278 +msgid "Item was not found." +msgstr "" + +#: ../../include/attach.php:335 +msgid "No source file." +msgstr "" + +#: ../../include/attach.php:352 +msgid "Cannot locate file to replace" +msgstr "" + +#: ../../include/attach.php:370 +msgid "Cannot locate file to revise/update" +msgstr "" + +#: ../../include/attach.php:381 +#, php-format +msgid "File exceeds size limit of %d" +msgstr "" + +#: ../../include/attach.php:393 +#, php-format +msgid "You have reached your limit of %1$.0f Mbytes attachment storage." +msgstr "" + +#: ../../include/attach.php:475 +msgid "File upload failed. Possible system limit or action terminated." +msgstr "" + +#: ../../include/attach.php:487 +msgid "Stored file could not be verified. Upload failed." +msgstr "" + +#: ../../include/attach.php:528 ../../include/attach.php:545 +msgid "Path not available." +msgstr "" + +#: ../../include/attach.php:590 +msgid "Empty pathname" +msgstr "" + +#: ../../include/attach.php:606 +msgid "duplicate filename or path" +msgstr "" + +#: ../../include/attach.php:630 +msgid "Path not found." +msgstr "" + +#: ../../include/attach.php:681 +msgid "mkdir failed." +msgstr "" + +#: ../../include/attach.php:685 +msgid "database storage failed." +msgstr "" + #: ../../include/conversation.php:120 ../../include/text.php:1743 #: ../../include/diaspora.php:1924 ../../mod/subthread.php:72 #: ../../mod/subthread.php:174 ../../mod/tagger.php:45 ../../mod/like.php:294 @@ -782,396 +783,392 @@ msgid "Private Message" msgstr "" #: ../../include/conversation.php:652 ../../include/ItemObject.php:194 -msgid "Message signature validated" +msgid "Message is verified" msgstr "" -#: ../../include/conversation.php:653 ../../include/ItemObject.php:195 -msgid "Message signature incorrect" -msgstr "" - -#: ../../include/conversation.php:674 +#: ../../include/conversation.php:671 #, php-format msgid "View %s's profile @ %s" msgstr "" -#: ../../include/conversation.php:689 +#: ../../include/conversation.php:685 msgid "Categories:" msgstr "" -#: ../../include/conversation.php:690 +#: ../../include/conversation.php:686 msgid "Filed under:" msgstr "" -#: ../../include/conversation.php:698 ../../include/ItemObject.php:265 +#: ../../include/conversation.php:694 ../../include/ItemObject.php:264 #, php-format msgid " from %s" msgstr "" -#: ../../include/conversation.php:701 ../../include/ItemObject.php:268 +#: ../../include/conversation.php:697 ../../include/ItemObject.php:267 #, php-format msgid "last edited: %s" msgstr "" -#: ../../include/conversation.php:702 ../../include/ItemObject.php:269 +#: ../../include/conversation.php:698 ../../include/ItemObject.php:268 #, php-format msgid "Expires: %s" msgstr "" -#: ../../include/conversation.php:717 +#: ../../include/conversation.php:713 msgid "View in context" msgstr "" -#: ../../include/conversation.php:719 ../../include/conversation.php:1153 -#: ../../include/ItemObject.php:310 ../../mod/photos.php:995 +#: ../../include/conversation.php:715 ../../include/conversation.php:1149 +#: ../../include/ItemObject.php:308 ../../mod/photos.php:995 #: ../../mod/editblock.php:120 ../../mod/editlayout.php:115 #: ../../mod/editpost.php:121 ../../mod/editwebpage.php:152 #: ../../mod/mail.php:234 ../../mod/mail.php:349 msgid "Please wait" msgstr "" -#: ../../include/conversation.php:843 +#: ../../include/conversation.php:839 msgid "remove" msgstr "" -#: ../../include/conversation.php:847 ../../include/nav.php:257 +#: ../../include/conversation.php:843 ../../include/nav.php:258 msgid "Loading..." msgstr "" -#: ../../include/conversation.php:848 +#: ../../include/conversation.php:844 msgid "Delete Selected Items" msgstr "" -#: ../../include/conversation.php:942 +#: ../../include/conversation.php:938 msgid "View Source" msgstr "" -#: ../../include/conversation.php:943 +#: ../../include/conversation.php:939 msgid "Follow Thread" msgstr "" -#: ../../include/conversation.php:944 +#: ../../include/conversation.php:940 msgid "View Status" msgstr "" -#: ../../include/conversation.php:945 ../../include/nav.php:99 +#: ../../include/conversation.php:941 ../../include/nav.php:98 #: ../../mod/connedit.php:415 ../../mod/connedit.php:529 msgid "View Profile" msgstr "" -#: ../../include/conversation.php:946 +#: ../../include/conversation.php:942 msgid "View Photos" msgstr "" -#: ../../include/conversation.php:947 +#: ../../include/conversation.php:943 msgid "Matrix Activity" msgstr "" -#: ../../include/conversation.php:949 +#: ../../include/conversation.php:945 msgid "Edit Contact" msgstr "" -#: ../../include/conversation.php:950 +#: ../../include/conversation.php:946 msgid "Send PM" msgstr "" -#: ../../include/conversation.php:1024 +#: ../../include/conversation.php:1020 #, php-format msgid "%s likes this." msgstr "" -#: ../../include/conversation.php:1024 +#: ../../include/conversation.php:1020 #, php-format msgid "%s doesn't like this." msgstr "" -#: ../../include/conversation.php:1028 +#: ../../include/conversation.php:1024 #, php-format msgid "%2$d people like this." msgid_plural "%2$d people like this." msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1030 +#: ../../include/conversation.php:1026 #, 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:1036 +#: ../../include/conversation.php:1032 msgid "and" msgstr "" -#: ../../include/conversation.php:1039 +#: ../../include/conversation.php:1035 #, php-format msgid ", and %d other people" msgid_plural ", and %d other people" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1040 +#: ../../include/conversation.php:1036 #, php-format msgid "%s like this." msgstr "" -#: ../../include/conversation.php:1040 +#: ../../include/conversation.php:1036 #, php-format msgid "%s don't like this." msgstr "" -#: ../../include/conversation.php:1097 +#: ../../include/conversation.php:1093 msgid "Visible to everybody" msgstr "" -#: ../../include/conversation.php:1098 ../../mod/mail.php:170 +#: ../../include/conversation.php:1094 ../../mod/mail.php:170 #: ../../mod/mail.php:282 msgid "Please enter a link URL:" msgstr "" -#: ../../include/conversation.php:1099 +#: ../../include/conversation.php:1095 msgid "Please enter a video link/URL:" msgstr "" -#: ../../include/conversation.php:1100 +#: ../../include/conversation.php:1096 msgid "Please enter an audio link/URL:" msgstr "" -#: ../../include/conversation.php:1101 +#: ../../include/conversation.php:1097 msgid "Tag term:" msgstr "" -#: ../../include/conversation.php:1102 ../../mod/filer.php:49 +#: ../../include/conversation.php:1098 ../../mod/filer.php:49 msgid "Save to Folder:" msgstr "" -#: ../../include/conversation.php:1103 +#: ../../include/conversation.php:1099 msgid "Where are you right now?" msgstr "" -#: ../../include/conversation.php:1104 ../../mod/editpost.php:52 +#: ../../include/conversation.php:1100 ../../mod/editpost.php:52 #: ../../mod/mail.php:171 ../../mod/mail.php:283 msgid "Expires YYYY-MM-DD HH:MM" msgstr "" -#: ../../include/conversation.php:1128 ../../mod/photos.php:994 +#: ../../include/conversation.php:1124 ../../mod/photos.php:994 #: ../../mod/editblock.php:168 ../../mod/editlayout.php:161 #: ../../mod/editwebpage.php:201 ../../mod/layouts.php:122 msgid "Share" msgstr "" -#: ../../include/conversation.php:1130 ../../mod/editwebpage.php:139 +#: ../../include/conversation.php:1126 ../../mod/editwebpage.php:139 msgid "Page link title" msgstr "" -#: ../../include/conversation.php:1133 +#: ../../include/conversation.php:1129 msgid "Post as" msgstr "" -#: ../../include/conversation.php:1134 ../../mod/editblock.php:112 +#: ../../include/conversation.php:1130 ../../mod/editblock.php:112 #: ../../mod/editlayout.php:107 ../../mod/editpost.php:113 #: ../../mod/editwebpage.php:144 ../../mod/mail.php:231 ../../mod/mail.php:345 msgid "Upload photo" msgstr "" -#: ../../include/conversation.php:1135 +#: ../../include/conversation.php:1131 msgid "upload photo" msgstr "" -#: ../../include/conversation.php:1136 ../../mod/editblock.php:113 +#: ../../include/conversation.php:1132 ../../mod/editblock.php:113 #: ../../mod/editlayout.php:108 ../../mod/editpost.php:114 #: ../../mod/editwebpage.php:145 ../../mod/mail.php:232 ../../mod/mail.php:346 msgid "Attach file" msgstr "" -#: ../../include/conversation.php:1137 +#: ../../include/conversation.php:1133 msgid "attach file" msgstr "" -#: ../../include/conversation.php:1138 ../../mod/editblock.php:114 +#: ../../include/conversation.php:1134 ../../mod/editblock.php:114 #: ../../mod/editlayout.php:109 ../../mod/editpost.php:115 #: ../../mod/editwebpage.php:146 ../../mod/mail.php:233 ../../mod/mail.php:347 msgid "Insert web link" msgstr "" -#: ../../include/conversation.php:1139 +#: ../../include/conversation.php:1135 msgid "web link" msgstr "" -#: ../../include/conversation.php:1140 +#: ../../include/conversation.php:1136 msgid "Insert video link" msgstr "" -#: ../../include/conversation.php:1141 +#: ../../include/conversation.php:1137 msgid "video link" msgstr "" -#: ../../include/conversation.php:1142 +#: ../../include/conversation.php:1138 msgid "Insert audio link" msgstr "" -#: ../../include/conversation.php:1143 +#: ../../include/conversation.php:1139 msgid "audio link" msgstr "" -#: ../../include/conversation.php:1144 ../../mod/editblock.php:118 +#: ../../include/conversation.php:1140 ../../mod/editblock.php:118 #: ../../mod/editlayout.php:113 ../../mod/editpost.php:119 #: ../../mod/editwebpage.php:150 msgid "Set your location" msgstr "" -#: ../../include/conversation.php:1145 +#: ../../include/conversation.php:1141 msgid "set location" msgstr "" -#: ../../include/conversation.php:1146 ../../mod/editblock.php:119 +#: ../../include/conversation.php:1142 ../../mod/editblock.php:119 #: ../../mod/editlayout.php:114 ../../mod/editpost.php:120 #: ../../mod/editwebpage.php:151 msgid "Clear browser location" msgstr "" -#: ../../include/conversation.php:1147 +#: ../../include/conversation.php:1143 msgid "clear location" msgstr "" -#: ../../include/conversation.php:1149 ../../mod/editblock.php:132 +#: ../../include/conversation.php:1145 ../../mod/editblock.php:132 #: ../../mod/editlayout.php:126 ../../mod/editpost.php:132 #: ../../mod/editwebpage.php:167 msgid "Set title" msgstr "" -#: ../../include/conversation.php:1152 ../../mod/events.php:544 -#: ../../mod/editblock.php:135 ../../mod/editlayout.php:129 -#: ../../mod/editpost.php:134 ../../mod/editwebpage.php:169 +#: ../../include/conversation.php:1148 ../../mod/editblock.php:135 +#: ../../mod/editlayout.php:129 ../../mod/editpost.php:134 +#: ../../mod/editwebpage.php:169 ../../mod/events.php:560 msgid "Categories (comma-separated list)" msgstr "" -#: ../../include/conversation.php:1154 ../../mod/editblock.php:121 +#: ../../include/conversation.php:1150 ../../mod/editblock.php:121 #: ../../mod/editlayout.php:116 ../../mod/editpost.php:122 #: ../../mod/editwebpage.php:153 msgid "Permission settings" msgstr "" -#: ../../include/conversation.php:1155 +#: ../../include/conversation.php:1151 msgid "permissions" msgstr "" -#: ../../include/conversation.php:1162 ../../mod/editblock.php:129 +#: ../../include/conversation.php:1158 ../../mod/editblock.php:129 #: ../../mod/editlayout.php:123 ../../mod/editpost.php:129 #: ../../mod/editwebpage.php:162 msgid "Public post" msgstr "" -#: ../../include/conversation.php:1164 ../../mod/editblock.php:136 +#: ../../include/conversation.php:1160 ../../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:1177 ../../mod/editblock.php:146 +#: ../../include/conversation.php:1173 ../../mod/editblock.php:146 #: ../../mod/editlayout.php:140 ../../mod/editpost.php:146 #: ../../mod/editwebpage.php:179 ../../mod/mail.php:238 ../../mod/mail.php:352 msgid "Set expiration date" msgstr "" -#: ../../include/conversation.php:1179 ../../include/ItemObject.php:611 +#: ../../include/conversation.php:1175 ../../include/ItemObject.php:609 #: ../../mod/editpost.php:148 ../../mod/mail.php:240 ../../mod/mail.php:354 msgid "Encrypt text" msgstr "" -#: ../../include/conversation.php:1181 ../../mod/events.php:550 -#: ../../mod/editpost.php:150 +#: ../../include/conversation.php:1177 ../../mod/editpost.php:150 +#: ../../mod/events.php:567 msgid "OK" msgstr "" -#: ../../include/conversation.php:1182 ../../mod/settings.php:520 -#: ../../mod/settings.php:546 ../../mod/events.php:549 -#: ../../mod/editpost.php:151 ../../mod/fbrowser.php:82 -#: ../../mod/fbrowser.php:117 ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 +#: ../../include/conversation.php:1178 ../../mod/settings.php:520 +#: ../../mod/settings.php:546 ../../mod/editpost.php:151 +#: ../../mod/fbrowser.php:82 ../../mod/fbrowser.php:117 +#: ../../mod/events.php:566 ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 msgid "Cancel" msgstr "" -#: ../../include/conversation.php:1426 +#: ../../include/conversation.php:1422 msgid "Discover" msgstr "" -#: ../../include/conversation.php:1429 +#: ../../include/conversation.php:1425 msgid "Imported public streams" msgstr "" -#: ../../include/conversation.php:1434 +#: ../../include/conversation.php:1430 msgid "Commented Order" msgstr "" -#: ../../include/conversation.php:1437 +#: ../../include/conversation.php:1433 msgid "Sort by Comment Date" msgstr "" -#: ../../include/conversation.php:1441 +#: ../../include/conversation.php:1437 msgid "Posted Order" msgstr "" -#: ../../include/conversation.php:1444 +#: ../../include/conversation.php:1440 msgid "Sort by Post Date" msgstr "" -#: ../../include/conversation.php:1452 +#: ../../include/conversation.php:1448 msgid "Posts that mention or involve you" msgstr "" -#: ../../include/conversation.php:1458 ../../mod/connections.php:211 +#: ../../include/conversation.php:1454 ../../mod/connections.php:211 #: ../../mod/connections.php:224 ../../mod/menu.php:61 msgid "New" msgstr "" -#: ../../include/conversation.php:1461 +#: ../../include/conversation.php:1457 msgid "Activity Stream - by date" msgstr "" -#: ../../include/conversation.php:1467 +#: ../../include/conversation.php:1463 msgid "Starred" msgstr "" -#: ../../include/conversation.php:1470 +#: ../../include/conversation.php:1466 msgid "Favourite Posts" msgstr "" -#: ../../include/conversation.php:1477 +#: ../../include/conversation.php:1473 msgid "Spam" msgstr "" -#: ../../include/conversation.php:1480 +#: ../../include/conversation.php:1476 msgid "Posts flagged as SPAM" msgstr "" -#: ../../include/conversation.php:1516 ../../mod/admin.php:867 +#: ../../include/conversation.php:1512 ../../mod/admin.php:867 msgid "Channel" msgstr "" -#: ../../include/conversation.php:1519 +#: ../../include/conversation.php:1515 msgid "Status Messages and Posts" msgstr "" -#: ../../include/conversation.php:1528 +#: ../../include/conversation.php:1524 msgid "About" msgstr "" -#: ../../include/conversation.php:1531 +#: ../../include/conversation.php:1527 msgid "Profile Details" msgstr "" -#: ../../include/conversation.php:1549 +#: ../../include/conversation.php:1545 msgid "Files and Storage" msgstr "" -#: ../../include/conversation.php:1558 ../../include/conversation.php:1561 +#: ../../include/conversation.php:1554 ../../include/conversation.php:1557 msgid "Chatrooms" msgstr "" -#: ../../include/conversation.php:1573 +#: ../../include/conversation.php:1569 msgid "Saved Bookmarks" msgstr "" -#: ../../include/conversation.php:1584 +#: ../../include/conversation.php:1580 msgid "Manage Webpages" msgstr "" @@ -1450,7 +1447,7 @@ msgstr "" msgid "Click to open/close" msgstr "" -#: ../../include/text.php:1523 ../../mod/events.php:404 +#: ../../include/text.php:1523 ../../mod/events.php:414 msgid "Link to Source" msgstr "" @@ -1523,7 +1520,7 @@ msgstr "" msgid "wants" msgstr "" -#: ../../include/taxonomy.php:254 ../../include/ItemObject.php:221 +#: ../../include/taxonomy.php:254 ../../include/ItemObject.php:220 msgid "like" msgstr "" @@ -1531,7 +1528,7 @@ msgstr "" msgid "likes" msgstr "" -#: ../../include/taxonomy.php:255 ../../include/ItemObject.php:222 +#: ../../include/taxonomy.php:255 ../../include/ItemObject.php:221 msgid "dislike" msgstr "" @@ -1539,7 +1536,7 @@ msgstr "" msgid "dislikes" msgstr "" -#: ../../include/taxonomy.php:338 ../../include/identity.php:1138 +#: ../../include/taxonomy.php:338 ../../include/identity.php:1137 #: ../../include/ItemObject.php:146 msgctxt "noun" msgid "Like" @@ -1551,6 +1548,191 @@ msgstr[1] "" msgid "Default" msgstr "" +#: ../../include/nav.php:94 ../../include/nav.php:126 ../../boot.php:1494 +msgid "Logout" +msgstr "" + +#: ../../include/nav.php:94 ../../include/nav.php:126 +msgid "End this session" +msgstr "" + +#: ../../include/nav.php:97 ../../include/nav.php:160 +msgid "Home" +msgstr "" + +#: ../../include/nav.php:97 +msgid "Your posts and conversations" +msgstr "" + +#: ../../include/nav.php:98 +msgid "Your profile page" +msgstr "" + +#: ../../include/nav.php:100 +msgid "Edit Profiles" +msgstr "" + +#: ../../include/nav.php:100 +msgid "Manage/Edit profiles" +msgstr "" + +#: ../../include/nav.php:102 ../../include/identity.php:855 +msgid "Edit Profile" +msgstr "" + +#: ../../include/nav.php:102 +msgid "Edit your profile" +msgstr "" + +#: ../../include/nav.php:104 +msgid "Your photos" +msgstr "" + +#: ../../include/nav.php:105 +msgid "Your files" +msgstr "" + +#: ../../include/nav.php:110 +msgid "Your chatrooms" +msgstr "" + +#: ../../include/nav.php:116 +msgid "Your bookmarks" +msgstr "" + +#: ../../include/nav.php:120 +msgid "Your webpages" +msgstr "" + +#: ../../include/nav.php:124 +msgid "Sign in" +msgstr "" + +#: ../../include/nav.php:141 +#, php-format +msgid "%s - click to logout" +msgstr "" + +#: ../../include/nav.php:146 +msgid "Click to authenticate to your home hub" +msgstr "" + +#: ../../include/nav.php:160 +msgid "Home Page" +msgstr "" + +#: ../../include/nav.php:164 ../../mod/register.php:220 ../../boot.php:1471 +msgid "Register" +msgstr "" + +#: ../../include/nav.php:164 +msgid "Create an account" +msgstr "" + +#: ../../include/nav.php:169 +msgid "Help and documentation" +msgstr "" + +#: ../../include/nav.php:172 +msgid "Applications, utilities, links, games" +msgstr "" + +#: ../../include/nav.php:174 +msgid "Search site content" +msgstr "" + +#: ../../include/nav.php:177 +msgid "Channel Locator" +msgstr "" + +#: ../../include/nav.php:191 +msgid "Your matrix" +msgstr "" + +#: ../../include/nav.php:192 +msgid "Mark all matrix notifications seen" +msgstr "" + +#: ../../include/nav.php:194 +msgid "Channel home" +msgstr "" + +#: ../../include/nav.php:195 +msgid "Mark all channel notifications seen" +msgstr "" + +#: ../../include/nav.php:198 ../../mod/connections.php:406 +msgid "Connections" +msgstr "" + +#: ../../include/nav.php:201 +msgid "Notices" +msgstr "" + +#: ../../include/nav.php:201 +msgid "Notifications" +msgstr "" + +#: ../../include/nav.php:202 +msgid "See all notifications" +msgstr "" + +#: ../../include/nav.php:203 ../../mod/notifications.php:99 +msgid "Mark all system notifications seen" +msgstr "" + +#: ../../include/nav.php:205 +msgid "Private mail" +msgstr "" + +#: ../../include/nav.php:206 +msgid "See all private messages" +msgstr "" + +#: ../../include/nav.php:207 +msgid "Mark all private messages seen" +msgstr "" + +#: ../../include/nav.php:208 +msgid "Inbox" +msgstr "" + +#: ../../include/nav.php:209 +msgid "Outbox" +msgstr "" + +#: ../../include/nav.php:213 +msgid "Event Calendar" +msgstr "" + +#: ../../include/nav.php:214 +msgid "See all events" +msgstr "" + +#: ../../include/nav.php:215 +msgid "Mark all events seen" +msgstr "" + +#: ../../include/nav.php:217 +msgid "Manage Your Channels" +msgstr "" + +#: ../../include/nav.php:219 +msgid "Account/Channel Settings" +msgstr "" + +#: ../../include/nav.php:227 ../../mod/admin.php:123 +msgid "Admin" +msgstr "" + +#: ../../include/nav.php:227 +msgid "Site Setup and Configuration" +msgstr "" + +#: ../../include/nav.php:263 +msgid "Please wait..." +msgstr "" + #: ../../include/contact_selectors.php:56 msgid "Frequently" msgstr "" @@ -1588,7 +1770,7 @@ msgid "RSS/Atom" msgstr "" #: ../../include/contact_selectors.php:79 ../../mod/admin.php:728 -#: ../../mod/admin.php:737 ../../boot.php:1498 +#: ../../mod/admin.php:737 ../../boot.php:1497 msgid "Email" msgstr "" @@ -1692,8 +1874,8 @@ msgid "Finishes:" msgstr "" #: ../../include/event.php:40 ../../include/bb2diaspora.php:461 -#: ../../include/identity.php:883 ../../mod/directory.php:156 -#: ../../mod/dirprofile.php:105 ../../mod/events.php:560 +#: ../../include/identity.php:882 ../../mod/directory.php:156 +#: ../../mod/dirprofile.php:105 ../../mod/events.php:579 msgid "Location:" msgstr "" @@ -1778,193 +1960,87 @@ msgstr "" msgid "This action is not available under your subscription plan." msgstr "" -#: ../../include/nav.php:95 ../../include/nav.php:128 ../../boot.php:1495 -msgid "Logout" -msgstr "" - -#: ../../include/nav.php:95 ../../include/nav.php:128 -msgid "End this session" -msgstr "" - -#: ../../include/nav.php:98 ../../include/nav.php:159 -msgid "Home" -msgstr "" - -#: ../../include/nav.php:98 -msgid "Your posts and conversations" -msgstr "" - -#: ../../include/nav.php:99 -msgid "Your profile page" -msgstr "" - -#: ../../include/nav.php:101 -msgid "Edit Profiles" -msgstr "" - -#: ../../include/nav.php:101 -msgid "Manage/Edit profiles" -msgstr "" - -#: ../../include/nav.php:103 ../../include/identity.php:856 -msgid "Edit Profile" -msgstr "" - -#: ../../include/nav.php:103 -msgid "Edit your profile" -msgstr "" - -#: ../../include/nav.php:105 -msgid "Your photos" -msgstr "" - -#: ../../include/nav.php:106 -msgid "Your files" -msgstr "" - -#: ../../include/nav.php:111 -msgid "Your chatrooms" -msgstr "" - -#: ../../include/nav.php:117 -msgid "Your bookmarks" -msgstr "" - -#: ../../include/nav.php:121 -msgid "Your webpages" -msgstr "" - -#: ../../include/nav.php:125 -msgid "Sign in" -msgstr "" - -#: ../../include/nav.php:142 -#, php-format -msgid "%s - click to logout" -msgstr "" - -#: ../../include/nav.php:145 -msgid "Remote authentication" -msgstr "" - -#: ../../include/nav.php:145 -msgid "Click to authenticate to your home hub" -msgstr "" - -#: ../../include/nav.php:159 -msgid "Home Page" -msgstr "" - -#: ../../include/nav.php:163 ../../mod/register.php:220 ../../boot.php:1472 -msgid "Register" -msgstr "" - -#: ../../include/nav.php:163 -msgid "Create an account" -msgstr "" - -#: ../../include/nav.php:168 -msgid "Help and documentation" -msgstr "" - -#: ../../include/nav.php:171 -msgid "Applications, utilities, links, games" -msgstr "" - -#: ../../include/nav.php:173 -msgid "Search site content" -msgstr "" - -#: ../../include/nav.php:176 -msgid "Channel Locator" -msgstr "" - -#: ../../include/nav.php:190 -msgid "Your matrix" -msgstr "" - -#: ../../include/nav.php:191 -msgid "Mark all matrix notifications seen" -msgstr "" - -#: ../../include/nav.php:193 -msgid "Channel home" +#: ../../include/datetime.php:43 ../../include/datetime.php:45 +msgid "Miscellaneous" msgstr "" -#: ../../include/nav.php:194 -msgid "Mark all channel notifications seen" +#: ../../include/datetime.php:152 ../../include/datetime.php:284 +msgid "year" msgstr "" -#: ../../include/nav.php:197 ../../mod/connections.php:406 -msgid "Connections" +#: ../../include/datetime.php:157 ../../include/datetime.php:285 +msgid "month" msgstr "" -#: ../../include/nav.php:200 -msgid "Notices" +#: ../../include/datetime.php:162 ../../include/datetime.php:287 +msgid "day" msgstr "" -#: ../../include/nav.php:200 -msgid "Notifications" +#: ../../include/datetime.php:275 +msgid "never" msgstr "" -#: ../../include/nav.php:201 -msgid "See all notifications" +#: ../../include/datetime.php:281 +msgid "less than a second ago" msgstr "" -#: ../../include/nav.php:202 ../../mod/notifications.php:99 -msgid "Mark all system notifications seen" +#: ../../include/datetime.php:284 +msgid "years" msgstr "" -#: ../../include/nav.php:204 -msgid "Private mail" +#: ../../include/datetime.php:285 +msgid "months" msgstr "" -#: ../../include/nav.php:205 -msgid "See all private messages" +#: ../../include/datetime.php:286 +msgid "week" msgstr "" -#: ../../include/nav.php:206 -msgid "Mark all private messages seen" +#: ../../include/datetime.php:286 +msgid "weeks" msgstr "" -#: ../../include/nav.php:207 -msgid "Inbox" +#: ../../include/datetime.php:287 +msgid "days" msgstr "" -#: ../../include/nav.php:208 -msgid "Outbox" +#: ../../include/datetime.php:288 +msgid "hour" msgstr "" -#: ../../include/nav.php:212 -msgid "Event Calendar" +#: ../../include/datetime.php:288 +msgid "hours" msgstr "" -#: ../../include/nav.php:213 -msgid "See all events" +#: ../../include/datetime.php:289 +msgid "minute" msgstr "" -#: ../../include/nav.php:214 -msgid "Mark all events seen" +#: ../../include/datetime.php:289 +msgid "minutes" msgstr "" -#: ../../include/nav.php:216 -msgid "Manage Your Channels" +#: ../../include/datetime.php:290 +msgid "second" msgstr "" -#: ../../include/nav.php:218 -msgid "Account/Channel Settings" +#: ../../include/datetime.php:290 +msgid "seconds" msgstr "" -#: ../../include/nav.php:226 ../../mod/admin.php:123 -msgid "Admin" +#: ../../include/datetime.php:299 +#, php-format +msgid "%1$d %2$s ago" msgstr "" -#: ../../include/nav.php:226 -msgid "Site Setup and Configuration" +#: ../../include/datetime.php:504 +#, php-format +msgid "%1$s's birthday" msgstr "" -#: ../../include/nav.php:262 -msgid "Please wait..." +#: ../../include/datetime.php:505 +#, php-format +msgid "Happy Birthday %1$s" msgstr "" #: ../../include/dir_fns.php:56 @@ -2553,81 +2629,81 @@ msgstr "" msgid "$1 wrote:" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:106 -#: ../../include/RedDAV/RedBrowser.php:249 +#: ../../include/RedDAV/RedBrowser.php:103 +#: ../../include/RedDAV/RedBrowser.php:246 msgid "parent" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:130 +#: ../../include/RedDAV/RedBrowser.php:127 msgid "Collection" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:133 +#: ../../include/RedDAV/RedBrowser.php:130 msgid "Principal" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:136 +#: ../../include/RedDAV/RedBrowser.php:133 msgid "Addressbook" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:139 +#: ../../include/RedDAV/RedBrowser.php:136 msgid "Calendar" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:142 +#: ../../include/RedDAV/RedBrowser.php:139 msgid "Schedule Inbox" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:145 +#: ../../include/RedDAV/RedBrowser.php:142 msgid "Schedule Outbox" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:223 +#: ../../include/RedDAV/RedBrowser.php:220 #, php-format msgid "%1$s used" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:228 +#: ../../include/RedDAV/RedBrowser.php:225 #, php-format msgid "%1$s used of %2$s (%3$s%)" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:245 ../../mod/settings.php:521 +#: ../../include/RedDAV/RedBrowser.php:242 ../../mod/settings.php:521 #: ../../mod/settings.php:547 ../../mod/admin.php:868 msgid "Name" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:246 +#: ../../include/RedDAV/RedBrowser.php:243 msgid "Type" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:247 +#: ../../include/RedDAV/RedBrowser.php:244 msgid "Size" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:248 +#: ../../include/RedDAV/RedBrowser.php:245 msgid "Last Modified" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:252 +#: ../../include/RedDAV/RedBrowser.php:249 msgid "Total" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:304 +#: ../../include/RedDAV/RedBrowser.php:293 msgid "Create new folder" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:305 ../../mod/mitem.php:142 +#: ../../include/RedDAV/RedBrowser.php:294 ../../mod/mitem.php:142 #: ../../mod/menu.php:84 ../../mod/new_channel.php:122 msgid "Create" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:306 +#: ../../include/RedDAV/RedBrowser.php:295 msgid "Upload file" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:307 ../../mod/photos.php:745 -#: ../../mod/photos.php:1226 ../../mod/profile_photo.php:361 +#: ../../include/RedDAV/RedBrowser.php:296 ../../mod/photos.php:745 +#: ../../mod/photos.php:1225 ../../mod/profile_photo.php:361 msgid "Upload" msgstr "" @@ -2655,7 +2731,7 @@ msgstr "" msgid "Reserved nickname. Please choose another." msgstr "" -#: ../../include/identity.php:200 ../../include/dimport.php:34 +#: ../../include/identity.php:200 msgid "" "Nickname has unsupported characters or is already being used on this site." msgstr "" @@ -2664,205 +2740,205 @@ msgstr "" msgid "Unable to retrieve created identity" msgstr "" -#: ../../include/identity.php:342 +#: ../../include/identity.php:341 msgid "Default Profile" msgstr "" -#: ../../include/identity.php:635 +#: ../../include/identity.php:634 msgid "Requested channel is not available." msgstr "" -#: ../../include/identity.php:683 ../../mod/achievements.php:11 -#: ../../mod/profile.php:16 ../../mod/blocks.php:10 ../../mod/connect.php:13 -#: ../../mod/filestorage.php:48 ../../mod/layouts.php:8 -#: ../../mod/webpages.php:8 ../../mod/hcard.php:8 +#: ../../include/identity.php:682 ../../mod/achievements.php:11 +#: ../../mod/profile.php:16 ../../mod/blocks.php:10 ../../mod/webpages.php:8 +#: ../../mod/connect.php:13 ../../mod/filestorage.php:40 +#: ../../mod/layouts.php:8 ../../mod/hcard.php:8 msgid "Requested profile is not available." msgstr "" -#: ../../include/identity.php:846 ../../mod/profiles.php:722 +#: ../../include/identity.php:845 ../../mod/profiles.php:750 msgid "Change profile photo" msgstr "" -#: ../../include/identity.php:852 +#: ../../include/identity.php:851 msgid "Profiles" msgstr "" -#: ../../include/identity.php:852 +#: ../../include/identity.php:851 msgid "Manage/edit profiles" msgstr "" -#: ../../include/identity.php:853 ../../mod/profiles.php:723 +#: ../../include/identity.php:852 ../../mod/profiles.php:751 msgid "Create New Profile" msgstr "" -#: ../../include/identity.php:867 ../../mod/profiles.php:734 +#: ../../include/identity.php:866 ../../mod/profiles.php:762 msgid "Profile Image" msgstr "" -#: ../../include/identity.php:870 +#: ../../include/identity.php:869 msgid "visible to everybody" msgstr "" -#: ../../include/identity.php:871 ../../mod/profiles.php:617 -#: ../../mod/profiles.php:738 +#: ../../include/identity.php:870 ../../mod/profiles.php:645 +#: ../../mod/profiles.php:766 msgid "Edit visibility" msgstr "" -#: ../../include/identity.php:885 ../../include/identity.php:1122 +#: ../../include/identity.php:884 ../../include/identity.php:1121 #: ../../mod/directory.php:158 msgid "Gender:" msgstr "" -#: ../../include/identity.php:886 ../../include/identity.php:1166 +#: ../../include/identity.php:885 ../../include/identity.php:1165 #: ../../mod/directory.php:160 msgid "Status:" msgstr "" -#: ../../include/identity.php:887 ../../include/identity.php:1177 +#: ../../include/identity.php:886 ../../include/identity.php:1176 #: ../../mod/directory.php:162 msgid "Homepage:" msgstr "" -#: ../../include/identity.php:888 ../../mod/dirprofile.php:151 +#: ../../include/identity.php:887 ../../mod/dirprofile.php:151 msgid "Online Now" msgstr "" -#: ../../include/identity.php:966 ../../include/identity.php:1046 +#: ../../include/identity.php:965 ../../include/identity.php:1045 #: ../../mod/ping.php:298 msgid "g A l F d" msgstr "" -#: ../../include/identity.php:967 ../../include/identity.php:1047 +#: ../../include/identity.php:966 ../../include/identity.php:1046 msgid "F d" msgstr "" -#: ../../include/identity.php:1012 ../../include/identity.php:1087 +#: ../../include/identity.php:1011 ../../include/identity.php:1086 #: ../../mod/ping.php:320 msgid "[today]" msgstr "" -#: ../../include/identity.php:1024 +#: ../../include/identity.php:1023 msgid "Birthday Reminders" msgstr "" -#: ../../include/identity.php:1025 +#: ../../include/identity.php:1024 msgid "Birthdays this week:" msgstr "" -#: ../../include/identity.php:1080 +#: ../../include/identity.php:1079 msgid "[No description]" msgstr "" -#: ../../include/identity.php:1098 +#: ../../include/identity.php:1097 msgid "Event Reminders" msgstr "" -#: ../../include/identity.php:1099 +#: ../../include/identity.php:1098 msgid "Events this week:" msgstr "" -#: ../../include/identity.php:1120 ../../mod/settings.php:953 +#: ../../include/identity.php:1119 ../../mod/settings.php:953 msgid "Full Name:" msgstr "" -#: ../../include/identity.php:1127 +#: ../../include/identity.php:1126 msgid "Like this channel" msgstr "" -#: ../../include/identity.php:1151 +#: ../../include/identity.php:1150 msgid "j F, Y" msgstr "" -#: ../../include/identity.php:1152 +#: ../../include/identity.php:1151 msgid "j F" msgstr "" -#: ../../include/identity.php:1159 +#: ../../include/identity.php:1158 msgid "Birthday:" msgstr "" -#: ../../include/identity.php:1163 +#: ../../include/identity.php:1162 msgid "Age:" msgstr "" -#: ../../include/identity.php:1172 +#: ../../include/identity.php:1171 #, php-format msgid "for %1$d %2$s" msgstr "" -#: ../../include/identity.php:1175 ../../mod/profiles.php:639 +#: ../../include/identity.php:1174 ../../mod/profiles.php:667 msgid "Sexual Preference:" msgstr "" -#: ../../include/identity.php:1179 ../../mod/profiles.php:641 +#: ../../include/identity.php:1178 ../../mod/profiles.php:669 msgid "Hometown:" msgstr "" -#: ../../include/identity.php:1181 +#: ../../include/identity.php:1180 msgid "Tags:" msgstr "" -#: ../../include/identity.php:1183 ../../mod/profiles.php:642 +#: ../../include/identity.php:1182 ../../mod/profiles.php:670 msgid "Political Views:" msgstr "" -#: ../../include/identity.php:1185 +#: ../../include/identity.php:1184 msgid "Religion:" msgstr "" -#: ../../include/identity.php:1187 ../../mod/directory.php:164 +#: ../../include/identity.php:1186 ../../mod/directory.php:164 msgid "About:" msgstr "" -#: ../../include/identity.php:1189 +#: ../../include/identity.php:1188 msgid "Hobbies/Interests:" msgstr "" -#: ../../include/identity.php:1191 ../../mod/profiles.php:645 +#: ../../include/identity.php:1190 ../../mod/profiles.php:673 msgid "Likes:" msgstr "" -#: ../../include/identity.php:1193 ../../mod/profiles.php:646 +#: ../../include/identity.php:1192 ../../mod/profiles.php:674 msgid "Dislikes:" msgstr "" -#: ../../include/identity.php:1196 +#: ../../include/identity.php:1195 msgid "Contact information and Social Networks:" msgstr "" -#: ../../include/identity.php:1198 +#: ../../include/identity.php:1197 msgid "My other channels:" msgstr "" -#: ../../include/identity.php:1200 +#: ../../include/identity.php:1199 msgid "Musical interests:" msgstr "" -#: ../../include/identity.php:1202 +#: ../../include/identity.php:1201 msgid "Books, literature:" msgstr "" -#: ../../include/identity.php:1204 +#: ../../include/identity.php:1203 msgid "Television:" msgstr "" -#: ../../include/identity.php:1206 +#: ../../include/identity.php:1205 msgid "Film/dance/culture/entertainment:" msgstr "" -#: ../../include/identity.php:1208 +#: ../../include/identity.php:1207 msgid "Love/Romance:" msgstr "" -#: ../../include/identity.php:1210 +#: ../../include/identity.php:1209 msgid "Work/employment:" msgstr "" -#: ../../include/identity.php:1212 +#: ../../include/identity.php:1211 msgid "School/education:" msgstr "" -#: ../../include/identity.php:1232 +#: ../../include/identity.php:1231 msgid "Like this thing" msgstr "" @@ -2913,138 +2989,138 @@ msgstr "" msgid "starred" msgstr "" -#: ../../include/ItemObject.php:203 +#: ../../include/ItemObject.php:202 msgid "Add Tag" msgstr "" -#: ../../include/ItemObject.php:221 ../../mod/photos.php:992 +#: ../../include/ItemObject.php:220 ../../mod/photos.php:992 msgid "I like this (toggle)" msgstr "" -#: ../../include/ItemObject.php:222 ../../mod/photos.php:993 +#: ../../include/ItemObject.php:221 ../../mod/photos.php:993 msgid "I don't like this (toggle)" msgstr "" -#: ../../include/ItemObject.php:226 +#: ../../include/ItemObject.php:225 msgid "Share This" msgstr "" -#: ../../include/ItemObject.php:226 +#: ../../include/ItemObject.php:225 msgid "share" msgstr "" -#: ../../include/ItemObject.php:249 ../../include/ItemObject.php:250 +#: ../../include/ItemObject.php:248 ../../include/ItemObject.php:249 #, php-format msgid "View %s's profile - %s" msgstr "" -#: ../../include/ItemObject.php:251 +#: ../../include/ItemObject.php:250 msgid "to" msgstr "" -#: ../../include/ItemObject.php:252 +#: ../../include/ItemObject.php:251 msgid "via" msgstr "" -#: ../../include/ItemObject.php:253 +#: ../../include/ItemObject.php:252 msgid "Wall-to-Wall" msgstr "" -#: ../../include/ItemObject.php:254 +#: ../../include/ItemObject.php:253 msgid "via Wall-To-Wall:" msgstr "" -#: ../../include/ItemObject.php:290 +#: ../../include/ItemObject.php:288 msgid "Save Bookmarks" msgstr "" -#: ../../include/ItemObject.php:291 +#: ../../include/ItemObject.php:289 msgid "Add to Calendar" msgstr "" -#: ../../include/ItemObject.php:299 +#: ../../include/ItemObject.php:297 msgctxt "noun" msgid "Likes" msgstr "" -#: ../../include/ItemObject.php:300 +#: ../../include/ItemObject.php:298 msgctxt "noun" msgid "Dislikes" msgstr "" -#: ../../include/ItemObject.php:331 +#: ../../include/ItemObject.php:329 #, php-format msgid "%d comment" msgid_plural "%d comments" msgstr[0] "" msgstr[1] "" -#: ../../include/ItemObject.php:332 ../../include/js_strings.php:7 +#: ../../include/ItemObject.php:330 ../../include/js_strings.php:7 msgid "[+] show all" msgstr "" -#: ../../include/ItemObject.php:596 ../../mod/photos.php:1011 +#: ../../include/ItemObject.php:594 ../../mod/photos.php:1011 #: ../../mod/photos.php:1098 msgid "This is you" msgstr "" -#: ../../include/ItemObject.php:598 ../../include/js_strings.php:6 +#: ../../include/ItemObject.php:596 ../../include/js_strings.php:6 #: ../../mod/photos.php:1013 ../../mod/photos.php:1100 msgid "Comment" msgstr "" -#: ../../include/ItemObject.php:599 ../../mod/mood.php:135 +#: ../../include/ItemObject.php:597 ../../mod/mood.php:135 #: ../../mod/settings.php:519 ../../mod/settings.php:631 #: ../../mod/settings.php:660 ../../mod/settings.php:684 #: ../../mod/settings.php:760 ../../mod/settings.php:945 -#: ../../mod/poke.php:166 ../../mod/profiles.php:615 ../../mod/photos.php:563 -#: ../../mod/photos.php:672 ../../mod/photos.php:974 ../../mod/photos.php:1014 -#: ../../mod/photos.php:1101 ../../mod/chat.php:177 ../../mod/chat.php:211 -#: ../../mod/connect.php:92 ../../mod/connedit.php:540 -#: ../../mod/events.php:568 ../../mod/setup.php:307 ../../mod/setup.php:350 -#: ../../mod/pdledit.php:58 ../../mod/sources.php:104 -#: ../../mod/sources.php:138 ../../mod/filestorage.php:146 -#: ../../mod/fsuggest.php:108 ../../mod/group.php:81 ../../mod/admin.php:414 -#: ../../mod/admin.php:725 ../../mod/admin.php:861 ../../mod/admin.php:994 -#: ../../mod/admin.php:1193 ../../mod/admin.php:1280 ../../mod/thing.php:284 -#: ../../mod/thing.php:327 ../../mod/import.php:480 ../../mod/invite.php:142 -#: ../../mod/mail.php:348 ../../mod/appman.php:99 ../../mod/poll.php:68 +#: ../../mod/poke.php:166 ../../mod/profiles.php:643 ../../mod/chat.php:177 +#: ../../mod/chat.php:211 ../../mod/connect.php:92 ../../mod/connedit.php:540 +#: ../../mod/photos.php:563 ../../mod/photos.php:672 ../../mod/photos.php:974 +#: ../../mod/photos.php:1014 ../../mod/photos.php:1101 ../../mod/setup.php:307 +#: ../../mod/setup.php:350 ../../mod/pdledit.php:58 ../../mod/sources.php:104 +#: ../../mod/sources.php:138 ../../mod/events.php:586 +#: ../../mod/filestorage.php:137 ../../mod/fsuggest.php:108 +#: ../../mod/group.php:81 ../../mod/admin.php:414 ../../mod/admin.php:725 +#: ../../mod/admin.php:861 ../../mod/admin.php:994 ../../mod/admin.php:1193 +#: ../../mod/admin.php:1280 ../../mod/thing.php:284 ../../mod/thing.php:327 +#: ../../mod/import.php:480 ../../mod/invite.php:142 ../../mod/mail.php:348 +#: ../../mod/appman.php:99 ../../mod/poll.php:68 #: ../../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 +#: ../../view/theme/redbasic/php/config.php:101 msgid "Submit" msgstr "" -#: ../../include/ItemObject.php:600 +#: ../../include/ItemObject.php:598 msgid "Bold" msgstr "" -#: ../../include/ItemObject.php:601 +#: ../../include/ItemObject.php:599 msgid "Italic" msgstr "" -#: ../../include/ItemObject.php:602 +#: ../../include/ItemObject.php:600 msgid "Underline" msgstr "" -#: ../../include/ItemObject.php:603 +#: ../../include/ItemObject.php:601 msgid "Quote" msgstr "" -#: ../../include/ItemObject.php:604 +#: ../../include/ItemObject.php:602 msgid "Code" msgstr "" -#: ../../include/ItemObject.php:605 +#: ../../include/ItemObject.php:603 msgid "Image" msgstr "" -#: ../../include/ItemObject.php:606 +#: ../../include/ItemObject.php:604 msgid "Link" msgstr "" -#: ../../include/ItemObject.php:607 +#: ../../include/ItemObject.php:605 msgid "Video" msgstr "" @@ -3547,89 +3623,6 @@ msgstr "" msgid "Custom/Expert Mode" msgstr "" -#: ../../include/datetime.php:43 ../../include/datetime.php:45 -msgid "Miscellaneous" -msgstr "" - -#: ../../include/datetime.php:238 -msgid "never" -msgstr "" - -#: ../../include/datetime.php:244 -msgid "less than a second ago" -msgstr "" - -#: ../../include/datetime.php:247 -msgid "year" -msgstr "" - -#: ../../include/datetime.php:247 -msgid "years" -msgstr "" - -#: ../../include/datetime.php:248 -msgid "month" -msgstr "" - -#: ../../include/datetime.php:248 -msgid "months" -msgstr "" - -#: ../../include/datetime.php:249 -msgid "week" -msgstr "" - -#: ../../include/datetime.php:249 -msgid "weeks" -msgstr "" - -#: ../../include/datetime.php:250 -msgid "day" -msgstr "" - -#: ../../include/datetime.php:250 -msgid "days" -msgstr "" - -#: ../../include/datetime.php:251 -msgid "hour" -msgstr "" - -#: ../../include/datetime.php:251 -msgid "hours" -msgstr "" - -#: ../../include/datetime.php:252 -msgid "minute" -msgstr "" - -#: ../../include/datetime.php:252 -msgid "minutes" -msgstr "" - -#: ../../include/datetime.php:253 -msgid "second" -msgstr "" - -#: ../../include/datetime.php:253 -msgid "seconds" -msgstr "" - -#: ../../include/datetime.php:262 -#, php-format -msgid "%1$d %2$s ago" -msgstr "" - -#: ../../include/datetime.php:467 -#, php-format -msgid "%1$s's birthday" -msgstr "" - -#: ../../include/datetime.php:468 -#, php-format -msgid "Happy Birthday %1$s" -msgstr "" - #: ../../mod/mood.php:132 msgid "Set your current mood and tell your friends" msgstr "" @@ -4019,13 +4012,13 @@ msgid "Publish your default profile in the network directory" msgstr "" #: ../../mod/settings.php:891 ../../mod/settings.php:896 -#: ../../mod/settings.php:973 ../../mod/api.php:106 ../../mod/profiles.php:574 +#: ../../mod/settings.php:973 ../../mod/api.php:106 ../../mod/profiles.php:602 #: ../../mod/admin.php:392 msgid "No" msgstr "" #: ../../mod/settings.php:891 ../../mod/settings.php:896 -#: ../../mod/settings.php:973 ../../mod/api.php:105 ../../mod/profiles.php:573 +#: ../../mod/settings.php:973 ../../mod/api.php:105 ../../mod/profiles.php:601 #: ../../mod/admin.php:394 msgid "Yes" msgstr "" @@ -4314,44 +4307,44 @@ msgstr "" msgid "Version %s" msgstr "" -#: ../../mod/siteinfo.php:111 +#: ../../mod/siteinfo.php:109 msgid "Installed plugins/addons/apps:" msgstr "" -#: ../../mod/siteinfo.php:124 +#: ../../mod/siteinfo.php:122 msgid "No installed plugins/addons/apps" msgstr "" -#: ../../mod/siteinfo.php:132 +#: ../../mod/siteinfo.php:130 msgid "Red" msgstr "" -#: ../../mod/siteinfo.php:133 +#: ../../mod/siteinfo.php:131 msgid "" "This is a hub of the Red Matrix - a global cooperative network of " "decentralized privacy enhanced websites." msgstr "" -#: ../../mod/siteinfo.php:137 +#: ../../mod/siteinfo.php:134 msgid "Running at web location" msgstr "" -#: ../../mod/siteinfo.php:138 +#: ../../mod/siteinfo.php:135 msgid "" "Please visit     GetZot.com to learn more " "about the Red Matrix." msgstr "" -#: ../../mod/siteinfo.php:139 +#: ../../mod/siteinfo.php:136 msgid "Bug reports and issues: please visit" msgstr "" -#: ../../mod/siteinfo.php:142 +#: ../../mod/siteinfo.php:139 msgid "" "Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot com" msgstr "" -#: ../../mod/siteinfo.php:144 +#: ../../mod/siteinfo.php:141 msgid "Site Administrators" msgstr "" @@ -4359,20 +4352,8 @@ msgstr "" msgid "Block Name" msgstr "" -#: ../../mod/bookmarks.php:38 -msgid "Bookmark added" -msgstr "" - -#: ../../mod/bookmarks.php:60 -msgid "My Bookmarks" -msgstr "" - -#: ../../mod/bookmarks.php:71 -msgid "My Connections Bookmarks" -msgstr "" - #: ../../mod/profiles.php:18 ../../mod/profiles.php:165 -#: ../../mod/profiles.php:222 ../../mod/profiles.php:547 +#: ../../mod/profiles.php:222 ../../mod/profiles.php:575 msgid "Profile not found." msgstr "" @@ -4400,236 +4381,237 @@ msgstr "" msgid "Profile Name is required." msgstr "" -#: ../../mod/profiles.php:362 +#: ../../mod/profiles.php:390 msgid "Marital Status" msgstr "" -#: ../../mod/profiles.php:366 +#: ../../mod/profiles.php:394 msgid "Romantic Partner" msgstr "" -#: ../../mod/profiles.php:370 +#: ../../mod/profiles.php:398 msgid "Likes" msgstr "" -#: ../../mod/profiles.php:374 +#: ../../mod/profiles.php:402 msgid "Dislikes" msgstr "" -#: ../../mod/profiles.php:378 +#: ../../mod/profiles.php:406 msgid "Work/Employment" msgstr "" -#: ../../mod/profiles.php:381 +#: ../../mod/profiles.php:409 msgid "Religion" msgstr "" -#: ../../mod/profiles.php:385 +#: ../../mod/profiles.php:413 msgid "Political Views" msgstr "" -#: ../../mod/profiles.php:389 +#: ../../mod/profiles.php:417 msgid "Gender" msgstr "" -#: ../../mod/profiles.php:393 +#: ../../mod/profiles.php:421 msgid "Sexual Preference" msgstr "" -#: ../../mod/profiles.php:397 +#: ../../mod/profiles.php:425 msgid "Homepage" msgstr "" -#: ../../mod/profiles.php:401 +#: ../../mod/profiles.php:429 msgid "Interests" msgstr "" -#: ../../mod/profiles.php:405 ../../mod/admin.php:868 +#: ../../mod/profiles.php:433 ../../mod/admin.php:868 msgid "Address" msgstr "" -#: ../../mod/profiles.php:412 ../../mod/pubsites.php:25 +#: ../../mod/profiles.php:440 ../../mod/pubsites.php:25 msgid "Location" msgstr "" -#: ../../mod/profiles.php:495 +#: ../../mod/profiles.php:523 msgid "Profile updated." msgstr "" -#: ../../mod/profiles.php:572 +#: ../../mod/profiles.php:600 msgid "Hide your contact/friend list from viewers of this profile?" msgstr "" -#: ../../mod/profiles.php:614 +#: ../../mod/profiles.php:642 msgid "Edit Profile Details" msgstr "" -#: ../../mod/profiles.php:616 +#: ../../mod/profiles.php:644 msgid "View this profile" msgstr "" -#: ../../mod/profiles.php:618 +#: ../../mod/profiles.php:646 msgid "Change Profile Photo" msgstr "" -#: ../../mod/profiles.php:619 +#: ../../mod/profiles.php:647 msgid "Create a new profile using these settings" msgstr "" -#: ../../mod/profiles.php:620 +#: ../../mod/profiles.php:648 msgid "Clone this profile" msgstr "" -#: ../../mod/profiles.php:621 +#: ../../mod/profiles.php:649 msgid "Delete this profile" msgstr "" -#: ../../mod/profiles.php:623 +#: ../../mod/profiles.php:651 msgid "Import profile from file" msgstr "" -#: ../../mod/profiles.php:624 +#: ../../mod/profiles.php:652 msgid "Export profile to file" msgstr "" -#: ../../mod/profiles.php:625 +#: ../../mod/profiles.php:653 msgid "Profile Name:" msgstr "" -#: ../../mod/profiles.php:626 +#: ../../mod/profiles.php:654 msgid "Your Full Name:" msgstr "" -#: ../../mod/profiles.php:627 +#: ../../mod/profiles.php:655 msgid "Title/Description:" msgstr "" -#: ../../mod/profiles.php:628 +#: ../../mod/profiles.php:656 msgid "Your Gender:" msgstr "" -#: ../../mod/profiles.php:629 -msgid "Birthday :" +#: ../../mod/profiles.php:657 +#, php-format +msgid "Birthday (%s):" msgstr "" -#: ../../mod/profiles.php:630 +#: ../../mod/profiles.php:658 msgid "Street Address:" msgstr "" -#: ../../mod/profiles.php:631 +#: ../../mod/profiles.php:659 msgid "Locality/City:" msgstr "" -#: ../../mod/profiles.php:632 +#: ../../mod/profiles.php:660 msgid "Postal/Zip Code:" msgstr "" -#: ../../mod/profiles.php:633 +#: ../../mod/profiles.php:661 msgid "Country:" msgstr "" -#: ../../mod/profiles.php:634 +#: ../../mod/profiles.php:662 msgid "Region/State:" msgstr "" -#: ../../mod/profiles.php:635 +#: ../../mod/profiles.php:663 msgid "♥ Marital Status:" msgstr "" -#: ../../mod/profiles.php:636 +#: ../../mod/profiles.php:664 msgid "Who: (if applicable)" msgstr "" -#: ../../mod/profiles.php:637 +#: ../../mod/profiles.php:665 msgid "Examples: cathy123, Cathy Williams, cathy@example.com" msgstr "" -#: ../../mod/profiles.php:638 +#: ../../mod/profiles.php:666 msgid "Since [date]:" msgstr "" -#: ../../mod/profiles.php:640 +#: ../../mod/profiles.php:668 msgid "Homepage URL:" msgstr "" -#: ../../mod/profiles.php:643 +#: ../../mod/profiles.php:671 msgid "Religious Views:" msgstr "" -#: ../../mod/profiles.php:644 +#: ../../mod/profiles.php:672 msgid "Keywords:" msgstr "" -#: ../../mod/profiles.php:647 +#: ../../mod/profiles.php:675 msgid "Example: fishing photography software" msgstr "" -#: ../../mod/profiles.php:648 +#: ../../mod/profiles.php:676 msgid "Used in directory listings" msgstr "" -#: ../../mod/profiles.php:649 +#: ../../mod/profiles.php:677 msgid "Tell us about yourself..." msgstr "" -#: ../../mod/profiles.php:650 +#: ../../mod/profiles.php:678 msgid "Hobbies/Interests" msgstr "" -#: ../../mod/profiles.php:651 +#: ../../mod/profiles.php:679 msgid "Contact information and Social Networks" msgstr "" -#: ../../mod/profiles.php:652 +#: ../../mod/profiles.php:680 msgid "My other channels" msgstr "" -#: ../../mod/profiles.php:653 +#: ../../mod/profiles.php:681 msgid "Musical interests" msgstr "" -#: ../../mod/profiles.php:654 +#: ../../mod/profiles.php:682 msgid "Books, literature" msgstr "" -#: ../../mod/profiles.php:655 +#: ../../mod/profiles.php:683 msgid "Television" msgstr "" -#: ../../mod/profiles.php:656 +#: ../../mod/profiles.php:684 msgid "Film/dance/culture/entertainment" msgstr "" -#: ../../mod/profiles.php:657 +#: ../../mod/profiles.php:685 msgid "Love/romance" msgstr "" -#: ../../mod/profiles.php:658 +#: ../../mod/profiles.php:686 msgid "Work/employment" msgstr "" -#: ../../mod/profiles.php:659 +#: ../../mod/profiles.php:687 msgid "School/education" msgstr "" -#: ../../mod/profiles.php:665 +#: ../../mod/profiles.php:693 msgid "This is your default profile." msgstr "" -#: ../../mod/profiles.php:676 ../../mod/directory.php:143 +#: ../../mod/profiles.php:704 ../../mod/directory.php:143 #: ../../mod/dirprofile.php:92 msgid "Age: " msgstr "" -#: ../../mod/profiles.php:719 +#: ../../mod/profiles.php:747 msgid "Edit/Manage Profiles" msgstr "" -#: ../../mod/profiles.php:720 +#: ../../mod/profiles.php:748 msgid "Add profile things" msgstr "" -#: ../../mod/profiles.php:721 +#: ../../mod/profiles.php:749 msgid "Include desirable objects in your profile" msgstr "" @@ -4653,147 +4635,6 @@ msgstr "" msgid "All Connections" msgstr "" -#: ../../mod/photos.php:77 -msgid "Page owner information could not be retrieved." -msgstr "" - -#: ../../mod/photos.php:97 -msgid "Album not found." -msgstr "" - -#: ../../mod/photos.php:119 ../../mod/photos.php:673 -msgid "Delete Album" -msgstr "" - -#: ../../mod/photos.php:159 ../../mod/photos.php:975 -msgid "Delete Photo" -msgstr "" - -#: ../../mod/photos.php:443 ../../mod/search.php:13 ../../mod/directory.php:15 -#: ../../mod/dirprofile.php:9 ../../mod/display.php:9 -#: ../../mod/viewconnections.php:17 -msgid "Public access denied." -msgstr "" - -#: ../../mod/photos.php:453 -msgid "No photos selected" -msgstr "" - -#: ../../mod/photos.php:500 -msgid "Access to this item is restricted." -msgstr "" - -#: ../../mod/photos.php:574 -#, php-format -msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage." -msgstr "" - -#: ../../mod/photos.php:577 -#, php-format -msgid "You have used %1$.2f Mbytes of photo storage." -msgstr "" - -#: ../../mod/photos.php:596 -msgid "Upload Photos" -msgstr "" - -#: ../../mod/photos.php:600 ../../mod/photos.php:668 -msgid "New album name: " -msgstr "" - -#: ../../mod/photos.php:601 -msgid "or existing album name: " -msgstr "" - -#: ../../mod/photos.php:602 -msgid "Do not show a status post for this upload" -msgstr "" - -#: ../../mod/photos.php:622 -msgid "Album name could not be decoded" -msgstr "" - -#: ../../mod/photos.php:657 ../../mod/photos.php:679 ../../mod/photos.php:1148 -#: ../../mod/photos.php:1163 -msgid "Contact Photos" -msgstr "" - -#: ../../mod/photos.php:681 -msgid "Edit Album" -msgstr "" - -#: ../../mod/photos.php:687 -msgid "Show Newest First" -msgstr "" - -#: ../../mod/photos.php:689 -msgid "Show Oldest First" -msgstr "" - -#: ../../mod/photos.php:716 ../../mod/photos.php:1195 -msgid "View Photo" -msgstr "" - -#: ../../mod/photos.php:794 -msgid "Permission denied. Access to this item may be restricted." -msgstr "" - -#: ../../mod/photos.php:796 -msgid "Photo not available" -msgstr "" - -#: ../../mod/photos.php:856 -msgid "Use as profile photo" -msgstr "" - -#: ../../mod/photos.php:880 -msgid "View Full Size" -msgstr "" - -#: ../../mod/photos.php:924 ../../mod/delegate.php:130 ../../mod/tagrm.php:93 -msgid "Remove" -msgstr "" - -#: ../../mod/photos.php:958 -msgid "Edit photo" -msgstr "" - -#: ../../mod/photos.php:960 -msgid "Rotate CW (right)" -msgstr "" - -#: ../../mod/photos.php:961 -msgid "Rotate CCW (left)" -msgstr "" - -#: ../../mod/photos.php:964 -msgid "New album name" -msgstr "" - -#: ../../mod/photos.php:967 -msgid "Caption" -msgstr "" - -#: ../../mod/photos.php:969 -msgid "Add a Tag" -msgstr "" - -#: ../../mod/photos.php:972 -msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" -msgstr "" - -#: ../../mod/photos.php:1125 -msgid "In This Photo:" -msgstr "" - -#: ../../mod/photos.php:1201 -msgid "View Album" -msgstr "" - -#: ../../mod/photos.php:1224 -msgid "Recent Photos" -msgstr "" - #: ../../mod/pubsites.php:16 msgid "Public Sites" msgstr "" @@ -4974,6 +4815,10 @@ msgstr "" msgid "Please login." msgstr "" +#: ../../mod/cloud.php:130 +msgid "RedMatrix - Guests: Username: {your email address}, Password: +++" +msgstr "" + #: ../../mod/removeme.php:29 msgid "" "Channel removals are not allowed within 48 hours of changing the account " @@ -5549,6 +5394,10 @@ msgstr "" msgid "Potential Delegates" msgstr "" +#: ../../mod/delegate.php:130 ../../mod/photos.php:924 ../../mod/tagrm.php:93 +msgid "Remove" +msgstr "" + #: ../../mod/delegate.php:131 msgid "Add" msgstr "" @@ -5557,6 +5406,12 @@ msgstr "" msgid "No entries." msgstr "" +#: ../../mod/search.php:13 ../../mod/directory.php:15 +#: ../../mod/dirprofile.php:9 ../../mod/photos.php:443 ../../mod/display.php:9 +#: ../../mod/viewconnections.php:17 +msgid "Public access denied." +msgstr "" + #: ../../mod/directory.php:146 ../../mod/dirprofile.php:95 msgid "Gender: " msgstr "" @@ -5605,77 +5460,135 @@ msgstr "" msgid "This site is not a directory server" msgstr "" -#: ../../mod/events.php:71 -msgid "Event can not end before it has started." +#: ../../mod/photos.php:77 +msgid "Page owner information could not be retrieved." msgstr "" -#: ../../mod/events.php:81 -msgid "Event title and start time are required." +#: ../../mod/photos.php:97 +msgid "Album not found." msgstr "" -#: ../../mod/events.php:95 -msgid "Event not found." +#: ../../mod/photos.php:119 ../../mod/photos.php:673 +msgid "Delete Album" msgstr "" -#: ../../mod/events.php:359 -msgid "l, F j" +#: ../../mod/photos.php:159 ../../mod/photos.php:975 +msgid "Delete Photo" msgstr "" -#: ../../mod/events.php:381 -msgid "Edit event" +#: ../../mod/photos.php:453 +msgid "No photos selected" msgstr "" -#: ../../mod/events.php:427 -msgid "Create New Event" +#: ../../mod/photos.php:500 +msgid "Access to this item is restricted." msgstr "" -#: ../../mod/events.php:428 -msgid "Previous" +#: ../../mod/photos.php:574 +#, php-format +msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage." msgstr "" -#: ../../mod/events.php:429 ../../mod/setup.php:261 -msgid "Next" +#: ../../mod/photos.php:577 +#, php-format +msgid "You have used %1$.2f Mbytes of photo storage." msgstr "" -#: ../../mod/events.php:541 -msgid "Event details" +#: ../../mod/photos.php:596 +msgid "Upload Photos" msgstr "" -#: ../../mod/events.php:542 -msgid "Starting date and Title are required." +#: ../../mod/photos.php:600 ../../mod/photos.php:668 +msgid "New album name: " msgstr "" -#: ../../mod/events.php:546 -msgid "Event Starts:" +#: ../../mod/photos.php:601 +msgid "or existing album name: " msgstr "" -#: ../../mod/events.php:546 ../../mod/events.php:562 ../../mod/appman.php:91 -#: ../../mod/appman.php:92 -msgid "Required" +#: ../../mod/photos.php:602 +msgid "Do not show a status post for this upload" msgstr "" -#: ../../mod/events.php:552 -msgid "Finish date/time is not known or not relevant" +#: ../../mod/photos.php:622 +msgid "Album name could not be decoded" msgstr "" -#: ../../mod/events.php:554 -msgid "Event Finishes:" +#: ../../mod/photos.php:657 ../../mod/photos.php:679 ../../mod/photos.php:1147 +#: ../../mod/photos.php:1162 +msgid "Contact Photos" msgstr "" -#: ../../mod/events.php:556 -msgid "Adjust for viewer timezone" +#: ../../mod/photos.php:681 +msgid "Edit Album" msgstr "" -#: ../../mod/events.php:558 -msgid "Description:" +#: ../../mod/photos.php:687 +msgid "Show Newest First" msgstr "" -#: ../../mod/events.php:562 -msgid "Title:" +#: ../../mod/photos.php:689 +msgid "Show Oldest First" msgstr "" -#: ../../mod/events.php:564 -msgid "Share this event" +#: ../../mod/photos.php:716 ../../mod/photos.php:1194 +msgid "View Photo" +msgstr "" + +#: ../../mod/photos.php:794 +msgid "Permission denied. Access to this item may be restricted." +msgstr "" + +#: ../../mod/photos.php:796 +msgid "Photo not available" +msgstr "" + +#: ../../mod/photos.php:856 +msgid "Use as profile photo" +msgstr "" + +#: ../../mod/photos.php:880 +msgid "View Full Size" +msgstr "" + +#: ../../mod/photos.php:958 +msgid "Edit photo" +msgstr "" + +#: ../../mod/photos.php:960 +msgid "Rotate CW (right)" +msgstr "" + +#: ../../mod/photos.php:961 +msgid "Rotate CCW (left)" +msgstr "" + +#: ../../mod/photos.php:964 +msgid "New album name" +msgstr "" + +#: ../../mod/photos.php:967 +msgid "Caption" +msgstr "" + +#: ../../mod/photos.php:969 +msgid "Add a Tag" +msgstr "" + +#: ../../mod/photos.php:972 +msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" +msgstr "" + +#: ../../mod/photos.php:1125 +msgid "In This Photo:" +msgstr "" + +#: ../../mod/photos.php:1200 +msgid "View Album" +msgstr "" + +#: ../../mod/photos.php:1223 +msgid "Recent Photos" msgstr "" #: ../../mod/setup.php:162 @@ -5714,6 +5627,10 @@ msgstr "" msgid "System check" msgstr "" +#: ../../mod/setup.php:261 ../../mod/events.php:439 +msgid "Next" +msgstr "" + #: ../../mod/setup.php:262 msgid "Check again" msgstr "" @@ -6140,8 +6057,16 @@ msgstr "" msgid "Delete Webpage" msgstr "" -#: ../../mod/cloud.php:130 -msgid "RedMatrix - Guests: Username: {your email address}, Password: +++" +#: ../../mod/bookmarks.php:38 +msgid "Bookmark added" +msgstr "" + +#: ../../mod/bookmarks.php:60 +msgid "My Bookmarks" +msgstr "" + +#: ../../mod/bookmarks.php:71 +msgid "My Connections Bookmarks" msgstr "" #: ../../mod/profile_photo.php:108 @@ -6283,35 +6208,109 @@ msgstr "" msgid "- select -" msgstr "" -#: ../../mod/filestorage.php:76 +#: ../../mod/events.php:91 +msgid "Event title and start time are required." +msgstr "" + +#: ../../mod/events.php:105 +msgid "Event not found." +msgstr "" + +#: ../../mod/events.php:369 +msgid "l, F j" +msgstr "" + +#: ../../mod/events.php:391 +msgid "Edit event" +msgstr "" + +#: ../../mod/events.php:437 +msgid "Create New Event" +msgstr "" + +#: ../../mod/events.php:438 +msgid "Previous" +msgstr "" + +#: ../../mod/events.php:536 +msgid "hour:minute" +msgstr "" + +#: ../../mod/events.php:556 +msgid "Event details" +msgstr "" + +#: ../../mod/events.php:557 +#, php-format +msgid "Format is %s %s." +msgstr "" + +#: ../../mod/events.php:558 +msgid "Starting date and Title are required." +msgstr "" + +#: ../../mod/events.php:562 +msgid "Event Starts:" +msgstr "" + +#: ../../mod/events.php:562 ../../mod/events.php:581 ../../mod/appman.php:91 +#: ../../mod/appman.php:92 +msgid "Required" +msgstr "" + +#: ../../mod/events.php:570 +msgid "Finish date/time is not known or not relevant" +msgstr "" + +#: ../../mod/events.php:572 +msgid "Event Finishes:" +msgstr "" + +#: ../../mod/events.php:575 +msgid "Adjust for viewer timezone" +msgstr "" + +#: ../../mod/events.php:577 +msgid "Description:" +msgstr "" + +#: ../../mod/events.php:581 +msgid "Title:" +msgstr "" + +#: ../../mod/events.php:583 +msgid "Share this event" +msgstr "" + +#: ../../mod/filestorage.php:68 msgid "Permission Denied." msgstr "" -#: ../../mod/filestorage.php:92 +#: ../../mod/filestorage.php:85 msgid "File not found." msgstr "" -#: ../../mod/filestorage.php:131 +#: ../../mod/filestorage.php:122 msgid "Edit file permissions" msgstr "" -#: ../../mod/filestorage.php:140 +#: ../../mod/filestorage.php:131 msgid "Set/edit permissions" msgstr "" -#: ../../mod/filestorage.php:141 +#: ../../mod/filestorage.php:132 msgid "Include all files and sub folders" msgstr "" -#: ../../mod/filestorage.php:142 +#: ../../mod/filestorage.php:133 msgid "Return to file list" msgstr "" -#: ../../mod/filestorage.php:144 +#: ../../mod/filestorage.php:135 msgid "Copy/paste this code to attach file to a post" msgstr "" -#: ../../mod/filestorage.php:145 +#: ../../mod/filestorage.php:136 msgid "Copy/paste this URL to link file from a web page" msgstr "" @@ -7398,7 +7397,7 @@ msgid "" "Password reset failed." msgstr "" -#: ../../mod/lostpass.php:85 ../../boot.php:1506 +#: ../../mod/lostpass.php:85 ../../boot.php:1505 msgid "Password Reset" msgstr "" @@ -7863,14 +7862,6 @@ msgstr "" msgid "%s element installed" msgstr "" -#: ../../mod/locs.php:47 ../../mod/locs.php:74 -msgid "Location not found." -msgstr "" - -#: ../../mod/locs.php:78 -msgid "Primary location cannot be removed." -msgstr "" - #: ../../view/theme/apw/php/config.php:202 #: ../../view/theme/apw/php/config.php:236 msgid "Schema Default" @@ -7887,17 +7878,17 @@ msgstr "" #: ../../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 +#: ../../view/theme/redbasic/php/config.php:104 msgid "Theme settings" msgstr "" #: ../../view/theme/apw/php/config.php:260 -#: ../../view/theme/redbasic/php/config.php:103 +#: ../../view/theme/redbasic/php/config.php:105 msgid "Set scheme" msgstr "" #: ../../view/theme/apw/php/config.php:261 -#: ../../view/theme/redbasic/php/config.php:124 +#: ../../view/theme/redbasic/php/config.php:127 msgid "Set font-size for posts and comments" msgstr "" @@ -8032,165 +8023,169 @@ msgstr "" msgid "Header image only on profile pages" msgstr "" -#: ../../view/theme/redbasic/php/config.php:84 +#: ../../view/theme/redbasic/php/config.php:86 msgid "Light (Red Matrix default)" msgstr "" -#: ../../view/theme/redbasic/php/config.php:104 +#: ../../view/theme/redbasic/php/config.php:106 msgid "Narrow navbar" msgstr "" -#: ../../view/theme/redbasic/php/config.php:105 +#: ../../view/theme/redbasic/php/config.php:107 msgid "Navigation bar background color" msgstr "" -#: ../../view/theme/redbasic/php/config.php:106 +#: ../../view/theme/redbasic/php/config.php:108 msgid "Navigation bar gradient top color" msgstr "" -#: ../../view/theme/redbasic/php/config.php:107 +#: ../../view/theme/redbasic/php/config.php:109 msgid "Navigation bar gradient bottom color" msgstr "" -#: ../../view/theme/redbasic/php/config.php:108 +#: ../../view/theme/redbasic/php/config.php:110 msgid "Navigation active button gradient top color" msgstr "" -#: ../../view/theme/redbasic/php/config.php:109 +#: ../../view/theme/redbasic/php/config.php:111 msgid "Navigation active button gradient bottom color" msgstr "" -#: ../../view/theme/redbasic/php/config.php:110 +#: ../../view/theme/redbasic/php/config.php:112 msgid "Navigation bar border color " msgstr "" -#: ../../view/theme/redbasic/php/config.php:111 +#: ../../view/theme/redbasic/php/config.php:113 msgid "Navigation bar icon color " msgstr "" -#: ../../view/theme/redbasic/php/config.php:112 +#: ../../view/theme/redbasic/php/config.php:114 msgid "Navigation bar active icon color " msgstr "" -#: ../../view/theme/redbasic/php/config.php:113 +#: ../../view/theme/redbasic/php/config.php:115 msgid "link color" msgstr "" -#: ../../view/theme/redbasic/php/config.php:114 +#: ../../view/theme/redbasic/php/config.php:116 msgid "Set font-color for banner" msgstr "" -#: ../../view/theme/redbasic/php/config.php:115 +#: ../../view/theme/redbasic/php/config.php:117 msgid "Set the background color" msgstr "" -#: ../../view/theme/redbasic/php/config.php:116 +#: ../../view/theme/redbasic/php/config.php:118 msgid "Set the background image" msgstr "" -#: ../../view/theme/redbasic/php/config.php:117 +#: ../../view/theme/redbasic/php/config.php:119 msgid "Set the background color of items" msgstr "" -#: ../../view/theme/redbasic/php/config.php:118 +#: ../../view/theme/redbasic/php/config.php:120 msgid "Set the background color of comments" msgstr "" -#: ../../view/theme/redbasic/php/config.php:119 +#: ../../view/theme/redbasic/php/config.php:121 msgid "Set the border color of comments" msgstr "" -#: ../../view/theme/redbasic/php/config.php:120 +#: ../../view/theme/redbasic/php/config.php:122 msgid "Set the indent for comments" msgstr "" -#: ../../view/theme/redbasic/php/config.php:121 +#: ../../view/theme/redbasic/php/config.php:123 msgid "Set the basic color for item icons" msgstr "" -#: ../../view/theme/redbasic/php/config.php:122 +#: ../../view/theme/redbasic/php/config.php:124 msgid "Set the hover color for item icons" msgstr "" -#: ../../view/theme/redbasic/php/config.php:123 +#: ../../view/theme/redbasic/php/config.php:125 +msgid "Set the background color of other content" +msgstr "" + +#: ../../view/theme/redbasic/php/config.php:126 msgid "Set font-size for the entire application" msgstr "" -#: ../../view/theme/redbasic/php/config.php:125 +#: ../../view/theme/redbasic/php/config.php:128 msgid "Set font-color for posts and comments" msgstr "" -#: ../../view/theme/redbasic/php/config.php:126 +#: ../../view/theme/redbasic/php/config.php:129 msgid "Set radius of corners" msgstr "" -#: ../../view/theme/redbasic/php/config.php:127 +#: ../../view/theme/redbasic/php/config.php:130 msgid "Set shadow depth of photos" msgstr "" -#: ../../view/theme/redbasic/php/config.php:128 +#: ../../view/theme/redbasic/php/config.php:131 msgid "Set maximum width of conversation regions" msgstr "" -#: ../../view/theme/redbasic/php/config.php:129 +#: ../../view/theme/redbasic/php/config.php:132 msgid "Center conversation regions" msgstr "" -#: ../../view/theme/redbasic/php/config.php:130 +#: ../../view/theme/redbasic/php/config.php:133 msgid "Set minimum opacity of nav bar - to hide it" msgstr "" -#: ../../view/theme/redbasic/php/config.php:131 +#: ../../view/theme/redbasic/php/config.php:134 msgid "Set size of conversation author photo" msgstr "" -#: ../../view/theme/redbasic/php/config.php:132 +#: ../../view/theme/redbasic/php/config.php:135 msgid "Set size of followup author photos" msgstr "" -#: ../../view/theme/redbasic/php/config.php:133 +#: ../../view/theme/redbasic/php/config.php:136 msgid "Sloppy photo albums" msgstr "" -#: ../../view/theme/redbasic/php/config.php:133 +#: ../../view/theme/redbasic/php/config.php:136 msgid "Are you a clean desk or a messy desk person?" msgstr "" -#: ../../boot.php:1294 +#: ../../boot.php:1293 #, php-format msgid "Update %s failed. See error logs." msgstr "" -#: ../../boot.php:1297 +#: ../../boot.php:1296 #, php-format msgid "Update Error at %s" msgstr "" -#: ../../boot.php:1471 +#: ../../boot.php:1470 msgid "" "Create an account to access services and applications within the Red Matrix" msgstr "" -#: ../../boot.php:1499 +#: ../../boot.php:1498 msgid "Password" msgstr "" -#: ../../boot.php:1500 +#: ../../boot.php:1499 msgid "Remember me" msgstr "" -#: ../../boot.php:1505 +#: ../../boot.php:1504 msgid "Forgot your password?" msgstr "" -#: ../../boot.php:1570 +#: ../../boot.php:1569 msgid "permission denied" msgstr "" -#: ../../boot.php:1571 +#: ../../boot.php:1570 msgid "Got Zot?" msgstr "" -#: ../../boot.php:2001 +#: ../../boot.php:2000 msgid "toggle mobile" msgstr "" diff --git a/view/tpl/event_form.tpl b/view/tpl/event_form.tpl index d91e44458..ade404125 100755 --- a/view/tpl/event_form.tpl +++ b/view/tpl/event_form.tpl @@ -3,8 +3,7 @@

    {{$title}}

    -{{if ! $bootstrap}} -{{$format_desc}} {{/if}}{{$desc}} +{{$desc}}

    @@ -17,11 +16,7 @@
    {{$s_text}}
    -{{if $bootstrap}} - -{{else}} -{{$s_dsel}} {{$s_tsel}} -{{/if}} +{{$s_dsel}}

    @@ -31,11 +26,7 @@
    {{$f_text}}
    -{{if $bootstrap}} - -{{else}} -{{$f_dsel}} {{$f_tsel}} -{{/if}} +{{$f_dsel}}
    @@ -73,81 +64,4 @@
    - - - - - - - diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index ac6cb1a9c..bc9d0ba37 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -47,6 +47,7 @@
    -

    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_group_members(), 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(), RedMatrix\RedDAV\RedDirectory\childExists(), cloud_init(), common_init(), connedit_content(), construct_page(), consume_feed(), conversation(), RedMatrix\RedDAV\RedDirectory\createFile(), photo_gd\cropImage(), photo_imagick\cropImage(), datesel(), datesel_format(), decode_tags(), deliver_run(), diaspora_comment(), diaspora_like(), diaspora_mention_callback(), dir_tagadelic(), directory_content(), directory_run(), dirprofile_init(), discover_by_url(), discover_by_webbie(), display_content(), downgrade_accounts(), editblock_content(), editlayout_content(), editwebpage_content(), 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(), foofoo(), fsuggest_post(), get_all_perms(), get_diaspora_reshare_xml(), 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_role_perms(), get_system_apps(), get_terms_oftype(), get_theme_uid(), get_things(), RedMatrix\RedDAV\RedDirectory\getChild(), RedMatrix\RedDAV\RedDirectory\getDir(), RedMatrix\RedDAV\RedDirectory\getQuotaInfo(), gprobe_run(), handle_feed(), hcard_init(), hostxrd_init(), ids_to_querystr(), impel_init(), import_author_diaspora(), import_author_rss(), import_author_unknown(), 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(), notifications_off(), notifications_on(), 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_location_delivery(), process_mail_delivery(), profile_init(), profile_load(), profile_photo_post(), prune_hub_reinstalls(), public_recips(), pubrsatome(), RedMatrix\RedDAV\RedFile\put(), dba_mysql\q(), dba_mysqli\q(), randprof_init(), red_item_new(), RedCollectionData(), RedFileData(), remote_online_status(), remove_community_tag(), remove_obsolete_hublocs(), rpost_content(), photo_driver\save(), scrape_feed(), scrape_vcard(), search_ac_init(), send_status_notifications(), service_limits_content(), share_init(), share_unshield(), site_default_perms(), smilies(), sources_content(), sslify_init(), photo_driver\store(), store_diaspora_comment_sig(), string_splitter(), stringify_array_elms(), sync_directories(), sync_locations(), tag_deliver(), tagadelic(), tagrm_content(), tagrm_post(), theme_status(), thing_content(), timesel(), toggle_theme(), update_channels_active_halfyear_stat(), update_channels_active_monthly_stat(), update_directory_entry(), update_imported_item(), upgrade_bool_message(), upgrade_message(), valid_email(), RedMatrix\RedDAV\RedBasicAuth\validateUserPass(), webpages_content(), what_next(), widget_affinity(), widget_bookmarkedchats(), widget_suggestedchats(), widget_suggestions(), xchan_query(), xmlify(), zfinger_init(), zot_build_packet(), zot_encode_locations(), 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_group_members(), 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(), RedMatrix\RedDAV\RedDirectory\childExists(), cloud_init(), common_init(), connedit_content(), construct_page(), consume_feed(), conversation(), RedMatrix\RedDAV\RedDirectory\createFile(), photo_gd\cropImage(), photo_imagick\cropImage(), decode_tags(), deliver_run(), diaspora_comment(), diaspora_like(), diaspora_mention_callback(), dir_tagadelic(), directory_content(), directory_run(), dirprofile_init(), discover_by_url(), discover_by_webbie(), display_content(), downgrade_accounts(), editblock_content(), editlayout_content(), editwebpage_content(), 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(), foofoo(), fsuggest_post(), get_all_perms(), get_diaspora_reshare_xml(), 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_role_perms(), get_system_apps(), get_terms_oftype(), get_theme_uid(), get_things(), RedMatrix\RedDAV\RedDirectory\getChild(), RedMatrix\RedDAV\RedDirectory\getDir(), RedMatrix\RedDAV\RedDirectory\getQuotaInfo(), gprobe_run(), handle_feed(), hcard_init(), hostxrd_init(), ids_to_querystr(), impel_init(), import_author_diaspora(), import_author_rss(), import_author_unknown(), 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(), notifications_off(), notifications_on(), notifier_run(), oembed_fetch_url(), onedirsync_run(), onepoll_run(), openid_content(), page_init(), 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_location_delivery(), process_mail_delivery(), profile_init(), profile_load(), profile_photo_post(), prune_hub_reinstalls(), public_recips(), pubrsatome(), RedMatrix\RedDAV\RedFile\put(), dba_mysql\q(), dba_mysqli\q(), randprof_init(), red_item_new(), RedCollectionData(), RedFileData(), remote_online_status(), remove_community_tag(), remove_obsolete_hublocs(), rpost_content(), photo_driver\save(), scrape_feed(), scrape_vcard(), search_ac_init(), send_status_notifications(), service_limits_content(), share_init(), share_unshield(), site_default_perms(), smilies(), sources_content(), sslify_init(), photo_driver\store(), store_diaspora_comment_sig(), string_splitter(), stringify_array_elms(), sync_directories(), sync_locations(), tag_deliver(), tagadelic(), tagrm_content(), tagrm_post(), theme_status(), thing_content(), toggle_theme(), update_channels_active_halfyear_stat(), update_channels_active_monthly_stat(), update_directory_entry(), update_imported_item(), upgrade_bool_message(), upgrade_message(), valid_email(), RedMatrix\RedDAV\RedBasicAuth\validateUserPass(), webpages_content(), what_next(), widget_affinity(), widget_bookmarkedchats(), widget_suggestedchats(), widget_suggestions(), xchan_query(), xmlify(), zfinger_init(), zot_build_packet(), zot_encode_locations(), zot_process_response(), zot_refresh(), zot_register_hub(), and zotfeed_init().

    diff --git a/doc/html/bb2diaspora_8php.html b/doc/html/bb2diaspora_8php.html index f485a3595..b3efd66e6 100644 --- a/doc/html/bb2diaspora_8php.html +++ b/doc/html/bb2diaspora_8php.html @@ -203,7 +203,7 @@ Functions
    -

    Referenced by diaspora_send_followup(), diaspora_send_relay(), diaspora_send_status(), p_init(), and store_diaspora_comment_sig().

    +

    Referenced by diaspora_send_followup(), diaspora_send_relay(), diaspora_send_status(), p_init(), and store_diaspora_comment_sig().

    diff --git a/doc/html/boot_8php.html b/doc/html/boot_8php.html index 2ea8e6f27..04a9ad0f6 100644 --- a/doc/html/boot_8php.html +++ b/doc/html/boot_8php.html @@ -189,6 +189,8 @@ Functions    get_custom_nav (&$a, $navname)   + load_pdl (&$a) +   construct_page (&$a)    appdirpath () @@ -766,7 +768,7 @@ Variables
    -

    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(), p_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(), p_init(), 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_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().

    @@ -784,7 +786,7 @@ Variables
    -

    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(), p_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(), p_init(), 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().

    @@ -1006,7 +1008,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(), 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(), RedMatrix\RedDAV\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(), 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(), process_location_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(), send_message(), send_reg_approval_email(), send_status_notifications(), send_verification_email(), service_class_allows(), service_class_fetch(), siteinfo_init(), smilies(), store_diaspora_comment_sig(), 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(), RedMatrix\RedDAV\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(), onedirsync_run(), onepoll_run(), page_init(), 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(), process_location_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(), send_message(), send_reg_approval_email(), send_status_notifications(), send_verification_email(), service_class_allows(), service_class_fetch(), siteinfo_init(), smilies(), store_diaspora_comment_sig(), 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().

    @@ -1259,6 +1261,24 @@ Variables

    Referenced by api_call(), conversation(), and item_photo_menu().

    + + + +
    +
    + + + + + + + + +
    load_pdl (& $a)
    +
    + +

    Referenced by RedMatrix\RedDAV\RedBrowser\generateDirectoryIndex().

    +
    @@ -1326,7 +1346,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_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(), 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(), import_content(), import_post(), importelm_post(), invite_content(), invite_post(), item_content(), item_post(), layouts_content(), like_content(), locs_post(), 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(), service_limits_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(), 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(), import_content(), import_post(), importelm_post(), invite_content(), invite_post(), item_content(), item_post(), layouts_content(), like_content(), locs_post(), 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_init(), 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(), service_limits_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().

    @@ -1494,7 +1514,7 @@ Variables
    -

    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_like(), diaspora_post(), diaspora_request(), diaspora_reshare(), directory_content(), dirprofile_init(), discover_by_url(), discover_by_webbie(), display_content(), event_store_item(), externals_run(), filestorage_content(), find_upstream_directory(), follow_init(), format_categories(), format_filer(), get_parent_cloudpath(), RedMatrix\RedDAV\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(), locs_post(), 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(), oembed_iframe(), 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(), remove_obsolete_hublocs(), 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_like(), diaspora_post(), diaspora_request(), diaspora_reshare(), directory_content(), dirprofile_init(), discover_by_url(), discover_by_webbie(), display_content(), event_store_item(), externals_run(), filestorage_content(), find_upstream_directory(), follow_init(), format_categories(), format_filer(), get_parent_cloudpath(), RedMatrix\RedDAV\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(), locs_post(), 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(), oembed_iframe(), 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(), remove_obsolete_hublocs(), 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(), xchan_store(), xref_init(), zfinger_init(), zid_init(), zot_build_packet(), zot_fetch(), zot_new_uid(), and zot_refresh().

    @@ -2463,7 +2483,7 @@ Variables
    -

    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(), 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(), import_post(), importelm_post(), invite_content(), invite_post(), item_content(), item_post(), layouts_content(), like_content(), load_database(), locs_post(), 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(), service_limits_content(), settings_post(), setup_content(), sources_content(), sources_post(), subthread_content(), suggest_content(), sync_locations(), 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(), 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(), import_post(), importelm_post(), invite_content(), invite_post(), item_content(), item_post(), layouts_content(), like_content(), load_database(), locs_post(), 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_init(), 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(), service_limits_content(), settings_post(), setup_content(), sources_content(), sources_post(), subthread_content(), suggest_content(), sync_locations(), 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().

    @@ -2803,7 +2823,7 @@ Variables

    Item Flags

    -

    Referenced by connedit_post(), diaspora_comment(), diaspora_like(), diaspora_signed_retraction(), event_store_item(), externals_run(), item_post(), like_content(), mood_init(), notifier_run(), photo_upload(), photos_create_item(), poke_init(), post_activity_item(), profile_activity(), start_delivery_chain(), subthread_content(), tag_deliver(), tagger_content(), and thing_init().

    +

    Referenced by connedit_post(), diaspora_comment(), diaspora_like(), diaspora_signed_retraction(), event_store_item(), externals_run(), item_post(), like_content(), mood_init(), notifier_run(), photo_upload(), photos_create_item(), poke_init(), post_activity_item(), process_delivery(), profile_activity(), start_delivery_chain(), subthread_content(), tag_deliver(), tagger_content(), and thing_init().

    @@ -3022,7 +3042,7 @@ Variables
    -

    Referenced by display_content(), editwebpage_content(), home_content(), impel_init(), item_check_service_class(), items_fetch(), notifier_run(), page_content(), update_remote_id(), webpages_content(), widget_item(), and widget_tagcloud().

    +

    Referenced by display_content(), editwebpage_content(), home_content(), impel_init(), item_check_service_class(), items_fetch(), notifier_run(), page_init(), update_remote_id(), webpages_content(), widget_item(), and widget_tagcloud().

    @@ -3094,7 +3114,7 @@ Variables
    -

    Referenced by admin_page_logs(), build_sync_packet(), check_form_security_token_ForbiddenOnErr(), check_form_security_token_redirectOnErr(), consume_feed(), deliver_run(), detect_language(), diaspora_decode(), diaspora_dispatch(), diaspora_msg_build(), diaspora_pubmsg_build(), diaspora_reshare(), diaspora_send_followup(), diaspora_send_images(), diaspora_send_mail(), diaspora_send_relay(), diaspora_send_status(), dir_parse_query(), directory_content(), dirprofile_init(), discover_by_url(), encode_item(), fetch_xrd_links(), find_diaspora_person_by_handle(), fix_private_photos(), get_atom_elements(), RedMatrix\RedDAV\RedDirectory\getChild(), RedMatrix\RedDAV\RedDirectory\getDir(), impel_init(), import_xchan(), item_post(), item_store(), item_store_update(), RedMatrix\RedDAV\RedDirectory\log(), RedMatrix\RedDAV\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(), RedMatrix\RedDAV\RedFile\setName(), RedMatrix\RedDAV\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 admin_page_logs(), build_sync_packet(), check_form_security_token_ForbiddenOnErr(), check_form_security_token_redirectOnErr(), consume_feed(), deliver_run(), detect_language(), diaspora_decode(), diaspora_dispatch(), diaspora_msg_build(), diaspora_pubmsg_build(), diaspora_reshare(), diaspora_send_followup(), diaspora_send_images(), diaspora_send_mail(), diaspora_send_relay(), diaspora_send_status(), dir_parse_query(), directory_content(), dirprofile_init(), discover_by_url(), encode_item(), fetch_xrd_links(), find_diaspora_person_by_handle(), fix_private_photos(), get_atom_elements(), RedMatrix\RedDAV\RedDirectory\getChild(), RedMatrix\RedDAV\RedDirectory\getDir(), impel_init(), import_xchan(), item_post(), item_store(), item_store_update(), RedMatrix\RedDAV\RedDirectory\log(), RedMatrix\RedDAV\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(), RedFileData(), RedMatrix\RedDAV\RedFile\setName(), RedMatrix\RedDAV\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().

    @@ -3108,7 +3128,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(), bb2diaspora_itemwallwall(), bookmark_add(), consume_feed(), conversation(), RedMatrix\RedDAV\RedDirectory\createDirectory(), RedMatrix\RedDAV\RedDirectory\createFile(), RedMatrix\RedDAV\RedFile\delete(), delete_imported_item(), deliver_run(), diaspora_conversation(), diaspora_handle_from_contact(), diaspora_like(), 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(), RedMatrix\RedDAV\RedFile\get(), get_diaspora_key(), get_diaspora_reshare_xml(), get_language_name(), Conversation\get_template_data(), group_content(), guess_image_type(), hubloc_change_primary(), import_author_rss(), import_author_unknown(), 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(), onepoll_run(), parse_url_content(), photo_upload(), photos_post(), poco_init(), poco_load(), poke_init(), post_post(), process_delivery(), process_location_delivery(), process_profile_delivery(), profile_load(), RedMatrix\RedDAV\RedFile\put(), queue_run(), receive_post(), RedChannelList(), RedFileData(), Item\remove_child(), remove_obsolete_hublocs(), scale_external_images(), scrape_feed(), enotify\send(), Conversation\set_mode(), store_diaspora_comment_sig(), stream_perms_api_uids(), stream_perms_xchans(), sync_locations(), 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(), bb2diaspora_itemwallwall(), bookmark_add(), consume_feed(), conversation(), RedMatrix\RedDAV\RedDirectory\createDirectory(), RedMatrix\RedDAV\RedDirectory\createFile(), RedMatrix\RedDAV\RedFile\delete(), delete_imported_item(), deliver_run(), diaspora_conversation(), diaspora_handle_from_contact(), diaspora_like(), 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(), RedMatrix\RedDAV\RedFile\get(), get_diaspora_key(), get_diaspora_reshare_xml(), get_language_name(), Conversation\get_template_data(), group_content(), guess_image_type(), hubloc_change_primary(), import_author_rss(), import_author_unknown(), 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(), onepoll_run(), parse_url_content(), photo_upload(), photos_post(), poco_init(), poco_load(), poke_init(), post_post(), process_delivery(), process_location_delivery(), process_profile_delivery(), profile_load(), RedMatrix\RedDAV\RedFile\put(), queue_run(), receive_post(), Item\remove_child(), remove_obsolete_hublocs(), scale_external_images(), scrape_feed(), enotify\send(), Conversation\set_mode(), store_diaspora_comment_sig(), stream_perms_api_uids(), stream_perms_xchans(), sync_locations(), tag_deliver(), unload_plugin(), z_fetch_url(), z_post_url(), zot_feed(), zot_finger(), zot_gethub(), zot_register_hub(), and zotfeed_init().

    diff --git a/doc/html/boot_8php.js b/doc/html/boot_8php.js index 3a93f8eb0..742aa4d99 100644 --- a/doc/html/boot_8php.js +++ b/doc/html/boot_8php.js @@ -30,6 +30,7 @@ var boot_8php = [ "is_windows", "boot_8php.html#ac5e74f899f6e98d8e91b14ba1c08bc08", null ], [ "killme", "boot_8php.html#aea7fc57a4d8e9dcb42f2601b0b9b761c", null ], [ "load_contact_links", "boot_8php.html#a719c7f3972d5f9268f37a41c76cd4ef6", null ], + [ "load_pdl", "boot_8php.html#a50a6707a28c7d05d3f49eaabc7994501", null ], [ "local_user", "boot_8php.html#ad4c9dc2c8a82e8f52b7404c1655eab44", null ], [ "login", "boot_8php.html#aefecf8599036df7f1b95d6820e0e2fa4", null ], [ "notice", "boot_8php.html#a9255af5ae9c887520091ea04763c1a88", null ], diff --git a/doc/html/comanche_8php.html b/doc/html/comanche_8php.html index 5967a7d6a..aec807d58 100644 --- a/doc/html/comanche_8php.html +++ b/doc/html/comanche_8php.html @@ -166,7 +166,7 @@ Functions

    comanche_get_channel_id() Returns the channel_id of the profile owner of the page, or the local_user if there is no profile owner. Otherwise returns 0

    -

    Referenced by comanche_block(), comanche_menu(), and construct_page().

    +

    Referenced by comanche_block(), comanche_menu(), and load_pdl().

    @@ -222,7 +222,7 @@ Functions
    -

    Referenced by construct_page(), and page_content().

    +

    Referenced by load_pdl(), and page_init().

    diff --git a/doc/html/crypto_8php.html b/doc/html/crypto_8php.html index 1e0227a30..e5ed0d591 100644 --- a/doc/html/crypto_8php.html +++ b/doc/html/crypto_8php.html @@ -316,7 +316,7 @@ Functions
    -

    Referenced by diaspora_comment(), diaspora_conversation(), diaspora_like(), diaspora_message(), get_item_elements(), get_mail_elements(), item_post(), item_store(), item_store_update(), localize_item(), post_activity_item(), post_post(), send_message(), start_delivery_chain(), store_diaspora_comment_sig(), zfinger_init(), zot_build_packet(), and zot_fetch().

    +

    Referenced by diaspora_comment(), diaspora_conversation(), diaspora_like(), diaspora_message(), get_item_elements(), get_mail_elements(), item_post(), item_store(), item_store_update(), localize_item(), post_activity_item(), post_post(), send_message(), start_delivery_chain(), store_diaspora_comment_sig(), zfinger_init(), zot_build_packet(), and zot_fetch().

    @@ -738,7 +738,7 @@ Functions
    -

    Referenced by create_identity(), diaspora_msg_build(), diaspora_pubmsg_build(), diaspora_send_followup(), diaspora_send_mail(), diaspora_send_relay(), diaspora_send_retraction(), fix_system_urls(), import_post(), item_post(), item_store(), item_store_update(), magic_init(), post_activity_item(), post_post(), store_diaspora_comment_sig(), zfinger_init(), zot_build_packet(), and zot_fetch().

    +

    Referenced by create_identity(), diaspora_msg_build(), diaspora_pubmsg_build(), diaspora_send_followup(), diaspora_send_mail(), diaspora_send_relay(), diaspora_send_retraction(), fix_system_urls(), import_post(), item_post(), item_store(), item_store_update(), magic_init(), post_activity_item(), post_post(), store_diaspora_comment_sig(), zfinger_init(), zot_build_packet(), and zot_fetch().

    diff --git a/doc/html/datetime_8php.html b/doc/html/datetime_8php.html index 41dc0f97f..1f6eb1430 100644 --- a/doc/html/datetime_8php.html +++ b/doc/html/datetime_8php.html @@ -122,12 +122,12 @@ Functions    dob ($dob)   - datesel_format ($f) -  - datesel ($f, $pre, $ymin, $ymax, $allow_blank, $y, $m, $d) -  - timesel ($pre, $h, $m) -  + datesel ($format, $min, $max, $default, $id= 'datepicker') +  + timesel ($format, $h, $m, $id='timepicker') +  + datetimesel ($format, $min, $max, $default, $id= 'datetimepicker', $pickdate=true, $picktime=true, $minfrom= '', $maxfrom= '') +   relative_date ($posted_date, $format=null)    age ($dob, $owner_tz= '', $viewer_tz= '') @@ -218,7 +218,7 @@ Functions - +
    @@ -226,49 +226,82 @@ Functions - + - + - + - + - + + + + + + + +
    datesel (  $f, $format,
     $pre, $min,
     $ymin, $max,
     $ymax, $default,
     $allow_blank, $id = 'datepicker' 
    )
    +
    +

    returns a date selector

    +
    Parameters
    + + + + + + +
    $formatformat string, e.g. 'ymd' or 'mdy'. Not currently supported
    $minunix timestamp of minimum date
    $maxunix timestap of maximum date
    $defaultunix timestamp of default date
    $idid and name of datetimepicker (defaults to "datetimepicker")
    +
    +
    + +

    Referenced by dob().

    + +
    +
    + +
    +
    + + + + + + - + - + - + @@ -278,55 +311,67 @@ Functions
    datetime_convert ( $from = 'UTC',
     $y, $to = 'UTC',
     $m, $s = 'now',
     $d $fmt = "Y-m-d H:i:s" 
    -

    Referenced by dob(), and events_content().

    +

    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(), RedMatrix\RedDAV\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_send_images(), diaspora_send_mail(), diaspora_send_status(), diaspora_transmit(), directory_run(), dirsearch_content(), discover_by_url(), discover_by_webbie(), dlogger(), 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(), RedMatrix\RedDAV\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(), RedMatrix\RedDAV\RedFile\getLastModified(), RedMatrix\RedDAV\RedDirectory\getLastModified(), impel_init(), import_author_rss(), import_author_unknown(), 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(), p_init(), 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(), RedMatrix\RedDAV\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(), sync_locations(), tag_deliver(), update_birthdays(), update_directory_entry(), update_modtime(), update_queue_time(), verify_email_address(), webpages_content(), xchan_store(), z_birthday(), zot_feed(), zot_process_response(), zot_refresh(), and zotfeed_init().

    - +
    - + - + + + + + + -
    datesel_format datetimesel (  $f)$format,
     $min,
    -
    - -

    Referenced by events_content(), and profiles_content().

    - -
    -
    - -
    -
    - - - + + - + - + - + - + + + + + + + + + + + + + + + + + + + @@ -335,8 +380,23 @@ Functions
    datetime_convert (  $from = 'UTC', $max,
     $to = 'UTC', $default,
     $s = 'now', $id = 'datetimepicker',
     $fmt = "Y-m-d H:i:s" $pickdate = true,
     $picktime = true,
     $minfrom = '',
     $maxfrom = '' 
    - -

    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(), RedMatrix\RedDAV\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_send_images(), diaspora_send_mail(), diaspora_send_status(), diaspora_transmit(), directory_run(), dirsearch_content(), discover_by_url(), 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(), RedMatrix\RedDAV\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(), RedMatrix\RedDAV\RedFile\getLastModified(), RedMatrix\RedDAV\RedDirectory\getLastModified(), impel_init(), import_author_rss(), import_author_unknown(), 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(), p_init(), 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(), RedMatrix\RedDAV\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(), sync_locations(), 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().

    +

    returns a datetime selector

    +
    Parameters
    + + + + + + + + + + +
    $formatformat string, e.g. 'ymd' or 'mdy'. Not currently supported
    $minunix timestamp of minimum date
    $maxunix timestap of maximum date
    $defaultunix timestamp of default date
    $idid and name of datetimepicker (defaults to "datetimepicker")
    $pickdatetrue to show date picker (default)
    $picktimetrue to show time picker (default)
    $minfromset minimum date from picker with id $minfrom (none by default)
    $maxfromset maximum date from picker with id $maxfrom (none by default)
    +
    +
    + +

    Referenced by datesel(), events_content(), and timesel().

    @@ -500,7 +560,7 @@ Functions - +
    @@ -508,7 +568,7 @@ Functions - + @@ -520,7 +580,13 @@ Functions - + + + + + + + @@ -529,8 +595,16 @@ Functions
    timesel (  $pre, $format,
     $m $m,
     $id = 'timepicker' 
    - -

    Referenced by events_content().

    +

    returns a date selector

    +
    Parameters
    + + + + + +
    $formatformat string, e.g. 'ymd' or 'mdy'. Not currently supported
    $halready selected hour
    $malready selected minute
    $idid and name of datetimepicker (defaults to "timepicker")
    +
    +
    diff --git a/doc/html/datetime_8php.js b/doc/html/datetime_8php.js index 19d2d7f24..7fdf58cfd 100644 --- a/doc/html/datetime_8php.js +++ b/doc/html/datetime_8php.js @@ -2,16 +2,16 @@ var datetime_8php = [ [ "age", "datetime_8php.html#abc1652f96799cec6fce8797ba2ebc2df", null ], [ "cal", "datetime_8php.html#aea356409ba69f9de412298c998595dd2", null ], - [ "datesel", "datetime_8php.html#ac265b86f384ee094ed5479aae02aa5c8", null ], - [ "datesel_format", "datetime_8php.html#a5f29553799005b1fd4e9ce9d98ce05aa", null ], + [ "datesel", "datetime_8php.html#a77bb385ae8a9e7ca663309c102c0d766", null ], [ "datetime_convert", "datetime_8php.html#ad6301e74b0f9267d52f8d432b5beb226", null ], + [ "datetimesel", "datetime_8php.html#a72218e5ee21876484934bacbb6bd9ba3", null ], [ "dob", "datetime_8php.html#a3f2897db32e745fe2f3e70a6b46578f8", null ], [ "field_timezone", "datetime_8php.html#a03900dcf0f9e3c58793a031673a70326", null ], [ "get_dim", "datetime_8php.html#a7df24d72ea05922d3127363e2295174c", null ], [ "get_first_dim", "datetime_8php.html#aba971b67f17fecf050813f1eba72367f", null ], [ "relative_date", "datetime_8php.html#a8ae8dc95ace7ac27fa5a1ecf42b78c82", null ], [ "select_timezone", "datetime_8php.html#a633dadba426fa2f60b25fabdb19ebc1f", null ], - [ "timesel", "datetime_8php.html#a36d3d6dff8d76b5f295bb3d9c535a5b1", null ], + [ "timesel", "datetime_8php.html#a3f239f94e23335d860b148958d87a093", null ], [ "timezone_cmp", "datetime_8php.html#aa51b5a7ea4f931b23acbdfcea46e9865", null ], [ "update_birthdays", "datetime_8php.html#af1cd77c97c901d9239cb7a61f97f9826", null ], [ "z_birthday", "datetime_8php.html#ab55e545b72ec8c097e052ea7d373491f", null ] diff --git a/doc/html/dba__driver_8php.html b/doc/html/dba__driver_8php.html index 5a9becc31..35a50094e 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_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(), bb2diaspora_itemwallwall(), bb2dmention_callback(), 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_upstream_directory(), 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(), RedMatrix\RedDAV\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_handle_from_contact(), diaspora_like(), diaspora_mention_callback(), diaspora_message(), diaspora_photo(), diaspora_post(), diaspora_process_outbound(), 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_url(), 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(), filter_insecure(), find_diaspora_person_by_handle(), find_filename_by_hash(), find_folder_hash_by_attach_hash(), RedMatrix\RedDAV\RedBrowser\findAttachHash(), RedMatrix\RedDAV\RedBrowser\findAttachIdByHash(), fix_attached_photo_permissions(), fix_private_photos(), fix_system_urls(), fsuggest_post(), Cache\get(), RedMatrix\RedDAV\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(), RedMatrix\RedDAV\RedDirectory\getDir(), RedMatrix\RedDAV\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(), hubloc_change_primary(), impel_init(), import_author_diaspora(), import_author_rss(), import_author_unknown(), 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(), locs_post(), 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(), menu_list_count(), 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(), p_init(), 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_location_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(), RedMatrix\RedDAV\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_obsolete_hublocs(), 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(), RedMatrix\RedDAV\RedFile\setName(), RedMatrix\RedDAV\RedDirectory\setName(), settings_post(), sitelist_init(), sources_content(), sources_post(), start_delivery_chain(), photo_driver\store(), store_diaspora_comment_sig(), store_item_tag(), stream_perms_xchans(), stringify_array_elms(), subthread_content(), suggest_init(), sync_directories(), sync_locations(), 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(), RedMatrix\RedDAV\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(), bb2diaspora_itemwallwall(), bb2dmention_callback(), 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_upstream_directory(), 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(), RedMatrix\RedDAV\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_handle_from_contact(), diaspora_like(), diaspora_mention_callback(), diaspora_message(), diaspora_photo(), diaspora_post(), diaspora_process_outbound(), 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_url(), 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(), filter_insecure(), find_diaspora_person_by_handle(), find_filename_by_hash(), find_folder_hash_by_attach_hash(), RedMatrix\RedDAV\RedBrowser\findAttachHash(), RedMatrix\RedDAV\RedBrowser\findAttachIdByHash(), fix_attached_photo_permissions(), fix_private_photos(), fix_system_urls(), fsuggest_post(), Cache\get(), RedMatrix\RedDAV\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(), RedMatrix\RedDAV\RedDirectory\getDir(), RedMatrix\RedDAV\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(), hubloc_change_primary(), impel_init(), import_author_diaspora(), import_author_rss(), import_author_unknown(), 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(), locs_post(), 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(), menu_list_count(), 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(), p_init(), page_init(), 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_location_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(), RedMatrix\RedDAV\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_obsolete_hublocs(), 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(), RedMatrix\RedDAV\RedFile\setName(), RedMatrix\RedDAV\RedDirectory\setName(), settings_post(), sitelist_init(), sources_content(), sources_post(), start_delivery_chain(), photo_driver\store(), store_diaspora_comment_sig(), store_item_tag(), stream_perms_xchans(), stringify_array_elms(), subthread_content(), suggest_init(), sync_directories(), sync_locations(), 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(), RedMatrix\RedDAV\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(), xchan_store(), 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_service_class_fetch(), 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_group(), api_group_members(), 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(), bb2diaspora_itemwallwall(), bb2dmention_callback(), 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(), chatroom_list_count(), chatsvc_content(), chatsvc_init(), chatsvc_post(), check_account_email(), check_account_invite(), check_config(), check_item_source(), check_upstream_directory(), 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(), RedMatrix\RedDAV\RedDirectory\createDirectory(), RedMatrix\RedDAV\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_mention_callback(), diaspora_message(), diaspora_photo(), diaspora_post(), diaspora_process_outbound(), 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_url(), 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(), filter_insecure(), find_diaspora_person_by_handle(), find_filename_by_hash(), find_folder_hash_by_attach_hash(), RedMatrix\RedDAV\RedBrowser\findAttachHash(), RedMatrix\RedDAV\RedBrowser\findAttachIdByHash(), first_post_date(), fix_attached_photo_permissions(), fix_private_photos(), fix_system_urls(), fsuggest_content(), fsuggest_post(), RedMatrix\RedDAV\RedBrowser\generateDirectoryIndex(), Cache\get(), RedMatrix\RedDAV\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(), RedMatrix\RedDAV\RedDirectory\getDir(), RedMatrix\RedDAV\RedDirectory\getLastModified(), RedMatrix\RedDAV\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(), hubloc_change_primary(), identity_basic_export(), identity_check_service_class(), identity_selector(), impel_init(), import_author_diaspora(), import_author_rss(), import_author_unknown(), 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(), locs_post(), 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(), menu_list_count(), 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_off(), notifications_on(), notifications_post(), notifier_run(), notify_content(), notify_init(), oauth_get_client(), onedirsync_run(), onepoll_run(), openid_content(), p_init(), 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_location_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(), RedMatrix\RedDAV\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_obsolete_hublocs(), 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(), RedMatrix\RedDAV\RedFile\setName(), RedMatrix\RedDAV\RedDirectory\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_diaspora_comment_sig(), store_item_tag(), stream_perms_api_uids(), stream_perms_xchans(), subthread_content(), suggest_init(), suggestion_query(), sync_directories(), sync_locations(), tag_deliver(), tagadelic(), tagger_content(), tagrm_content(), tagrm_post(), tgroup_check(), thing_content(), thing_init(), uninstall_plugin(), unregister_hook(), update_birthdays(), update_channels_active_halfyear_stat(), update_channels_active_monthly_stat(), update_channels_total_stat(), update_directory_entry(), update_local_posts_stat(), update_modtime(), update_queue_time(), update_remote_id(), update_suggestions(), user_allow(), user_approve(), user_deny(), RedMatrix\RedDAV\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_service_class_fetch(), 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_group(), api_group_members(), 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(), bb2diaspora_itemwallwall(), bb2dmention_callback(), 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(), chatroom_list_count(), chatsvc_content(), chatsvc_init(), chatsvc_post(), check_account_email(), check_account_invite(), check_config(), check_item_source(), check_upstream_directory(), 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(), RedMatrix\RedDAV\RedDirectory\createDirectory(), RedMatrix\RedDAV\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_mention_callback(), diaspora_message(), diaspora_photo(), diaspora_post(), diaspora_process_outbound(), 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_url(), 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(), filter_insecure(), find_diaspora_person_by_handle(), find_filename_by_hash(), find_folder_hash_by_attach_hash(), RedMatrix\RedDAV\RedBrowser\findAttachHash(), RedMatrix\RedDAV\RedBrowser\findAttachIdByHash(), first_post_date(), fix_attached_photo_permissions(), fix_private_photos(), fix_system_urls(), fsuggest_content(), fsuggest_post(), RedMatrix\RedDAV\RedBrowser\generateDirectoryIndex(), Cache\get(), RedMatrix\RedDAV\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(), RedMatrix\RedDAV\RedDirectory\getDir(), RedMatrix\RedDAV\RedDirectory\getLastModified(), RedMatrix\RedDAV\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(), hubloc_change_primary(), identity_basic_export(), identity_check_service_class(), identity_selector(), impel_init(), import_author_diaspora(), import_author_rss(), import_author_unknown(), 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(), locs_post(), 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(), menu_list_count(), 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_off(), notifications_on(), notifications_post(), notifier_run(), notify_content(), notify_init(), oauth_get_client(), onedirsync_run(), onepoll_run(), openid_content(), p_init(), page_init(), 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_location_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(), RedMatrix\RedDAV\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_obsolete_hublocs(), 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(), RedMatrix\RedDAV\RedFile\setName(), RedMatrix\RedDAV\RedDirectory\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_diaspora_comment_sig(), store_item_tag(), stream_perms_api_uids(), stream_perms_xchans(), subthread_content(), suggest_init(), suggestion_query(), sync_directories(), sync_locations(), tag_deliver(), tagadelic(), tagger_content(), tagrm_content(), tagrm_post(), tgroup_check(), thing_content(), thing_init(), uninstall_plugin(), unregister_hook(), update_birthdays(), update_channels_active_halfyear_stat(), update_channels_active_monthly_stat(), update_channels_total_stat(), update_directory_entry(), update_local_posts_stat(), update_modtime(), update_queue_time(), update_remote_id(), update_suggestions(), user_allow(), user_approve(), user_deny(), RedMatrix\RedDAV\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_fetch(), xchan_mail_query(), xchan_query(), xchan_store(), 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/dir_0262a6a8df56a167e3761b6e5a54bb1c.html b/doc/html/dir_0262a6a8df56a167e3761b6e5a54bb1c.html new file mode 100644 index 000000000..e3fe69222 --- /dev/null +++ b/doc/html/dir_0262a6a8df56a167e3761b6e5a54bb1c.html @@ -0,0 +1,112 @@ + + + + + + +The Red Matrix: view/theme/suckerberg Directory Reference + + + + + + + + + + + + + +
    +
    + + + + + + + +
    +
    The Red Matrix +
    +
    +
    + + + + +
    +
    + +
    +
    +
    + +
    + + + + +
    + +
    + +
    +
    +
    suckerberg Directory Reference
    +
    +
    + + + + +

    +Directories

    directory  php
     
    +
    +
    + diff --git a/doc/html/dir_0262a6a8df56a167e3761b6e5a54bb1c.js b/doc/html/dir_0262a6a8df56a167e3761b6e5a54bb1c.js new file mode 100644 index 000000000..c0919b906 --- /dev/null +++ b/doc/html/dir_0262a6a8df56a167e3761b6e5a54bb1c.js @@ -0,0 +1,4 @@ +var dir_0262a6a8df56a167e3761b6e5a54bb1c = +[ + [ "php", "dir_ac4f5165c8d71ebb1a1a0a168a48f3f7.html", "dir_ac4f5165c8d71ebb1a1a0a168a48f3f7" ] +]; \ No newline at end of file diff --git a/doc/html/dir_4acb285a1960a920438b718da0958cf4.html b/doc/html/dir_4acb285a1960a920438b718da0958cf4.html new file mode 100644 index 000000000..b609d2603 --- /dev/null +++ b/doc/html/dir_4acb285a1960a920438b718da0958cf4.html @@ -0,0 +1,112 @@ + + + + + + +The Red Matrix: view/theme/stumble Directory Reference + + + + + + + + + + + + + +
    +
    + + + + + + + +
    +
    The Red Matrix +
    +
    +
    + + + + +
    +
    + +
    +
    +
    + +
    + + + + +
    + +
    + +
    +
    +
    stumble Directory Reference
    +
    +
    + + + + +

    +Directories

    directory  php
     
    +
    +
    + diff --git a/doc/html/dir_4acb285a1960a920438b718da0958cf4.js b/doc/html/dir_4acb285a1960a920438b718da0958cf4.js new file mode 100644 index 000000000..ddf00ba8a --- /dev/null +++ b/doc/html/dir_4acb285a1960a920438b718da0958cf4.js @@ -0,0 +1,4 @@ +var dir_4acb285a1960a920438b718da0958cf4 = +[ + [ "php", "dir_65522070e0a83623cefc01ebe26a83e3.html", "dir_65522070e0a83623cefc01ebe26a83e3" ] +]; \ No newline at end of file diff --git a/doc/html/dir_65522070e0a83623cefc01ebe26a83e3.html b/doc/html/dir_65522070e0a83623cefc01ebe26a83e3.html new file mode 100644 index 000000000..70b82fa1e --- /dev/null +++ b/doc/html/dir_65522070e0a83623cefc01ebe26a83e3.html @@ -0,0 +1,114 @@ + + + + + + +The Red Matrix: view/theme/stumble/php Directory Reference + + + + + + + + + + + + + +
    +
    + + + + + + + +
    +
    The Red Matrix +
    +
    +
    + + + + +
    +
    + +
    +
    +
    + +
    + + + + +
    + +
    + +
    +
    +
    php Directory Reference
    +
    +
    + + + + + + +

    +Files

    file  style.php
     
    file  theme.php
     
    +
    +
    + diff --git a/doc/html/dir_65522070e0a83623cefc01ebe26a83e3.js b/doc/html/dir_65522070e0a83623cefc01ebe26a83e3.js new file mode 100644 index 000000000..f914d9b01 --- /dev/null +++ b/doc/html/dir_65522070e0a83623cefc01ebe26a83e3.js @@ -0,0 +1,5 @@ +var dir_65522070e0a83623cefc01ebe26a83e3 = +[ + [ "style.php", "stumble_2php_2style_8php.html", null ], + [ "theme.php", "stumble_2php_2theme_8php.html", "stumble_2php_2theme_8php" ] +]; \ No newline at end of file diff --git a/doc/html/dir_6e52a2a2cd27c08b7df5e5cdb216bd77.html b/doc/html/dir_6e52a2a2cd27c08b7df5e5cdb216bd77.html new file mode 100644 index 000000000..920784d3d --- /dev/null +++ b/doc/html/dir_6e52a2a2cd27c08b7df5e5cdb216bd77.html @@ -0,0 +1,112 @@ + + + + + + +The Red Matrix: view/theme/hivenet Directory Reference + + + + + + + + + + + + + +
    +
    + + + + + + + +
    +
    The Red Matrix +
    +
    +
    + + + + +
    +
    + +
    +
    +
    + +
    + + + + +
    + +
    + +
    +
    +
    hivenet Directory Reference
    +
    +
    + + + + +

    +Directories

    directory  php
     
    +
    +
    + diff --git a/doc/html/dir_6e52a2a2cd27c08b7df5e5cdb216bd77.js b/doc/html/dir_6e52a2a2cd27c08b7df5e5cdb216bd77.js new file mode 100644 index 000000000..cc2615730 --- /dev/null +++ b/doc/html/dir_6e52a2a2cd27c08b7df5e5cdb216bd77.js @@ -0,0 +1,4 @@ +var dir_6e52a2a2cd27c08b7df5e5cdb216bd77 = +[ + [ "php", "dir_9ef82eb3846cd201470898c3b6ef38cf.html", "dir_9ef82eb3846cd201470898c3b6ef38cf" ] +]; \ No newline at end of file diff --git a/doc/html/dir_8543001e5d25368a6edede3e63efb554.html b/doc/html/dir_8543001e5d25368a6edede3e63efb554.html index 5c15c9f91..3b9d184f6 100644 --- a/doc/html/dir_8543001e5d25368a6edede3e63efb554.html +++ b/doc/html/dir_8543001e5d25368a6edede3e63efb554.html @@ -108,10 +108,16 @@ Directories   directory  blogga   +directory  hivenet +  directory  mytheme   directory  redbasic   +directory  stumble +  +directory  suckerberg +  diff --git a/doc/html/dir_8543001e5d25368a6edede3e63efb554.js b/doc/html/dir_8543001e5d25368a6edede3e63efb554.js index 25e3e7cc0..63c07db40 100644 --- a/doc/html/dir_8543001e5d25368a6edede3e63efb554.js +++ b/doc/html/dir_8543001e5d25368a6edede3e63efb554.js @@ -2,6 +2,9 @@ var dir_8543001e5d25368a6edede3e63efb554 = [ [ "apw", "dir_d520c5cf583201d9437764f209363c22.html", "dir_d520c5cf583201d9437764f209363c22" ], [ "blogga", "dir_922c77e958c99a98db92d38a3a349bf2.html", "dir_922c77e958c99a98db92d38a3a349bf2" ], + [ "hivenet", "dir_6e52a2a2cd27c08b7df5e5cdb216bd77.html", "dir_6e52a2a2cd27c08b7df5e5cdb216bd77" ], [ "mytheme", "dir_8e58ba5e98ac07e59ee15ca7486c9950.html", "dir_8e58ba5e98ac07e59ee15ca7486c9950" ], - [ "redbasic", "dir_55dbaf9b7b53c4fc605c9011743a7353.html", "dir_55dbaf9b7b53c4fc605c9011743a7353" ] + [ "redbasic", "dir_55dbaf9b7b53c4fc605c9011743a7353.html", "dir_55dbaf9b7b53c4fc605c9011743a7353" ], + [ "stumble", "dir_4acb285a1960a920438b718da0958cf4.html", "dir_4acb285a1960a920438b718da0958cf4" ], + [ "suckerberg", "dir_0262a6a8df56a167e3761b6e5a54bb1c.html", "dir_0262a6a8df56a167e3761b6e5a54bb1c" ] ]; \ No newline at end of file diff --git a/doc/html/dir_9ef82eb3846cd201470898c3b6ef38cf.html b/doc/html/dir_9ef82eb3846cd201470898c3b6ef38cf.html new file mode 100644 index 000000000..91c6ed04b --- /dev/null +++ b/doc/html/dir_9ef82eb3846cd201470898c3b6ef38cf.html @@ -0,0 +1,114 @@ + + + + + + +The Red Matrix: view/theme/hivenet/php Directory Reference + + + + + + + + + + + + + +
    +
    + + + + + + + +
    +
    The Red Matrix +
    +
    +
    + + + + +
    +
    + +
    +
    +
    + +
    + + + + +
    + +
    + +
    +
    +
    php Directory Reference
    +
    +
    + + + + + + +

    +Files

    file  style.php
     
    file  theme.php
     
    +
    +
    + diff --git a/doc/html/dir_9ef82eb3846cd201470898c3b6ef38cf.js b/doc/html/dir_9ef82eb3846cd201470898c3b6ef38cf.js new file mode 100644 index 000000000..576c2c655 --- /dev/null +++ b/doc/html/dir_9ef82eb3846cd201470898c3b6ef38cf.js @@ -0,0 +1,5 @@ +var dir_9ef82eb3846cd201470898c3b6ef38cf = +[ + [ "style.php", "hivenet_2php_2style_8php.html", null ], + [ "theme.php", "hivenet_2php_2theme_8php.html", "hivenet_2php_2theme_8php" ] +]; \ No newline at end of file diff --git a/doc/html/dir_ac4f5165c8d71ebb1a1a0a168a48f3f7.html b/doc/html/dir_ac4f5165c8d71ebb1a1a0a168a48f3f7.html new file mode 100644 index 000000000..76a464461 --- /dev/null +++ b/doc/html/dir_ac4f5165c8d71ebb1a1a0a168a48f3f7.html @@ -0,0 +1,114 @@ + + + + + + +The Red Matrix: view/theme/suckerberg/php Directory Reference + + + + + + + + + + + + + +
    +
    + + + + + + + +
    +
    The Red Matrix +
    +
    +
    + + + + +
    +
    + +
    +
    +
    + +
    + + + + +
    + +
    + +
    +
    +
    php Directory Reference
    +
    +
    + + + + + + +

    +Files

    file  style.php
     
    file  theme.php
     
    +
    +
    + diff --git a/doc/html/dir_ac4f5165c8d71ebb1a1a0a168a48f3f7.js b/doc/html/dir_ac4f5165c8d71ebb1a1a0a168a48f3f7.js new file mode 100644 index 000000000..0e2f340ef --- /dev/null +++ b/doc/html/dir_ac4f5165c8d71ebb1a1a0a168a48f3f7.js @@ -0,0 +1,5 @@ +var dir_ac4f5165c8d71ebb1a1a0a168a48f3f7 = +[ + [ "style.php", "suckerberg_2php_2style_8php.html", null ], + [ "theme.php", "suckerberg_2php_2theme_8php.html", "suckerberg_2php_2theme_8php" ] +]; \ No newline at end of file diff --git a/doc/html/extract_8php.html b/doc/html/extract_8php.html index 9e08aa0f4..7f383a243 100644 --- a/doc/html/extract_8php.html +++ b/doc/html/extract_8php.html @@ -132,7 +132,7 @@ Variables
    -

    Referenced by _well_known_init(), account_service_class_fetch(), 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_url(), discover_by_webbie(), drop_item(), event_store_event(), event_store_item(), externals_run(), feature_enabled(), fetch_xrd_links(), filter_insecure(), find_xchan_in_array(), foofoo(), 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(), impel_init(), import_author_rss(), import_author_unknown(), 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_location_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(), sync_locations(), 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(), account_service_class_fetch(), 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_url(), discover_by_webbie(), drop_item(), event_store_event(), event_store_item(), externals_run(), feature_enabled(), fetch_xrd_links(), filter_insecure(), find_xchan_in_array(), foofoo(), 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(), impel_init(), import_author_rss(), import_author_unknown(), 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_location_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(), sync_locations(), 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_fetch(), xchan_mail_query(), xchan_query(), xchan_store(), 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(), event_store_item(), expand_acl(), extra_query_args(), 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(), import_xchan(), 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(), update_channels_active_halfyear_stat(), update_channels_active_monthly_stat(), Template\var_replace(), webfinger_rfc7033(), x(), xchan_content(), 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(), datetime_convert(), day_translate(), detect_language(), diaspora2bb(), diaspora_is_blacklisted(), diaspora_ol(), diaspora_ul(), dir_parse_query(), dir_query_build(), event_store_item(), expand_acl(), extra_query_args(), 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(), import_xchan(), info(), is_a_date_arg(), is_foreigner(), is_member(), json_decode_plus(), legal_webbie(), linkify(), load_pdl(), 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(), update_channels_active_halfyear_stat(), update_channels_active_monthly_stat(), Template\var_replace(), webfinger_rfc7033(), x(), xchan_content(), 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 f5a3e5e36..640a7234a 100644 --- a/doc/html/files.html +++ b/doc/html/files.html @@ -408,25 +408,37 @@ $(document).ready(function(){initNavTree('files.html','');}); | |   o*config.php | |   o*default.php | |   \*theme.php -| o+mytheme -| |\+php -| | o*default.php -| | o*style.php -| | \*theme.php -| \+redbasic -|  o+php -|  |o*config.php -|  |o*style.php -|  |o*theme.php -|  |\*theme_init.php -|  \+schema -|   o*boxy.php -|   o*BS-Default.php -|   o*dark.php -|   o*notred.php -|   o*simple_black_on_white.php -|   o*simple_green_on_black.php -|   \*simple_white_on_black.php +| o+hivenet +| |\+php +| | o*style.php +| | \*theme.php +| o+mytheme +| |\+php +| | o*default.php +| | o*style.php +| | \*theme.php +| o+redbasic +| |o+php +| ||o*config.php +| ||o*style.php +| ||o*theme.php +| ||\*theme_init.php +| |\+schema +| | o*boxy.php +| | o*BS-Default.php +| | o*dark.php +| | o*notred.php +| | o*simple_black_on_white.php +| | o*simple_green_on_black.php +| | \*simple_white_on_black.php +| o+stumble +| |\+php +| | o*style.php +| | \*theme.php +| \+suckerberg +|  \+php +|   o*style.php +|   \*theme.php \*boot.php diff --git a/doc/html/globals_0x61.html b/doc/html/globals_0x61.html index f789f92bb..1274fbb03 100644 --- a/doc/html/globals_0x61.html +++ b/doc/html/globals_0x61.html @@ -522,6 +522,9 @@ $(document).ready(function(){initNavTree('globals_0x61.html','');});
  • api_post() : api.php
    • +
  • api_red_xchan() +: api.php +
  • api_register_func() : api.php
    • diff --git a/doc/html/globals_0x64.html b/doc/html/globals_0x64.html index 314b2c265..52b9313da 100644 --- a/doc/html/globals_0x64.html +++ b/doc/html/globals_0x64.html @@ -145,14 +145,14 @@ $(document).ready(function(){initNavTree('globals_0x64.html','');});

    - d -

    • datesel() -: datetime.php -
      • -
    • datesel_format() -: datetime.php +: datetime.php
    • datetime_convert() : datetime.php
      • +
    • datetimesel() +: datetime.php +
    • day_translate() : text.php
      • diff --git a/doc/html/globals_0x68.html b/doc/html/globals_0x68.html index d977abe55..8a464ae94 100644 --- a/doc/html/globals_0x68.html +++ b/doc/html/globals_0x68.html @@ -189,6 +189,9 @@ $(document).ready(function(){initNavTree('globals_0x68.html','');});
    • help_content() : help.php
      • +
    • hivenet_init() +: theme.php +
    • home_content() : home.php
      • diff --git a/doc/html/globals_0x6c.html b/doc/html/globals_0x6c.html index 2d5f282b7..5b3016536 100644 --- a/doc/html/globals_0x6c.html +++ b/doc/html/globals_0x6c.html @@ -204,6 +204,9 @@ $(document).ready(function(){initNavTree('globals_0x6c.html','');});
    • load_pconfig() : config.php
      • +
    • load_pdl() +: boot.php +
    • load_plugin() : plugin.php
      • diff --git a/doc/html/globals_0x73.html b/doc/html/globals_0x73.html index 014205a9e..03522e36b 100644 --- a/doc/html/globals_0x73.html +++ b/doc/html/globals_0x73.html @@ -325,7 +325,7 @@ $(document).ready(function(){initNavTree('globals_0x73.html','');}); : boot.php
    • store_diaspora_comment_sig() -: items.php +: items.php
    • store_item_tag() : taxonomy.php @@ -351,9 +351,15 @@ $(document).ready(function(){initNavTree('globals_0x73.html','');});
    • stripdcode_br_cb() : bb2diaspora.php
      • +
    • stumble_init() +: theme.php +
    • subthread_content() : subthread.php
      • +
    • suckerberg_init() +: theme.php +
    • suggest_content() : suggest.php
      • diff --git a/doc/html/globals_0x74.html b/doc/html/globals_0x74.html index 1013da261..48ce7c771 100644 --- a/doc/html/globals_0x74.html +++ b/doc/html/globals_0x74.html @@ -265,7 +265,7 @@ $(document).ready(function(){initNavTree('globals_0x74.html','');}); : thing.php
    • timesel() -: datetime.php +: datetime.php
    • timezone_cmp() : datetime.php diff --git a/doc/html/globals_0x78.html b/doc/html/globals_0x78.html index 368f1a7a2..dc2845bd9 100644 --- a/doc/html/globals_0x78.html +++ b/doc/html/globals_0x78.html @@ -150,6 +150,9 @@ $(document).ready(function(){initNavTree('globals_0x78.html','');});
    • xchan_content() : xchan.php
      • +
    • xchan_fetch() +: hubloc.php +
    • XCHAN_FLAGS_CENSORED : boot.php
      • @@ -177,6 +180,9 @@ $(document).ready(function(){initNavTree('globals_0x78.html','');});
    • xchan_query() : text.php
      • +
    • xchan_store() +: hubloc.php +
    • xml2array() : network.php
      • diff --git a/doc/html/globals_func_0x61.html b/doc/html/globals_func_0x61.html index ee7ca7aa7..a7712761a 100644 --- a/doc/html/globals_func_0x61.html +++ b/doc/html/globals_func_0x61.html @@ -374,6 +374,9 @@ $(document).ready(function(){initNavTree('globals_func_0x61.html','');});
    • api_post() : api.php
      • +
    • api_red_xchan() +: api.php +
    • api_register_func() : api.php
      • diff --git a/doc/html/globals_func_0x64.html b/doc/html/globals_func_0x64.html index b52048dc5..c788e8a9f 100644 --- a/doc/html/globals_func_0x64.html +++ b/doc/html/globals_func_0x64.html @@ -144,14 +144,14 @@ $(document).ready(function(){initNavTree('globals_func_0x64.html','');});

      - d -

      • datesel() -: datetime.php -
        • -
      • datesel_format() -: datetime.php +: datetime.php
      • datetime_convert() : datetime.php
        • +
      • datetimesel() +: datetime.php +
      • day_translate() : text.php
        • diff --git a/doc/html/globals_func_0x68.html b/doc/html/globals_func_0x68.html index 89ce80d99..7739ffc9b 100644 --- a/doc/html/globals_func_0x68.html +++ b/doc/html/globals_func_0x68.html @@ -188,6 +188,9 @@ $(document).ready(function(){initNavTree('globals_func_0x68.html','');});
      • help_content() : help.php
        • +
      • hivenet_init() +: theme.php +
      • home_content() : home.php
        • diff --git a/doc/html/globals_func_0x6c.html b/doc/html/globals_func_0x6c.html index 3987ba94b..c0e581e73 100644 --- a/doc/html/globals_func_0x6c.html +++ b/doc/html/globals_func_0x6c.html @@ -197,6 +197,9 @@ $(document).ready(function(){initNavTree('globals_func_0x6c.html','');});
      • load_pconfig() : config.php
        • +
      • load_pdl() +: boot.php +
      • load_plugin() : plugin.php
        • diff --git a/doc/html/globals_func_0x73.html b/doc/html/globals_func_0x73.html index e7a91598d..dd80318c2 100644 --- a/doc/html/globals_func_0x73.html +++ b/doc/html/globals_func_0x73.html @@ -312,7 +312,7 @@ $(document).ready(function(){initNavTree('globals_func_0x73.html','');}); : conversation.php
      • store_diaspora_comment_sig() -: items.php +: items.php
      • store_item_tag() : taxonomy.php @@ -338,9 +338,15 @@ $(document).ready(function(){initNavTree('globals_func_0x73.html','');});
      • stripdcode_br_cb() : bb2diaspora.php
        • +
      • stumble_init() +: theme.php +
      • subthread_content() : subthread.php
        • +
      • suckerberg_init() +: theme.php +
      • suggest_content() : suggest.php
        • diff --git a/doc/html/globals_func_0x74.html b/doc/html/globals_func_0x74.html index 948474abe..b7027bb20 100644 --- a/doc/html/globals_func_0x74.html +++ b/doc/html/globals_func_0x74.html @@ -213,7 +213,7 @@ $(document).ready(function(){initNavTree('globals_func_0x74.html','');}); : thing.php
      • timesel() -: datetime.php +: datetime.php
      • timezone_cmp() : datetime.php diff --git a/doc/html/globals_func_0x78.html b/doc/html/globals_func_0x78.html index 211bd1000..d20431ab2 100644 --- a/doc/html/globals_func_0x78.html +++ b/doc/html/globals_func_0x78.html @@ -149,12 +149,18 @@ $(document).ready(function(){initNavTree('globals_func_0x78.html','');});
      • xchan_content() : xchan.php
        • +
      • xchan_fetch() +: hubloc.php +
      • xchan_mail_query() : text.php
      • xchan_query() : text.php
        • +
      • xchan_store() +: hubloc.php +
      • xml2array() : network.php
        • diff --git a/doc/html/hivenet_2php_2style_8php.html b/doc/html/hivenet_2php_2style_8php.html new file mode 100644 index 000000000..b2adc9011 --- /dev/null +++ b/doc/html/hivenet_2php_2style_8php.html @@ -0,0 +1,112 @@ + + + + + + +The Red Matrix: view/theme/hivenet/php/style.php File Reference + + + + + + + + + + + + + +
        +
        + + + + + + + +
        +
        The Red Matrix +
        +
        +
        + + + + + +
        +
        + +
        +
        +
        + +
        + + + + +
        + +
        + +
        +
        +
        style.php File Reference
        +
        +
        +
        +
        + diff --git a/doc/html/hivenet_2php_2theme_8php.html b/doc/html/hivenet_2php_2theme_8php.html new file mode 100644 index 000000000..de9afb019 --- /dev/null +++ b/doc/html/hivenet_2php_2theme_8php.html @@ -0,0 +1,144 @@ + + + + + + +The Red Matrix: view/theme/hivenet/php/theme.php File Reference + + + + + + + + + + + + + +
        +
        + + + + + + + +
        +
        The Red Matrix +
        +
        +
        + + + + + +
        +
        + +
        +
        +
        + +
        + + + + +
        + +
        + +
        +
        +Functions
        +
        +
        theme.php File Reference
        +
        +
        + + + + +

        +Functions

         hivenet_init (&$a)
         
        +

        Function Documentation

        + +
        +
        + + + + + + + + +
        hivenet_init (& $a)
        +
        +
          +
        • Name: Hivenet
          • +
        • Description: An experimental red-colored theme based on redbasic
          • +
        • Version: 1.0
          • +
        • Author: Sean Tilley
          • +
        • Compat: Red [*]
          • +
        + +
        +
        +
        +
        + diff --git a/doc/html/hivenet_2php_2theme_8php.js b/doc/html/hivenet_2php_2theme_8php.js new file mode 100644 index 000000000..f6923b33f --- /dev/null +++ b/doc/html/hivenet_2php_2theme_8php.js @@ -0,0 +1,4 @@ +var hivenet_2php_2theme_8php = +[ + [ "hivenet_init", "hivenet_2php_2theme_8php.html#a3a8b539b112ae63936025236dbaf0a29", null ] +]; \ No newline at end of file diff --git a/doc/html/hubloc_8php.html b/doc/html/hubloc_8php.html index bdc2eaa03..cd60f6b6a 100644 --- a/doc/html/hubloc_8php.html +++ b/doc/html/hubloc_8php.html @@ -120,6 +120,10 @@ Functions    hubloc_change_primary ($hubloc)   + xchan_store ($arr) +  + xchan_fetch ($arr) + 

        Function Documentation

        @@ -190,6 +194,42 @@ Functions

        Referenced by poller_run().

        + + + +
        +
        + + + + + + + + +
        xchan_fetch ( $arr)
        +
        + +

        Referenced by api_red_xchan().

        + +
        +
        + +
        +
        + + + + + + + + +
        xchan_store ( $arr)
        +
        + +

        Referenced by api_red_xchan().

        +
        diff --git a/doc/html/hubloc_8php.js b/doc/html/hubloc_8php.js index 0c81388d9..d16715d55 100644 --- a/doc/html/hubloc_8php.js +++ b/doc/html/hubloc_8php.js @@ -3,5 +3,7 @@ var hubloc_8php = [ "hubloc_change_primary", "hubloc_8php.html#ad86214b3a74084bd7b54e8d6c919ce4d", null ], [ "is_matrix_url", "hubloc_8php.html#aebd244b4616ded022cbbee5e82926951", null ], [ "prune_hub_reinstalls", "hubloc_8php.html#ad3d0dcfcfcb347744f7617fe6f5de002", null ], - [ "remove_obsolete_hublocs", "hubloc_8php.html#a84c79b7be352f62d12fe4fa2c80fc6ea", null ] + [ "remove_obsolete_hublocs", "hubloc_8php.html#a84c79b7be352f62d12fe4fa2c80fc6ea", null ], + [ "xchan_fetch", "hubloc_8php.html#af1b476c936f96a93282b1d058e3d05ea", null ], + [ "xchan_store", "hubloc_8php.html#acb708dd197aae72a4858cf5ff4e3195b", null ] ]; \ No newline at end of file diff --git a/doc/html/identity_8php.html b/doc/html/identity_8php.html index f54d372ee..184cb2c1f 100644 --- a/doc/html/identity_8php.html +++ b/doc/html/identity_8php.html @@ -314,7 +314,7 @@ Functions
        Returns
        string
        -

        Referenced by app_render(), app_store(), app_update(), avatar_img(), import_profile_photo(), openid_content(), parse_app_description(), and photo_init().

        +

        Referenced by app_render(), app_store(), app_update(), avatar_img(), import_profile_photo(), openid_content(), parse_app_description(), photo_init(), and xchan_store().

        diff --git a/doc/html/include_2api_8php.html b/doc/html/include_2api_8php.html index 55dc11fad..2347d75af 100644 --- a/doc/html/include_2api_8php.html +++ b/doc/html/include_2api_8php.html @@ -149,6 +149,8 @@ Functions    api_group (&$a, $type)   + api_red_xchan (&$a, $type) +   api_statuses_mediap (&$a, $type)    api_statuses_update (&$a, $type) @@ -1084,6 +1086,32 @@ Variables
        +
        + + +
        +
        + + + + + + + + + + + + + + + + + + +
        api_red_xchan (& $a,
         $type 
        )
        +
        +
        @@ -1570,7 +1598,7 @@ Variables
        -

        Referenced by api_account_verify_credentials(), api_call(), api_channel_stream(), api_direct_messages_box(), api_direct_messages_new(), api_export_basic(), api_favorites(), api_ff_ids(), api_get_user(), api_group(), api_group_members(), api_statuses_destroy(), api_statuses_f(), 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(), and red_item_new().

        +

        Referenced by api_account_verify_credentials(), api_call(), api_channel_stream(), api_direct_messages_box(), api_direct_messages_new(), api_export_basic(), api_favorites(), api_ff_ids(), api_get_user(), api_group(), api_group_members(), api_red_xchan(), api_statuses_destroy(), api_statuses_f(), 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(), and red_item_new().

        diff --git a/doc/html/include_2api_8php.js b/doc/html/include_2api_8php.js index 6ef1f5f68..6e8ba125d 100644 --- a/doc/html/include_2api_8php.js +++ b/doc/html/include_2api_8php.js @@ -32,6 +32,7 @@ var include_2api_8php = [ "api_oauth_access_token", "include_2api_8php.html#aff322705cc6084b329003fc8eab0aad0", null ], [ "api_oauth_request_token", "include_2api_8php.html#aa1bddb580510e70cc1a7b7381667f1a3", null ], [ "api_photos", "include_2api_8php.html#aa6fc3bc8c0fad1d081db0dcc456dd77f", null ], + [ "api_red_xchan", "include_2api_8php.html#a4fe872332ff0bd8d5eae2f0c6819cb60", null ], [ "api_register_func", "include_2api_8php.html#ac2c2b18c426d697d11a830bca146be8a", null ], [ "api_rss_extra", "include_2api_8php.html#a6a04b48168ba1d9dd2de3081a630611f", null ], [ "api_status_show", "include_2api_8php.html#a645397787618b5c548a31e8686e8cca4", null ], diff --git a/doc/html/include_2config_8php.html b/doc/html/include_2config_8php.html index b0f3479bb..496ab8186 100644 --- a/doc/html/include_2config_8php.html +++ b/doc/html/include_2config_8php.html @@ -340,7 +340,7 @@ Functions
        Returns
        mixed Return value or false on error or if not set
        -

        Referenced by account_service_class_fetch(), 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(), bb2diaspora_itembody(), bbcode(), build_sync_packet(), channel_content(), check_account_admin(), check_account_invite(), check_config(), check_upstream_directory(), cli_startup(), create_account(), create_identity(), create_sys_channel(), RedMatrix\RedDAV\RedDirectory\createFile(), detect_language(), diaspora_comment(), diaspora_conversation(), diaspora_dispatch(), diaspora_dispatch_public(), diaspora_is_blacklisted(), diaspora_like(), diaspora_message(), diaspora_process_outbound(), diaspora_send_followup(), diaspora_send_mail(), diaspora_send_relay(), 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(), filter_insecure(), 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(), get_role_perms(), RedMatrix\RedDAV\RedDirectory\getChild(), RedMatrix\RedDAV\RedDirectory\getChildren(), group_content(), guess_image_type(), home_content(), home_init(), identity_basic_export(), 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_contact(), new_keypair(), notification(), notifier_run(), oembed_bbcode2html(), openid_content(), parse_url_content(), perm_is_allowed(), photo_factory(), 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(), RedMatrix\RedDAV\RedFile\put(), receive_post(), register_content(), register_post(), reload_plugins(), remove_all_xchan_resources(), remove_obsolete_hublocs(), scale_external_images(), search_content(), send_message(), send_reg_approval_email(), send_verification_email(), service_class_allows(), service_class_fetch(), service_limits_content(), set_config(), settings_post(), site_default_perms(), siteinfo_content(), siteinfo_init(), smilies(), start_delivery_chain(), store_diaspora_comment_sig(), 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(), widget_fullprofile(), widget_profile(), z_fetch_url(), z_post_url(), zfinger_init(), zot_fetch(), zot_gethub(), zot_import(), and zotfeed_init().

        +

        Referenced by account_service_class_fetch(), 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(), bb2diaspora_itembody(), bbcode(), build_sync_packet(), channel_content(), check_account_admin(), check_account_invite(), check_config(), check_upstream_directory(), cli_startup(), create_account(), create_identity(), create_sys_channel(), RedMatrix\RedDAV\RedDirectory\createFile(), detect_language(), diaspora_comment(), diaspora_conversation(), diaspora_dispatch(), diaspora_dispatch_public(), diaspora_is_blacklisted(), diaspora_like(), diaspora_message(), diaspora_process_outbound(), diaspora_send_followup(), diaspora_send_mail(), diaspora_send_relay(), 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(), filter_insecure(), 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(), get_role_perms(), RedMatrix\RedDAV\RedDirectory\getChild(), RedMatrix\RedDAV\RedDirectory\getChildren(), group_content(), guess_image_type(), home_content(), home_init(), identity_basic_export(), 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_contact(), new_keypair(), notification(), notifier_run(), oembed_bbcode2html(), openid_content(), parse_url_content(), perm_is_allowed(), photo_factory(), 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(), RedMatrix\RedDAV\RedFile\put(), receive_post(), register_content(), register_post(), reload_plugins(), remove_all_xchan_resources(), remove_obsolete_hublocs(), scale_external_images(), search_content(), send_message(), send_reg_approval_email(), send_verification_email(), service_class_allows(), service_class_fetch(), service_limits_content(), set_config(), settings_post(), site_default_perms(), siteinfo_content(), siteinfo_init(), smilies(), start_delivery_chain(), store_diaspora_comment_sig(), 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(), widget_fullprofile(), widget_profile(), z_fetch_url(), z_post_url(), zfinger_init(), zot_fetch(), zot_gethub(), zot_import(), and zotfeed_init().

        @@ -433,7 +433,7 @@ Functions
        Returns
        mixed Stored value or false if it does not exist
        -

        Referenced by Conversation\__construct(), acl_init(), bb2diaspora_itembody(), App\build_pagehead(), change_channel(), channel_content(), connect_content(), connedit_content(), connedit_post(), construct_page(), contact_block(), contact_remove(), conversation(), current_theme(), display_content(), editpost_content(), feature_enabled(), findpeople_widget(), fix_attached_file_permissions(), fix_attached_photo_permissions(), Item\get_comment_box(), get_online_status(), Item\get_template_data(), 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(), nav(), network_content(), new_contact(), 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(), webpages_content(), and widget_notes().

        +

        Referenced by Conversation\__construct(), acl_init(), bb2diaspora_itembody(), App\build_pagehead(), change_channel(), channel_content(), connect_content(), connedit_content(), connedit_post(), contact_block(), contact_remove(), conversation(), current_theme(), display_content(), editpost_content(), feature_enabled(), findpeople_widget(), fix_attached_file_permissions(), fix_attached_photo_permissions(), Item\get_comment_box(), get_online_status(), Item\get_template_data(), get_theme_uid(), group_content(), home_init(), invite_content(), invite_post(), item_post(), item_store(), item_store_update(), items_fetch(), load_pdl(), FKOAuth1\loginUser(), mail_content(), message_content(), nav(), network_content(), new_contact(), 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(), webpages_content(), and widget_notes().

        diff --git a/doc/html/include_2network_8php.html b/doc/html/include_2network_8php.html index 2a5cb1c96..9537e68a6 100644 --- a/doc/html/include_2network_8php.html +++ b/doc/html/include_2network_8php.html @@ -463,7 +463,7 @@ Functions
        -

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

        +

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

        diff --git a/doc/html/items_8php.html b/doc/html/items_8php.html index 693ca815a..ffba36cd4 100644 --- a/doc/html/items_8php.html +++ b/doc/html/items_8php.html @@ -192,8 +192,8 @@ Functions    item_store_update ($arr, $allow_exec=false)   - store_diaspora_comment_sig ($datarray, $channel, $parent_item, $post_id) -  + store_diaspora_comment_sig ($datarray, $channel, $parent_item, $post_id, $walltowall=false) +   send_status_notifications ($post_id, $item)    get_item_contact ($item, $contacts) @@ -1884,7 +1884,7 @@ Functions - +
        @@ -1910,7 +1910,13 @@ Functions - + + + + + + + diff --git a/doc/html/items_8php.js b/doc/html/items_8php.js index 7b326cce6..c0568d1f7 100644 --- a/doc/html/items_8php.js +++ b/doc/html/items_8php.js @@ -64,7 +64,7 @@ var items_8php = [ "retain_item", "items_8php.html#af6237605c60d69abdd959ddbbee3420c", null ], [ "send_status_notifications", "items_8php.html#aab9e0c58247427126de0699c729c3b6c", null ], [ "start_delivery_chain", "items_8php.html#adf2b8137dc4ad9ec958de2842f16f3c2", null ], - [ "store_diaspora_comment_sig", "items_8php.html#af0a887050dc8d0f51c89890cdaf3145f", null ], + [ "store_diaspora_comment_sig", "items_8php.html#a25221826fa4621f523c68483e3b6af26", null ], [ "tag_deliver", "items_8php.html#ab1bce4261bcf75ad62753b498a144d17", null ], [ "termtype", "items_8php.html#ad34827ed330898456783fb14c7b46154", null ], [ "tgroup_check", "items_8php.html#a88c6cf7649ac836fbbed82a7a0315110", null ], diff --git a/doc/html/language_8php.html b/doc/html/language_8php.html index 0f1fe6ebd..073080f20 100644 --- a/doc/html/language_8php.html +++ b/doc/html/language_8php.html @@ -372,7 +372,7 @@ Functions
        Returns
        translated string if exists, otherwise return $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_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(), bb2diaspora_itembody(), bbcode(), block_content(), blocks_content(), blogtheme_form(), bookmark_add(), bookmarks_content(), bookmarks_init(), categories_widget(), channel_content(), channel_init(), 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(), 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(), foofoo(), format_categories(), format_event_diaspora(), format_event_html(), format_filer(), format_like(), format_notification(), fsuggest_content(), fsuggest_post(), gender_selector(), gender_selector_min(), RedMatrix\RedDAV\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(), RedMatrix\RedDAV\RedBrowser\htmlActionsPanel(), identity_check_service_class(), impel_init(), import_author_rss(), import_author_unknown(), 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(), like_puller(), load_database(), localize_item(), lockview_content(), locs_post(), 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(), role_selector(), rpost_content(), scale_external_images(), search(), search_content(), searchbox(), select_timezone(), send_message(), send_reg_approval_email(), send_verification_email(), service_limits_content(), settings_post(), setup_content(), sexpref_selector(), sexpref_selector_min(), siteinfo_content(), sources_content(), sources_post(), subthread_content(), suggest_content(), sync_locations(), 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(), bb2diaspora_itembody(), bbcode(), block_content(), blocks_content(), blogtheme_form(), bookmark_add(), bookmarks_content(), bookmarks_init(), categories_widget(), channel_content(), channel_init(), 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(), day_translate(), delegate_content(), design_tools(), diaspora_like(), 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(), foofoo(), format_categories(), format_event_diaspora(), format_event_html(), format_filer(), format_like(), format_notification(), fsuggest_content(), fsuggest_post(), gender_selector(), gender_selector_min(), RedMatrix\RedDAV\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(), RedMatrix\RedDAV\RedBrowser\htmlActionsPanel(), identity_check_service_class(), impel_init(), import_author_rss(), import_author_unknown(), 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(), like_puller(), load_database(), localize_item(), lockview_content(), locs_post(), 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_init(), 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(), role_selector(), rpost_content(), scale_external_images(), search(), search_content(), searchbox(), select_timezone(), send_message(), send_reg_approval_email(), send_verification_email(), service_limits_content(), settings_post(), setup_content(), sexpref_selector(), sexpref_selector_min(), siteinfo_content(), sources_content(), sources_post(), subthread_content(), suggest_content(), sync_locations(), 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 29bd1cf55..b13e549ed 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#a56fd673eaa7014150297ce1162502db5", -"classApp.html#a557d7b779d8259027f4724ebf7b248dc", -"classdba__driver.html", -"dir_05f4fba29266e8fd7869afcd6cefb5cb.html", -"gprobe_8php.html", -"include_2oembed_8php.html#a03fa3b7832c98a3d0b4630afeb73d487", -"notifier_8php.html", -"setup_8php.html#a13cf286774149a0a7bd8adb8179cec75", -"view_2theme_2redbasic_2php_2config_8php.html#a8574a41fa9735ee391ba57ab24b93793" +"boot_8php.html#a5542c5c2806ab8bca04bad53d47b5209", +"classApp.html#a5293a8543ba338dcf38cd4ff3bc5d4be", +"classZotDriver.html#afaaf9941169fc966e43e25b25e6daea6", +"dir_0262a6a8df56a167e3761b6e5a54bb1c.html", +"globals_vars_0x72.html", +"include_2network_8php.html#a9e9da2aafb806c98ecdc318604e60dc6", +"nav_8php.html#ac3c920ce3ea5b0d9e0678ee37155f06a", +"session_8php.html#a62e4a6cb26b4bb1b8ddd8277b26090eb", +"updatetpl_8py.html#ac9d11279fed403a329a719298feafc4f" ]; var SYNCONMSG = 'click to disable panel synchronisation'; diff --git a/doc/html/navtreeindex0.js b/doc/html/navtreeindex0.js index 7e19edb9b..30ad06206 100644 --- a/doc/html/navtreeindex0.js +++ b/doc/html/navtreeindex0.js @@ -1,6 +1,6 @@ var NAVTREEINDEX0 = { -"BS-Default_8php.html":[6,0,3,1,3,1,1], +"BS-Default_8php.html":[6,0,3,1,4,1,1], "BaseObject_8php.html":[6,0,0,10], "Contact_8php.html":[6,0,0,21], "Contact_8php.html#a024919623a830e8703ac4f23496dd66c":[6,0,0,21,2], @@ -152,102 +152,102 @@ 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,145], -"boot_8php.html#a01353c9abebc3544ea080ac161729632":[6,0,4,38], -"boot_8php.html#a022cea669f9f13ef7c6268b63884c57f":[6,0,4,159], -"boot_8php.html#a02566ac9d891369a1d3ebb81a15722fc":[6,0,4,264], -"boot_8php.html#a028380b2902a86ba32198f6d3b5d10bb":[6,0,4,137], -"boot_8php.html#a032bbd6d0321e99e9117332c9ed2b1b8":[6,0,4,57], -"boot_8php.html#a03d19251c245587de7ed959300b87bdf":[6,0,4,178], -"boot_8php.html#a0450389f24c632906fbc24347700a543":[6,0,4,48], -"boot_8php.html#a0603d6ece8c5d37b4b7db697db053a4b":[6,0,4,110], +"boot_8php.html#a009e6a0637cb65804ea8094ecc4450b0":[6,0,4,146], +"boot_8php.html#a01353c9abebc3544ea080ac161729632":[6,0,4,39], +"boot_8php.html#a022cea669f9f13ef7c6268b63884c57f":[6,0,4,160], +"boot_8php.html#a02566ac9d891369a1d3ebb81a15722fc":[6,0,4,265], +"boot_8php.html#a028380b2902a86ba32198f6d3b5d10bb":[6,0,4,138], +"boot_8php.html#a032bbd6d0321e99e9117332c9ed2b1b8":[6,0,4,58], +"boot_8php.html#a03d19251c245587de7ed959300b87bdf":[6,0,4,179], +"boot_8php.html#a0450389f24c632906fbc24347700a543":[6,0,4,49], +"boot_8php.html#a0603d6ece8c5d37b4b7db697db053a4b":[6,0,4,111], "boot_8php.html#a081307d681d7d04f17b9ced2076e7c85":[6,0,4,1], -"boot_8php.html#a09532c3f750ae8c4527e63b2b790cbf3":[6,0,4,221], -"boot_8php.html#a0a98dd0110dc6c8e24cefc8ae74d5562":[6,0,4,72], -"boot_8php.html#a0b73e2548d6f9beb9c93211f488e336a":[6,0,4,182], -"boot_8php.html#a0c59dde058efebbc66520d136cbd1631":[6,0,4,284], -"boot_8php.html#a0cc8dc76bd10ac0ec81bac08a46f82fe":[6,0,4,280], -"boot_8php.html#a0d877df1e20bae765e1708be50f6b503":[6,0,4,283], +"boot_8php.html#a09532c3f750ae8c4527e63b2b790cbf3":[6,0,4,222], +"boot_8php.html#a0a98dd0110dc6c8e24cefc8ae74d5562":[6,0,4,73], +"boot_8php.html#a0b73e2548d6f9beb9c93211f488e336a":[6,0,4,183], +"boot_8php.html#a0c59dde058efebbc66520d136cbd1631":[6,0,4,285], +"boot_8php.html#a0cc8dc76bd10ac0ec81bac08a46f82fe":[6,0,4,281], +"boot_8php.html#a0d877df1e20bae765e1708be50f6b503":[6,0,4,284], "boot_8php.html#a0e4701c9742c3ef88f02ac450a042a84":[6,0,4,22], -"boot_8php.html#a0e57f846e6d47a308feced0f7274f178":[6,0,4,64], +"boot_8php.html#a0e57f846e6d47a308feced0f7274f178":[6,0,4,65], "boot_8php.html#a0e6db7e365f2b041a828b93786f694bc":[6,0,4,15], -"boot_8php.html#a0fb63e51c2a9814941842ae8f2f4dff8":[6,0,4,82], -"boot_8php.html#a107d53f96acf5319905a34b1870db09a":[6,0,4,41], -"boot_8php.html#a115faf8797718c3165498abbd6895843":[6,0,4,269], -"boot_8php.html#a11cfe7d99b4dac0454d0de8873989f81":[6,0,4,139], -"boot_8php.html#a1200c1f968ff3d52ef878de5fc5c30c1":[6,0,4,268], -"boot_8php.html#a12c781cefc20167231e2e3fd5866b1b5":[6,0,4,86], -"boot_8php.html#a14ba8f9e162f2559831ee3bf98e0c3bd":[6,0,4,83], -"boot_8php.html#a14d44d4a00223dc3db4ea962325db192":[6,0,4,209], -"boot_8php.html#a176664e78dcb9132e16be69418223eb2":[6,0,4,67], -"boot_8php.html#a17b4ea23d9ecf628d9c8f53b7abcb805":[6,0,4,158], -"boot_8php.html#a17cf72338b040891781a4bcbdd9a8595":[6,0,4,154], -"boot_8php.html#a181c111f4b6c14d091dfd3bf0d0a22cd":[6,0,4,181], -"boot_8php.html#a18a400fa45e5632811b33041d8c048bf":[6,0,4,148], -"boot_8php.html#a1af3ed96de14aa0d7891b39cc75b60f2":[6,0,4,292], -"boot_8php.html#a1ba00027b718db732f30fc0e2c3e0abc":[6,0,4,258], -"boot_8php.html#a1c923b99bf77e4203ae94e5684b6ad0f":[6,0,4,294], -"boot_8php.html#a1d6e7f4c08bb68e4a424326a811bdd86":[6,0,4,185], -"boot_8php.html#a1da180f961f49a11573cac4ff6c62c05":[6,0,4,81], -"boot_8php.html#a1db4f0009c9cb4e107eab0f914a3c8dc":[6,0,4,236], -"boot_8php.html#a1f5906598e90b5ea2b4245f682be4348":[6,0,4,112], -"boot_8php.html#a1fbb93cf030f07391f22cc2948744869":[6,0,4,165], -"boot_8php.html#a205d013103997adfa72953d2f20c01e1":[6,0,4,230], -"boot_8php.html#a20f0eed431d25870b624b8937a07a59f":[6,0,4,202], -"boot_8php.html#a21cc29e0025943e7c28ff58cb4856ac3":[6,0,4,260], -"boot_8php.html#a222395aa223cfbff6166fab0b4e2e1d5":[6,0,4,42], +"boot_8php.html#a0fb63e51c2a9814941842ae8f2f4dff8":[6,0,4,83], +"boot_8php.html#a107d53f96acf5319905a34b1870db09a":[6,0,4,42], +"boot_8php.html#a115faf8797718c3165498abbd6895843":[6,0,4,270], +"boot_8php.html#a11cfe7d99b4dac0454d0de8873989f81":[6,0,4,140], +"boot_8php.html#a1200c1f968ff3d52ef878de5fc5c30c1":[6,0,4,269], +"boot_8php.html#a12c781cefc20167231e2e3fd5866b1b5":[6,0,4,87], +"boot_8php.html#a14ba8f9e162f2559831ee3bf98e0c3bd":[6,0,4,84], +"boot_8php.html#a14d44d4a00223dc3db4ea962325db192":[6,0,4,210], +"boot_8php.html#a176664e78dcb9132e16be69418223eb2":[6,0,4,68], +"boot_8php.html#a17b4ea23d9ecf628d9c8f53b7abcb805":[6,0,4,159], +"boot_8php.html#a17cf72338b040891781a4bcbdd9a8595":[6,0,4,155], +"boot_8php.html#a181c111f4b6c14d091dfd3bf0d0a22cd":[6,0,4,182], +"boot_8php.html#a18a400fa45e5632811b33041d8c048bf":[6,0,4,149], +"boot_8php.html#a1af3ed96de14aa0d7891b39cc75b60f2":[6,0,4,293], +"boot_8php.html#a1ba00027b718db732f30fc0e2c3e0abc":[6,0,4,259], +"boot_8php.html#a1c923b99bf77e4203ae94e5684b6ad0f":[6,0,4,295], +"boot_8php.html#a1d6e7f4c08bb68e4a424326a811bdd86":[6,0,4,186], +"boot_8php.html#a1da180f961f49a11573cac4ff6c62c05":[6,0,4,82], +"boot_8php.html#a1db4f0009c9cb4e107eab0f914a3c8dc":[6,0,4,237], +"boot_8php.html#a1f5906598e90b5ea2b4245f682be4348":[6,0,4,113], +"boot_8php.html#a1fbb93cf030f07391f22cc2948744869":[6,0,4,166], +"boot_8php.html#a205d013103997adfa72953d2f20c01e1":[6,0,4,231], +"boot_8php.html#a20f0eed431d25870b624b8937a07a59f":[6,0,4,203], +"boot_8php.html#a21cc29e0025943e7c28ff58cb4856ac3":[6,0,4,261], +"boot_8php.html#a222395aa223cfbff6166fab0b4e2e1d5":[6,0,4,43], "boot_8php.html#a24a7a70afedd5d85fe0eadc85afa9f77":[6,0,4,21], -"boot_8php.html#a25476eec71fceda237f7dc1d78b0adb8":[6,0,4,105], -"boot_8php.html#a27299ecfb9e9a99826f17a1c14c6995f":[6,0,4,97], -"boot_8php.html#a2750985ec445617d7e82ae3098c91e3f":[6,0,4,272], -"boot_8php.html#a285732e7889fa7f333cbe431111e1029":[6,0,4,205], -"boot_8php.html#a29528a2544373cc19a378f350040c6a1":[6,0,4,88], -"boot_8php.html#a2958a2bd5422b85329d7c36c06dbc221":[6,0,4,138], -"boot_8php.html#a29e921c0c72412cc738e44cca6ca1f62":[6,0,4,234], -"boot_8php.html#a2af173e4e9836ee7c90757b4793a2be3":[6,0,4,113], -"boot_8php.html#a2b525996e4426bdddbcec277778bde08":[6,0,4,256], -"boot_8php.html#a2c65e925994566a63e6c03c381f1b4a0":[6,0,4,201], -"boot_8php.html#a2c8906f1af94a3559a5b4661067bb79d":[6,0,4,134], -"boot_8php.html#a2e90096fede6acce16abf0da8cb2febe":[6,0,4,73], -"boot_8php.html#a2f8f25b13480c37a5f22511f53da8bab":[6,0,4,78], +"boot_8php.html#a25476eec71fceda237f7dc1d78b0adb8":[6,0,4,106], +"boot_8php.html#a27299ecfb9e9a99826f17a1c14c6995f":[6,0,4,98], +"boot_8php.html#a2750985ec445617d7e82ae3098c91e3f":[6,0,4,273], +"boot_8php.html#a285732e7889fa7f333cbe431111e1029":[6,0,4,206], +"boot_8php.html#a29528a2544373cc19a378f350040c6a1":[6,0,4,89], +"boot_8php.html#a2958a2bd5422b85329d7c36c06dbc221":[6,0,4,139], +"boot_8php.html#a29e921c0c72412cc738e44cca6ca1f62":[6,0,4,235], +"boot_8php.html#a2af173e4e9836ee7c90757b4793a2be3":[6,0,4,114], +"boot_8php.html#a2b525996e4426bdddbcec277778bde08":[6,0,4,257], +"boot_8php.html#a2c65e925994566a63e6c03c381f1b4a0":[6,0,4,202], +"boot_8php.html#a2c8906f1af94a3559a5b4661067bb79d":[6,0,4,135], +"boot_8php.html#a2e90096fede6acce16abf0da8cb2febe":[6,0,4,74], +"boot_8php.html#a2f8f25b13480c37a5f22511f53da8bab":[6,0,4,79], "boot_8php.html#a329400dcb29897cdaae3020109272285":[6,0,4,17], -"boot_8php.html#a32df13fec0e43281da5979e1f5579aa8":[6,0,4,241], -"boot_8php.html#a3475ff6c2e575f946ea0ee377e944173":[6,0,4,152], -"boot_8php.html#a34c756469ebed32e2fc987bcde62d382":[6,0,4,45], -"boot_8php.html#a3515ea6bf77495de89b93e9ccd881c49":[6,0,4,127], -"boot_8php.html#a35625dacd2158b9f1f1a8e77f9f081fd":[6,0,4,167], -"boot_8php.html#a36003bebe4ce860c6652bcc3e09b2214":[6,0,4,217], -"boot_8php.html#a36b31575f992a10b5927b76efba9362e":[6,0,4,298], -"boot_8php.html#a38f6c7fe33b5434a24b4314567753dfa":[6,0,4,190], -"boot_8php.html#a3ad9cc5d4354be741fa1de12b96e9955":[6,0,4,116], -"boot_8php.html#a3b56bfc6a0dd159070e316ddac3b7456":[6,0,4,121], -"boot_8php.html#a3cd42a70c6b3999590e4fd7a1a9096af":[6,0,4,297], -"boot_8php.html#a3d48dffd9dc73a187263c3002cdf00c0":[6,0,4,187], -"boot_8php.html#a3d6d4fc5fafcc9156811669158541caf":[6,0,4,232], +"boot_8php.html#a32df13fec0e43281da5979e1f5579aa8":[6,0,4,242], +"boot_8php.html#a3475ff6c2e575f946ea0ee377e944173":[6,0,4,153], +"boot_8php.html#a34c756469ebed32e2fc987bcde62d382":[6,0,4,46], +"boot_8php.html#a3515ea6bf77495de89b93e9ccd881c49":[6,0,4,128], +"boot_8php.html#a35625dacd2158b9f1f1a8e77f9f081fd":[6,0,4,168], +"boot_8php.html#a36003bebe4ce860c6652bcc3e09b2214":[6,0,4,218], +"boot_8php.html#a36b31575f992a10b5927b76efba9362e":[6,0,4,299], +"boot_8php.html#a38f6c7fe33b5434a24b4314567753dfa":[6,0,4,191], +"boot_8php.html#a3ad9cc5d4354be741fa1de12b96e9955":[6,0,4,117], +"boot_8php.html#a3b56bfc6a0dd159070e316ddac3b7456":[6,0,4,122], +"boot_8php.html#a3cd42a70c6b3999590e4fd7a1a9096af":[6,0,4,298], +"boot_8php.html#a3d48dffd9dc73a187263c3002cdf00c0":[6,0,4,188], +"boot_8php.html#a3d6d4fc5fafcc9156811669158541caf":[6,0,4,233], "boot_8php.html#a3e0930933fb2c0bf8211cc7ab4e1c3b4":[6,0,4,12], -"boot_8php.html#a3e2ea123d29a72012db1241f96280b0e":[6,0,4,65], -"boot_8php.html#a3f40aa5bafff8c4eebdc62e5121daf77":[6,0,4,95], -"boot_8php.html#a400519fa181591cd6fdbb8f25fbcba0a":[6,0,4,55], -"boot_8php.html#a40d885b2cfd736aab4234ae641ca4dfb":[6,0,4,141], -"boot_8php.html#a423505ab8dbd8e39d04ae3fe1374102b":[6,0,4,225], -"boot_8php.html#a43296b1b4398aacbf92a4b2d56bab91e":[6,0,4,200], -"boot_8php.html#a43c6c7d84d880e9500bd4f8f8ecc5731":[6,0,4,94], -"boot_8php.html#a444ce608ce34efb82ee11852f36e825f":[6,0,4,175], -"boot_8php.html#a44ae1542a805ffd7f826fb511db07374":[6,0,4,162], -"boot_8php.html#a44d069c8a1cfcc6d2007c506a17ff28f":[6,0,4,76], -"boot_8php.html#a458e19af801bc4b0d1f1ce1a6d9e857e":[6,0,4,168], -"boot_8php.html#a45b12aefab9675baffc7a07a09486db8":[6,0,4,281], -"boot_8php.html#a49f2a70b3b43aa904223a8d19e986a47":[6,0,4,188], -"boot_8php.html#a4a12ce5de39789b0361e308d89925a20":[6,0,4,111], -"boot_8php.html#a4a49b29838ef2c45ab3556b52baec6a4":[6,0,4,250], -"boot_8php.html#a4bfe22e163657690dfb6d5b1d04cb47e":[6,0,4,186], +"boot_8php.html#a3e2ea123d29a72012db1241f96280b0e":[6,0,4,66], +"boot_8php.html#a3f40aa5bafff8c4eebdc62e5121daf77":[6,0,4,96], +"boot_8php.html#a400519fa181591cd6fdbb8f25fbcba0a":[6,0,4,56], +"boot_8php.html#a40d885b2cfd736aab4234ae641ca4dfb":[6,0,4,142], +"boot_8php.html#a423505ab8dbd8e39d04ae3fe1374102b":[6,0,4,226], +"boot_8php.html#a43296b1b4398aacbf92a4b2d56bab91e":[6,0,4,201], +"boot_8php.html#a43c6c7d84d880e9500bd4f8f8ecc5731":[6,0,4,95], +"boot_8php.html#a444ce608ce34efb82ee11852f36e825f":[6,0,4,176], +"boot_8php.html#a44ae1542a805ffd7f826fb511db07374":[6,0,4,163], +"boot_8php.html#a44d069c8a1cfcc6d2007c506a17ff28f":[6,0,4,77], +"boot_8php.html#a458e19af801bc4b0d1f1ce1a6d9e857e":[6,0,4,169], +"boot_8php.html#a45b12aefab9675baffc7a07a09486db8":[6,0,4,282], +"boot_8php.html#a49f2a70b3b43aa904223a8d19e986a47":[6,0,4,189], +"boot_8php.html#a4a12ce5de39789b0361e308d89925a20":[6,0,4,112], +"boot_8php.html#a4a49b29838ef2c45ab3556b52baec6a4":[6,0,4,251], +"boot_8php.html#a4bfe22e163657690dfb6d5b1d04cb47e":[6,0,4,187], "boot_8php.html#a4c02d88e66852a01bd5a1feecb7c3ce3":[6,0,4,6], -"boot_8php.html#a4edce16cb7f21cdafa1e85bf63d713e6":[6,0,4,223], -"boot_8php.html#a4f507a5996dbb3da148add0339a40d5a":[6,0,4,61], -"boot_8php.html#a4fefd7486d3b888a05cfd3dc9575f115":[6,0,4,246], -"boot_8php.html#a505410c7edc5f5bb5fa227b98359793e":[6,0,4,212], -"boot_8php.html#a525ca93ff35d3535d1a2b8ba57876afa":[6,0,4,166], -"boot_8php.html#a52b599cd13e152ebc80d7e4413683195":[6,0,4,43], -"boot_8php.html#a53e4bdb6f225da55115acb9277f75e53":[6,0,4,87], -"boot_8php.html#a5542c5c2806ab8bca04bad53d47b5209":[6,0,4,35] +"boot_8php.html#a4edce16cb7f21cdafa1e85bf63d713e6":[6,0,4,224], +"boot_8php.html#a4f507a5996dbb3da148add0339a40d5a":[6,0,4,62], +"boot_8php.html#a4fefd7486d3b888a05cfd3dc9575f115":[6,0,4,247], +"boot_8php.html#a505410c7edc5f5bb5fa227b98359793e":[6,0,4,213], +"boot_8php.html#a50a6707a28c7d05d3f49eaabc7994501":[6,0,4,30], +"boot_8php.html#a525ca93ff35d3535d1a2b8ba57876afa":[6,0,4,167], +"boot_8php.html#a52b599cd13e152ebc80d7e4413683195":[6,0,4,44], +"boot_8php.html#a53e4bdb6f225da55115acb9277f75e53":[6,0,4,88] }; diff --git a/doc/html/navtreeindex1.js b/doc/html/navtreeindex1.js index 5784f0f8f..6950ffef0 100644 --- a/doc/html/navtreeindex1.js +++ b/doc/html/navtreeindex1.js @@ -1,206 +1,207 @@ var NAVTREEINDEX1 = { -"boot_8php.html#a56fd673eaa7014150297ce1162502db5":[6,0,4,204], -"boot_8php.html#a57eee7352714c004d36c26dda74af73e":[6,0,4,245], -"boot_8php.html#a5a681a672e007cdc22b43345d71f07c6":[6,0,4,295], +"boot_8php.html#a5542c5c2806ab8bca04bad53d47b5209":[6,0,4,36], +"boot_8php.html#a56fd673eaa7014150297ce1162502db5":[6,0,4,205], +"boot_8php.html#a57eee7352714c004d36c26dda74af73e":[6,0,4,246], +"boot_8php.html#a5a681a672e007cdc22b43345d71f07c6":[6,0,4,296], "boot_8php.html#a5ab6181607a090bcdbaa13b15b85aba1":[6,0,4,20], -"boot_8php.html#a5ae728ac966ea1d3525a19e7fec59434":[6,0,4,66], -"boot_8php.html#a5b043b7fdcfd4e8c9c3747574afc6caa":[6,0,4,194], -"boot_8php.html#a5b8484922918946d041e5e0515dbe718":[6,0,4,218], -"boot_8php.html#a5c3747e0f505f0d5271dc4c54e3feaf4":[6,0,4,84], -"boot_8php.html#a5df5359090d1f8e898c36d7cf8878ad2":[6,0,4,173], -"boot_8php.html#a5e322a2a2d0f51924c0b2e874988e640":[6,0,4,219], -"boot_8php.html#a5fbebdf7a1c0ea8f904dbd9d78c2c06c":[6,0,4,33], +"boot_8php.html#a5ae728ac966ea1d3525a19e7fec59434":[6,0,4,67], +"boot_8php.html#a5b043b7fdcfd4e8c9c3747574afc6caa":[6,0,4,195], +"boot_8php.html#a5b8484922918946d041e5e0515dbe718":[6,0,4,219], +"boot_8php.html#a5c3747e0f505f0d5271dc4c54e3feaf4":[6,0,4,85], +"boot_8php.html#a5df5359090d1f8e898c36d7cf8878ad2":[6,0,4,174], +"boot_8php.html#a5e322a2a2d0f51924c0b2e874988e640":[6,0,4,220], +"boot_8php.html#a5fbebdf7a1c0ea8f904dbd9d78c2c06c":[6,0,4,34], "boot_8php.html#a623e49c79943f3e7bdb770d021683cf7":[6,0,4,19], "boot_8php.html#a6252d8eca67c689d9035ec6da544cf46":[6,0,4,25], -"boot_8php.html#a62c832a95e38b1fa23e6cef39521b7d5":[6,0,4,80], -"boot_8php.html#a639f079bf28f7bbb2769fee651d76dd8":[6,0,4,109], -"boot_8php.html#a64617d4655804de2a3c86501ab4fdbfd":[6,0,4,277], -"boot_8php.html#a6626f383c3d2d459f731ab8b4f237d16":[6,0,4,179], -"boot_8php.html#a6788e99021ec8ffb0fa94d651f22a322":[6,0,4,150], -"boot_8php.html#a68d1d5bc9c7ccb663dc671b48c66df11":[6,0,4,153], -"boot_8php.html#a68eebe493e6f729ffd1aeda7a4b11155":[6,0,4,47], -"boot_8php.html#a6969947145a139ec374ce098224d8e81":[6,0,4,156], -"boot_8php.html#a69aac276ed82e010dc382b16ab4d59e1":[6,0,4,262], -"boot_8php.html#a6b14a31a8aa9f3452a13383f413bffa2":[6,0,4,249], -"boot_8php.html#a6b31dd451bc6c37fe7c9c766ff385aaf":[6,0,4,243], -"boot_8php.html#a6b9909db6a7ec80ec6fdd40ba74014dd":[6,0,4,106], -"boot_8php.html#a6c5e9e293c8242dcb9bc2c3ea2fee2c9":[6,0,4,98], -"boot_8php.html#a6cd1b4081630b2bf7be38836cd9f410c":[6,0,4,213], -"boot_8php.html#a6df1102664f64b274810db85197c2755":[6,0,4,229], -"boot_8php.html#a6e57d913634d033b4d5ad72d99fd3e9d":[6,0,4,136], -"boot_8php.html#a6ee7a72d558d1851bbb9e3cdde377932":[6,0,4,224], -"boot_8php.html#a7037bcbca223395c06bc67f65024de7a":[6,0,4,107], -"boot_8php.html#a7176c0f9f1c98421b97735d892cf6252":[6,0,4,261], -"boot_8php.html#a718a801b0be6cbaef5e519516da12721":[6,0,4,172], +"boot_8php.html#a62c832a95e38b1fa23e6cef39521b7d5":[6,0,4,81], +"boot_8php.html#a639f079bf28f7bbb2769fee651d76dd8":[6,0,4,110], +"boot_8php.html#a64617d4655804de2a3c86501ab4fdbfd":[6,0,4,278], +"boot_8php.html#a6626f383c3d2d459f731ab8b4f237d16":[6,0,4,180], +"boot_8php.html#a6788e99021ec8ffb0fa94d651f22a322":[6,0,4,151], +"boot_8php.html#a68d1d5bc9c7ccb663dc671b48c66df11":[6,0,4,154], +"boot_8php.html#a68eebe493e6f729ffd1aeda7a4b11155":[6,0,4,48], +"boot_8php.html#a6969947145a139ec374ce098224d8e81":[6,0,4,157], +"boot_8php.html#a69aac276ed82e010dc382b16ab4d59e1":[6,0,4,263], +"boot_8php.html#a6b14a31a8aa9f3452a13383f413bffa2":[6,0,4,250], +"boot_8php.html#a6b31dd451bc6c37fe7c9c766ff385aaf":[6,0,4,244], +"boot_8php.html#a6b9909db6a7ec80ec6fdd40ba74014dd":[6,0,4,107], +"boot_8php.html#a6c5e9e293c8242dcb9bc2c3ea2fee2c9":[6,0,4,99], +"boot_8php.html#a6cd1b4081630b2bf7be38836cd9f410c":[6,0,4,214], +"boot_8php.html#a6df1102664f64b274810db85197c2755":[6,0,4,230], +"boot_8php.html#a6e57d913634d033b4d5ad72d99fd3e9d":[6,0,4,137], +"boot_8php.html#a6ee7a72d558d1851bbb9e3cdde377932":[6,0,4,225], +"boot_8php.html#a7037bcbca223395c06bc67f65024de7a":[6,0,4,108], +"boot_8php.html#a7176c0f9f1c98421b97735d892cf6252":[6,0,4,262], +"boot_8php.html#a718a801b0be6cbaef5e519516da12721":[6,0,4,173], "boot_8php.html#a719c7f3972d5f9268f37a41c76cd4ef6":[6,0,4,29], -"boot_8php.html#a7236b2cdcf59f02a42302e893a99013b":[6,0,4,195], -"boot_8php.html#a749144d8dd9c1366596a0213c277d050":[6,0,4,143], -"boot_8php.html#a74bf27f7564c9a37975e7b37d973dcab":[6,0,4,77], +"boot_8php.html#a7236b2cdcf59f02a42302e893a99013b":[6,0,4,196], +"boot_8php.html#a749144d8dd9c1366596a0213c277d050":[6,0,4,144], +"boot_8php.html#a74bf27f7564c9a37975e7b37d973dcab":[6,0,4,78], "boot_8php.html#a75a90b0eadd0df510f7e63210733634d":[6,0,4,2], -"boot_8php.html#a75fc600186b13c3b25e661afefb5eac8":[6,0,4,285], +"boot_8php.html#a75fc600186b13c3b25e661afefb5eac8":[6,0,4,286], "boot_8php.html#a768f00b7d66be0daf7ef4eea2e862006":[6,0,4,4], -"boot_8php.html#a774f0f792ebfec1e774c5a17bb9d5966":[6,0,4,79], -"boot_8php.html#a781916f83fcc8ff1035649afa45f0292":[6,0,4,92], -"boot_8php.html#a78849a1bf8ce8d9804b4cbb502e8f383":[6,0,4,252], -"boot_8php.html#a7a8ba64d089cc0412c59a2eefc6d655c":[6,0,4,122], -"boot_8php.html#a7aa57438db03834aaa0b468bdce773a6":[6,0,4,70], -"boot_8php.html#a7af107fab8d62b9a73801713b774ed30":[6,0,4,142], -"boot_8php.html#a7b8f8ad9dbe82711257d23891ef6b133":[6,0,4,174], -"boot_8php.html#a7bff2278e68a71e524afd1c7c951e1e3":[6,0,4,74], -"boot_8php.html#a7c286add8961fd2d79216314cd4aadd8":[6,0,4,114], -"boot_8php.html#a7c2eb822d50e1554bf5c32861f36342b":[6,0,4,62], -"boot_8php.html#a7ed4581ab66ebcde97f6b3730856b028":[6,0,4,176], -"boot_8php.html#a7eeb83e15968f7a6cc5937d493815773":[6,0,4,49], -"boot_8php.html#a7f3474fec541e261fc8dff47313c4017":[6,0,4,52], -"boot_8php.html#a7f4264232dbb6c3b41f2617deecb1866":[6,0,4,89], -"boot_8php.html#a7fc4b291a7cdaa48b38e27344ea183cf":[6,0,4,125], -"boot_8php.html#a8231d115060d41a9c2a677f2c86f10ed":[6,0,4,215], -"boot_8php.html#a84057c5bfa1bca5fba8497fe005ee4d8":[6,0,4,56], -"boot_8php.html#a845891f82bf6edd7fa2d578b66703112":[6,0,4,119], -"boot_8php.html#a84f48897059bbd4a8738d7ee4cec6688":[6,0,4,60], -"boot_8php.html#a852d4036a3bed66af1534d014c4ecde2":[6,0,4,227], -"boot_8php.html#a8663f32171568489dbb2a01dd00371f8":[6,0,4,132], -"boot_8php.html#a87b0f279f8413c7e4d805c5d85f20d34":[6,0,4,124], -"boot_8php.html#a882b666adfe21f035a0f8c02806066d6":[6,0,4,276], -"boot_8php.html#a8892374789fd261eb32a7969d934a14a":[6,0,4,275], -"boot_8php.html#a8905fde0a5b7882bdc083b20d9b34701":[6,0,4,193], +"boot_8php.html#a774f0f792ebfec1e774c5a17bb9d5966":[6,0,4,80], +"boot_8php.html#a781916f83fcc8ff1035649afa45f0292":[6,0,4,93], +"boot_8php.html#a78849a1bf8ce8d9804b4cbb502e8f383":[6,0,4,253], +"boot_8php.html#a7a8ba64d089cc0412c59a2eefc6d655c":[6,0,4,123], +"boot_8php.html#a7aa57438db03834aaa0b468bdce773a6":[6,0,4,71], +"boot_8php.html#a7af107fab8d62b9a73801713b774ed30":[6,0,4,143], +"boot_8php.html#a7b8f8ad9dbe82711257d23891ef6b133":[6,0,4,175], +"boot_8php.html#a7bff2278e68a71e524afd1c7c951e1e3":[6,0,4,75], +"boot_8php.html#a7c286add8961fd2d79216314cd4aadd8":[6,0,4,115], +"boot_8php.html#a7c2eb822d50e1554bf5c32861f36342b":[6,0,4,63], +"boot_8php.html#a7ed4581ab66ebcde97f6b3730856b028":[6,0,4,177], +"boot_8php.html#a7eeb83e15968f7a6cc5937d493815773":[6,0,4,50], +"boot_8php.html#a7f3474fec541e261fc8dff47313c4017":[6,0,4,53], +"boot_8php.html#a7f4264232dbb6c3b41f2617deecb1866":[6,0,4,90], +"boot_8php.html#a7fc4b291a7cdaa48b38e27344ea183cf":[6,0,4,126], +"boot_8php.html#a8231d115060d41a9c2a677f2c86f10ed":[6,0,4,216], +"boot_8php.html#a84057c5bfa1bca5fba8497fe005ee4d8":[6,0,4,57], +"boot_8php.html#a845891f82bf6edd7fa2d578b66703112":[6,0,4,120], +"boot_8php.html#a84f48897059bbd4a8738d7ee4cec6688":[6,0,4,61], +"boot_8php.html#a852d4036a3bed66af1534d014c4ecde2":[6,0,4,228], +"boot_8php.html#a8663f32171568489dbb2a01dd00371f8":[6,0,4,133], +"boot_8php.html#a87b0f279f8413c7e4d805c5d85f20d34":[6,0,4,125], +"boot_8php.html#a882b666adfe21f035a0f8c02806066d6":[6,0,4,277], +"boot_8php.html#a8892374789fd261eb32a7969d934a14a":[6,0,4,276], +"boot_8php.html#a8905fde0a5b7882bdc083b20d9b34701":[6,0,4,194], "boot_8php.html#a899d24fd074594ceebbf72e1feff335f":[6,0,4,16], -"boot_8php.html#a8a60cc38bb567765fd926fef70205f16":[6,0,4,103], -"boot_8php.html#a8bb0395933b5e886f086f6a2fb0bfa55":[6,0,4,247], -"boot_8php.html#a8c9dce0ef27b35397e29298eb966f7f7":[6,0,4,135], -"boot_8php.html#a8da836617174eed9fc2ac8054125354b":[6,0,4,129], -"boot_8php.html#a8df201788c9dd0ca91384e3a14c08bce":[6,0,4,254], -"boot_8php.html#a8fdcc4ffb365a3267bd02ce8a8d466d6":[6,0,4,293], -"boot_8php.html#a9255af5ae9c887520091ea04763c1a88":[6,0,4,32], +"boot_8php.html#a8a60cc38bb567765fd926fef70205f16":[6,0,4,104], +"boot_8php.html#a8bb0395933b5e886f086f6a2fb0bfa55":[6,0,4,248], +"boot_8php.html#a8c9dce0ef27b35397e29298eb966f7f7":[6,0,4,136], +"boot_8php.html#a8da836617174eed9fc2ac8054125354b":[6,0,4,130], +"boot_8php.html#a8df201788c9dd0ca91384e3a14c08bce":[6,0,4,255], +"boot_8php.html#a8fdcc4ffb365a3267bd02ce8a8d466d6":[6,0,4,294], +"boot_8php.html#a9255af5ae9c887520091ea04763c1a88":[6,0,4,33], "boot_8php.html#a926cad0b3d8b9d9ee5da1898fc063ba3":[6,0,4,11], -"boot_8php.html#a93823d15ae07548a4c49de88d325cd26":[6,0,4,157], -"boot_8php.html#a939de9a99278f4fd7dcd0ee67f243f08":[6,0,4,133], -"boot_8php.html#a949116d9a295b214293006c060ca4848":[6,0,4,131], -"boot_8php.html#a9690d73434125ce594a1f5e7c2a4f7c0":[6,0,4,288], -"boot_8php.html#a96ad56755a21e1361dbd7bf93c9e7ff4":[6,0,4,259], +"boot_8php.html#a93823d15ae07548a4c49de88d325cd26":[6,0,4,158], +"boot_8php.html#a939de9a99278f4fd7dcd0ee67f243f08":[6,0,4,134], +"boot_8php.html#a949116d9a295b214293006c060ca4848":[6,0,4,132], +"boot_8php.html#a9690d73434125ce594a1f5e7c2a4f7c0":[6,0,4,289], +"boot_8php.html#a96ad56755a21e1361dbd7bf93c9e7ff4":[6,0,4,260], "boot_8php.html#a97769915c9f14adc4f8ab1ea2cecfd90":[6,0,4,18], -"boot_8php.html#a981d46380f9f23c308bac1f9cb00dc5b":[6,0,4,207], -"boot_8php.html#a99a4a17cb644e7e6826ea07ecaf09777":[6,0,4,248], -"boot_8php.html#a9c80420e5a063a4a87ce4831f086134d":[6,0,4,51], +"boot_8php.html#a981d46380f9f23c308bac1f9cb00dc5b":[6,0,4,208], +"boot_8php.html#a99a4a17cb644e7e6826ea07ecaf09777":[6,0,4,249], +"boot_8php.html#a9c80420e5a063a4a87ce4831f086134d":[6,0,4,52], "boot_8php.html#a9cbab4ee728e9a8b4ce952bae643044e":[6,0,4,5], -"boot_8php.html#a9cc986b4f9dd6558cbb2e25aadbfd964":[6,0,4,239], -"boot_8php.html#a9d01ef178b72b145016cca1393415bc4":[6,0,4,208], -"boot_8php.html#a9ea1290e00c6d40684892047f2c778a9":[6,0,4,291], -"boot_8php.html#a9eeb8989272d5ff804a616898bb13659":[6,0,4,278], -"boot_8php.html#a9ff652e5cb83cd11cbb0350844e7b28f":[6,0,4,238], -"boot_8php.html#aa17a4f9c63f5cbc5c06f1066b6aebc42":[6,0,4,196], +"boot_8php.html#a9cc986b4f9dd6558cbb2e25aadbfd964":[6,0,4,240], +"boot_8php.html#a9d01ef178b72b145016cca1393415bc4":[6,0,4,209], +"boot_8php.html#a9ea1290e00c6d40684892047f2c778a9":[6,0,4,292], +"boot_8php.html#a9eeb8989272d5ff804a616898bb13659":[6,0,4,279], +"boot_8php.html#a9ff652e5cb83cd11cbb0350844e7b28f":[6,0,4,239], +"boot_8php.html#aa17a4f9c63f5cbc5c06f1066b6aebc42":[6,0,4,197], "boot_8php.html#aa1e828bbbcba170265eb2668d8daf42e":[6,0,4,26], -"boot_8php.html#aa275653b9c87abc7391bb8040c1c2de9":[6,0,4,216], -"boot_8php.html#aa3425e2de85b08f7041656d3a8502cb6":[6,0,4,46], -"boot_8php.html#aa3679df31c8dad1b71816b0322d5baff":[6,0,4,164], +"boot_8php.html#aa275653b9c87abc7391bb8040c1c2de9":[6,0,4,217], +"boot_8php.html#aa3425e2de85b08f7041656d3a8502cb6":[6,0,4,47], +"boot_8php.html#aa3679df31c8dad1b71816b0322d5baff":[6,0,4,165], "boot_8php.html#aa4221641e5c21db69fa52c426b9017f5":[6,0,4,9], -"boot_8php.html#aa544a6c078130d0967a1f4ed8ce0a2d2":[6,0,4,161], -"boot_8php.html#aa589421267f0c2f0d643f727792cce35":[6,0,4,118], -"boot_8php.html#aa74438cf71e48e37bf7b440b94243985":[6,0,4,91], -"boot_8php.html#aa8a2b61e70900139d1ca28e46f1da49d":[6,0,4,100], -"boot_8php.html#aa9244fc9cc221980c07a20cc534111be":[6,0,4,244], -"boot_8php.html#aad33b494084f729b6ee3b0bc457718a1":[6,0,4,147], -"boot_8php.html#aae6c941bde5fd6fce07e51dba7326ead":[6,0,4,226], -"boot_8php.html#aaf9b76832ee5f85e56466af162ba8a14":[6,0,4,71], -"boot_8php.html#ab21fb0f3e6b962419955c6fc7f26734f":[6,0,4,199], -"boot_8php.html#ab28dc518fa90b6f617dd8c564eb4f35f":[6,0,4,123], -"boot_8php.html#ab2d0e8a9b81ee548ef2ce8e4560da2f6":[6,0,4,228], -"boot_8php.html#ab346a2ece14993861f3e4206befa94f0":[6,0,4,34], -"boot_8php.html#ab3920c2f3cd64802c0b7ff625c3b2ea8":[6,0,4,222], -"boot_8php.html#ab4bc9c50ecc927b92d519e36562b0df0":[6,0,4,251], -"boot_8php.html#ab4bddb41a0cf407178ec5278b950c393":[6,0,4,192], -"boot_8php.html#ab51965fabe54dc031e9a0ce1142ee83e":[6,0,4,233], -"boot_8php.html#ab54b24cc302e1a42a67a49d788b6b764":[6,0,4,117], -"boot_8php.html#ab55b16ae7fc19fafe5afaedd49163bbf":[6,0,4,149], -"boot_8php.html#ab5ddbe69d3d03acd06e1fb281488cb78":[6,0,4,58], -"boot_8php.html#ab724491497ab2618b23a01d5da60aec0":[6,0,4,210], +"boot_8php.html#aa544a6c078130d0967a1f4ed8ce0a2d2":[6,0,4,162], +"boot_8php.html#aa589421267f0c2f0d643f727792cce35":[6,0,4,119], +"boot_8php.html#aa74438cf71e48e37bf7b440b94243985":[6,0,4,92], +"boot_8php.html#aa8a2b61e70900139d1ca28e46f1da49d":[6,0,4,101], +"boot_8php.html#aa9244fc9cc221980c07a20cc534111be":[6,0,4,245], +"boot_8php.html#aad33b494084f729b6ee3b0bc457718a1":[6,0,4,148], +"boot_8php.html#aae6c941bde5fd6fce07e51dba7326ead":[6,0,4,227], +"boot_8php.html#aaf9b76832ee5f85e56466af162ba8a14":[6,0,4,72], +"boot_8php.html#ab21fb0f3e6b962419955c6fc7f26734f":[6,0,4,200], +"boot_8php.html#ab28dc518fa90b6f617dd8c564eb4f35f":[6,0,4,124], +"boot_8php.html#ab2d0e8a9b81ee548ef2ce8e4560da2f6":[6,0,4,229], +"boot_8php.html#ab346a2ece14993861f3e4206befa94f0":[6,0,4,35], +"boot_8php.html#ab3920c2f3cd64802c0b7ff625c3b2ea8":[6,0,4,223], +"boot_8php.html#ab4bc9c50ecc927b92d519e36562b0df0":[6,0,4,252], +"boot_8php.html#ab4bddb41a0cf407178ec5278b950c393":[6,0,4,193], +"boot_8php.html#ab51965fabe54dc031e9a0ce1142ee83e":[6,0,4,234], +"boot_8php.html#ab54b24cc302e1a42a67a49d788b6b764":[6,0,4,118], +"boot_8php.html#ab55b16ae7fc19fafe5afaedd49163bbf":[6,0,4,150], +"boot_8php.html#ab5ddbe69d3d03acd06e1fb281488cb78":[6,0,4,59], +"boot_8php.html#ab724491497ab2618b23a01d5da60aec0":[6,0,4,211], "boot_8php.html#ab79b8b4555cae20d03f8200666d89d63":[6,0,4,7], -"boot_8php.html#ab7d65a7e7417825a4db62906bb600729":[6,0,4,102], -"boot_8php.html#ab9dca53455cd157d3c6ba2bdecdbd22d":[6,0,4,287], -"boot_8php.html#aba208673515cbb8a55e5fa4a1da99fda":[6,0,4,39], -"boot_8php.html#abbf5ac24eb8aeedb862f618ee0d21e86":[6,0,4,255], +"boot_8php.html#ab7d65a7e7417825a4db62906bb600729":[6,0,4,103], +"boot_8php.html#ab9dca53455cd157d3c6ba2bdecdbd22d":[6,0,4,288], +"boot_8php.html#aba208673515cbb8a55e5fa4a1da99fda":[6,0,4,40], +"boot_8php.html#abbf5ac24eb8aeedb862f618ee0d21e86":[6,0,4,256], "boot_8php.html#abc0a90a1a77f5b668aa7e4b57d1776a7":[6,0,4,3], -"boot_8php.html#abd7bb40da9cc073297e49736b338ca07":[6,0,4,282], -"boot_8php.html#abdcdfc873ace4e0902177bad934de0c0":[6,0,4,69], -"boot_8php.html#abeb4d86e17cefa8584f1244e2183b0e1":[6,0,4,120], -"boot_8php.html#abedd940e664017c61b48c6efa31d0cb8":[6,0,4,101], -"boot_8php.html#ac01230c7655e0705b2e99c9bc03c4450":[6,0,4,130], +"boot_8php.html#abd7bb40da9cc073297e49736b338ca07":[6,0,4,283], +"boot_8php.html#abdcdfc873ace4e0902177bad934de0c0":[6,0,4,70], +"boot_8php.html#abeb4d86e17cefa8584f1244e2183b0e1":[6,0,4,121], +"boot_8php.html#abedd940e664017c61b48c6efa31d0cb8":[6,0,4,102], +"boot_8php.html#ac01230c7655e0705b2e99c9bc03c4450":[6,0,4,131], "boot_8php.html#ac17fc8a416ea79e9d5cb4dc9a8ff8c5c":[6,0,4,24], -"boot_8php.html#ac195fc9003298923ea81f144388e24b1":[6,0,4,177], -"boot_8php.html#ac43182e0d8bae7576a30b603774974f8":[6,0,4,253], -"boot_8php.html#ac4d1c93dabcace711ffb4931204c336b":[6,0,4,140], -"boot_8php.html#ac59a18a4838710d6c2de37aed6b21f03":[6,0,4,99], +"boot_8php.html#ac195fc9003298923ea81f144388e24b1":[6,0,4,178], +"boot_8php.html#ac43182e0d8bae7576a30b603774974f8":[6,0,4,254], +"boot_8php.html#ac4d1c93dabcace711ffb4931204c336b":[6,0,4,141], +"boot_8php.html#ac59a18a4838710d6c2de37aed6b21f03":[6,0,4,100], "boot_8php.html#ac5e74f899f6e98d8e91b14ba1c08bc08":[6,0,4,27], -"boot_8php.html#ac608a34f3bc180e7724192e0fd31f9b0":[6,0,4,37], -"boot_8php.html#ac8400313df2c831653f9036f71ebd86d":[6,0,4,59], -"boot_8php.html#ac86615ddc0763a00f5311c90e991730c":[6,0,4,289], -"boot_8php.html#ac890557fedc5b5a3b1d996249b1e1a20":[6,0,4,126], -"boot_8php.html#ac99fc4d040764eac1736bec6973556fe":[6,0,4,128], -"boot_8php.html#aca08bc4f1554ba877500f6abcc99e1e8":[6,0,4,206], -"boot_8php.html#aca47505b8732177f52bb2d647eb2741c":[6,0,4,36], +"boot_8php.html#ac608a34f3bc180e7724192e0fd31f9b0":[6,0,4,38], +"boot_8php.html#ac8400313df2c831653f9036f71ebd86d":[6,0,4,60], +"boot_8php.html#ac86615ddc0763a00f5311c90e991730c":[6,0,4,290], +"boot_8php.html#ac890557fedc5b5a3b1d996249b1e1a20":[6,0,4,127], +"boot_8php.html#ac99fc4d040764eac1736bec6973556fe":[6,0,4,129], +"boot_8php.html#aca08bc4f1554ba877500f6abcc99e1e8":[6,0,4,207], +"boot_8php.html#aca47505b8732177f52bb2d647eb2741c":[6,0,4,37], "boot_8php.html#aca5e42678e178c6b9034610d66666fd7":[6,0,4,13], "boot_8php.html#acc4e0c910af066148b810e5fde55fff1":[6,0,4,8], -"boot_8php.html#acca19aae62e1a6951a856b945de20d67":[6,0,4,180], -"boot_8php.html#accd6f36cc9f40225cbd720e4d12a7c6e":[6,0,4,290], -"boot_8php.html#acd877c405b06b348b37b6f7e62a211e9":[6,0,4,240], -"boot_8php.html#ace6d70ac290397ddd40e561fd0831858":[6,0,4,274], -"boot_8php.html#ace83842dbeb84f7ed9ac59a9f57a7c32":[6,0,4,214], -"boot_8php.html#aced60c7285192e80b7c4757e45a7f1e3":[6,0,4,68], -"boot_8php.html#ad0876e837cf3fad8a26417e315f6e2c8":[6,0,4,160], -"boot_8php.html#ad11f30a6590d3d77f0c5e1e3909af8f5":[6,0,4,170], +"boot_8php.html#acca19aae62e1a6951a856b945de20d67":[6,0,4,181], +"boot_8php.html#accd6f36cc9f40225cbd720e4d12a7c6e":[6,0,4,291], +"boot_8php.html#acd877c405b06b348b37b6f7e62a211e9":[6,0,4,241], +"boot_8php.html#ace6d70ac290397ddd40e561fd0831858":[6,0,4,275], +"boot_8php.html#ace83842dbeb84f7ed9ac59a9f57a7c32":[6,0,4,215], +"boot_8php.html#aced60c7285192e80b7c4757e45a7f1e3":[6,0,4,69], +"boot_8php.html#ad0876e837cf3fad8a26417e315f6e2c8":[6,0,4,161], +"boot_8php.html#ad11f30a6590d3d77f0c5e1e3909af8f5":[6,0,4,171], "boot_8php.html#ad206598b909e8eb67eb0e0bb5ef69c13":[6,0,4,10], -"boot_8php.html#ad302cb26b838898d475f57f61b0fcc9f":[6,0,4,75], -"boot_8php.html#ad34c1547020a305915bcc39707744690":[6,0,4,90], -"boot_8php.html#ad4c9dc2c8a82e8f52b7404c1655eab44":[6,0,4,30], -"boot_8php.html#ad789aef3cb95fc1eb36be7c4283d0137":[6,0,4,235], -"boot_8php.html#ad8887b49bbb02dd30b4eb9f6c7773c63":[6,0,4,263], -"boot_8php.html#ad88a70ec62e08d590123d3697dfe64d5":[6,0,4,257], -"boot_8php.html#ada72d88ae39a7e3b45baea201cb49a29":[6,0,4,96], -"boot_8php.html#adaeb4f590c56326b2dca3b19f31b6272":[6,0,4,144], -"boot_8php.html#adca48aee78465ae3064ca4432c0d87b5":[6,0,4,266], -"boot_8php.html#add517a0958ac684792c62142a3877f81":[6,0,4,40], +"boot_8php.html#ad302cb26b838898d475f57f61b0fcc9f":[6,0,4,76], +"boot_8php.html#ad34c1547020a305915bcc39707744690":[6,0,4,91], +"boot_8php.html#ad4c9dc2c8a82e8f52b7404c1655eab44":[6,0,4,31], +"boot_8php.html#ad789aef3cb95fc1eb36be7c4283d0137":[6,0,4,236], +"boot_8php.html#ad8887b49bbb02dd30b4eb9f6c7773c63":[6,0,4,264], +"boot_8php.html#ad88a70ec62e08d590123d3697dfe64d5":[6,0,4,258], +"boot_8php.html#ada72d88ae39a7e3b45baea201cb49a29":[6,0,4,97], +"boot_8php.html#adaeb4f590c56326b2dca3b19f31b6272":[6,0,4,145], +"boot_8php.html#adca48aee78465ae3064ca4432c0d87b5":[6,0,4,267], +"boot_8php.html#add517a0958ac684792c62142a3877f81":[6,0,4,41], "boot_8php.html#adfb2fc7be5a4226c0a8e24131da9d498":[6,0,4,23], -"boot_8php.html#ae0d9527117cd87dcba11986047ae336e":[6,0,4,44], -"boot_8php.html#ae0da3ca0f54d75d22c71e007331f8d06":[6,0,4,108], -"boot_8php.html#ae37444eaa42705185080ccf3e670cbc2":[6,0,4,273], -"boot_8php.html#ae3cef7b63e25e7bafea3fcf6b99fad0e":[6,0,4,189], -"boot_8php.html#ae4861de36017fe399c1839f778bad9f5":[6,0,4,163], -"boot_8php.html#ae94f7c7c0909629a75aed1c41f10bc95":[6,0,4,197], -"boot_8php.html#aea392cb26ed617f3a8cde648385b5df0":[6,0,4,286], +"boot_8php.html#ae0d9527117cd87dcba11986047ae336e":[6,0,4,45], +"boot_8php.html#ae0da3ca0f54d75d22c71e007331f8d06":[6,0,4,109], +"boot_8php.html#ae37444eaa42705185080ccf3e670cbc2":[6,0,4,274], +"boot_8php.html#ae3cef7b63e25e7bafea3fcf6b99fad0e":[6,0,4,190], +"boot_8php.html#ae4861de36017fe399c1839f778bad9f5":[6,0,4,164], +"boot_8php.html#ae94f7c7c0909629a75aed1c41f10bc95":[6,0,4,198], +"boot_8php.html#aea392cb26ed617f3a8cde648385b5df0":[6,0,4,287], "boot_8php.html#aea7fc57a4d8e9dcb42f2601b0b9b761c":[6,0,4,28], -"boot_8php.html#aead84fa27d7516b855220fe004964a45":[6,0,4,279], -"boot_8php.html#aeb1039302affcbe7e8872c01c08c88f8":[6,0,4,53], -"boot_8php.html#aec36f8fcd4cb14a52934590b3d6666b4":[6,0,4,237], -"boot_8php.html#aecaa1b6945b317ba8f1daf4af2aed8e6":[6,0,4,267], -"boot_8php.html#aed0dfb35f7dd00dc9e4f868ea7f7ff53":[6,0,4,171], -"boot_8php.html#aedfb9501ed408278667995524e0d15cf":[6,0,4,104], -"boot_8php.html#aee324eca9de4e0fedf01ab5f92e27c67":[6,0,4,183], -"boot_8php.html#aef4b6c558c68c88c10f13c5a00c20e3d":[6,0,4,198], -"boot_8php.html#aefba06f1c0842036329033e7567ecf6d":[6,0,4,146], -"boot_8php.html#aefe573c3c7b0d37fbff264bbae79d673":[6,0,4,115], -"boot_8php.html#aefecf8599036df7f1b95d6820e0e2fa4":[6,0,4,31], -"boot_8php.html#af33d1b2e98a1e21af672005525d46dfe":[6,0,4,270], -"boot_8php.html#af3905ea8f8568d0236db13fca40514e3":[6,0,4,191], -"boot_8php.html#af3a4271630aabd8be592213f925d6a36":[6,0,4,63], -"boot_8php.html#af3bdfc20979c16f15bb9c60446a480f9":[6,0,4,54], -"boot_8php.html#af3ff14985bffbd951a6ea356b7ec3007":[6,0,4,242], -"boot_8php.html#af489d0c3166551b93e63a79ff2c9be35":[6,0,4,151], -"boot_8php.html#af6937db5f581d006bf4a5c3d9c7e0461":[6,0,4,211], -"boot_8php.html#af6b3de425e5849c73370a484c44607a3":[6,0,4,169], -"boot_8php.html#af6f6f6f40139f12fc09ec47373b30919":[6,0,4,93], -"boot_8php.html#af86c651547aa8f9e549ee40a09455549":[6,0,4,265], -"boot_8php.html#af8c0cb0744c9a6b5d6d3baafb1f1e71d":[6,0,4,203], -"boot_8php.html#afaf93b7026f784b113b4f8921745891e":[6,0,4,184], -"boot_8php.html#afb97615e985a013799839b68b99018d7":[6,0,4,271], -"boot_8php.html#afbb1fe1b2c8c730ec8e08da93b6512c4":[6,0,4,50], -"boot_8php.html#afbb21ecccac9819aa65397e816868a5f":[6,0,4,220], -"boot_8php.html#afe084c30a1810c10442edb4fbcbc0086":[6,0,4,85], -"boot_8php.html#afe63ae69ba55299f813766e54df06ede":[6,0,4,155], +"boot_8php.html#aead84fa27d7516b855220fe004964a45":[6,0,4,280], +"boot_8php.html#aeb1039302affcbe7e8872c01c08c88f8":[6,0,4,54], +"boot_8php.html#aec36f8fcd4cb14a52934590b3d6666b4":[6,0,4,238], +"boot_8php.html#aecaa1b6945b317ba8f1daf4af2aed8e6":[6,0,4,268], +"boot_8php.html#aed0dfb35f7dd00dc9e4f868ea7f7ff53":[6,0,4,172], +"boot_8php.html#aedfb9501ed408278667995524e0d15cf":[6,0,4,105], +"boot_8php.html#aee324eca9de4e0fedf01ab5f92e27c67":[6,0,4,184], +"boot_8php.html#aef4b6c558c68c88c10f13c5a00c20e3d":[6,0,4,199], +"boot_8php.html#aefba06f1c0842036329033e7567ecf6d":[6,0,4,147], +"boot_8php.html#aefe573c3c7b0d37fbff264bbae79d673":[6,0,4,116], +"boot_8php.html#aefecf8599036df7f1b95d6820e0e2fa4":[6,0,4,32], +"boot_8php.html#af33d1b2e98a1e21af672005525d46dfe":[6,0,4,271], +"boot_8php.html#af3905ea8f8568d0236db13fca40514e3":[6,0,4,192], +"boot_8php.html#af3a4271630aabd8be592213f925d6a36":[6,0,4,64], +"boot_8php.html#af3bdfc20979c16f15bb9c60446a480f9":[6,0,4,55], +"boot_8php.html#af3ff14985bffbd951a6ea356b7ec3007":[6,0,4,243], +"boot_8php.html#af489d0c3166551b93e63a79ff2c9be35":[6,0,4,152], +"boot_8php.html#af6937db5f581d006bf4a5c3d9c7e0461":[6,0,4,212], +"boot_8php.html#af6b3de425e5849c73370a484c44607a3":[6,0,4,170], +"boot_8php.html#af6f6f6f40139f12fc09ec47373b30919":[6,0,4,94], +"boot_8php.html#af86c651547aa8f9e549ee40a09455549":[6,0,4,266], +"boot_8php.html#af8c0cb0744c9a6b5d6d3baafb1f1e71d":[6,0,4,204], +"boot_8php.html#afaf93b7026f784b113b4f8921745891e":[6,0,4,185], +"boot_8php.html#afb97615e985a013799839b68b99018d7":[6,0,4,272], +"boot_8php.html#afbb1fe1b2c8c730ec8e08da93b6512c4":[6,0,4,51], +"boot_8php.html#afbb21ecccac9819aa65397e816868a5f":[6,0,4,221], +"boot_8php.html#afe084c30a1810c10442edb4fbcbc0086":[6,0,4,86], +"boot_8php.html#afe63ae69ba55299f813766e54df06ede":[6,0,4,156], "boot_8php.html#afe88b920aa285982edb817a0dd44eb37":[6,0,4,14], -"boot_8php.html#afef254290febac854c85fc698d9483a6":[6,0,4,296], -"boot_8php.html#aff210e8403dd72368522b17fb6e5d4e7":[6,0,4,231], -"boxy_8php.html":[6,0,3,1,3,1,0], +"boot_8php.html#afef254290febac854c85fc698d9483a6":[6,0,4,297], +"boot_8php.html#aff210e8403dd72368522b17fb6e5d4e7":[6,0,4,232], +"boxy_8php.html":[6,0,3,1,4,1,0], "cache_8php.html":[6,0,0,14], "chanman_8php.html":[6,0,0,15], "chanman_8php.html#a21ba9a5c961e866ff27aee3ee67bf99b":[6,0,0,15,0], @@ -248,6 +249,5 @@ var NAVTREEINDEX1 = "classApp.html#a4b67935096f66d1f14b657399a8461ac":[5,0,6,68], "classApp.html#a4bdd7bfed62f50515fce652127bf481b":[5,0,6,25], "classApp.html#a4c7cfc62d39508086cf300dc2e39c4df":[5,0,6,59], -"classApp.html#a4ffe529fb14389f7fedf5fdc5f722e7f":[5,0,6,67], -"classApp.html#a5293a8543ba338dcf38cd4ff3bc5d4be":[5,0,6,9] +"classApp.html#a4ffe529fb14389f7fedf5fdc5f722e7f":[5,0,6,67] }; diff --git a/doc/html/navtreeindex2.js b/doc/html/navtreeindex2.js index 5477cae7b..6e0f047f2 100644 --- a/doc/html/navtreeindex2.js +++ b/doc/html/navtreeindex2.js @@ -1,5 +1,6 @@ var NAVTREEINDEX2 = { +"classApp.html#a5293a8543ba338dcf38cd4ff3bc5d4be":[5,0,6,9], "classApp.html#a557d7b779d8259027f4724ebf7b248dc":[5,0,6,28], "classApp.html#a560189f048d3db2f526841963cc43e97":[5,0,6,26], "classApp.html#a56b1a432c96aef8b1971f779c9d93c8c":[5,0,6,88], @@ -248,6 +249,5 @@ var NAVTREEINDEX2 = "classZotDriver.html#a40d328ff9f6b0a238afe286dddee1514":[5,0,25,6], "classZotDriver.html#a6776935156accb0f170e2e24577133db":[5,0,25,1], "classZotDriver.html#a876e3e0e4cad83c0b58c8696b344be6f":[5,0,25,4], -"classZotDriver.html#af65febb26031eb7f39871b9e2a539797":[5,0,25,2], -"classZotDriver.html#afaaf9941169fc966e43e25b25e6daea6":[5,0,25,5] +"classZotDriver.html#af65febb26031eb7f39871b9e2a539797":[5,0,25,2] }; diff --git a/doc/html/navtreeindex3.js b/doc/html/navtreeindex3.js index a13c90144..cb37ba352 100644 --- a/doc/html/navtreeindex3.js +++ b/doc/html/navtreeindex3.js @@ -1,5 +1,6 @@ var NAVTREEINDEX3 = { +"classZotDriver.html#afaaf9941169fc966e43e25b25e6daea6":[5,0,25,5], "classdba__driver.html":[5,0,10], "classdba__driver.html#a1a8bc9dc839a6320a0e07d8047a6b721":[5,0,10,1], "classdba__driver.html#a205f6535e399700b6fca2492f96f2229":[5,0,10,8], @@ -176,24 +177,24 @@ var NAVTREEINDEX3 = "crypto_8php.html#ad5e51fd44cff93cfaa07a37e24a5edec":[6,0,0,27,15], "crypto_8php.html#ae5af17db1cb5d7c91d486e1264079839":[6,0,0,27,7], "crypto_8php.html#af8bbdeaf4abed7b40365d301e6013c85":[6,0,0,27,8], -"dark_8php.html":[6,0,3,1,3,1,2], +"dark_8php.html":[6,0,3,1,4,1,2], "darkness_8php.html":[6,0,3,1,0,2,0], "darknessleftaside_8php.html":[6,0,3,1,0,2,1], "darknessrightaside_8php.html":[6,0,3,1,0,2,2], "datetime_8php.html":[6,0,0,28], "datetime_8php.html#a03900dcf0f9e3c58793a031673a70326":[6,0,0,28,6], -"datetime_8php.html#a36d3d6dff8d76b5f295bb3d9c535a5b1":[6,0,0,28,11], +"datetime_8php.html#a3f239f94e23335d860b148958d87a093":[6,0,0,28,11], "datetime_8php.html#a3f2897db32e745fe2f3e70a6b46578f8":[6,0,0,28,5], -"datetime_8php.html#a5f29553799005b1fd4e9ce9d98ce05aa":[6,0,0,28,3], "datetime_8php.html#a633dadba426fa2f60b25fabdb19ebc1f":[6,0,0,28,10], +"datetime_8php.html#a72218e5ee21876484934bacbb6bd9ba3":[6,0,0,28,4], +"datetime_8php.html#a77bb385ae8a9e7ca663309c102c0d766":[6,0,0,28,2], "datetime_8php.html#a7df24d72ea05922d3127363e2295174c":[6,0,0,28,7], "datetime_8php.html#a8ae8dc95ace7ac27fa5a1ecf42b78c82":[6,0,0,28,9], "datetime_8php.html#aa51b5a7ea4f931b23acbdfcea46e9865":[6,0,0,28,12], "datetime_8php.html#ab55e545b72ec8c097e052ea7d373491f":[6,0,0,28,14], "datetime_8php.html#aba971b67f17fecf050813f1eba72367f":[6,0,0,28,8], "datetime_8php.html#abc1652f96799cec6fce8797ba2ebc2df":[6,0,0,28,0], -"datetime_8php.html#ac265b86f384ee094ed5479aae02aa5c8":[6,0,0,28,2], -"datetime_8php.html#ad6301e74b0f9267d52f8d432b5beb226":[6,0,0,28,4], +"datetime_8php.html#ad6301e74b0f9267d52f8d432b5beb226":[6,0,0,28,3], "datetime_8php.html#aea356409ba69f9de412298c998595dd2":[6,0,0,28,1], "datetime_8php.html#af1cd77c97c901d9239cb7a61f97f9826":[6,0,0,28,13], "db__update_8php.html":[6,0,2,2], @@ -248,6 +249,5 @@ var NAVTREEINDEX3 = "diaspora_8php.html#aeb2bb78f620dbf51d9335e6eb7444f2c":[6,0,0,30,23], "diaspora_8php.html#af4698b165766f83d89ec1ea964bc92cc":[6,0,0,30,21], "dimport_8php.html":[6,0,0,31], -"dimport_8php.html#a581f040717941ce3e1868b0b5dceefd1":[6,0,0,31,0], -"dir_032dd9e2cfe278a2cfa5eb9547448eb9.html":[6,0,3,1,3,0] +"dimport_8php.html#a581f040717941ce3e1868b0b5dceefd1":[6,0,0,31,0] }; diff --git a/doc/html/navtreeindex4.js b/doc/html/navtreeindex4.js index a533b3d46..15d1aed09 100644 --- a/doc/html/navtreeindex4.js +++ b/doc/html/navtreeindex4.js @@ -1,20 +1,26 @@ var NAVTREEINDEX4 = { +"dir_0262a6a8df56a167e3761b6e5a54bb1c.html":[6,0,3,1,6], +"dir_032dd9e2cfe278a2cfa5eb9547448eb9.html":[6,0,3,1,4,0], "dir_05f4fba29266e8fd7869afcd6cefb5cb.html":[6,0,3,1,0,2], "dir_0eaa4a0adae8ba4811e133c6e594aeee.html":[6,0,2,0], "dir_21bc5169ff11430004758be31dcfc6c4.html":[6,0,0,0], "dir_23ec12649285f9fabf3a6b7380226c28.html":[6,0,2], "dir_25f74a9991dbbca1b52a94e358ca73c1.html":[6,0,2,1,0], -"dir_3d9c9d0c5e9556dd3eba1e072fa6eaeb.html":[6,0,3,1,3,1], -"dir_55dbaf9b7b53c4fc605c9011743a7353.html":[6,0,3,1,3], +"dir_3d9c9d0c5e9556dd3eba1e072fa6eaeb.html":[6,0,3,1,4,1], +"dir_4acb285a1960a920438b718da0958cf4.html":[6,0,3,1,5], +"dir_55dbaf9b7b53c4fc605c9011743a7353.html":[6,0,3,1,4], +"dir_65522070e0a83623cefc01ebe26a83e3.html":[6,0,3,1,5,0], "dir_6cee3bb9ace89cc4e2f065aa2ca7bc5b.html":[6,0,3,1,1,1,0], +"dir_6e52a2a2cd27c08b7df5e5cdb216bd77.html":[6,0,3,1,2], "dir_720432dea4a717197ae070dbc42b8f20.html":[6,0,2,1], "dir_817f6d302394b98e59575acdb59998bc.html":[6,0,3,0], "dir_8543001e5d25368a6edede3e63efb554.html":[6,0,3,1], -"dir_887fdc94312ba7b057b6bfe7fdd27ea5.html":[6,0,3,1,2,0], -"dir_8e58ba5e98ac07e59ee15ca7486c9950.html":[6,0,3,1,2], +"dir_887fdc94312ba7b057b6bfe7fdd27ea5.html":[6,0,3,1,3,0], +"dir_8e58ba5e98ac07e59ee15ca7486c9950.html":[6,0,3,1,3], "dir_922c77e958c99a98db92d38a3a349bf2.html":[6,0,3,1,1], "dir_92d6b429199666aa3765c8a934db5e14.html":[6,0,3,1,1,1], +"dir_9ef82eb3846cd201470898c3b6ef38cf.html":[6,0,3,1,2,0], "dir__fns_8php.html":[6,0,0,32], "dir__fns_8php.html#a2f7d74bb2aea8bcd2537aee5c6708a16":[6,0,0,32,0], "dir__fns_8php.html#a44062d4b471d1e83f92f6c184585aa13":[6,0,0,32,6], @@ -25,6 +31,7 @@ var NAVTREEINDEX4 = "dir__fns_8php.html#ae56881d69bb6f8e828c9e35454386774":[6,0,0,32,2], "dir_a8a0005c2b8590c535262d232c22afab.html":[6,0,3,1,1,1,0,0], "dir_aae29906d7bfc07d076125f669c8352e.html":[6,0,0,1], +"dir_ac4f5165c8d71ebb1a1a0a168a48f3f7.html":[6,0,3,1,6,0], "dir_b2f003339c516cc00c8cadcafbe82f13.html":[6,0,3], "dir_c02447ad39a5307c81c64e880ec9e8d3.html":[6,0,3,1,1,0], "dir_cb8a8f75dcdd0b3fbfcc82e9eda410c5.html":[6,0,3,1,0,1], @@ -227,8 +234,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], @@ -242,12 +249,5 @@ var NAVTREEINDEX4 = "globals_vars_0x6c.html":[6,1,2,11], "globals_vars_0x6d.html":[6,1,2,12], "globals_vars_0x6e.html":[6,1,2,13], -"globals_vars_0x70.html":[6,1,2,14], -"globals_vars_0x72.html":[6,1,2,15], -"globals_vars_0x73.html":[6,1,2,16], -"globals_vars_0x74.html":[6,1,2,17], -"globals_vars_0x75.html":[6,1,2,18], -"globals_vars_0x77.html":[6,1,2,19], -"globals_vars_0x78.html":[6,1,2,20], -"globals_vars_0x7a.html":[6,1,2,21] +"globals_vars_0x70.html":[6,1,2,14] }; diff --git a/doc/html/navtreeindex5.js b/doc/html/navtreeindex5.js index 87a5fb67d..cea8ef638 100644 --- a/doc/html/navtreeindex5.js +++ b/doc/html/navtreeindex5.js @@ -1,5 +1,12 @@ var NAVTREEINDEX5 = { +"globals_vars_0x72.html":[6,1,2,15], +"globals_vars_0x73.html":[6,1,2,16], +"globals_vars_0x74.html":[6,1,2,17], +"globals_vars_0x75.html":[6,1,2,18], +"globals_vars_0x77.html":[6,1,2,19], +"globals_vars_0x78.html":[6,1,2,20], +"globals_vars_0x7a.html":[6,1,2,21], "gprobe_8php.html":[6,0,0,40], "gprobe_8php.html#adf72cb0a70b5b9d99fdec1cc60e18ed1":[6,0,0,40,0], "greenthumbnails_8php.html":[6,0,3,1,0,2,3], @@ -10,6 +17,9 @@ var NAVTREEINDEX5 = "help_8php.html#a06b2a51aaabed99e53a9b639047c4ce4":[6,0,1,40,1], "help_8php.html#af055e15f600ffa6fbca9386fdf715224":[6,0,1,40,0], "hierarchy.html":[5,2], +"hivenet_2php_2style_8php.html":[6,0,3,1,2,0,0], +"hivenet_2php_2theme_8php.html":[6,0,3,1,2,0,1], +"hivenet_2php_2theme_8php.html#a3a8b539b112ae63936025236dbaf0a29":[6,0,3,1,2,0,1,0], "home_8php.html":[6,0,1,41], "home_8php.html#aa1cf697851a646755baf537f75334c46":[6,0,1,41,0], "home_8php.html#ac4642c38b6f23a8d065dd4a75c620bde":[6,0,1,41,1], @@ -27,9 +37,11 @@ var NAVTREEINDEX5 = "html2plain_8php.html#ae1c203d0f089d5678d73a6c64a395201":[6,0,0,43,1], "hubloc_8php.html":[6,0,0,44], "hubloc_8php.html#a84c79b7be352f62d12fe4fa2c80fc6ea":[6,0,0,44,3], +"hubloc_8php.html#acb708dd197aae72a4858cf5ff4e3195b":[6,0,0,44,5], "hubloc_8php.html#ad3d0dcfcfcb347744f7617fe6f5de002":[6,0,0,44,2], "hubloc_8php.html#ad86214b3a74084bd7b54e8d6c919ce4d":[6,0,0,44,0], "hubloc_8php.html#aebd244b4616ded022cbbee5e82926951":[6,0,0,44,1], +"hubloc_8php.html#af1b476c936f96a93282b1d058e3d05ea":[6,0,0,44,4], "identity_8php.html":[6,0,0,45], "identity_8php.html#a1cf83ac2b645de12868edaa3a5718f05":[6,0,0,45,3], "identity_8php.html#a224710dfb7465b706c91134247c20afa":[6,0,0,45,11], @@ -76,54 +88,55 @@ var NAVTREEINDEX5 = "include_2api_8php.html#a18cab7c6391df5c421753463f5d2a879":[6,0,0,6,18], "include_2api_8php.html#a2c71b1226ef1283b5370bd1c200fee5f":[6,0,0,6,15], "include_2api_8php.html#a2e94eab9d6c164bfef7a1b2ab87b339b":[6,0,0,6,0], -"include_2api_8php.html#a32f0dda848d0c11c727fe1c3e741c283":[6,0,0,6,46], +"include_2api_8php.html#a32f0dda848d0c11c727fe1c3e741c283":[6,0,0,6,47], "include_2api_8php.html#a36344c80b8e9755da2f2dd3a0e28cce8":[6,0,0,6,16], -"include_2api_8php.html#a43c47de8565cc00c3369cb35c19cc75e":[6,0,0,6,52], -"include_2api_8php.html#a450d8732b7b608f7ac929aee61572b95":[6,0,0,6,40], +"include_2api_8php.html#a43c47de8565cc00c3369cb35c19cc75e":[6,0,0,6,53], +"include_2api_8php.html#a450d8732b7b608f7ac929aee61572b95":[6,0,0,6,41], "include_2api_8php.html#a4c6fb9fb5203aa60f4b3afd4521db8ea":[6,0,0,6,19], -"include_2api_8php.html#a528d8070ee74ea800102936ce73cf366":[6,0,0,6,39], +"include_2api_8php.html#a4fe872332ff0bd8d5eae2f0c6819cb60":[6,0,0,6,32], +"include_2api_8php.html#a528d8070ee74ea800102936ce73cf366":[6,0,0,6,40], "include_2api_8php.html#a53b0680b682ae6078f2e1ed18cfb3f74":[6,0,0,6,21], "include_2api_8php.html#a58cf4c02ef435996f5c3bc4283d3968d":[6,0,0,6,13], "include_2api_8php.html#a5990101034e7abf6404feba3cd273629":[6,0,0,6,4], -"include_2api_8php.html#a623793229a7256dd31bcfd5ab90eef08":[6,0,0,6,47], -"include_2api_8php.html#a645397787618b5c548a31e8686e8cca4":[6,0,0,6,34], -"include_2api_8php.html#a6951c690d87775eb37e569c66011988e":[6,0,0,6,37], -"include_2api_8php.html#a6a04b48168ba1d9dd2de3081a630611f":[6,0,0,6,33], +"include_2api_8php.html#a623793229a7256dd31bcfd5ab90eef08":[6,0,0,6,48], +"include_2api_8php.html#a645397787618b5c548a31e8686e8cca4":[6,0,0,6,35], +"include_2api_8php.html#a6951c690d87775eb37e569c66011988e":[6,0,0,6,38], +"include_2api_8php.html#a6a04b48168ba1d9dd2de3081a630611f":[6,0,0,6,34], "include_2api_8php.html#a72bfecac1970bc29b853073e816388ff":[6,0,0,6,6], "include_2api_8php.html#a7759ccddc8dff012ad168e511ffe5af5":[6,0,0,6,9], "include_2api_8php.html#a864191bb876a515ed71b17e260ef35ad":[6,0,0,6,2], -"include_2api_8php.html#a8969e8d9c683f12ba17dcd4b059e020d":[6,0,0,6,48], -"include_2api_8php.html#a8b25a186bd0893f51aa72a62f655735e":[6,0,0,6,41], +"include_2api_8php.html#a8969e8d9c683f12ba17dcd4b059e020d":[6,0,0,6,49], +"include_2api_8php.html#a8b25a186bd0893f51aa72a62f655735e":[6,0,0,6,42], "include_2api_8php.html#a9160288b7ac220635942d8dc209b78c3":[6,0,0,6,10], "include_2api_8php.html#a970b02c06dea8b229aa3d5fff9cf4705":[6,0,0,6,8], -"include_2api_8php.html#aa0d6b29fff0344a8e67f3507a6d01410":[6,0,0,6,36], +"include_2api_8php.html#aa0d6b29fff0344a8e67f3507a6d01410":[6,0,0,6,37], "include_2api_8php.html#aa1bddb580510e70cc1a7b7381667f1a3":[6,0,0,6,30], "include_2api_8php.html#aa40bae797bcd9ccacffdce5a3b5a1afa":[6,0,0,6,23], "include_2api_8php.html#aa49741342ad8ba285737eea1209a37e1":[6,0,0,6,27], -"include_2api_8php.html#aa62b15a6bbb280e86b98132eb214013d":[6,0,0,6,54], +"include_2api_8php.html#aa62b15a6bbb280e86b98132eb214013d":[6,0,0,6,55], "include_2api_8php.html#aa6fc3bc8c0fad1d081db0dcc456dd77f":[6,0,0,6,31], "include_2api_8php.html#aa9dc5350b26d6c7727d6c4b641ecba18":[6,0,0,6,3], -"include_2api_8php.html#aafa82b65a9f879a1a1197cfe8aaf3898":[6,0,0,6,51], +"include_2api_8php.html#aafa82b65a9f879a1a1197cfe8aaf3898":[6,0,0,6,52], "include_2api_8php.html#ab1ecb58954f722444bfe03233345cb1b":[6,0,0,6,17], -"include_2api_8php.html#abe8e929e93f7ab134b1cb1fb30f19a76":[6,0,0,6,50], -"include_2api_8php.html#ac2c2b18c426d697d11a830bca146be8a":[6,0,0,6,32], +"include_2api_8php.html#abe8e929e93f7ab134b1cb1fb30f19a76":[6,0,0,6,51], +"include_2api_8php.html#ac2c2b18c426d697d11a830bca146be8a":[6,0,0,6,33], "include_2api_8php.html#ac5a64cc81d70ff3cf866093ea9721d23":[6,0,0,6,26], "include_2api_8php.html#acafd2899309a005fcb725289173dc7fe":[6,0,0,6,22], -"include_2api_8php.html#ad24ce1bf20867add4c9211a8eaf93f22":[6,0,0,6,42], +"include_2api_8php.html#ad24ce1bf20867add4c9211a8eaf93f22":[6,0,0,6,43], "include_2api_8php.html#ad2b0192f3006918bea895de8074bf8d2":[6,0,0,6,11], -"include_2api_8php.html#ad4c29f43418f6110f85a6b3998239ab4":[6,0,0,6,35], -"include_2api_8php.html#ad4d1634df6b35126552324683caaffa2":[6,0,0,6,45], +"include_2api_8php.html#ad4c29f43418f6110f85a6b3998239ab4":[6,0,0,6,36], +"include_2api_8php.html#ad4d1634df6b35126552324683caaffa2":[6,0,0,6,46], "include_2api_8php.html#ad5fe62d6c25c86999f627b2e6cfde536":[6,0,0,6,24], -"include_2api_8php.html#ade742525b2e41c82b090799ef3c51d5e":[6,0,0,6,38], +"include_2api_8php.html#ade742525b2e41c82b090799ef3c51d5e":[6,0,0,6,39], "include_2api_8php.html#adfc035ee6303c1d8ba5336a4ead2bd53":[6,0,0,6,14], -"include_2api_8php.html#ae0fa388479cace9c5a7a45b571ab42f8":[6,0,0,6,43], +"include_2api_8php.html#ae0fa388479cace9c5a7a45b571ab42f8":[6,0,0,6,44], "include_2api_8php.html#ae46f964e5a9c80b96dc78df61c09ed3a":[6,0,0,6,25], "include_2api_8php.html#ae82608c317421f27446465aa6724733d":[6,0,0,6,20], "include_2api_8php.html#ae8f5863e18d69421005c71441c9d99a5":[6,0,0,6,1], "include_2api_8php.html#aea2dda92a155f2843a0ca188d8dfdf25":[6,0,0,6,7], -"include_2api_8php.html#aeb2e7ad00ea666b4b6dfcf82008194f8":[6,0,0,6,53], -"include_2api_8php.html#af6f1d89cdb0a0621025efbec1597bc63":[6,0,0,6,44], -"include_2api_8php.html#afb99daa6b731bf497b81f2128084852c":[6,0,0,6,49], +"include_2api_8php.html#aeb2e7ad00ea666b4b6dfcf82008194f8":[6,0,0,6,54], +"include_2api_8php.html#af6f1d89cdb0a0621025efbec1597bc63":[6,0,0,6,45], +"include_2api_8php.html#afb99daa6b731bf497b81f2128084852c":[6,0,0,6,50], "include_2api_8php.html#afe534f826e4282b72d66e8cadca7bb73":[6,0,0,6,28], "include_2api_8php.html#aff322705cc6084b329003fc8eab0aad0":[6,0,0,6,29], "include_2apps_8php.html":[6,0,0,7], @@ -236,18 +249,5 @@ var NAVTREEINDEX5 = "include_2network_8php.html#a8d5a3afb51cc932032b5dcc159efaae0":[6,0,0,53,8], "include_2network_8php.html#a9129fd55e7fc175b4ea9a195cccc16bc":[6,0,0,53,24], "include_2network_8php.html#a984708e60d531b31b2d1f88b5f408f7b":[6,0,0,53,25], -"include_2network_8php.html#a99353baabbc3e0584b85eb79ee802cff":[6,0,0,53,21], -"include_2network_8php.html#a9e9da2aafb806c98ecdc318604e60dc6":[6,0,0,53,22], -"include_2network_8php.html#aafd06c0a75402aefb06cfb9f9740fa37":[6,0,0,53,23], -"include_2network_8php.html#ab07ce9d75eae559865ed90aad2154bd7":[6,0,0,53,2], -"include_2network_8php.html#aba38458a2ff2d92d3536488dbb119694":[6,0,0,53,0], -"include_2network_8php.html#acb0bd7f5fe38ff1eaebeae3284525070":[6,0,0,53,17], -"include_2network_8php.html#ad4056d3ce69988f5c1a997a79f503246":[6,0,0,53,3], -"include_2network_8php.html#ae8d9c41a11000fb8667039fc71b4f73f":[6,0,0,53,15], -"include_2network_8php.html#aee35d9ad6b3f872bfb39ba3598936aa7":[6,0,0,53,1], -"include_2notify_8php.html":[6,0,0,55], -"include_2notify_8php.html#a0e61728e487df50c72e6434f911a57d3":[6,0,0,55,0], -"include_2oembed_8php.html":[6,0,0,57], -"include_2oembed_8php.html#a000a62b97113cf95b0e9e00412168172":[6,0,0,57,5], -"include_2oembed_8php.html#a00c4c80deffd9daf8dc97b58d4c64ed0":[6,0,0,57,7] +"include_2network_8php.html#a99353baabbc3e0584b85eb79ee802cff":[6,0,0,53,21] }; diff --git a/doc/html/navtreeindex6.js b/doc/html/navtreeindex6.js index 7e42a4dcc..e3c3f1ab3 100644 --- a/doc/html/navtreeindex6.js +++ b/doc/html/navtreeindex6.js @@ -1,5 +1,18 @@ var NAVTREEINDEX6 = { +"include_2network_8php.html#a9e9da2aafb806c98ecdc318604e60dc6":[6,0,0,53,22], +"include_2network_8php.html#aafd06c0a75402aefb06cfb9f9740fa37":[6,0,0,53,23], +"include_2network_8php.html#ab07ce9d75eae559865ed90aad2154bd7":[6,0,0,53,2], +"include_2network_8php.html#aba38458a2ff2d92d3536488dbb119694":[6,0,0,53,0], +"include_2network_8php.html#acb0bd7f5fe38ff1eaebeae3284525070":[6,0,0,53,17], +"include_2network_8php.html#ad4056d3ce69988f5c1a997a79f503246":[6,0,0,53,3], +"include_2network_8php.html#ae8d9c41a11000fb8667039fc71b4f73f":[6,0,0,53,15], +"include_2network_8php.html#aee35d9ad6b3f872bfb39ba3598936aa7":[6,0,0,53,1], +"include_2notify_8php.html":[6,0,0,55], +"include_2notify_8php.html#a0e61728e487df50c72e6434f911a57d3":[6,0,0,55,0], +"include_2oembed_8php.html":[6,0,0,57], +"include_2oembed_8php.html#a000a62b97113cf95b0e9e00412168172":[6,0,0,57,5], +"include_2oembed_8php.html#a00c4c80deffd9daf8dc97b58d4c64ed0":[6,0,0,57,7], "include_2oembed_8php.html#a03fa3b7832c98a3d0b4630afeb73d487":[6,0,0,57,1], "include_2oembed_8php.html#a26bb4c1e330d2f94ea7b6ce2fe970cf3":[6,0,0,57,4], "include_2oembed_8php.html#a98549b9af8140eda3eceaeedcaabc2c2":[6,0,0,57,3], @@ -50,6 +63,7 @@ var NAVTREEINDEX6 = "items_8php.html#a0cf98bb619f07dd18f602683a55a5f59":[6,0,0,48,27], "items_8php.html#a1e75047cf175aaee8dd16aa761913ff9":[6,0,0,48,5], "items_8php.html#a251343637ff40a50cca93452cd530c26":[6,0,0,48,34], +"items_8php.html#a25221826fa4621f523c68483e3b6af26":[6,0,0,48,64], "items_8php.html#a2541e6861a56d145c9281877cc501615":[6,0,0,48,47], "items_8php.html#a275108c050f7eb18bcbb5018e6b81cf6":[6,0,0,48,4], "items_8php.html#a2baa9e05f1e8aa3dd61c85803ae39bd6":[6,0,0,48,71], @@ -109,7 +123,6 @@ var NAVTREEINDEX6 = "items_8php.html#adf2b8137dc4ad9ec958de2842f16f3c2":[6,0,0,48,63], "items_8php.html#adf980098b6de9c3993bc3ff26a8dd6f9":[6,0,0,48,25], "items_8php.html#ae73794179b62d39bb597ff670ab1c1e5":[6,0,0,48,41], -"items_8php.html#af0a887050dc8d0f51c89890cdaf3145f":[6,0,0,48,64], "items_8php.html#af6237605c60d69abdd959ddbbee3420c":[6,0,0,48,61], "items_8php.html#af94c281016c6c912d06e064113336c5c":[6,0,0,48,50], "items_8php.html#afbcf26dfcf8a83fff952aa858c1b7b67":[6,0,0,48,24], @@ -214,15 +227,15 @@ var NAVTREEINDEX6 = "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], -"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":[4,0,1], +"mytheme_2php_2style_8php.html":[6,0,3,1,3,0,1], +"mytheme_2php_2theme_8php.html":[6,0,3,1,3,0,2], +"mytheme_2php_2theme_8php.html#a6ce5df8ece6acc09c1fddaccbeb244e8":[6,0,3,1,3,0,2,0], "namespaceFriendica.html":[5,0,1], +"namespaceFriendica.html":[4,0,1], "namespaceRedMatrix.html":[5,0,3], "namespaceRedMatrix.html":[4,0,3], -"namespaceRedMatrix_1_1RedDAV.html":[5,0,3,0], "namespaceRedMatrix_1_1RedDAV.html":[4,0,3,0], +"namespaceRedMatrix_1_1RedDAV.html":[5,0,3,0], "namespaceacl__selectors.html":[5,0,0], "namespaceacl__selectors.html":[4,0,0], "namespacefriendica-to-smarty-tpl.html":[4,0,2], @@ -236,18 +249,5 @@ var NAVTREEINDEX6 = "namespaceutil.html":[4,0,5], "namespaceutil.html":[5,0,5], "nav_8php.html":[6,0,0,52], -"nav_8php.html#a43be0df73b90647ea70947ce004e231e":[6,0,0,52,0], -"nav_8php.html#ac3c920ce3ea5b0d9e0678ee37155f06a":[6,0,0,52,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], -"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] +"nav_8php.html#a43be0df73b90647ea70947ce004e231e":[6,0,0,52,0] }; diff --git a/doc/html/navtreeindex7.js b/doc/html/navtreeindex7.js index 2d9e8f269..0ffba9f84 100644 --- a/doc/html/navtreeindex7.js +++ b/doc/html/navtreeindex7.js @@ -1,8 +1,21 @@ var NAVTREEINDEX7 = { +"nav_8php.html#ac3c920ce3ea5b0d9e0678ee37155f06a":[6,0,0,52,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], +"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], "notifier_8php.html":[6,0,0,54], "notifier_8php.html#a568c502f626cff95e344c0748938b85d":[6,0,0,54,0], -"notred_8php.html":[6,0,3,1,3,1,3], +"notred_8php.html":[6,0,3,1,4,1,3], "oauth_8php.html":[6,0,0,56], "oauth_8php.html#a7a32a5990f113ac9465b03b29175cf16":[6,0,0,56,3], "oauth_8php.html#ad343cab37aa860d2d14dc86b7f5ca0c6":[6,0,0,56,2], @@ -181,11 +194,11 @@ var NAVTREEINDEX7 = "receive_8php.html#a03d8fa26e77844020ba5602deca7d494":[6,0,1,96,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], -"redbasic_2php_2style_8php.html#a01c151bf47f7da2b979aaa4cb868da4c":[6,0,3,1,3,0,1,0], -"redbasic_2php_2style_8php.html#ab3afb90d611eca90819f597a2c0bb459":[6,0,3,1,3,0,1,1], -"redbasic_2php_2theme_8php.html":[6,0,3,1,3,0,2], -"redbasic_2php_2theme_8php.html#af6eb813e9fc7e2d76ac1b82bc5c0ed9b":[6,0,3,1,3,0,2,0], +"redbasic_2php_2style_8php.html":[6,0,3,1,4,0,1], +"redbasic_2php_2style_8php.html#a01c151bf47f7da2b979aaa4cb868da4c":[6,0,3,1,4,0,1,0], +"redbasic_2php_2style_8php.html#ab3afb90d611eca90819f597a2c0bb459":[6,0,3,1,4,0,1,1], +"redbasic_2php_2theme_8php.html":[6,0,3,1,4,0,2], +"redbasic_2php_2theme_8php.html#af6eb813e9fc7e2d76ac1b82bc5c0ed9b":[6,0,3,1,4,0,2,0], "redbasic_8php.html":[6,0,3,1,0,2,9], "reddav_8php.html":[6,0,0,70], "reddav_8php.html#a5df0d09893f2e65dc5cf6bbab6cfb266":[6,0,0,70,1], @@ -236,18 +249,5 @@ var NAVTREEINDEX7 = "session_8php.html":[6,0,0,72], "session_8php.html#a26fa1042356d555023cbf15ddd4f8507":[6,0,0,72,4], "session_8php.html#a4c0ead624f95483e386bc80abf570a8f":[6,0,0,72,0], -"session_8php.html#a5e1c616e02b863d5450317d101366bb7":[6,0,0,72,1], -"session_8php.html#a62e4a6cb26b4bb1b8ddd8277b26090eb":[6,0,0,72,8], -"session_8php.html#a7f0f50576360d9ba52d29364e0b83a8e":[6,0,0,72,5], -"session_8php.html#a96b09cc763572f45280786a7b33feb7e":[6,0,0,72,7], -"session_8php.html#ac4461c1984543d3553e73dba2771568f":[6,0,0,72,6], -"session_8php.html#ac95373f4966862a028033dd2f94d4da1":[6,0,0,72,3], -"session_8php.html#af0100a2642a5268594bbd5742a03d885":[6,0,0,72,9], -"session_8php.html#af230b86bfff7db66c3bdd7e0bbc24052":[6,0,0,72,2], -"settings_8php.html":[6,0,1,108], -"settings_8php.html#a39abc76ff5459c57e3b957664f273f18":[6,0,1,108,0], -"settings_8php.html#a3a4cde287482fced008583f54ba2a722":[6,0,1,108,1], -"settings_8php.html#aa7ee94d88ac088edb04ccf3a26de3586":[6,0,1,108,2], -"setup_8php.html":[6,0,1,109], -"setup_8php.html#a0c3f3b671381f6dccd924b8ecdfc56c4":[6,0,1,109,2] +"session_8php.html#a5e1c616e02b863d5450317d101366bb7":[6,0,0,72,1] }; diff --git a/doc/html/navtreeindex8.js b/doc/html/navtreeindex8.js index de2843783..00b662dfe 100644 --- a/doc/html/navtreeindex8.js +++ b/doc/html/navtreeindex8.js @@ -1,5 +1,18 @@ var NAVTREEINDEX8 = { +"session_8php.html#a62e4a6cb26b4bb1b8ddd8277b26090eb":[6,0,0,72,8], +"session_8php.html#a7f0f50576360d9ba52d29364e0b83a8e":[6,0,0,72,5], +"session_8php.html#a96b09cc763572f45280786a7b33feb7e":[6,0,0,72,7], +"session_8php.html#ac4461c1984543d3553e73dba2771568f":[6,0,0,72,6], +"session_8php.html#ac95373f4966862a028033dd2f94d4da1":[6,0,0,72,3], +"session_8php.html#af0100a2642a5268594bbd5742a03d885":[6,0,0,72,9], +"session_8php.html#af230b86bfff7db66c3bdd7e0bbc24052":[6,0,0,72,2], +"settings_8php.html":[6,0,1,108], +"settings_8php.html#a39abc76ff5459c57e3b957664f273f18":[6,0,1,108,0], +"settings_8php.html#a3a4cde287482fced008583f54ba2a722":[6,0,1,108,1], +"settings_8php.html#aa7ee94d88ac088edb04ccf3a26de3586":[6,0,1,108,2], +"setup_8php.html":[6,0,1,109], +"setup_8php.html#a0c3f3b671381f6dccd924b8ecdfc56c4":[6,0,1,109,2], "setup_8php.html#a13cf286774149a0a7bd8adb8179cec75":[6,0,1,109,14], "setup_8php.html#a14d208682a88632290c895d20da6e7d6":[6,0,1,109,5], "setup_8php.html#a267555abd17290e659b4bf44b885e4e0":[6,0,1,109,13], @@ -18,9 +31,9 @@ var NAVTREEINDEX8 = "setup_8php.html#afd8b0b3ade1507c45325caf377bf459d":[6,0,1,109,6], "share_8php.html":[6,0,1,110], "share_8php.html#afeb26046bdd02567ecd29ab5f188b249":[6,0,1,110,0], -"simple__black__on__white_8php.html":[6,0,3,1,3,1,4], -"simple__green__on__black_8php.html":[6,0,3,1,3,1,5], -"simple__white__on__black_8php.html":[6,0,3,1,3,1,6], +"simple__black__on__white_8php.html":[6,0,3,1,4,1,4], +"simple__green__on__black_8php.html":[6,0,3,1,4,1,5], +"simple__white__on__black_8php.html":[6,0,3,1,4,1,6], "siteinfo_8php.html":[6,0,1,111], "siteinfo_8php.html#a3efbd0bd6564af19ec0a9ce0294e59d0":[6,0,1,111,1], "siteinfo_8php.html#a70c09bfb6dd1c86a125a35f62ed53656":[6,0,1,111,0], @@ -54,8 +67,14 @@ var NAVTREEINDEX8 = "statistics__fns_8php.html#a82726229a961d3bd3d543005c61dd8e6":[6,0,0,76,0], "statistics__fns_8php.html#a9dd516dda693f17f5ce48a94876f7efa":[6,0,0,76,3], "statistics__fns_8php.html#ad2b7b595c039c4c2eb0d6cd57a393dfe":[6,0,0,76,1], +"stumble_2php_2style_8php.html":[6,0,3,1,5,0,0], +"stumble_2php_2theme_8php.html":[6,0,3,1,5,0,1], +"stumble_2php_2theme_8php.html#a71db9eff6289e0ee47771c37c01d6753":[6,0,3,1,5,0,1,0], "subthread_8php.html":[6,0,1,117], "subthread_8php.html#a50368f3d825b77996030528e7fbfa3d3":[6,0,1,117,0], +"suckerberg_2php_2style_8php.html":[6,0,3,1,6,0,0], +"suckerberg_2php_2theme_8php.html":[6,0,3,1,6,0,1], +"suckerberg_2php_2theme_8php.html#a4104fce7d5fb71d15ed811978b628fc8":[6,0,3,1,6,0,1,0], "suggest_8php.html":[6,0,1,118], "suggest_8php.html#a58748a8235d4523f8333847f3e42dd91":[6,0,1,118,0], "suggest_8php.html#a696acf1dd8070e479adcc80c63c6718c":[6,0,1,118,1], @@ -192,9 +211,9 @@ var NAVTREEINDEX8 = "theme_2blogga_2view_2theme_2blog_2default_8php.html#a1230ab83d4ec9785d8f3a966f33dc5f3":[6,0,3,1,1,1,0,0,1,2], "theme_2blogga_2view_2theme_2blog_2default_8php.html#a52d9dd070ed541729088395c22502539":[6,0,3,1,1,1,0,0,1,1], "theme_2blogga_2view_2theme_2blog_2default_8php.html#a720581ae288aa09511670563e4205a4a":[6,0,3,1,1,1,0,0,1,0], -"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], +"theme_2mytheme_2php_2default_8php.html":[6,0,3,1,3,0,0], +"theme_2mytheme_2php_2default_8php.html#a3987f5547ceb7e36a210a66a06241a5a":[6,0,3,1,3,0,0,0], +"theme_2redbasic_2php_2theme__init_8php.html":[6,0,3,1,4,0,3], "thing_8php.html":[6,0,1,121], "thing_8php.html#a24a35f1e64029a67fdbea94a776ae04b":[6,0,1,121,0], "thing_8php.html#a8be23b1d475ec3d9291999221c674c80":[6,0,1,121,1], @@ -230,24 +249,5 @@ var NAVTREEINDEX8 = "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], -"view_2theme_2apw_2php_2config_8php.html#ad59fc09da66b66267f9753c8b2dd68d0":[6,0,3,1,0,1,0,0], -"view_2theme_2blogga_2php_2config_8php.html":[6,0,3,1,1,0,0], -"view_2theme_2blogga_2php_2config_8php.html#a09cd81013505f83aea0771243a1e4e53":[6,0,3,1,1,0,0,1], -"view_2theme_2blogga_2php_2config_8php.html#a8a311a402d3e746ce53fadc38e4b2d27":[6,0,3,1,1,0,0,0], -"view_2theme_2blogga_2php_2config_8php.html#aa7d5739b72efef9822535b2b32d5364d":[6,0,3,1,1,0,0,3], -"view_2theme_2blogga_2php_2config_8php.html#ad29461920cf03b9ce1428e21eb1f4ba6":[6,0,3,1,1,0,0,4], -"view_2theme_2blogga_2php_2config_8php.html#aef2da5582b7cb6b5f63e5ca5d69fd30b":[6,0,3,1,1,0,0,2], -"view_2theme_2blogga_2view_2theme_2blog_2config_8php.html":[6,0,3,1,1,1,0,0,0], -"view_2theme_2blogga_2view_2theme_2blog_2config_8php.html#a09cd81013505f83aea0771243a1e4e53":[6,0,3,1,1,1,0,0,0,1], -"view_2theme_2blogga_2view_2theme_2blog_2config_8php.html#a8a311a402d3e746ce53fadc38e4b2d27":[6,0,3,1,1,1,0,0,0,0], -"view_2theme_2blogga_2view_2theme_2blog_2config_8php.html#aa7d5739b72efef9822535b2b32d5364d":[6,0,3,1,1,1,0,0,0,3], -"view_2theme_2blogga_2view_2theme_2blog_2config_8php.html#ad29461920cf03b9ce1428e21eb1f4ba6":[6,0,3,1,1,1,0,0,0,4], -"view_2theme_2blogga_2view_2theme_2blog_2config_8php.html#aef2da5582b7cb6b5f63e5ca5d69fd30b":[6,0,3,1,1,1,0,0,0,2], -"view_2theme_2redbasic_2php_2config_8php.html":[6,0,3,1,3,0,0] +"updatetpl_8py.html#ab42dd79af65ee82201fd6f04715f62f6":[6,0,2,11,3] }; diff --git a/doc/html/navtreeindex9.js b/doc/html/navtreeindex9.js index 1e9892a17..26a4d9e31 100644 --- a/doc/html/navtreeindex9.js +++ b/doc/html/navtreeindex9.js @@ -1,8 +1,27 @@ var NAVTREEINDEX9 = { -"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], +"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], +"view_2theme_2apw_2php_2config_8php.html#ad59fc09da66b66267f9753c8b2dd68d0":[6,0,3,1,0,1,0,0], +"view_2theme_2blogga_2php_2config_8php.html":[6,0,3,1,1,0,0], +"view_2theme_2blogga_2php_2config_8php.html#a09cd81013505f83aea0771243a1e4e53":[6,0,3,1,1,0,0,1], +"view_2theme_2blogga_2php_2config_8php.html#a8a311a402d3e746ce53fadc38e4b2d27":[6,0,3,1,1,0,0,0], +"view_2theme_2blogga_2php_2config_8php.html#aa7d5739b72efef9822535b2b32d5364d":[6,0,3,1,1,0,0,3], +"view_2theme_2blogga_2php_2config_8php.html#ad29461920cf03b9ce1428e21eb1f4ba6":[6,0,3,1,1,0,0,4], +"view_2theme_2blogga_2php_2config_8php.html#aef2da5582b7cb6b5f63e5ca5d69fd30b":[6,0,3,1,1,0,0,2], +"view_2theme_2blogga_2view_2theme_2blog_2config_8php.html":[6,0,3,1,1,1,0,0,0], +"view_2theme_2blogga_2view_2theme_2blog_2config_8php.html#a09cd81013505f83aea0771243a1e4e53":[6,0,3,1,1,1,0,0,0,1], +"view_2theme_2blogga_2view_2theme_2blog_2config_8php.html#a8a311a402d3e746ce53fadc38e4b2d27":[6,0,3,1,1,1,0,0,0,0], +"view_2theme_2blogga_2view_2theme_2blog_2config_8php.html#aa7d5739b72efef9822535b2b32d5364d":[6,0,3,1,1,1,0,0,0,3], +"view_2theme_2blogga_2view_2theme_2blog_2config_8php.html#ad29461920cf03b9ce1428e21eb1f4ba6":[6,0,3,1,1,1,0,0,0,4], +"view_2theme_2blogga_2view_2theme_2blog_2config_8php.html#aef2da5582b7cb6b5f63e5ca5d69fd30b":[6,0,3,1,1,1,0,0,0,2], +"view_2theme_2redbasic_2php_2config_8php.html":[6,0,3,1,4,0,0], +"view_2theme_2redbasic_2php_2config_8php.html#a8574a41fa9735ee391ba57ab24b93793":[6,0,3,1,4,0,0,0], +"view_2theme_2redbasic_2php_2config_8php.html#aa7d5739b72efef9822535b2b32d5364d":[6,0,3,1,4,0,0,1], +"view_2theme_2redbasic_2php_2config_8php.html#ad29461920cf03b9ce1428e21eb1f4ba6":[6,0,3,1,4,0,0,2], "view_8php.html":[6,0,1,129], "view_8php.html#ac168f6c61a91ba2063f13b441c0ae96e":[6,0,1,129,0], "viewconnections_8php.html":[6,0,1,130], diff --git a/doc/html/permissions_8php.html b/doc/html/permissions_8php.html index 8ae3220ff..d7cdd11e6 100644 --- a/doc/html/permissions_8php.html +++ b/doc/html/permissions_8php.html @@ -201,7 +201,7 @@ Functions
        Returns
        : array of all permissions, key is permission name, value is true or false
        -

        Referenced by achievements_content(), blocks_content(), change_channel(), channel_content(), connedit_content(), editlayout_content(), editwebpage_content(), filestorage_content(), layouts_content(), like_content(), page_content(), webpages_content(), zfinger_init(), and zot_refresh().

        +

        Referenced by achievements_content(), blocks_content(), change_channel(), channel_content(), connedit_content(), editlayout_content(), editwebpage_content(), filestorage_content(), layouts_content(), like_content(), page_init(), webpages_content(), zfinger_init(), and zot_refresh().

        diff --git a/doc/html/photo__driver_8php.html b/doc/html/photo__driver_8php.html index db723d160..204df52dd 100644 --- a/doc/html/photo__driver_8php.html +++ b/doc/html/photo__driver_8php.html @@ -232,7 +232,7 @@ Functions
         $post_id $post_id,
         $walltowall = false 
        -

        Referenced by app_store(), app_update(), diaspora_profile(), discover_by_url(), discover_by_webbie(), import_author_rss(), import_author_unknown(), import_post(), import_xchan(), openid_content(), poller_run(), and thing_init().

        +

        Referenced by app_store(), app_update(), diaspora_profile(), discover_by_url(), discover_by_webbie(), import_author_rss(), import_author_unknown(), import_post(), import_xchan(), openid_content(), poller_run(), thing_init(), and xchan_store().

        diff --git a/doc/html/php2po_8php.html b/doc/html/php2po_8php.html index 40001f325..898a5544b 100644 --- a/doc/html/php2po_8php.html +++ b/doc/html/php2po_8php.html @@ -168,7 +168,7 @@ Variables
        -

        Referenced by App\__construct(), Template\_get_var(), Template\_replcb_for(), activity_sanitise(), aes_encapsulate(), aes_unencapsulate(), app_render(), bb_sanitize_style(), build_sync_packet(), connections_post(), connedit_content(), connedit_post(), construct_page(), contact_poll_interval(), dirprofile_init(), dirsearch_content(), extra_query_args(), foofoo(), RedMatrix\RedDAV\RedBrowser\generateDirectoryIndex(), get_plugin_info(), get_theme_info(), get_things(), guess_image_type(), import_directory_profile(), item_photo_menu(), item_store_update(), load_config(), load_pconfig(), load_xconfig(), local_dir_update(), mail_post(), mood_content(), netgrowth_content(), new_contact(), FKOAuthDataStore\new_request_token(), obj_verb_selector(), openid_content(), parse_app_description(), photos_albums_list(), po2php_run(), poco_init(), poke_content(), private_messages_fetch_conversation(), private_messages_fetch_message(), private_messages_list(), process_channel_sync_delivery(), profile_load(), requestdata(), role_selector(), settings_post(), sslify_init(), startup(), tt(), RedMatrix\RedDAV\RedBrowser\userReadableSize(), vote_post(), x(), zfinger_init(), and zot_refresh().

        +

        Referenced by App\__construct(), Template\_get_var(), Template\_replcb_for(), activity_sanitise(), aes_encapsulate(), aes_unencapsulate(), app_render(), bb_sanitize_style(), build_sync_packet(), connections_post(), connedit_content(), connedit_post(), construct_page(), contact_poll_interval(), dirprofile_init(), dirsearch_content(), extra_query_args(), foofoo(), RedMatrix\RedDAV\RedBrowser\generateDirectoryIndex(), get_plugin_info(), get_theme_info(), get_things(), guess_image_type(), import_directory_profile(), item_photo_menu(), item_store_update(), load_config(), load_pconfig(), load_xconfig(), local_dir_update(), mail_post(), mood_content(), netgrowth_content(), new_contact(), FKOAuthDataStore\new_request_token(), obj_verb_selector(), openid_content(), parse_app_description(), photos_albums_list(), po2php_run(), poco_init(), poke_content(), private_messages_fetch_conversation(), private_messages_fetch_message(), private_messages_list(), process_channel_sync_delivery(), profile_load(), requestdata(), role_selector(), settings_post(), sslify_init(), startup(), tt(), RedMatrix\RedDAV\RedBrowser\userReadableSize(), vote_post(), x(), xchan_fetch(), zfinger_init(), and zot_refresh().

        diff --git a/doc/html/php_2theme__init_8php.html b/doc/html/php_2theme__init_8php.html index 814d0a7b5..c045b7ef5 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(), 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(), impel_init(), import_post(), importelm_post(), invite_content(), is_public_profile(), item_photo_menu(), item_post(), item_store(), item_store_update(), items_fetch(), layouts_content(), locs_post(), 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(), store_diaspora_comment_sig(), 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_encode_locations(), 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(), impel_init(), import_post(), importelm_post(), invite_content(), is_public_profile(), item_photo_menu(), item_post(), item_store(), item_store_update(), items_fetch(), layouts_content(), locs_post(), 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(), store_diaspora_comment_sig(), 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_encode_locations(), zot_finger(), and zot_refresh().

        diff --git a/doc/html/plugin_8php.html b/doc/html/plugin_8php.html index 39aa7880f..c71c22f19 100644 --- a/doc/html/plugin_8php.html +++ b/doc/html/plugin_8php.html @@ -778,7 +778,7 @@ Functions
        -

        Referenced by construct_page(), format_css_if_exists(), format_js_if_exists(), FriendicaSmartyEngine\get_intltext_template(), FriendicaSmartyEngine\get_markup_template(), Template\get_markup_template(), and pdledit_content().

        +

        Referenced by construct_page(), format_css_if_exists(), format_js_if_exists(), FriendicaSmartyEngine\get_intltext_template(), FriendicaSmartyEngine\get_markup_template(), Template\get_markup_template(), load_pdl(), and pdledit_content().

        diff --git a/doc/html/search/all_61.js b/doc/html/search/all_61.js index cae31ee43..3ab5333ef 100644 --- a/doc/html/search/all_61.js +++ b/doc/html/search/all_61.js @@ -138,6 +138,7 @@ var searchData= ['api_5foauth_5frequest_5ftoken',['api_oauth_request_token',['../include_2api_8php.html#aa1bddb580510e70cc1a7b7381667f1a3',1,'api.php']]], ['api_5fphotos',['api_photos',['../include_2api_8php.html#aa6fc3bc8c0fad1d081db0dcc456dd77f',1,'api.php']]], ['api_5fpost',['api_post',['../mod_2api_8php.html#a6fe77f05c07cb51048df0d557b4b9bd2',1,'api.php']]], + ['api_5fred_5fxchan',['api_red_xchan',['../include_2api_8php.html#a4fe872332ff0bd8d5eae2f0c6819cb60',1,'api.php']]], ['api_5fregister_5ffunc',['api_register_func',['../include_2api_8php.html#ac2c2b18c426d697d11a830bca146be8a',1,'api.php']]], ['api_5frss_5fextra',['api_rss_extra',['../include_2api_8php.html#a6a04b48168ba1d9dd2de3081a630611f',1,'api.php']]], ['api_5fstatus_5fshow',['api_status_show',['../include_2api_8php.html#a645397787618b5c548a31e8686e8cca4',1,'api.php']]], @@ -172,8 +173,8 @@ var searchData= ['appman_2ephp',['appman.php',['../appman_8php.html',1,'']]], ['appman_5fcontent',['appman_content',['../appman_8php.html#af48805ac2f6f123f2681a8ae1c6f123f',1,'appman.php']]], ['appman_5fpost',['appman_post',['../appman_8php.html#a2979acbe47ffaecfa19b9eabfbfbde39',1,'appman.php']]], - ['apps_2ephp',['apps.php',['../include_2apps_8php.html',1,'']]], ['apps_2ephp',['apps.php',['../mod_2apps_8php.html',1,'']]], + ['apps_2ephp',['apps.php',['../include_2apps_8php.html',1,'']]], ['apps_5fcontent',['apps_content',['../mod_2apps_8php.html#a546016cb960d0b110ee8e489dfa6c27c',1,'apps.php']]], ['apw_5fform',['apw_form',['../view_2theme_2apw_2php_2config_8php.html#ad59fc09da66b66267f9753c8b2dd68d0',1,'config.php']]], ['apw_5finit',['apw_init',['../apw_2php_2theme_8php.html#a42167c539043a39a6b83c252d05f1e89',1,'theme.php']]], diff --git a/doc/html/search/all_64.js b/doc/html/search/all_64.js index 882c7252e..5805f8a1c 100644 --- a/doc/html/search/all_64.js +++ b/doc/html/search/all_64.js @@ -4,10 +4,10 @@ var searchData= ['darkness_2ephp',['darkness.php',['../darkness_8php.html',1,'']]], ['darknessleftaside_2ephp',['darknessleftaside.php',['../darknessleftaside_8php.html',1,'']]], ['darknessrightaside_2ephp',['darknessrightaside.php',['../darknessrightaside_8php.html',1,'']]], - ['datesel',['datesel',['../datetime_8php.html#ac265b86f384ee094ed5479aae02aa5c8',1,'datetime.php']]], - ['datesel_5fformat',['datesel_format',['../datetime_8php.html#a5f29553799005b1fd4e9ce9d98ce05aa',1,'datetime.php']]], + ['datesel',['datesel',['../datetime_8php.html#a77bb385ae8a9e7ca663309c102c0d766',1,'datetime.php']]], ['datetime_2ephp',['datetime.php',['../datetime_8php.html',1,'']]], ['datetime_5fconvert',['datetime_convert',['../datetime_8php.html#ad6301e74b0f9267d52f8d432b5beb226',1,'datetime.php']]], + ['datetimesel',['datetimesel',['../datetime_8php.html#a72218e5ee21876484934bacbb6bd9ba3',1,'datetime.php']]], ['day_5ftranslate',['day_translate',['../text_8php.html#a63fb21c0bed2fc72eef2c1471ac42b63',1,'text.php']]], ['db_5fupdate_2ephp',['db_update.php',['../db__update_8php.html',1,'']]], ['db_5fupdate_5fversion',['DB_UPDATE_VERSION',['../boot_8php.html#ac59a18a4838710d6c2de37aed6b21f03',1,'boot.php']]], diff --git a/doc/html/search/all_68.js b/doc/html/search/all_68.js index d08c52aa0..216dd68d1 100644 --- a/doc/html/search/all_68.js +++ b/doc/html/search/all_68.js @@ -18,6 +18,7 @@ var searchData= ['help',['help',['../namespacefriendica-to-smarty-tpl.html#af6b2c793958aae2aadc294577431f749',1,'friendica-to-smarty-tpl.help()'],['../namespaceupdatetpl.html#ac9d11279fed403a329a719298feafc4f',1,'updatetpl.help()']]], ['help_2ephp',['help.php',['../help_8php.html',1,'']]], ['help_5fcontent',['help_content',['../help_8php.html#af055e15f600ffa6fbca9386fdf715224',1,'help.php']]], + ['hivenet_5finit',['hivenet_init',['../hivenet_2php_2theme_8php.html#a3a8b539b112ae63936025236dbaf0a29',1,'theme.php']]], ['home_2ephp',['home.php',['../home_8php.html',1,'']]], ['home_5fcontent',['home_content',['../home_8php.html#aa1cf697851a646755baf537f75334c46',1,'home.php']]], ['home_5finit',['home_init',['../home_8php.html#ac4642c38b6f23a8d065dd4a75c620bde',1,'home.php']]], diff --git a/doc/html/search/all_6c.js b/doc/html/search/all_6c.js index 483bab71e..765d4c768 100644 --- a/doc/html/search/all_6c.js +++ b/doc/html/search/all_6c.js @@ -26,6 +26,7 @@ var searchData= ['load_5fdatabase_5frem',['load_database_rem',['../setup_8php.html#a2b375ddc555140236fc500135de99371',1,'setup.php']]], ['load_5fhooks',['load_hooks',['../plugin_8php.html#a326365e48ef94f0b9a0a771b8d75e813',1,'plugin.php']]], ['load_5fpconfig',['load_pconfig',['../include_2config_8php.html#a559791dda7fef8a4b2394c83e835787b',1,'config.php']]], + ['load_5fpdl',['load_pdl',['../boot_8php.html#a50a6707a28c7d05d3f49eaabc7994501',1,'boot.php']]], ['load_5fplugin',['load_plugin',['../plugin_8php.html#a9ca9632b7309a65b05c03a3e2f473a3d',1,'plugin.php']]], ['load_5ftranslation_5ftable',['load_translation_table',['../language_8php.html#a7e9904c730bb24ddcb0ff50fc96f6b05',1,'language.php']]], ['load_5fxconfig',['load_xconfig',['../include_2config_8php.html#aee4b619839cf4b64220f34edf5c67b52',1,'config.php']]], diff --git a/doc/html/search/all_73.js b/doc/html/search/all_73.js index 03ae80329..eb2f2fe85 100644 --- a/doc/html/search/all_73.js +++ b/doc/html/search/all_73.js @@ -116,7 +116,7 @@ var searchData= ['status_5feditor',['status_editor',['../conversation_8php.html#a2a7d541854bba755eb8ada59af7dcb1a',1,'conversation.php']]], ['storage_5fdefault_5fpermissions',['STORAGE_DEFAULT_PERMISSIONS',['../boot_8php.html#aecaa1b6945b317ba8f1daf4af2aed8e6',1,'boot.php']]], ['store',['store',['../classphoto__driver.html#a642a8d0c4ad5f887c99c6af77cee287b',1,'photo_driver']]], - ['store_5fdiaspora_5fcomment_5fsig',['store_diaspora_comment_sig',['../items_8php.html#af0a887050dc8d0f51c89890cdaf3145f',1,'items.php']]], + ['store_5fdiaspora_5fcomment_5fsig',['store_diaspora_comment_sig',['../items_8php.html#a25221826fa4621f523c68483e3b6af26',1,'items.php']]], ['store_5fitem_5ftag',['store_item_tag',['../taxonomy_8php.html#a4ba1339b2a7054971178ce194e4440fd',1,'taxonomy.php']]], ['stream_5fperms_5fapi_5fuids',['stream_perms_api_uids',['../security_8php.html#a6126c77a1267e046ac59cf864613f011',1,'security.php']]], ['stream_5fperms_5fxchans',['stream_perms_xchans',['../security_8php.html#a3ef2be6a7e4928e39d50059d6feb457c',1,'security.php']]], @@ -125,11 +125,16 @@ 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',['../apw_2php_2style_8php.html',1,'']]], - ['style_2ephp',['style.php',['../mytheme_2php_2style_8php.html',1,'']]], + ['stumble_5finit',['stumble_init',['../stumble_2php_2theme_8php.html#a71db9eff6289e0ee47771c37c01d6753',1,'theme.php']]], + ['style_2ephp',['style.php',['../stumble_2php_2style_8php.html',1,'']]], + ['style_2ephp',['style.php',['../hivenet_2php_2style_8php.html',1,'']]], ['style_2ephp',['style.php',['../redbasic_2php_2style_8php.html',1,'']]], + ['style_2ephp',['style.php',['../mytheme_2php_2style_8php.html',1,'']]], + ['style_2ephp',['style.php',['../suckerberg_2php_2style_8php.html',1,'']]], + ['style_2ephp',['style.php',['../apw_2php_2style_8php.html',1,'']]], ['subthread_2ephp',['subthread.php',['../subthread_8php.html',1,'']]], ['subthread_5fcontent',['subthread_content',['../subthread_8php.html#a50368f3d825b77996030528e7fbfa3d3',1,'subthread.php']]], + ['suckerberg_5finit',['suckerberg_init',['../suckerberg_2php_2theme_8php.html#a4104fce7d5fb71d15ed811978b628fc8',1,'theme.php']]], ['suggest_2ephp',['suggest.php',['../suggest_8php.html',1,'']]], ['suggest_5fcontent',['suggest_content',['../suggest_8php.html#a58748a8235d4523f8333847f3e42dd91',1,'suggest.php']]], ['suggest_5finit',['suggest_init',['../suggest_8php.html#a696acf1dd8070e479adcc80c63c6718c',1,'suggest.php']]], diff --git a/doc/html/search/all_74.js b/doc/html/search/all_74.js index dd14daf49..a3dd387f4 100644 --- a/doc/html/search/all_74.js +++ b/doc/html/search/all_74.js @@ -41,23 +41,26 @@ var searchData= ['theme_2ephp',['theme.php',['../apw_2php_2theme_8php.html',1,'']]], ['theme_2ephp',['theme.php',['../blogga_2php_2theme_8php.html',1,'']]], ['theme_2ephp',['theme.php',['../blogga_2view_2theme_2blog_2theme_8php.html',1,'']]], + ['theme_2ephp',['theme.php',['../hivenet_2php_2theme_8php.html',1,'']]], ['theme_2ephp',['theme.php',['../mytheme_2php_2theme_8php.html',1,'']]], ['theme_2ephp',['theme.php',['../redbasic_2php_2theme_8php.html',1,'']]], + ['theme_2ephp',['theme.php',['../stumble_2php_2theme_8php.html',1,'']]], + ['theme_2ephp',['theme.php',['../suckerberg_2php_2theme_8php.html',1,'']]], ['theme_5fadmin',['theme_admin',['../view_2theme_2blogga_2php_2config_8php.html#a09cd81013505f83aea0771243a1e4e53',1,'theme_admin(&$a): config.php'],['../view_2theme_2blogga_2view_2theme_2blog_2config_8php.html#a09cd81013505f83aea0771243a1e4e53',1,'theme_admin(&$a): config.php']]], ['theme_5fadmin_5fpost',['theme_admin_post',['../view_2theme_2blogga_2php_2config_8php.html#aef2da5582b7cb6b5f63e5ca5d69fd30b',1,'theme_admin_post(&$a): config.php'],['../view_2theme_2blogga_2view_2theme_2blog_2config_8php.html#aef2da5582b7cb6b5f63e5ca5d69fd30b',1,'theme_admin_post(&$a): config.php']]], ['theme_5fattachments',['theme_attachments',['../text_8php.html#af9c9ac3f74c82dc60acfa404d0e9dc53',1,'text.php']]], ['theme_5fcontent',['theme_content',['../view_2theme_2apw_2php_2config_8php.html#aa7d5739b72efef9822535b2b32d5364d',1,'theme_content(&$a): config.php'],['../view_2theme_2blogga_2php_2config_8php.html#aa7d5739b72efef9822535b2b32d5364d',1,'theme_content(&$a): config.php'],['../view_2theme_2blogga_2view_2theme_2blog_2config_8php.html#aa7d5739b72efef9822535b2b32d5364d',1,'theme_content(&$a): config.php'],['../view_2theme_2redbasic_2php_2config_8php.html#aa7d5739b72efef9822535b2b32d5364d',1,'theme_content(&$a): config.php']]], ['theme_5finclude',['theme_include',['../plugin_8php.html#a65fedcffbe03562ef844cabee37d34e2',1,'plugin.php']]], ['theme_5finit_2ephp',['theme_init.php',['../theme_2redbasic_2php_2theme__init_8php.html',1,'']]], + ['theme_5finit_2ephp',['theme_init.php',['../theme_2blogga_2php_2theme__init_8php.html',1,'']]], ['theme_5finit_2ephp',['theme_init.php',['../theme_2apw_2php_2theme__init_8php.html',1,'']]], ['theme_5finit_2ephp',['theme_init.php',['../php_2theme__init_8php.html',1,'']]], - ['theme_5finit_2ephp',['theme_init.php',['../theme_2blogga_2php_2theme__init_8php.html',1,'']]], ['theme_5fpost',['theme_post',['../view_2theme_2apw_2php_2config_8php.html#ad29461920cf03b9ce1428e21eb1f4ba6',1,'theme_post(&$a): config.php'],['../view_2theme_2blogga_2php_2config_8php.html#ad29461920cf03b9ce1428e21eb1f4ba6',1,'theme_post(&$a): config.php'],['../view_2theme_2blogga_2view_2theme_2blog_2config_8php.html#ad29461920cf03b9ce1428e21eb1f4ba6',1,'theme_post(&$a): config.php'],['../view_2theme_2redbasic_2php_2config_8php.html#ad29461920cf03b9ce1428e21eb1f4ba6',1,'theme_post(&$a): config.php']]], ['theme_5fstatus',['theme_status',['../admin_8php.html#ad4f74f33944a98b56d2c8c7601f124a4',1,'admin.php']]], ['thing_2ephp',['thing.php',['../thing_8php.html',1,'']]], ['thing_5fcontent',['thing_content',['../thing_8php.html#a24a35f1e64029a67fdbea94a776ae04b',1,'thing.php']]], ['thing_5finit',['thing_init',['../thing_8php.html#a8be23b1d475ec3d9291999221c674c80',1,'thing.php']]], - ['timesel',['timesel',['../datetime_8php.html#a36d3d6dff8d76b5f295bb3d9c535a5b1',1,'datetime.php']]], + ['timesel',['timesel',['../datetime_8php.html#a3f239f94e23335d860b148958d87a093',1,'datetime.php']]], ['timezone_5fcmp',['timezone_cmp',['../datetime_8php.html#aa51b5a7ea4f931b23acbdfcea46e9865',1,'datetime.php']]], ['title_5fis_5fbody',['title_is_body',['../items_8php.html#aa371905f0a211b307cb3f7188c6cba04',1,'items.php']]], ['todo_20list',['Todo List',['../todo.html',1,'']]], diff --git a/doc/html/search/all_78.js b/doc/html/search/all_78.js index 235ed6555..12730655a 100644 --- a/doc/html/search/all_78.js +++ b/doc/html/search/all_78.js @@ -3,6 +3,7 @@ var searchData= ['x',['x',['../boot_8php.html#a01353c9abebc3544ea080ac161729632',1,'boot.php']]], ['xchan_2ephp',['xchan.php',['../xchan_8php.html',1,'']]], ['xchan_5fcontent',['xchan_content',['../xchan_8php.html#a9853348bf1a35c644460221ba75edc2d',1,'xchan.php']]], + ['xchan_5ffetch',['xchan_fetch',['../hubloc_8php.html#af1b476c936f96a93282b1d058e3d05ea',1,'hubloc.php']]], ['xchan_5fflags_5fcensored',['XCHAN_FLAGS_CENSORED',['../boot_8php.html#accd6f36cc9f40225cbd720e4d12a7c6e',1,'boot.php']]], ['xchan_5fflags_5fdeleted',['XCHAN_FLAGS_DELETED',['../boot_8php.html#a9ea1290e00c6d40684892047f2c778a9',1,'boot.php']]], ['xchan_5fflags_5fhidden',['XCHAN_FLAGS_HIDDEN',['../boot_8php.html#a1af3ed96de14aa0d7891b39cc75b60f2',1,'boot.php']]], @@ -12,6 +13,7 @@ var searchData= ['xchan_5fflags_5fsystem',['XCHAN_FLAGS_SYSTEM',['../boot_8php.html#afef254290febac854c85fc698d9483a6',1,'boot.php']]], ['xchan_5fmail_5fquery',['xchan_mail_query',['../text_8php.html#a543447c5ed766535221e2d9636b379ee',1,'text.php']]], ['xchan_5fquery',['xchan_query',['../text_8php.html#a905c3895feb6f276df23f07f16f9bb52',1,'text.php']]], + ['xchan_5fstore',['xchan_store',['../hubloc_8php.html#acb708dd197aae72a4858cf5ff4e3195b',1,'hubloc.php']]], ['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']]], diff --git a/doc/html/search/files_73.js b/doc/html/search/files_73.js index 3e62fcaac..f4c9ba8ba 100644 --- a/doc/html/search/files_73.js +++ b/doc/html/search/files_73.js @@ -21,9 +21,12 @@ var searchData= ['sslify_2ephp',['sslify.php',['../sslify_8php.html',1,'']]], ['starred_2ephp',['starred.php',['../starred_8php.html',1,'']]], ['statistics_5ffns_2ephp',['statistics_fns.php',['../statistics__fns_8php.html',1,'']]], + ['style_2ephp',['style.php',['../stumble_2php_2style_8php.html',1,'']]], ['style_2ephp',['style.php',['../mytheme_2php_2style_8php.html',1,'']]], - ['style_2ephp',['style.php',['../redbasic_2php_2style_8php.html',1,'']]], + ['style_2ephp',['style.php',['../hivenet_2php_2style_8php.html',1,'']]], ['style_2ephp',['style.php',['../apw_2php_2style_8php.html',1,'']]], + ['style_2ephp',['style.php',['../redbasic_2php_2style_8php.html',1,'']]], + ['style_2ephp',['style.php',['../suckerberg_2php_2style_8php.html',1,'']]], ['subthread_2ephp',['subthread.php',['../subthread_8php.html',1,'']]], ['suggest_2ephp',['suggest.php',['../suggest_8php.html',1,'']]], ['system_5funavailable_2ephp',['system_unavailable.php',['../system__unavailable_8php.html',1,'']]] diff --git a/doc/html/search/files_74.js b/doc/html/search/files_74.js index 8a5b0ea9f..ecd4ad809 100644 --- a/doc/html/search/files_74.js +++ b/doc/html/search/files_74.js @@ -5,11 +5,14 @@ var searchData= ['taxonomy_2ephp',['taxonomy.php',['../taxonomy_8php.html',1,'']]], ['template_5fprocessor_2ephp',['template_processor.php',['../template__processor_8php.html',1,'']]], ['text_2ephp',['text.php',['../text_8php.html',1,'']]], - ['theme_2ephp',['theme.php',['../mytheme_2php_2theme_8php.html',1,'']]], + ['theme_2ephp',['theme.php',['../hivenet_2php_2theme_8php.html',1,'']]], + ['theme_2ephp',['theme.php',['../redbasic_2php_2theme_8php.html',1,'']]], ['theme_2ephp',['theme.php',['../apw_2php_2theme_8php.html',1,'']]], ['theme_2ephp',['theme.php',['../blogga_2php_2theme_8php.html',1,'']]], ['theme_2ephp',['theme.php',['../blogga_2view_2theme_2blog_2theme_8php.html',1,'']]], - ['theme_2ephp',['theme.php',['../redbasic_2php_2theme_8php.html',1,'']]], + ['theme_2ephp',['theme.php',['../suckerberg_2php_2theme_8php.html',1,'']]], + ['theme_2ephp',['theme.php',['../mytheme_2php_2theme_8php.html',1,'']]], + ['theme_2ephp',['theme.php',['../stumble_2php_2theme_8php.html',1,'']]], ['theme_5finit_2ephp',['theme_init.php',['../theme_2redbasic_2php_2theme__init_8php.html',1,'']]], ['theme_5finit_2ephp',['theme_init.php',['../php_2theme__init_8php.html',1,'']]], ['theme_5finit_2ephp',['theme_init.php',['../theme_2apw_2php_2theme__init_8php.html',1,'']]], diff --git a/doc/html/search/functions_61.js b/doc/html/search/functions_61.js index 98d2f8ec2..4c85f29be 100644 --- a/doc/html/search/functions_61.js +++ b/doc/html/search/functions_61.js @@ -80,6 +80,7 @@ var searchData= ['api_5foauth_5frequest_5ftoken',['api_oauth_request_token',['../include_2api_8php.html#aa1bddb580510e70cc1a7b7381667f1a3',1,'api.php']]], ['api_5fphotos',['api_photos',['../include_2api_8php.html#aa6fc3bc8c0fad1d081db0dcc456dd77f',1,'api.php']]], ['api_5fpost',['api_post',['../mod_2api_8php.html#a6fe77f05c07cb51048df0d557b4b9bd2',1,'api.php']]], + ['api_5fred_5fxchan',['api_red_xchan',['../include_2api_8php.html#a4fe872332ff0bd8d5eae2f0c6819cb60',1,'api.php']]], ['api_5fregister_5ffunc',['api_register_func',['../include_2api_8php.html#ac2c2b18c426d697d11a830bca146be8a',1,'api.php']]], ['api_5frss_5fextra',['api_rss_extra',['../include_2api_8php.html#a6a04b48168ba1d9dd2de3081a630611f',1,'api.php']]], ['api_5fstatus_5fshow',['api_status_show',['../include_2api_8php.html#a645397787618b5c548a31e8686e8cca4',1,'api.php']]], diff --git a/doc/html/search/functions_64.js b/doc/html/search/functions_64.js index 96a309f6d..1c6e9fc31 100644 --- a/doc/html/search/functions_64.js +++ b/doc/html/search/functions_64.js @@ -1,8 +1,8 @@ var searchData= [ - ['datesel',['datesel',['../datetime_8php.html#ac265b86f384ee094ed5479aae02aa5c8',1,'datetime.php']]], - ['datesel_5fformat',['datesel_format',['../datetime_8php.html#a5f29553799005b1fd4e9ce9d98ce05aa',1,'datetime.php']]], + ['datesel',['datesel',['../datetime_8php.html#a77bb385ae8a9e7ca663309c102c0d766',1,'datetime.php']]], ['datetime_5fconvert',['datetime_convert',['../datetime_8php.html#ad6301e74b0f9267d52f8d432b5beb226',1,'datetime.php']]], + ['datetimesel',['datetimesel',['../datetime_8php.html#a72218e5ee21876484934bacbb6bd9ba3',1,'datetime.php']]], ['day_5ftranslate',['day_translate',['../text_8php.html#a63fb21c0bed2fc72eef2c1471ac42b63',1,'text.php']]], ['dba_5ffactory',['dba_factory',['../dba__driver_8php.html#ac10e60f6e5b95bcf67bd82cb88f37947',1,'dba_driver.php']]], ['dba_5ftimer',['dba_timer',['../boot_8php.html#a3e0930933fb2c0bf8211cc7ab4e1c3b4',1,'boot.php']]], diff --git a/doc/html/search/functions_68.js b/doc/html/search/functions_68.js index c047c0a86..481991cb0 100644 --- a/doc/html/search/functions_68.js +++ b/doc/html/search/functions_68.js @@ -16,6 +16,7 @@ var searchData= ['head_5fset_5ficon',['head_set_icon',['../classApp.html#a8863703a0305eaa45eb970dbd2046291',1,'App\head_set_icon()'],['../boot_8php.html#a0e4701c9742c3ef88f02ac450a042a84',1,'head_set_icon(): boot.php']]], ['help',['help',['../namespacefriendica-to-smarty-tpl.html#af6b2c793958aae2aadc294577431f749',1,'friendica-to-smarty-tpl.help()'],['../namespaceupdatetpl.html#ac9d11279fed403a329a719298feafc4f',1,'updatetpl.help()']]], ['help_5fcontent',['help_content',['../help_8php.html#af055e15f600ffa6fbca9386fdf715224',1,'help.php']]], + ['hivenet_5finit',['hivenet_init',['../hivenet_2php_2theme_8php.html#a3a8b539b112ae63936025236dbaf0a29',1,'theme.php']]], ['home_5fcontent',['home_content',['../home_8php.html#aa1cf697851a646755baf537f75334c46',1,'home.php']]], ['home_5finit',['home_init',['../home_8php.html#ac4642c38b6f23a8d065dd4a75c620bde',1,'home.php']]], ['hostxrd_5finit',['hostxrd_init',['../hostxrd_8php.html#aa37ffc8e7900bc76c4828bd25916db92',1,'hostxrd.php']]], diff --git a/doc/html/search/functions_6c.js b/doc/html/search/functions_6c.js index a7e715a07..171acad1d 100644 --- a/doc/html/search/functions_6c.js +++ b/doc/html/search/functions_6c.js @@ -19,6 +19,7 @@ var searchData= ['load_5fdatabase_5frem',['load_database_rem',['../setup_8php.html#a2b375ddc555140236fc500135de99371',1,'setup.php']]], ['load_5fhooks',['load_hooks',['../plugin_8php.html#a326365e48ef94f0b9a0a771b8d75e813',1,'plugin.php']]], ['load_5fpconfig',['load_pconfig',['../include_2config_8php.html#a559791dda7fef8a4b2394c83e835787b',1,'config.php']]], + ['load_5fpdl',['load_pdl',['../boot_8php.html#a50a6707a28c7d05d3f49eaabc7994501',1,'boot.php']]], ['load_5fplugin',['load_plugin',['../plugin_8php.html#a9ca9632b7309a65b05c03a3e2f473a3d',1,'plugin.php']]], ['load_5ftranslation_5ftable',['load_translation_table',['../language_8php.html#a7e9904c730bb24ddcb0ff50fc96f6b05',1,'language.php']]], ['load_5fxconfig',['load_xconfig',['../include_2config_8php.html#aee4b619839cf4b64220f34edf5c67b52',1,'config.php']]], diff --git a/doc/html/search/functions_73.js b/doc/html/search/functions_73.js index ecbf52d43..1d53a42aa 100644 --- a/doc/html/search/functions_73.js +++ b/doc/html/search/functions_73.js @@ -91,7 +91,7 @@ var searchData= ['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']]], - ['store_5fdiaspora_5fcomment_5fsig',['store_diaspora_comment_sig',['../items_8php.html#af0a887050dc8d0f51c89890cdaf3145f',1,'items.php']]], + ['store_5fdiaspora_5fcomment_5fsig',['store_diaspora_comment_sig',['../items_8php.html#a25221826fa4621f523c68483e3b6af26',1,'items.php']]], ['store_5fitem_5ftag',['store_item_tag',['../taxonomy_8php.html#a4ba1339b2a7054971178ce194e4440fd',1,'taxonomy.php']]], ['stream_5fperms_5fapi_5fuids',['stream_perms_api_uids',['../security_8php.html#a6126c77a1267e046ac59cf864613f011',1,'security.php']]], ['stream_5fperms_5fxchans',['stream_perms_xchans',['../security_8php.html#a3ef2be6a7e4928e39d50059d6feb457c',1,'security.php']]], @@ -100,7 +100,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']]], + ['stumble_5finit',['stumble_init',['../stumble_2php_2theme_8php.html#a71db9eff6289e0ee47771c37c01d6753',1,'theme.php']]], ['subthread_5fcontent',['subthread_content',['../subthread_8php.html#a50368f3d825b77996030528e7fbfa3d3',1,'subthread.php']]], + ['suckerberg_5finit',['suckerberg_init',['../suckerberg_2php_2theme_8php.html#a4104fce7d5fb71d15ed811978b628fc8',1,'theme.php']]], ['suggest_5fcontent',['suggest_content',['../suggest_8php.html#a58748a8235d4523f8333847f3e42dd91',1,'suggest.php']]], ['suggest_5finit',['suggest_init',['../suggest_8php.html#a696acf1dd8070e479adcc80c63c6718c',1,'suggest.php']]], ['suggestion_5fquery',['suggestion_query',['../socgraph_8php.html#a76e6fca3d2bc842dcd9e710bb87c8329',1,'socgraph.php']]], diff --git a/doc/html/search/functions_74.js b/doc/html/search/functions_74.js index 4b68ef1d9..412bc29e2 100644 --- a/doc/html/search/functions_74.js +++ b/doc/html/search/functions_74.js @@ -24,7 +24,7 @@ var searchData= ['theme_5fstatus',['theme_status',['../admin_8php.html#ad4f74f33944a98b56d2c8c7601f124a4',1,'admin.php']]], ['thing_5fcontent',['thing_content',['../thing_8php.html#a24a35f1e64029a67fdbea94a776ae04b',1,'thing.php']]], ['thing_5finit',['thing_init',['../thing_8php.html#a8be23b1d475ec3d9291999221c674c80',1,'thing.php']]], - ['timesel',['timesel',['../datetime_8php.html#a36d3d6dff8d76b5f295bb3d9c535a5b1',1,'datetime.php']]], + ['timesel',['timesel',['../datetime_8php.html#a3f239f94e23335d860b148958d87a093',1,'datetime.php']]], ['timezone_5fcmp',['timezone_cmp',['../datetime_8php.html#aa51b5a7ea4f931b23acbdfcea46e9865',1,'datetime.php']]], ['title_5fis_5fbody',['title_is_body',['../items_8php.html#aa371905f0a211b307cb3f7188c6cba04',1,'items.php']]], ['toggle_5fmobile_5finit',['toggle_mobile_init',['../toggle__mobile_8php.html#aca53ade8971802b45c31e722b22c6254',1,'toggle_mobile.php']]], diff --git a/doc/html/search/functions_78.js b/doc/html/search/functions_78.js index 1112f2127..78d52f21a 100644 --- a/doc/html/search/functions_78.js +++ b/doc/html/search/functions_78.js @@ -2,8 +2,10 @@ var searchData= [ ['x',['x',['../boot_8php.html#a01353c9abebc3544ea080ac161729632',1,'boot.php']]], ['xchan_5fcontent',['xchan_content',['../xchan_8php.html#a9853348bf1a35c644460221ba75edc2d',1,'xchan.php']]], + ['xchan_5ffetch',['xchan_fetch',['../hubloc_8php.html#af1b476c936f96a93282b1d058e3d05ea',1,'hubloc.php']]], ['xchan_5fmail_5fquery',['xchan_mail_query',['../text_8php.html#a543447c5ed766535221e2d9636b379ee',1,'text.php']]], ['xchan_5fquery',['xchan_query',['../text_8php.html#a905c3895feb6f276df23f07f16f9bb52',1,'text.php']]], + ['xchan_5fstore',['xchan_store',['../hubloc_8php.html#acb708dd197aae72a4858cf5ff4e3195b',1,'hubloc.php']]], ['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']]], diff --git a/doc/html/security_8php.html b/doc/html/security_8php.html index 6945f5897..26227d9bd 100644 --- a/doc/html/security_8php.html +++ b/doc/html/security_8php.html @@ -361,7 +361,7 @@ Functions

        Profile owner - everything is visible

        Authenticated visitor. Unless pre-verified, check that the contact belongs to this $owner_id and load the groups the visitor belongs to. If pre-verified, the caller is expected to have already done this and passed the groups into this function.

        -

        Referenced by block_content(), channel_content(), items_fetch(), page_content(), pdl_selector(), share_init(), widget_item(), and zot_feed().

        +

        Referenced by block_content(), channel_content(), items_fetch(), page_init(), pdl_selector(), share_init(), widget_item(), and zot_feed().

        diff --git a/doc/html/stumble_2php_2style_8php.html b/doc/html/stumble_2php_2style_8php.html new file mode 100644 index 000000000..57672ce6a --- /dev/null +++ b/doc/html/stumble_2php_2style_8php.html @@ -0,0 +1,112 @@ + + + + + + +The Red Matrix: view/theme/stumble/php/style.php File Reference + + + + + + + + + + + + + +
        +
        + + + + + + + +
        +
        The Red Matrix +
        +
        +
        + + + + + +
        +
        + +
        +
        +
        + +
        + + + + +
        + +
        + +
        +
        +
        style.php File Reference
        +
        +
        +
        +
        + diff --git a/doc/html/stumble_2php_2theme_8php.html b/doc/html/stumble_2php_2theme_8php.html new file mode 100644 index 000000000..1d04d981d --- /dev/null +++ b/doc/html/stumble_2php_2theme_8php.html @@ -0,0 +1,144 @@ + + + + + + +The Red Matrix: view/theme/stumble/php/theme.php File Reference + + + + + + + + + + + + + +
        +
        + + + + + + + +
        +
        The Red Matrix +
        +
        +
        + + + + + +
        +
        + +
        +
        +
        + +
        + + + + +
        + +
        + +
        +
        +Functions
        +
        +
        theme.php File Reference
        +
        +
        + + + + +

        +Functions

         stumble_init (&$a)
         
        +

        Function Documentation

        + +
        +
        + + + + + + + + +
        stumble_init (& $a)
        +
        +
          +
        • Name: Stumble
          • +
        • Description: A Tumblr-like theme based on redbasic
          • +
        • Version: 1.0
          • +
        • Author: Sean Tilley
          • +
        • Compat: Red [*]
          • +
        + +
        +
        +
        +
        + diff --git a/doc/html/stumble_2php_2theme_8php.js b/doc/html/stumble_2php_2theme_8php.js new file mode 100644 index 000000000..88ddab748 --- /dev/null +++ b/doc/html/stumble_2php_2theme_8php.js @@ -0,0 +1,4 @@ +var stumble_2php_2theme_8php = +[ + [ "stumble_init", "stumble_2php_2theme_8php.html#a71db9eff6289e0ee47771c37c01d6753", null ] +]; \ No newline at end of file diff --git a/doc/html/suckerberg_2php_2style_8php.html b/doc/html/suckerberg_2php_2style_8php.html new file mode 100644 index 000000000..97bb9bdec --- /dev/null +++ b/doc/html/suckerberg_2php_2style_8php.html @@ -0,0 +1,112 @@ + + + + + + +The Red Matrix: view/theme/suckerberg/php/style.php File Reference + + + + + + + + + + + + + +
        +
        + + + + + + + +
        +
        The Red Matrix +
        +
        +
        + + + + + +
        +
        + +
        +
        +
        + +
        + + + + +
        + +
        + +
        +
        +
        style.php File Reference
        +
        +
        +
        +
        + diff --git a/doc/html/suckerberg_2php_2theme_8php.html b/doc/html/suckerberg_2php_2theme_8php.html new file mode 100644 index 000000000..bca524b6e --- /dev/null +++ b/doc/html/suckerberg_2php_2theme_8php.html @@ -0,0 +1,144 @@ + + + + + + +The Red Matrix: view/theme/suckerberg/php/theme.php File Reference + + + + + + + + + + + + + +
        +
        + + + + + + + +
        +
        The Red Matrix +
        +
        +
        + + + + + +
        +
        + +
        +
        +
        + +
        + + + + +
        + +
        + +
        +
        +Functions
        +
        +
        theme.php File Reference
        +
        +
        + + + + +

        +Functions

         suckerberg_init (&$a)
         
        +

        Function Documentation

        + +
        +
        + + + + + + + + +
        suckerberg_init (& $a)
        +
        +
          +
        • Name: Suckerberg
          • +
        • Description: A Facebook-like theme based on redbasic
          • +
        • Version: 1.0
          • +
        • Author: Sean Tilley
          • +
        • Compat: Red [*]
          • +
        + +
        +
        +
        +
        + diff --git a/doc/html/suckerberg_2php_2theme_8php.js b/doc/html/suckerberg_2php_2theme_8php.js new file mode 100644 index 000000000..3ab17833a --- /dev/null +++ b/doc/html/suckerberg_2php_2theme_8php.js @@ -0,0 +1,4 @@ +var suckerberg_2php_2theme_8php = +[ + [ "suckerberg_init", "suckerberg_2php_2theme_8php.html#a4104fce7d5fb71d15ed811978b628fc8", null ] +]; \ No newline at end of file diff --git a/doc/html/text_8php.html b/doc/html/text_8php.html index 7ce8da167..e916c7ac1 100644 --- a/doc/html/text_8php.html +++ b/doc/html/text_8php.html @@ -1339,7 +1339,7 @@ Variables
        -

        Referenced by 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(), bb2diaspora_itembody(), bb2diaspora_itemwallwall(), 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(), cloud_init(), connedit_post(), consume_feed(), conversation(), create_account(), create_identity(), RedMatrix\RedDAV\RedDirectory\createDirectory(), RedMatrix\RedDAV\RedDirectory\createFile(), cronhooks_run(), datetime_convert(), RedMatrix\RedDAV\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_url(), 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(), RedMatrix\RedDAV\RedFile\get(), get_atom_elements(), get_diaspora_key(), get_diaspora_reshare_xml(), get_item_elements(), get_language_name(), Conversation\get_template_data(), RedMatrix\RedDAV\RedDirectory\getChild(), RedMatrix\RedDAV\RedDirectory\getDir(), group_content(), guess_image_type(), http_status_exit(), hubloc_change_primary(), impel_init(), import_author_rss(), import_author_unknown(), 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(), RedMatrix\RedDAV\RedDirectory\log(), RedMatrix\RedDAV\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(), process_channel_sync_delivery(), process_delivery(), process_location_delivery(), process_mail_delivery(), process_profile_delivery(), profile_load(), profile_photo_set_profile_perms(), profile_sidebar(), profiles_content(), prune_hub_reinstalls(), public_recips(), RedMatrix\RedDAV\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_obsolete_hublocs(), remove_queue_item(), scale_external_images(), scrape_feed(), scrape_vcard(), search_ac_init(), enotify\send(), send_reg_approval_email(), Conversation\set_mode(), RedMatrix\RedDAV\RedFile\setName(), RedMatrix\RedDAV\RedDirectory\setName(), start_delivery_chain(), store_diaspora_comment_sig(), stream_perms_api_uids(), stream_perms_xchans(), subthread_content(), sync_directories(), sync_locations(), tag_deliver(), tagger_content(), tgroup_check(), uninstall_plugin(), unload_plugin(), update_directory_entry(), update_feed_item(), update_imported_item(), update_queue_time(), RedMatrix\RedDAV\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 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(), bb2diaspora_itembody(), bb2diaspora_itemwallwall(), 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(), cloud_init(), connedit_post(), consume_feed(), conversation(), create_account(), create_identity(), RedMatrix\RedDAV\RedDirectory\createDirectory(), RedMatrix\RedDAV\RedDirectory\createFile(), cronhooks_run(), datetime_convert(), RedMatrix\RedDAV\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_url(), 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(), RedMatrix\RedDAV\RedFile\get(), get_atom_elements(), get_diaspora_key(), get_diaspora_reshare_xml(), get_item_elements(), get_language_name(), Conversation\get_template_data(), RedMatrix\RedDAV\RedDirectory\getChild(), RedMatrix\RedDAV\RedDirectory\getDir(), group_content(), guess_image_type(), http_status_exit(), hubloc_change_primary(), impel_init(), import_author_rss(), import_author_unknown(), 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(), RedMatrix\RedDAV\RedDirectory\log(), RedMatrix\RedDAV\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(), process_channel_sync_delivery(), process_delivery(), process_location_delivery(), process_mail_delivery(), process_profile_delivery(), profile_load(), profile_photo_set_profile_perms(), profile_sidebar(), profiles_content(), prune_hub_reinstalls(), public_recips(), RedMatrix\RedDAV\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_obsolete_hublocs(), remove_queue_item(), scale_external_images(), scrape_feed(), scrape_vcard(), search_ac_init(), enotify\send(), send_reg_approval_email(), Conversation\set_mode(), RedMatrix\RedDAV\RedFile\setName(), RedMatrix\RedDAV\RedDirectory\setName(), start_delivery_chain(), store_diaspora_comment_sig(), stream_perms_api_uids(), stream_perms_xchans(), subthread_content(), sync_directories(), sync_locations(), tag_deliver(), tagger_content(), tgroup_check(), uninstall_plugin(), unload_plugin(), update_directory_entry(), update_feed_item(), update_imported_item(), update_queue_time(), RedMatrix\RedDAV\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().

        diff --git a/doc/html/typo_8php.html b/doc/html/typo_8php.html index 4c7a43de7..deafea102 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(), impel_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(), locs_post(), 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(), oexchange_content(), oexchange_init(), onedirsync_run(), onepoll_run(), openid_content(), opensearch_init(), p_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(), send_message(), service_class_allows(), service_class_fetch(), service_limits_content(), 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(), hivenet_init(), home_content(), home_init(), hostxrd_init(), impel_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_pdl(), load_translation_table(), load_xconfig(), locs_post(), 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(), oexchange_content(), oexchange_init(), onedirsync_run(), onepoll_run(), openid_content(), opensearch_init(), p_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(), send_message(), service_class_allows(), service_class_fetch(), service_limits_content(), 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(), stumble_init(), subthread_content(), suckerberg_init(), 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().

        -- cgit v1.2.3 From 1d8aa7d817242114001a9d1cc011f4fe38c21d57 Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 24 Oct 2014 04:17:35 -0700 Subject: string update --- util/messages.po | 7888 ++++++++++++++++++++++++++++-------------------------- version.inc | 2 +- 2 files changed, 4027 insertions(+), 3863 deletions(-) diff --git a/util/messages.po b/util/messages.po index 87c0a1724..0fa553483 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 2014-10-16.830\n" +"Project-Id-Version: 2014-10-24.838\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-17 14:18+0000\n" +"POT-Creation-Date: 2014-10-24 00:04-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,695 +17,705 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../../view/theme/redbasic/php/config.php:84 -msgid "Light (Red Matrix default)" +#: ../../include/dba/dba_driver.php:50 +#, php-format +msgid "Cannot locate DNS info for database server '%s'" msgstr "" -#: ../../view/theme/redbasic/php/config.php:99 -#: ../../include/ItemObject.php:599 ../../mod/settings.php:519 -#: ../../mod/settings.php:631 ../../mod/settings.php:660 -#: ../../mod/settings.php:684 ../../mod/settings.php:760 -#: ../../mod/settings.php:945 ../../mod/filestorage.php:146 -#: ../../mod/admin.php:414 ../../mod/admin.php:725 ../../mod/admin.php:861 -#: ../../mod/admin.php:994 ../../mod/admin.php:1193 ../../mod/admin.php:1280 -#: ../../mod/photos.php:563 ../../mod/photos.php:672 ../../mod/photos.php:974 -#: ../../mod/photos.php:1014 ../../mod/photos.php:1101 ../../mod/mood.php:135 -#: ../../mod/pdledit.php:58 ../../mod/connedit.php:540 ../../mod/setup.php:307 -#: ../../mod/setup.php:350 ../../mod/invite.php:142 ../../mod/thing.php:284 -#: ../../mod/thing.php:327 ../../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:480 ../../mod/mail.php:348 ../../mod/profiles.php:643 -#: ../../mod/chat.php:177 ../../mod/chat.php:211 ../../mod/events.php:587 -msgid "Submit" +#: ../../include/photo/photo_driver.php:680 ../../include/photos.php:51 +#: ../../mod/photos.php:91 ../../mod/photos.php:657 ../../mod/photos.php:679 +#: ../../mod/profile_photo.php:142 ../../mod/profile_photo.php:301 +#: ../../mod/profile_photo.php:423 +msgid "Profile Photos" msgstr "" -#: ../../view/theme/redbasic/php/config.php:102 -msgid "Theme settings" +#: ../../include/network.php:590 +msgid "view full size" msgstr "" -#: ../../view/theme/redbasic/php/config.php:103 -msgid "Set scheme" +#: ../../include/oembed.php:171 +msgid "Embedded content" msgstr "" -#: ../../view/theme/redbasic/php/config.php:104 -msgid "Narrow navbar" +#: ../../include/oembed.php:180 +msgid "Embedding disabled" msgstr "" -#: ../../view/theme/redbasic/php/config.php:105 -msgid "Navigation bar background color" +#: ../../include/items.php:377 ../../mod/profperm.php:23 +#: ../../mod/subthread.php:49 ../../mod/group.php:68 ../../mod/like.php:242 +#: ../../index.php:388 +msgid "Permission denied" msgstr "" -#: ../../view/theme/redbasic/php/config.php:106 -msgid "Navigation bar gradient top color" +#: ../../include/items.php:964 ../../include/items.php:1009 +msgid "(Unknown)" msgstr "" -#: ../../view/theme/redbasic/php/config.php:107 -msgid "Navigation bar gradient bottom color" +#: ../../include/items.php:1165 +msgid "Visible to anybody on the internet." msgstr "" -#: ../../view/theme/redbasic/php/config.php:108 -msgid "Navigation active button gradient top color" +#: ../../include/items.php:1167 +msgid "Visible to you only." msgstr "" -#: ../../view/theme/redbasic/php/config.php:109 -msgid "Navigation active button gradient bottom color" +#: ../../include/items.php:1169 +msgid "Visible to anybody in this network." msgstr "" -#: ../../view/theme/redbasic/php/config.php:110 -msgid "Navigation bar border color " +#: ../../include/items.php:1171 +msgid "Visible to anybody authenticated." msgstr "" -#: ../../view/theme/redbasic/php/config.php:111 -msgid "Navigation bar icon color " +#: ../../include/items.php:1173 +#, php-format +msgid "Visible to anybody on %s." msgstr "" -#: ../../view/theme/redbasic/php/config.php:112 -msgid "Navigation bar active icon color " +#: ../../include/items.php:1175 +msgid "Visible to all connections." msgstr "" -#: ../../view/theme/redbasic/php/config.php:113 -msgid "link color" +#: ../../include/items.php:1177 +msgid "Visible to approved connections." msgstr "" -#: ../../view/theme/redbasic/php/config.php:114 -msgid "Set font-color for banner" +#: ../../include/items.php:1179 +msgid "Visible to specific connections." msgstr "" -#: ../../view/theme/redbasic/php/config.php:115 -msgid "Set the background color" +#: ../../include/items.php:3938 ../../mod/display.php:32 +#: ../../mod/filestorage.php:26 ../../mod/admin.php:168 +#: ../../mod/admin.php:898 ../../mod/admin.php:1101 ../../mod/thing.php:76 +#: ../../mod/viewsrc.php:20 +msgid "Item not found." msgstr "" -#: ../../view/theme/redbasic/php/config.php:116 -msgid "Set the background image" +#: ../../include/items.php:4005 ../../include/attach.php:116 +#: ../../include/attach.php:163 ../../include/attach.php:226 +#: ../../include/attach.php:240 ../../include/attach.php:280 +#: ../../include/attach.php:294 ../../include/attach.php:318 +#: ../../include/attach.php:511 ../../include/attach.php:584 +#: ../../include/photos.php:15 ../../include/chat.php:116 +#: ../../mod/mood.php:112 ../../mod/photos.php:68 ../../mod/photos.php:526 +#: ../../mod/mitem.php:73 ../../mod/achievements.php:30 +#: ../../mod/settings.php:496 ../../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/blocks.php:29 ../../mod/blocks.php:44 ../../mod/bookmarks.php:46 +#: ../../mod/profiles.php:179 ../../mod/profiles.php:532 +#: ../../mod/events.php:195 ../../mod/channel.php:89 ../../mod/channel.php:193 +#: ../../mod/channel.php:236 ../../mod/chat.php:90 ../../mod/chat.php:95 +#: ../../mod/register.php:70 ../../mod/regmod.php:17 ../../mod/common.php:35 +#: ../../mod/network.php:12 ../../mod/connections.php:169 +#: ../../mod/connedit.php:254 ../../mod/delegate.php:6 ../../mod/page.php:28 +#: ../../mod/page.php:78 ../../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/profile_photo.php:263 +#: ../../mod/profile_photo.php:276 ../../mod/sources.php:66 +#: ../../mod/filestorage.php:18 ../../mod/filestorage.php:67 +#: ../../mod/filestorage.php:82 ../../mod/filestorage.php:109 +#: ../../mod/fsuggest.php:78 ../../mod/suggest.php:26 ../../mod/group.php:9 +#: ../../mod/thing.php:247 ../../mod/thing.php:264 ../../mod/thing.php:299 +#: ../../mod/invite.php:13 ../../mod/invite.php:104 ../../mod/item.php:182 +#: ../../mod/item.php:190 ../../mod/item.php:954 ../../mod/layouts.php:27 +#: ../../mod/layouts.php:39 ../../mod/like.php:154 +#: ../../mod/viewconnections.php:22 ../../mod/viewconnections.php:27 +#: ../../mod/viewsrc.php:14 ../../mod/mail.php:111 ../../mod/manage.php:6 +#: ../../mod/menu.php:44 ../../mod/webpages.php:40 ../../mod/message.php:16 +#: ../../mod/new_channel.php:68 ../../mod/new_channel.php:99 +#: ../../mod/notifications.php:66 ../../mod/appman.php:66 +#: ../../mod/service_limits.php:7 ../../index.php:190 ../../index.php:389 +msgid "Permission denied." msgstr "" -#: ../../view/theme/redbasic/php/config.php:117 -msgid "Set the background color of items" +#: ../../include/items.php:4376 ../../mod/group.php:38 ../../mod/group.php:140 +msgid "Collection not found." msgstr "" -#: ../../view/theme/redbasic/php/config.php:118 -msgid "Set the background color of comments" +#: ../../include/items.php:4391 +msgid "Collection is empty." msgstr "" -#: ../../view/theme/redbasic/php/config.php:119 -msgid "Set the border color of comments" +#: ../../include/items.php:4398 +#, php-format +msgid "Collection: %s" msgstr "" -#: ../../view/theme/redbasic/php/config.php:120 -msgid "Set the indent for comments" +#: ../../include/items.php:4409 +#, php-format +msgid "Connection: %s" msgstr "" -#: ../../view/theme/redbasic/php/config.php:121 -msgid "Set the basic color for item icons" +#: ../../include/items.php:4412 +msgid "Connection not found." msgstr "" -#: ../../view/theme/redbasic/php/config.php:122 -msgid "Set the hover color for item icons" +#: ../../include/notify.php:23 +msgid "created a new post" msgstr "" -#: ../../view/theme/redbasic/php/config.php:123 -msgid "Set font-size for the entire application" +#: ../../include/notify.php:24 +#, php-format +msgid "commented on %s's post" msgstr "" -#: ../../view/theme/redbasic/php/config.php:124 -msgid "Set font-size for posts and comments" +#: ../../include/apps.php:126 +msgid "Site Admin" msgstr "" -#: ../../view/theme/redbasic/php/config.php:125 -msgid "Set font-color for posts and comments" +#: ../../include/apps.php:127 ../../include/conversation.php:1570 +#: ../../include/nav.php:117 +msgid "Bookmarks" msgstr "" -#: ../../view/theme/redbasic/php/config.php:126 -msgid "Set radius of corners" +#: ../../include/apps.php:128 +msgid "Address Book" msgstr "" -#: ../../view/theme/redbasic/php/config.php:127 -msgid "Set shadow depth of photos" +#: ../../include/apps.php:129 ../../include/nav.php:125 ../../boot.php:1496 +msgid "Login" msgstr "" -#: ../../view/theme/redbasic/php/config.php:128 -msgid "Set maximum width of conversation regions" +#: ../../include/apps.php:130 ../../include/nav.php:216 +#: ../../mod/manage.php:148 +msgid "Channel Manager" msgstr "" -#: ../../view/theme/redbasic/php/config.php:129 -msgid "Center conversation regions" +#: ../../include/apps.php:131 ../../include/nav.php:190 +msgid "Matrix" msgstr "" -#: ../../view/theme/redbasic/php/config.php:130 -msgid "Set minimum opacity of nav bar - to hide it" +#: ../../include/apps.php:132 ../../include/widgets.php:521 +#: ../../include/nav.php:218 ../../mod/admin.php:953 ../../mod/admin.php:1158 +msgid "Settings" msgstr "" -#: ../../view/theme/redbasic/php/config.php:131 -msgid "Set size of conversation author photo" +#: ../../include/apps.php:133 ../../include/conversation.php:1546 +#: ../../include/nav.php:106 ../../include/RedDAV/RedBrowser.php:241 +#: ../../mod/fbrowser.php:114 +msgid "Files" msgstr "" -#: ../../view/theme/redbasic/php/config.php:132 -msgid "Set size of followup author photos" +#: ../../include/apps.php:134 ../../include/conversation.php:1581 +#: ../../include/nav.php:121 ../../mod/webpages.php:129 +msgid "Webpages" msgstr "" -#: ../../view/theme/redbasic/php/config.php:133 -msgid "Sloppy photo albums" +#: ../../include/apps.php:135 ../../include/nav.php:193 +msgid "Channel Home" msgstr "" -#: ../../view/theme/redbasic/php/config.php:133 -msgid "Are you a clean desk or a messy desk person?" +#: ../../include/apps.php:136 ../../include/identity.php:1113 +#: ../../include/identity.php:1231 ../../mod/profperm.php:112 +msgid "Profile" msgstr "" -#: ../../boot.php:1294 -#, php-format -msgid "Update %s failed. See error logs." +#: ../../include/apps.php:137 ../../include/conversation.php:1537 +#: ../../include/nav.php:105 ../../mod/fbrowser.php:25 +msgid "Photos" msgstr "" -#: ../../boot.php:1297 -#, php-format -msgid "Update Error at %s" +#: ../../include/apps.php:138 ../../include/nav.php:212 +#: ../../mod/events.php:431 +msgid "Events" msgstr "" -#: ../../boot.php:1471 -msgid "" -"Create an account to access services and applications within the Red Matrix" +#: ../../include/apps.php:139 ../../include/nav.php:176 +#: ../../mod/directory.php:226 +msgid "Directory" msgstr "" -#: ../../boot.php:1472 ../../include/nav.php:163 ../../mod/register.php:220 -msgid "Register" +#: ../../include/apps.php:140 ../../include/nav.php:168 ../../mod/help.php:60 +#: ../../mod/help.php:65 +msgid "Help" msgstr "" -#: ../../boot.php:1495 ../../include/nav.php:95 ../../include/nav.php:128 -msgid "Logout" +#: ../../include/apps.php:141 ../../include/nav.php:204 +msgid "Mail" msgstr "" -#: ../../boot.php:1496 ../../include/nav.php:125 ../../include/apps.php:129 -msgid "Login" +#: ../../include/apps.php:142 ../../mod/mood.php:131 +msgid "Mood" msgstr "" -#: ../../boot.php:1498 ../../include/contact_selectors.php:79 -#: ../../mod/admin.php:728 ../../mod/admin.php:737 -msgid "Email" +#: ../../include/apps.php:143 ../../include/conversation.php:951 +msgid "Poke" msgstr "" -#: ../../boot.php:1499 -msgid "Password" +#: ../../include/apps.php:144 ../../include/nav.php:111 +msgid "Chat" msgstr "" -#: ../../boot.php:1500 -msgid "Remember me" +#: ../../include/apps.php:145 ../../include/text.php:822 +#: ../../include/text.php:834 ../../include/nav.php:173 +#: ../../mod/search.php:30 +msgid "Search" msgstr "" -#: ../../boot.php:1505 -msgid "Forgot your password?" +#: ../../include/apps.php:146 +msgid "Probe" msgstr "" -#: ../../boot.php:1506 ../../mod/lostpass.php:85 -msgid "Password Reset" +#: ../../include/apps.php:147 +msgid "Suggest" msgstr "" -#: ../../boot.php:1570 -msgid "permission denied" +#: ../../include/apps.php:148 +msgid "Random Channel" msgstr "" -#: ../../boot.php:1571 -msgid "Got Zot?" +#: ../../include/apps.php:149 +msgid "Invite" msgstr "" -#: ../../boot.php:2001 -msgid "toggle mobile" +#: ../../include/apps.php:150 +msgid "Features" msgstr "" -#: ../../include/auth.php:116 -msgid "Logged out." +#: ../../include/apps.php:151 +msgid "Language" msgstr "" -#: ../../include/auth.php:257 -msgid "Failed authentication" +#: ../../include/apps.php:152 +msgid "Post" msgstr "" -#: ../../include/auth.php:271 ../../mod/openid.php:190 -msgid "Login failed." +#: ../../include/apps.php:153 +msgid "Profile Photo" msgstr "" -#: ../../include/comanche.php:35 -msgid "Default" +#: ../../include/apps.php:242 ../../mod/settings.php:79 +#: ../../mod/settings.php:545 +msgid "Update" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:106 -#: ../../include/RedDAV/RedBrowser.php:249 -msgid "parent" +#: ../../include/apps.php:242 +msgid "Install" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:130 -msgid "Collection" +#: ../../include/apps.php:247 +msgid "Purchase" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:133 -msgid "Principal" +#: ../../include/apps.php:249 ../../include/page_widgets.php:8 +#: ../../include/page_widgets.php:36 ../../include/RedDAV/RedBrowser.php:250 +#: ../../include/menu.php:42 ../../include/ItemObject.php:100 +#: ../../mod/settings.php:581 ../../mod/blocks.php:99 +#: ../../mod/connections.php:381 ../../mod/connections.php:394 +#: ../../mod/connections.php:413 ../../mod/editblock.php:111 +#: ../../mod/editlayout.php:106 ../../mod/editpost.php:112 +#: ../../mod/editwebpage.php:143 ../../mod/thing.php:233 +#: ../../mod/layouts.php:121 ../../mod/menu.php:59 ../../mod/webpages.php:131 +msgid "Edit" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:136 -msgid "Addressbook" +#: ../../include/apps.php:250 ../../include/conversation.php:638 +#: ../../include/RedDAV/RedBrowser.php:251 ../../include/ItemObject.php:120 +#: ../../mod/photos.php:1062 ../../mod/settings.php:582 +#: ../../mod/connedit.php:462 ../../mod/group.php:176 ../../mod/admin.php:732 +#: ../../mod/admin.php:863 ../../mod/thing.php:234 +msgid "Delete" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:139 -msgid "Calendar" +#: ../../include/apps.php:331 ../../include/apps.php:382 +#: ../../include/conversation.php:1003 ../../include/RedDAV/RedBrowser.php:163 +#: ../../mod/photos.php:1124 ../../mod/connedit.php:498 +msgid "Unknown" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:142 -msgid "Schedule Inbox" +#: ../../include/attach.php:221 ../../include/attach.php:275 +msgid "Item was not found." msgstr "" -#: ../../include/RedDAV/RedBrowser.php:145 -msgid "Schedule Outbox" +#: ../../include/attach.php:331 +msgid "No source file." msgstr "" -#: ../../include/RedDAV/RedBrowser.php:163 ../../include/apps.php:331 -#: ../../include/apps.php:382 ../../include/conversation.php:1003 -#: ../../mod/connedit.php:498 -msgid "Unknown" +#: ../../include/attach.php:348 +msgid "Cannot locate file to replace" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:223 +#: ../../include/attach.php:366 +msgid "Cannot locate file to revise/update" +msgstr "" + +#: ../../include/attach.php:377 #, php-format -msgid "%1$s used" +msgid "File exceeds size limit of %d" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:228 +#: ../../include/attach.php:389 #, php-format -msgid "%1$s used of %2$s (%3$s%)" +msgid "You have reached your limit of %1$.0f Mbytes attachment storage." msgstr "" -#: ../../include/RedDAV/RedBrowser.php:241 ../../include/nav.php:106 -#: ../../include/apps.php:133 ../../include/conversation.php:1546 -#: ../../mod/fbrowser.php:114 -msgid "Files" +#: ../../include/attach.php:472 +msgid "File upload failed. Possible system limit or action terminated." msgstr "" -#: ../../include/RedDAV/RedBrowser.php:245 ../../mod/settings.php:521 -#: ../../mod/settings.php:547 ../../mod/admin.php:868 -msgid "Name" +#: ../../include/attach.php:484 +msgid "Stored file could not be verified. Upload failed." msgstr "" -#: ../../include/RedDAV/RedBrowser.php:246 -msgid "Type" +#: ../../include/attach.php:526 ../../include/attach.php:543 +msgid "Path not available." msgstr "" -#: ../../include/RedDAV/RedBrowser.php:247 -msgid "Size" +#: ../../include/attach.php:589 +msgid "Empty pathname" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:248 -msgid "Last Modified" +#: ../../include/attach.php:605 +msgid "duplicate filename or path" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:250 ../../include/page_widgets.php:8 -#: ../../include/page_widgets.php:36 ../../include/menu.php:42 -#: ../../include/ItemObject.php:100 ../../include/apps.php:249 -#: ../../mod/settings.php:581 ../../mod/webpages.php:131 -#: ../../mod/connections.php:381 ../../mod/connections.php:394 -#: ../../mod/connections.php:413 ../../mod/menu.php:59 ../../mod/thing.php:233 -#: ../../mod/editpost.php:112 ../../mod/editwebpage.php:143 -#: ../../mod/blocks.php:99 ../../mod/layouts.php:121 -#: ../../mod/editblock.php:111 ../../mod/editlayout.php:106 -msgid "Edit" +#: ../../include/attach.php:629 +msgid "Path not found." msgstr "" -#: ../../include/RedDAV/RedBrowser.php:251 ../../include/ItemObject.php:120 -#: ../../include/apps.php:250 ../../include/conversation.php:638 -#: ../../mod/settings.php:582 ../../mod/admin.php:732 ../../mod/admin.php:863 -#: ../../mod/photos.php:1064 ../../mod/connedit.php:462 -#: ../../mod/thing.php:234 ../../mod/group.php:176 -msgid "Delete" +#: ../../include/attach.php:680 +msgid "mkdir failed." msgstr "" -#: ../../include/RedDAV/RedBrowser.php:252 -msgid "Total" +#: ../../include/attach.php:684 +msgid "database storage failed." msgstr "" -#: ../../include/RedDAV/RedBrowser.php:304 -msgid "Create new folder" +#: ../../include/page_widgets.php:6 +msgid "New Page" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:305 ../../mod/new_channel.php:122 -#: ../../mod/mitem.php:142 ../../mod/menu.php:84 -msgid "Create" +#: ../../include/page_widgets.php:39 ../../mod/blocks.php:102 +#: ../../mod/layouts.php:125 ../../mod/webpages.php:134 +msgid "View" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:306 -msgid "Upload file" +#: ../../include/page_widgets.php:40 ../../include/conversation.php:1114 +#: ../../include/ItemObject.php:608 ../../mod/photos.php:1013 +#: ../../mod/editblock.php:141 ../../mod/editlayout.php:135 +#: ../../mod/editpost.php:140 ../../mod/editwebpage.php:174 +#: ../../mod/webpages.php:135 +msgid "Preview" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:307 ../../mod/photos.php:745 -#: ../../mod/photos.php:1226 ../../mod/profile_photo.php:361 -msgid "Upload" +#: ../../include/page_widgets.php:41 ../../mod/webpages.php:136 +msgid "Actions" msgstr "" -#: ../../include/photos.php:15 ../../include/items.php:3994 -#: ../../include/attach.php:116 ../../include/attach.php:163 -#: ../../include/attach.php:226 ../../include/attach.php:240 -#: ../../include/attach.php:280 ../../include/attach.php:294 -#: ../../include/attach.php:318 ../../include/attach.php:511 -#: ../../include/attach.php:584 ../../include/chat.php:116 -#: ../../mod/settings.php:496 ../../mod/filestorage.php:18 -#: ../../mod/filestorage.php:67 ../../mod/filestorage.php:82 -#: ../../mod/filestorage.php:109 ../../mod/webpages.php:40 -#: ../../mod/authtest.php:13 ../../mod/new_channel.php:68 -#: ../../mod/new_channel.php:99 ../../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:17 -#: ../../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:247 ../../mod/thing.php:264 -#: ../../mod/thing.php:299 ../../mod/viewconnections.php:22 -#: ../../mod/viewconnections.php:27 ../../mod/register.php:70 -#: ../../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/service_limits.php:7 ../../mod/item.php:182 -#: ../../mod/item.php:190 ../../mod/item.php:929 ../../mod/appman.php:66 -#: ../../mod/sources.php:66 ../../mod/page.php:30 ../../mod/page.php:80 -#: ../../mod/mail.php:111 ../../mod/channel.php:89 ../../mod/channel.php:193 -#: ../../mod/channel.php:236 ../../mod/profiles.php:179 -#: ../../mod/profiles.php:560 ../../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:200 ../../mod/notifications.php:66 -#: ../../mod/layouts.php:27 ../../mod/layouts.php:39 -#: ../../mod/editblock.php:34 ../../mod/viewsrc.php:14 -#: ../../mod/achievements.php:30 ../../mod/editlayout.php:48 -#: ../../index.php:190 ../../index.php:365 -msgid "Permission denied." +#: ../../include/page_widgets.php:42 ../../mod/webpages.php:137 +msgid "Page Link" msgstr "" -#: ../../include/photos.php:51 ../../include/photo/photo_driver.php:680 -#: ../../mod/photos.php:91 ../../mod/photos.php:657 ../../mod/photos.php:679 -#: ../../mod/profile_photo.php:142 ../../mod/profile_photo.php:301 -#: ../../mod/profile_photo.php:423 -msgid "Profile Photos" +#: ../../include/page_widgets.php:43 ../../mod/webpages.php:138 +msgid "Title" msgstr "" -#: ../../include/photos.php:104 -#, php-format -msgid "Image exceeds website size limit of %lu bytes" +#: ../../include/page_widgets.php:44 ../../mod/webpages.php:139 +msgid "Created" msgstr "" -#: ../../include/photos.php:111 -msgid "Image file is empty." +#: ../../include/page_widgets.php:45 ../../mod/webpages.php:140 +msgid "Edited" msgstr "" -#: ../../include/photos.php:140 ../../mod/profile_photo.php:216 -msgid "Unable to process image" +#: ../../include/security.php:320 +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/photos.php:212 -msgid "Photo storage failed." +#: ../../include/widgets.php:29 ../../include/contact_widgets.php:93 +msgid "Categories" msgstr "" -#: ../../include/photos.php:340 ../../include/conversation.php:1540 -msgid "Photo Albums" +#: ../../include/widgets.php:86 ../../include/nav.php:171 +#: ../../mod/apps.php:33 +msgid "Apps" msgstr "" -#: ../../include/photos.php:344 -msgid "Upload New Photos" +#: ../../include/widgets.php:87 +msgid "System" msgstr "" -#: ../../include/contact_widgets.php:14 -#, php-format -msgid "%d invitation available" -msgid_plural "%d invitations available" -msgstr[0] "" -msgstr[1] "" - -#: ../../include/contact_widgets.php:19 ../../mod/admin.php:418 -msgid "Advanced" +#: ../../include/widgets.php:89 ../../include/conversation.php:1449 +msgid "Personal" msgstr "" -#: ../../include/contact_widgets.php:22 -msgid "Find Channels" +#: ../../include/widgets.php:90 +msgid "Create Personal App" msgstr "" -#: ../../include/contact_widgets.php:23 -msgid "Enter name or interest" +#: ../../include/widgets.php:91 +msgid "Edit Personal App" msgstr "" -#: ../../include/contact_widgets.php:24 -msgid "Connect/Follow" +#: ../../include/widgets.php:135 ../../include/widgets.php:175 +#: ../../include/identity.php:833 ../../include/conversation.php:948 +#: ../../include/Contact.php:107 ../../mod/directory.php:183 +#: ../../mod/dirprofile.php:164 ../../mod/suggest.php:51 +#: ../../mod/match.php:62 +msgid "Connect" msgstr "" -#: ../../include/contact_widgets.php:25 -msgid "Examples: Robert Morgenstein, Fishing" +#: ../../include/widgets.php:137 ../../mod/suggest.php:53 +msgid "Ignore/Hide" msgstr "" -#: ../../include/contact_widgets.php:26 ../../mod/connections.php:412 -#: ../../mod/directory.php:222 ../../mod/directory.php:227 -msgid "Find" +#: ../../include/widgets.php:143 ../../mod/connections.php:267 +msgid "Suggestions" msgstr "" -#: ../../include/contact_widgets.php:27 ../../mod/suggest.php:59 -msgid "Channel Suggestions" +#: ../../include/widgets.php:144 +msgid "See more..." msgstr "" -#: ../../include/contact_widgets.php:29 -msgid "Random Profile" +#: ../../include/widgets.php:166 +#, php-format +msgid "You have %1$.0f of %2$.0f allowed connections." msgstr "" -#: ../../include/contact_widgets.php:30 -msgid "Invite Friends" +#: ../../include/widgets.php:172 +msgid "Add New Connection" msgstr "" -#: ../../include/contact_widgets.php:32 -msgid "Exammple: name=fred and country=iceland" +#: ../../include/widgets.php:173 +msgid "Enter the channel address" msgstr "" -#: ../../include/contact_widgets.php:33 -msgid "Advanced Find" +#: ../../include/widgets.php:174 +msgid "Example: bob@example.com, http://example.com/barbara" msgstr "" -#: ../../include/contact_widgets.php:58 ../../include/features.php:72 -#: ../../include/widgets.php:303 -msgid "Saved Folders" +#: ../../include/widgets.php:191 +msgid "Notes" msgstr "" -#: ../../include/contact_widgets.php:61 ../../include/contact_widgets.php:96 -#: ../../include/widgets.php:306 -msgid "Everything" +#: ../../include/widgets.php:193 ../../include/text.php:823 +#: ../../include/text.php:835 ../../mod/rbmark.php:28 ../../mod/rbmark.php:98 +#: ../../mod/filer.php:50 ../../mod/admin.php:1341 ../../mod/admin.php:1362 +msgid "Save" msgstr "" -#: ../../include/contact_widgets.php:93 ../../include/widgets.php:29 -msgid "Categories" +#: ../../include/widgets.php:263 +msgid "Remove term" msgstr "" -#: ../../include/contact_widgets.php:126 -#, php-format -msgid "%d connection in common" -msgid_plural "%d connections in common" -msgstr[0] "" -msgstr[1] "" - -#: ../../include/contact_widgets.php:131 -msgid "show more" +#: ../../include/widgets.php:272 ../../include/features.php:58 +msgid "Saved Searches" msgstr "" -#: ../../include/activities.php:39 -msgid " and " +#: ../../include/widgets.php:273 ../../include/group.php:302 +msgid "add" msgstr "" -#: ../../include/activities.php:47 -msgid "public profile" +#: ../../include/widgets.php:303 ../../include/contact_widgets.php:58 +#: ../../include/features.php:72 +msgid "Saved Folders" msgstr "" -#: ../../include/activities.php:52 -#, php-format -msgid "%1$s changed %2$s to “%3$s”" +#: ../../include/widgets.php:306 ../../include/contact_widgets.php:61 +#: ../../include/contact_widgets.php:96 +msgid "Everything" msgstr "" -#: ../../include/activities.php:53 -#, php-format -msgid "Visit %1$s's %2$s" +#: ../../include/widgets.php:342 +msgid "Archives" msgstr "" -#: ../../include/activities.php:56 -#, php-format -msgid "%1$s has an updated %2$s, changing %3$s." +#: ../../include/widgets.php:404 +msgid "Refresh" msgstr "" -#: ../../include/items.php:375 ../../mod/subthread.php:49 -#: ../../mod/profperm.php:23 ../../mod/group.php:68 ../../mod/like.php:242 -#: ../../index.php:364 -msgid "Permission denied" +#: ../../include/widgets.php:405 ../../mod/connedit.php:492 +msgid "Me" msgstr "" -#: ../../include/items.php:962 ../../include/items.php:1007 -msgid "(Unknown)" +#: ../../include/widgets.php:406 ../../mod/connedit.php:494 +msgid "Best Friends" msgstr "" -#: ../../include/items.php:1163 -msgid "Visible to anybody on the internet." +#: ../../include/widgets.php:407 ../../include/identity.php:381 +#: ../../include/identity.php:382 ../../include/identity.php:389 +#: ../../include/profile_selectors.php:80 ../../mod/connedit.php:495 +msgid "Friends" msgstr "" -#: ../../include/items.php:1165 -msgid "Visible to you only." +#: ../../include/widgets.php:408 +msgid "Co-workers" msgstr "" -#: ../../include/items.php:1167 -msgid "Visible to anybody in this network." +#: ../../include/widgets.php:409 ../../mod/connedit.php:496 +msgid "Former Friends" msgstr "" -#: ../../include/items.php:1169 -msgid "Visible to anybody authenticated." +#: ../../include/widgets.php:410 ../../mod/connedit.php:497 +msgid "Acquaintances" msgstr "" -#: ../../include/items.php:1171 -#, php-format -msgid "Visible to anybody on %s." +#: ../../include/widgets.php:411 +msgid "Everybody" msgstr "" -#: ../../include/items.php:1173 -msgid "Visible to all connections." +#: ../../include/widgets.php:443 +msgid "Account settings" msgstr "" -#: ../../include/items.php:1175 -msgid "Visible to approved connections." +#: ../../include/widgets.php:449 +msgid "Channel settings" msgstr "" -#: ../../include/items.php:1177 -msgid "Visible to specific connections." +#: ../../include/widgets.php:455 +msgid "Additional features" msgstr "" -#: ../../include/items.php:3927 ../../mod/filestorage.php:26 -#: ../../mod/admin.php:168 ../../mod/admin.php:898 ../../mod/admin.php:1101 -#: ../../mod/thing.php:76 ../../mod/display.php:32 ../../mod/viewsrc.php:20 -msgid "Item not found." +#: ../../include/widgets.php:461 +msgid "Feature settings" msgstr "" -#: ../../include/items.php:4365 ../../mod/group.php:38 ../../mod/group.php:140 -msgid "Collection not found." +#: ../../include/widgets.php:467 +msgid "Display settings" msgstr "" -#: ../../include/items.php:4380 -msgid "Collection is empty." +#: ../../include/widgets.php:473 +msgid "Connected apps" msgstr "" -#: ../../include/items.php:4387 -#, php-format -msgid "Collection: %s" +#: ../../include/widgets.php:479 +msgid "Export channel" msgstr "" -#: ../../include/items.php:4398 -#, php-format -msgid "Connection: %s" +#: ../../include/widgets.php:485 +msgid "Export content" msgstr "" -#: ../../include/items.php:4401 -msgid "Connection not found." +#: ../../include/widgets.php:491 +msgid "Automatic Permissions (Advanced)" msgstr "" -#: ../../include/Contact.php:107 ../../include/identity.php:832 -#: ../../include/conversation.php:948 ../../include/widgets.php:135 -#: ../../include/widgets.php:175 ../../mod/dirprofile.php:164 -#: ../../mod/suggest.php:51 ../../mod/directory.php:183 ../../mod/match.php:62 -msgid "Connect" +#: ../../include/widgets.php:501 +msgid "Premium Channel Settings" msgstr "" -#: ../../include/Contact.php:123 -msgid "New window" +#: ../../include/widgets.php:510 ../../include/features.php:49 +#: ../../mod/sources.php:88 +msgid "Channel Sources" msgstr "" -#: ../../include/Contact.php:124 -msgid "Open the selected location in a different window or browser tab" +#: ../../include/widgets.php:535 ../../mod/mail.php:124 +#: ../../mod/message.php:31 +msgid "Messages" msgstr "" -#: ../../include/Contact.php:211 ../../mod/admin.php:649 -#, php-format -msgid "User '%s' deleted" +#: ../../include/widgets.php:540 +msgid "Check Mail" msgstr "" -#: ../../include/datetime.php:43 ../../include/datetime.php:45 -msgid "Miscellaneous" +#: ../../include/widgets.php:545 ../../include/nav.php:209 +msgid "New Message" msgstr "" -#: ../../include/datetime.php:152 ../../include/datetime.php:284 -msgid "year" +#: ../../include/widgets.php:621 +msgid "Chat Rooms" msgstr "" -#: ../../include/datetime.php:157 ../../include/datetime.php:285 -msgid "month" +#: ../../include/widgets.php:639 +msgid "Bookmarked Chatrooms" msgstr "" -#: ../../include/datetime.php:162 ../../include/datetime.php:287 -msgid "day" +#: ../../include/widgets.php:657 +msgid "Suggested Chatrooms" msgstr "" -#: ../../include/datetime.php:275 -msgid "never" +#: ../../include/zot.php:655 +msgid "Invalid data packet" msgstr "" -#: ../../include/datetime.php:281 -msgid "less than a second ago" +#: ../../include/zot.php:671 +msgid "Unable to verify channel signature" msgstr "" -#: ../../include/datetime.php:284 -msgid "years" +#: ../../include/zot.php:1763 +#, php-format +msgid "Unable to verify site signature for %s" msgstr "" -#: ../../include/datetime.php:285 -msgid "months" +#: ../../include/photos.php:104 +#, php-format +msgid "Image exceeds website size limit of %lu bytes" msgstr "" -#: ../../include/datetime.php:286 -msgid "week" +#: ../../include/photos.php:111 +msgid "Image file is empty." msgstr "" -#: ../../include/datetime.php:286 -msgid "weeks" +#: ../../include/photos.php:140 ../../mod/profile_photo.php:216 +msgid "Unable to process image" msgstr "" -#: ../../include/datetime.php:287 -msgid "days" +#: ../../include/photos.php:212 +msgid "Photo storage failed." msgstr "" -#: ../../include/datetime.php:288 -msgid "hour" +#: ../../include/photos.php:340 ../../include/conversation.php:1540 +msgid "Photo Albums" msgstr "" -#: ../../include/datetime.php:288 -msgid "hours" +#: ../../include/photos.php:344 +msgid "Upload New Photos" msgstr "" -#: ../../include/datetime.php:289 -msgid "minute" +#: ../../include/acl_selectors.php:240 +msgid "Visible to your default audience" msgstr "" -#: ../../include/datetime.php:289 -msgid "minutes" +#: ../../include/acl_selectors.php:241 +msgid "Show" msgstr "" -#: ../../include/datetime.php:290 -msgid "second" +#: ../../include/acl_selectors.php:242 +msgid "Don't show" msgstr "" -#: ../../include/datetime.php:290 -msgid "seconds" +#: ../../include/acl_selectors.php:248 ../../mod/photos.php:604 +#: ../../mod/photos.php:968 ../../mod/events.php:585 ../../mod/chat.php:209 +#: ../../mod/filestorage.php:137 +msgid "Permissions" +msgstr "" + +#: ../../include/acl_selectors.php:249 ../../include/ItemObject.php:305 +msgid "Close" +msgstr "" + +#: ../../include/activities.php:39 +msgid " and " msgstr "" -#: ../../include/datetime.php:299 +#: ../../include/activities.php:47 +msgid "public profile" +msgstr "" + +#: ../../include/activities.php:52 #, php-format -msgid "%1$d %2$s ago" +msgid "%1$s changed %2$s to “%3$s”" msgstr "" -#: ../../include/datetime.php:504 +#: ../../include/activities.php:53 #, php-format -msgid "%1$s's birthday" +msgid "Visit %1$s's %2$s" msgstr "" -#: ../../include/datetime.php:505 +#: ../../include/activities.php:56 #, php-format -msgid "Happy Birthday %1$s" +msgid "%1$s has an updated %2$s, changing %3$s." +msgstr "" + +#: ../../include/api.php:1084 +msgid "Public Timeline" msgstr "" -#: ../../include/identity.php:31 ../../mod/item.php:1319 +#: ../../include/identity.php:31 ../../mod/item.php:1344 msgid "Unable to obtain identity information from database" msgstr "" @@ -729,7 +739,7 @@ msgstr "" msgid "Reserved nickname. Please choose another." msgstr "" -#: ../../include/identity.php:200 +#: ../../include/identity.php:200 ../../include/dimport.php:34 msgid "" "Nickname has unsupported characters or is already being used on this site." msgstr "" @@ -742,129 +752,118 @@ msgstr "" msgid "Default Profile" msgstr "" -#: ../../include/identity.php:381 ../../include/identity.php:382 -#: ../../include/identity.php:389 ../../include/profile_selectors.php:80 -#: ../../include/widgets.php:407 ../../mod/connedit.php:495 -msgid "Friends" -msgstr "" - -#: ../../include/identity.php:635 +#: ../../include/identity.php:636 msgid "Requested channel is not available." msgstr "" -#: ../../include/identity.php:683 ../../mod/filestorage.php:48 -#: ../../mod/webpages.php:8 ../../mod/profile.php:16 ../../mod/hcard.php:8 -#: ../../mod/connect.php:13 ../../mod/blocks.php:10 ../../mod/layouts.php:8 -#: ../../mod/achievements.php:11 +#: ../../include/identity.php:684 ../../mod/achievements.php:11 +#: ../../mod/profile.php:16 ../../mod/blocks.php:10 ../../mod/connect.php:13 +#: ../../mod/filestorage.php:48 ../../mod/layouts.php:8 +#: ../../mod/webpages.php:8 ../../mod/hcard.php:8 msgid "Requested profile is not available." msgstr "" -#: ../../include/identity.php:846 ../../mod/profiles.php:750 +#: ../../include/identity.php:847 ../../mod/profiles.php:722 msgid "Change profile photo" msgstr "" -#: ../../include/identity.php:852 +#: ../../include/identity.php:853 msgid "Profiles" msgstr "" -#: ../../include/identity.php:852 +#: ../../include/identity.php:853 msgid "Manage/edit profiles" msgstr "" -#: ../../include/identity.php:853 ../../mod/profiles.php:751 +#: ../../include/identity.php:854 ../../mod/profiles.php:723 msgid "Create New Profile" msgstr "" -#: ../../include/identity.php:856 ../../include/nav.php:103 +#: ../../include/identity.php:857 ../../include/nav.php:103 msgid "Edit Profile" msgstr "" -#: ../../include/identity.php:867 ../../mod/profiles.php:762 +#: ../../include/identity.php:868 ../../mod/profiles.php:734 msgid "Profile Image" msgstr "" -#: ../../include/identity.php:870 +#: ../../include/identity.php:871 msgid "visible to everybody" msgstr "" -#: ../../include/identity.php:871 ../../mod/profiles.php:645 -#: ../../mod/profiles.php:766 +#: ../../include/identity.php:872 ../../mod/profiles.php:617 +#: ../../mod/profiles.php:738 msgid "Edit visibility" msgstr "" -#: ../../include/identity.php:883 ../../include/event.php:40 -#: ../../include/bb2diaspora.php:461 ../../mod/dirprofile.php:105 -#: ../../mod/directory.php:156 ../../mod/events.php:579 +#: ../../include/identity.php:884 ../../include/event.php:40 +#: ../../include/bb2diaspora.php:480 ../../mod/events.php:579 +#: ../../mod/directory.php:156 ../../mod/dirprofile.php:105 msgid "Location:" msgstr "" -#: ../../include/identity.php:885 ../../include/identity.php:1122 +#: ../../include/identity.php:886 ../../include/identity.php:1123 #: ../../mod/directory.php:158 msgid "Gender:" msgstr "" -#: ../../include/identity.php:886 ../../include/identity.php:1166 +#: ../../include/identity.php:887 ../../include/identity.php:1167 #: ../../mod/directory.php:160 msgid "Status:" msgstr "" -#: ../../include/identity.php:887 ../../include/identity.php:1177 +#: ../../include/identity.php:888 ../../include/identity.php:1178 #: ../../mod/directory.php:162 msgid "Homepage:" msgstr "" -#: ../../include/identity.php:888 ../../mod/dirprofile.php:151 +#: ../../include/identity.php:889 ../../mod/dirprofile.php:151 msgid "Online Now" msgstr "" -#: ../../include/identity.php:966 ../../include/identity.php:1046 +#: ../../include/identity.php:967 ../../include/identity.php:1047 #: ../../mod/ping.php:298 msgid "g A l F d" msgstr "" -#: ../../include/identity.php:967 ../../include/identity.php:1047 +#: ../../include/identity.php:968 ../../include/identity.php:1048 msgid "F d" msgstr "" -#: ../../include/identity.php:1012 ../../include/identity.php:1087 +#: ../../include/identity.php:1013 ../../include/identity.php:1088 #: ../../mod/ping.php:320 msgid "[today]" msgstr "" -#: ../../include/identity.php:1024 +#: ../../include/identity.php:1025 msgid "Birthday Reminders" msgstr "" -#: ../../include/identity.php:1025 +#: ../../include/identity.php:1026 msgid "Birthdays this week:" msgstr "" -#: ../../include/identity.php:1080 +#: ../../include/identity.php:1081 msgid "[No description]" msgstr "" -#: ../../include/identity.php:1098 +#: ../../include/identity.php:1099 msgid "Event Reminders" msgstr "" -#: ../../include/identity.php:1099 +#: ../../include/identity.php:1100 msgid "Events this week:" msgstr "" -#: ../../include/identity.php:1112 ../../include/identity.php:1230 -#: ../../include/apps.php:136 ../../mod/profperm.php:112 -msgid "Profile" -msgstr "" - -#: ../../include/identity.php:1120 ../../mod/settings.php:953 +#: ../../include/identity.php:1121 ../../mod/settings.php:953 msgid "Full Name:" msgstr "" -#: ../../include/identity.php:1127 +#: ../../include/identity.php:1128 msgid "Like this channel" msgstr "" -#: ../../include/identity.php:1138 ../../include/taxonomy.php:338 +#: ../../include/identity.php:1139 ../../include/taxonomy.php:338 #: ../../include/ItemObject.php:146 msgctxt "noun" msgid "Like" @@ -872,1504 +871,1334 @@ msgid_plural "Likes" msgstr[0] "" msgstr[1] "" -#: ../../include/identity.php:1151 +#: ../../include/identity.php:1152 msgid "j F, Y" msgstr "" -#: ../../include/identity.php:1152 +#: ../../include/identity.php:1153 msgid "j F" msgstr "" -#: ../../include/identity.php:1159 +#: ../../include/identity.php:1160 msgid "Birthday:" msgstr "" -#: ../../include/identity.php:1163 +#: ../../include/identity.php:1164 msgid "Age:" msgstr "" -#: ../../include/identity.php:1172 +#: ../../include/identity.php:1173 #, php-format msgid "for %1$d %2$s" msgstr "" -#: ../../include/identity.php:1175 ../../mod/profiles.php:667 +#: ../../include/identity.php:1176 ../../mod/profiles.php:639 msgid "Sexual Preference:" msgstr "" -#: ../../include/identity.php:1179 ../../mod/profiles.php:669 +#: ../../include/identity.php:1180 ../../mod/profiles.php:641 msgid "Hometown:" msgstr "" -#: ../../include/identity.php:1181 +#: ../../include/identity.php:1182 msgid "Tags:" msgstr "" -#: ../../include/identity.php:1183 ../../mod/profiles.php:670 +#: ../../include/identity.php:1184 ../../mod/profiles.php:642 msgid "Political Views:" msgstr "" -#: ../../include/identity.php:1185 +#: ../../include/identity.php:1186 msgid "Religion:" msgstr "" -#: ../../include/identity.php:1187 ../../mod/directory.php:164 +#: ../../include/identity.php:1188 ../../mod/directory.php:164 msgid "About:" msgstr "" -#: ../../include/identity.php:1189 +#: ../../include/identity.php:1190 msgid "Hobbies/Interests:" msgstr "" -#: ../../include/identity.php:1191 ../../mod/profiles.php:673 +#: ../../include/identity.php:1192 ../../mod/profiles.php:645 msgid "Likes:" msgstr "" -#: ../../include/identity.php:1193 ../../mod/profiles.php:674 +#: ../../include/identity.php:1194 ../../mod/profiles.php:646 msgid "Dislikes:" msgstr "" -#: ../../include/identity.php:1196 +#: ../../include/identity.php:1197 msgid "Contact information and Social Networks:" msgstr "" -#: ../../include/identity.php:1198 +#: ../../include/identity.php:1199 msgid "My other channels:" msgstr "" -#: ../../include/identity.php:1200 +#: ../../include/identity.php:1201 msgid "Musical interests:" msgstr "" -#: ../../include/identity.php:1202 +#: ../../include/identity.php:1203 msgid "Books, literature:" msgstr "" -#: ../../include/identity.php:1204 +#: ../../include/identity.php:1205 msgid "Television:" msgstr "" -#: ../../include/identity.php:1206 +#: ../../include/identity.php:1207 msgid "Film/dance/culture/entertainment:" msgstr "" -#: ../../include/identity.php:1208 +#: ../../include/identity.php:1209 msgid "Love/Romance:" msgstr "" -#: ../../include/identity.php:1210 +#: ../../include/identity.php:1211 msgid "Work/employment:" msgstr "" -#: ../../include/identity.php:1212 +#: ../../include/identity.php:1213 msgid "School/education:" msgstr "" -#: ../../include/identity.php:1232 +#: ../../include/identity.php:1233 msgid "Like this thing" msgstr "" -#: ../../include/page_widgets.php:6 -msgid "New Page" -msgstr "" - -#: ../../include/page_widgets.php:39 ../../mod/webpages.php:134 -#: ../../mod/blocks.php:102 ../../mod/layouts.php:125 -msgid "View" +#: ../../include/conversation.php:120 ../../include/text.php:1743 +#: ../../include/diaspora.php:1924 ../../mod/subthread.php:72 +#: ../../mod/subthread.php:174 ../../mod/tagger.php:45 ../../mod/like.php:294 +msgid "photo" msgstr "" -#: ../../include/page_widgets.php:40 ../../include/ItemObject.php:608 -#: ../../include/conversation.php:1114 ../../mod/webpages.php:135 -#: ../../mod/photos.php:1015 ../../mod/editpost.php:140 -#: ../../mod/editwebpage.php:174 ../../mod/editblock.php:141 -#: ../../mod/editlayout.php:135 -msgid "Preview" +#: ../../include/conversation.php:123 ../../include/text.php:1746 +#: ../../mod/tagger.php:49 +msgid "event" msgstr "" -#: ../../include/page_widgets.php:41 ../../mod/webpages.php:136 -msgid "Actions" +#: ../../include/conversation.php:126 ../../mod/like.php:89 +msgid "channel" msgstr "" -#: ../../include/page_widgets.php:42 ../../mod/webpages.php:137 -msgid "Page Link" +#: ../../include/conversation.php:148 ../../include/text.php:1749 +#: ../../include/diaspora.php:1924 ../../mod/subthread.php:72 +#: ../../mod/subthread.php:174 ../../mod/tagger.php:53 ../../mod/like.php:294 +msgid "status" msgstr "" -#: ../../include/page_widgets.php:43 ../../mod/webpages.php:138 -msgid "Title" +#: ../../include/conversation.php:150 ../../include/text.php:1751 +#: ../../mod/tagger.php:55 +msgid "comment" msgstr "" -#: ../../include/page_widgets.php:44 ../../mod/webpages.php:139 -msgid "Created" +#: ../../include/conversation.php:164 ../../include/diaspora.php:1953 +#: ../../mod/like.php:331 +#, php-format +msgid "%1$s likes %2$s's %3$s" msgstr "" -#: ../../include/page_widgets.php:45 ../../mod/webpages.php:140 -msgid "Edited" +#: ../../include/conversation.php:167 ../../mod/like.php:333 +#, php-format +msgid "%1$s doesn't like %2$s's %3$s" msgstr "" -#: ../../include/message.php:18 -msgid "No recipient provided." +#: ../../include/conversation.php:204 +#, php-format +msgid "%1$s is now connected with %2$s" msgstr "" -#: ../../include/message.php:23 -msgid "[no subject]" +#: ../../include/conversation.php:239 +#, php-format +msgid "%1$s poked %2$s" msgstr "" -#: ../../include/message.php:45 -msgid "Unable to determine sender." +#: ../../include/conversation.php:243 ../../include/text.php:901 +msgid "poked" msgstr "" -#: ../../include/message.php:200 -msgid "Stored post could not be verified." +#: ../../include/conversation.php:261 ../../mod/mood.php:63 +#, php-format +msgctxt "mood" +msgid "%1$s is %2$s" msgstr "" -#: ../../include/taxonomy.php:210 -msgid "Tags" +#: ../../include/conversation.php:637 ../../include/ItemObject.php:126 +msgid "Select" msgstr "" -#: ../../include/taxonomy.php:227 -msgid "Keywords" +#: ../../include/conversation.php:645 ../../include/ItemObject.php:89 +msgid "Private Message" msgstr "" -#: ../../include/taxonomy.php:252 -msgid "have" +#: ../../include/conversation.php:652 ../../include/ItemObject.php:194 +msgid "Message signature validated" msgstr "" -#: ../../include/taxonomy.php:252 -msgid "has" +#: ../../include/conversation.php:653 ../../include/ItemObject.php:195 +msgid "Message signature incorrect" msgstr "" -#: ../../include/taxonomy.php:253 -msgid "want" +#: ../../include/conversation.php:674 +#, php-format +msgid "View %s's profile @ %s" msgstr "" -#: ../../include/taxonomy.php:253 -msgid "wants" +#: ../../include/conversation.php:689 +msgid "Categories:" msgstr "" -#: ../../include/taxonomy.php:254 ../../include/ItemObject.php:221 -msgid "like" +#: ../../include/conversation.php:690 +msgid "Filed under:" msgstr "" -#: ../../include/taxonomy.php:254 -msgid "likes" +#: ../../include/conversation.php:698 ../../include/ItemObject.php:265 +#, php-format +msgid " from %s" msgstr "" -#: ../../include/taxonomy.php:255 ../../include/ItemObject.php:222 -msgid "dislike" +#: ../../include/conversation.php:701 ../../include/ItemObject.php:268 +#, php-format +msgid "last edited: %s" msgstr "" -#: ../../include/taxonomy.php:255 -msgid "dislikes" +#: ../../include/conversation.php:702 ../../include/ItemObject.php:269 +#, php-format +msgid "Expires: %s" msgstr "" -#: ../../include/js_strings.php:5 -msgid "Delete this item?" +#: ../../include/conversation.php:717 +msgid "View in context" msgstr "" -#: ../../include/js_strings.php:6 ../../include/ItemObject.php:598 -#: ../../mod/photos.php:1013 ../../mod/photos.php:1100 -msgid "Comment" +#: ../../include/conversation.php:719 ../../include/conversation.php:1153 +#: ../../include/ItemObject.php:310 ../../mod/photos.php:993 +#: ../../mod/editblock.php:120 ../../mod/editlayout.php:115 +#: ../../mod/editpost.php:121 ../../mod/editwebpage.php:152 +#: ../../mod/mail.php:234 ../../mod/mail.php:349 +msgid "Please wait" msgstr "" -#: ../../include/js_strings.php:7 ../../include/ItemObject.php:332 -msgid "[+] show all" +#: ../../include/conversation.php:843 +msgid "remove" msgstr "" -#: ../../include/js_strings.php:8 -msgid "[-] show less" +#: ../../include/conversation.php:847 ../../include/nav.php:257 +msgid "Loading..." msgstr "" -#: ../../include/js_strings.php:9 -msgid "[+] expand" +#: ../../include/conversation.php:848 +msgid "Delete Selected Items" msgstr "" -#: ../../include/js_strings.php:10 -msgid "[-] collapse" +#: ../../include/conversation.php:942 +msgid "View Source" msgstr "" -#: ../../include/js_strings.php:11 -msgid "Password too short" +#: ../../include/conversation.php:943 +msgid "Follow Thread" msgstr "" -#: ../../include/js_strings.php:12 -msgid "Passwords do not match" +#: ../../include/conversation.php:944 +msgid "View Status" msgstr "" -#: ../../include/js_strings.php:13 ../../mod/photos.php:39 -msgid "everybody" +#: ../../include/conversation.php:945 ../../include/nav.php:99 +#: ../../mod/connedit.php:415 ../../mod/connedit.php:529 +msgid "View Profile" msgstr "" -#: ../../include/js_strings.php:14 -msgid "Secret Passphrase" +#: ../../include/conversation.php:946 +msgid "View Photos" msgstr "" -#: ../../include/js_strings.php:15 -msgid "Passphrase hint" +#: ../../include/conversation.php:947 +msgid "Matrix Activity" msgstr "" -#: ../../include/js_strings.php:16 -msgid "Notice: Permissions have changed but have not yet been submitted." +#: ../../include/conversation.php:949 +msgid "Edit Contact" msgstr "" -#: ../../include/js_strings.php:17 -msgid "close all" +#: ../../include/conversation.php:950 +msgid "Send PM" msgstr "" -#: ../../include/js_strings.php:18 -msgid "Nothing new here" +#: ../../include/conversation.php:1024 +#, php-format +msgid "%s likes this." msgstr "" -#: ../../include/js_strings.php:20 -msgid "timeago.prefixAgo" +#: ../../include/conversation.php:1024 +#, php-format +msgid "%s doesn't like this." msgstr "" -#: ../../include/js_strings.php:21 -msgid "timeago.prefixFromNow" -msgstr "" +#: ../../include/conversation.php:1028 +#, php-format +msgid "%2$d people like this." +msgid_plural "%2$d people like this." +msgstr[0] "" +msgstr[1] "" -#: ../../include/js_strings.php:22 -msgid "ago" -msgstr "" +#: ../../include/conversation.php:1030 +#, php-format +msgid "%2$d people don't like this." +msgid_plural "%2$d people don't like this." +msgstr[0] "" +msgstr[1] "" -#: ../../include/js_strings.php:23 -msgid "from now" +#: ../../include/conversation.php:1036 +msgid "and" msgstr "" -#: ../../include/js_strings.php:24 -msgid "less than a minute" -msgstr "" +#: ../../include/conversation.php:1039 +#, php-format +msgid ", and %d other people" +msgid_plural ", and %d other people" +msgstr[0] "" +msgstr[1] "" -#: ../../include/js_strings.php:25 -msgid "about a minute" +#: ../../include/conversation.php:1040 +#, php-format +msgid "%s like this." msgstr "" -#: ../../include/js_strings.php:26 +#: ../../include/conversation.php:1040 #, php-format -msgid "%d minutes" +msgid "%s don't like this." msgstr "" -#: ../../include/js_strings.php:27 -msgid "about an hour" +#: ../../include/conversation.php:1097 +msgid "Visible to everybody" msgstr "" -#: ../../include/js_strings.php:28 -#, php-format -msgid "about %d hours" +#: ../../include/conversation.php:1098 ../../mod/mail.php:170 +#: ../../mod/mail.php:282 +msgid "Please enter a link URL:" msgstr "" -#: ../../include/js_strings.php:29 -msgid "a day" +#: ../../include/conversation.php:1099 +msgid "Please enter a video link/URL:" msgstr "" -#: ../../include/js_strings.php:30 -#, php-format -msgid "%d days" +#: ../../include/conversation.php:1100 +msgid "Please enter an audio link/URL:" msgstr "" -#: ../../include/js_strings.php:31 -msgid "about a month" +#: ../../include/conversation.php:1101 +msgid "Tag term:" msgstr "" -#: ../../include/js_strings.php:32 -#, php-format -msgid "%d months" +#: ../../include/conversation.php:1102 ../../mod/filer.php:49 +msgid "Save to Folder:" msgstr "" -#: ../../include/js_strings.php:33 -msgid "about a year" +#: ../../include/conversation.php:1103 +msgid "Where are you right now?" msgstr "" -#: ../../include/js_strings.php:34 -#, php-format -msgid "%d years" +#: ../../include/conversation.php:1104 ../../mod/editpost.php:52 +#: ../../mod/mail.php:171 ../../mod/mail.php:283 +msgid "Expires YYYY-MM-DD HH:MM" msgstr "" -#: ../../include/js_strings.php:35 -msgid " " +#: ../../include/conversation.php:1128 ../../mod/photos.php:992 +#: ../../mod/editblock.php:168 ../../mod/editlayout.php:161 +#: ../../mod/editwebpage.php:201 ../../mod/layouts.php:122 +msgid "Share" msgstr "" -#: ../../include/js_strings.php:36 -msgid "timeago.numbers" +#: ../../include/conversation.php:1130 ../../mod/editwebpage.php:139 +msgid "Page link title" msgstr "" -#: ../../include/permissions.php:13 -msgid "Can view my normal stream and posts" +#: ../../include/conversation.php:1133 +msgid "Post as" msgstr "" -#: ../../include/permissions.php:14 -msgid "Can view my default channel profile" +#: ../../include/conversation.php:1134 ../../mod/editblock.php:112 +#: ../../mod/editlayout.php:107 ../../mod/editpost.php:113 +#: ../../mod/editwebpage.php:144 ../../mod/mail.php:231 ../../mod/mail.php:345 +msgid "Upload photo" msgstr "" -#: ../../include/permissions.php:15 -msgid "Can view my photo albums" +#: ../../include/conversation.php:1135 +msgid "upload photo" msgstr "" -#: ../../include/permissions.php:16 -msgid "Can view my connections" +#: ../../include/conversation.php:1136 ../../mod/editblock.php:113 +#: ../../mod/editlayout.php:108 ../../mod/editpost.php:114 +#: ../../mod/editwebpage.php:145 ../../mod/mail.php:232 ../../mod/mail.php:346 +msgid "Attach file" msgstr "" -#: ../../include/permissions.php:17 -msgid "Can view my file storage" +#: ../../include/conversation.php:1137 +msgid "attach file" msgstr "" -#: ../../include/permissions.php:18 -msgid "Can view my webpages" +#: ../../include/conversation.php:1138 ../../mod/editblock.php:114 +#: ../../mod/editlayout.php:109 ../../mod/editpost.php:115 +#: ../../mod/editwebpage.php:146 ../../mod/mail.php:233 ../../mod/mail.php:347 +msgid "Insert web link" msgstr "" -#: ../../include/permissions.php:21 -msgid "Can send me their channel stream and posts" +#: ../../include/conversation.php:1139 +msgid "web link" msgstr "" -#: ../../include/permissions.php:22 -msgid "Can post on my channel page (\"wall\")" +#: ../../include/conversation.php:1140 +msgid "Insert video link" msgstr "" -#: ../../include/permissions.php:23 -msgid "Can comment on or like my posts" +#: ../../include/conversation.php:1141 +msgid "video link" msgstr "" -#: ../../include/permissions.php:24 -msgid "Can send me private mail messages" +#: ../../include/conversation.php:1142 +msgid "Insert audio link" msgstr "" -#: ../../include/permissions.php:25 -msgid "Can post photos to my photo albums" +#: ../../include/conversation.php:1143 +msgid "audio link" msgstr "" -#: ../../include/permissions.php:26 -msgid "Can like/dislike stuff" +#: ../../include/conversation.php:1144 ../../mod/editblock.php:118 +#: ../../mod/editlayout.php:113 ../../mod/editpost.php:119 +#: ../../mod/editwebpage.php:150 +msgid "Set your location" msgstr "" -#: ../../include/permissions.php:26 -msgid "Profiles and things other than posts/comments" +#: ../../include/conversation.php:1145 +msgid "set location" msgstr "" -#: ../../include/permissions.php:28 -msgid "Can forward to all my channel contacts via post @mentions" +#: ../../include/conversation.php:1146 ../../mod/editblock.php:119 +#: ../../mod/editlayout.php:114 ../../mod/editpost.php:120 +#: ../../mod/editwebpage.php:151 +msgid "Clear browser location" msgstr "" -#: ../../include/permissions.php:28 -msgid "Advanced - useful for creating group forum channels" +#: ../../include/conversation.php:1147 +msgid "clear location" msgstr "" -#: ../../include/permissions.php:29 -msgid "Can chat with me (when available)" +#: ../../include/conversation.php:1149 ../../mod/editblock.php:132 +#: ../../mod/editlayout.php:126 ../../mod/editpost.php:132 +#: ../../mod/editwebpage.php:167 +msgid "Set title" msgstr "" -#: ../../include/permissions.php:30 -msgid "Can write to my file storage" +#: ../../include/conversation.php:1152 ../../mod/events.php:563 +#: ../../mod/editblock.php:135 ../../mod/editlayout.php:129 +#: ../../mod/editpost.php:134 ../../mod/editwebpage.php:169 +msgid "Categories (comma-separated list)" msgstr "" -#: ../../include/permissions.php:31 -msgid "Can edit my webpages" +#: ../../include/conversation.php:1154 ../../mod/editblock.php:121 +#: ../../mod/editlayout.php:116 ../../mod/editpost.php:122 +#: ../../mod/editwebpage.php:153 +msgid "Permission settings" msgstr "" -#: ../../include/permissions.php:33 -msgid "Can source my public posts in derived channels" +#: ../../include/conversation.php:1155 +msgid "permissions" msgstr "" -#: ../../include/permissions.php:33 -msgid "Somewhat advanced - very useful in open communities" +#: ../../include/conversation.php:1162 ../../mod/editblock.php:129 +#: ../../mod/editlayout.php:123 ../../mod/editpost.php:129 +#: ../../mod/editwebpage.php:162 +msgid "Public post" msgstr "" -#: ../../include/permissions.php:35 -msgid "Can administer my channel resources" +#: ../../include/conversation.php:1164 ../../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/permissions.php:35 -msgid "Extremely advanced. Leave this alone unless you know what you are doing" +#: ../../include/conversation.php:1177 ../../mod/editblock.php:146 +#: ../../mod/editlayout.php:140 ../../mod/editpost.php:146 +#: ../../mod/editwebpage.php:179 ../../mod/mail.php:238 ../../mod/mail.php:352 +msgid "Set expiration date" msgstr "" -#: ../../include/permissions.php:738 -msgid "Social Networking" +#: ../../include/conversation.php:1179 ../../include/ItemObject.php:611 +#: ../../mod/editpost.php:148 ../../mod/mail.php:240 ../../mod/mail.php:354 +msgid "Encrypt text" msgstr "" -#: ../../include/permissions.php:739 ../../include/permissions.php:741 -#: ../../include/permissions.php:743 ../../include/permissions.php:745 -msgid "Mostly Public" +#: ../../include/conversation.php:1181 ../../mod/events.php:569 +#: ../../mod/editpost.php:150 +msgid "OK" msgstr "" -#: ../../include/permissions.php:739 ../../include/permissions.php:741 -#: ../../include/permissions.php:743 -msgid "Restricted" +#: ../../include/conversation.php:1182 ../../mod/settings.php:520 +#: ../../mod/settings.php:546 ../../mod/events.php:568 +#: ../../mod/editpost.php:151 ../../mod/fbrowser.php:82 +#: ../../mod/fbrowser.php:117 ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 +msgid "Cancel" msgstr "" -#: ../../include/permissions.php:739 ../../include/permissions.php:741 -msgid "Private" +#: ../../include/conversation.php:1426 +msgid "Discover" msgstr "" -#: ../../include/permissions.php:740 -msgid "Community Forum" +#: ../../include/conversation.php:1429 +msgid "Imported public streams" msgstr "" -#: ../../include/permissions.php:742 -msgid "Feed Republish" +#: ../../include/conversation.php:1434 +msgid "Commented Order" msgstr "" -#: ../../include/permissions.php:744 -msgid "Celebrity/Soapbox" +#: ../../include/conversation.php:1437 +msgid "Sort by Comment Date" msgstr "" -#: ../../include/permissions.php:746 ../../include/profile_selectors.php:6 -#: ../../include/profile_selectors.php:23 -#: ../../include/profile_selectors.php:61 -#: ../../include/profile_selectors.php:97 -msgid "Other" +#: ../../include/conversation.php:1441 +msgid "Posted Order" msgstr "" -#: ../../include/permissions.php:747 -msgid "Custom/Expert Mode" +#: ../../include/conversation.php:1444 +msgid "Sort by Post Date" msgstr "" -#: ../../include/contact_selectors.php:56 -msgid "Frequently" +#: ../../include/conversation.php:1452 +msgid "Posts that mention or involve you" msgstr "" -#: ../../include/contact_selectors.php:57 -msgid "Hourly" +#: ../../include/conversation.php:1458 ../../mod/connections.php:211 +#: ../../mod/connections.php:224 ../../mod/menu.php:61 +msgid "New" msgstr "" -#: ../../include/contact_selectors.php:58 -msgid "Twice daily" +#: ../../include/conversation.php:1461 +msgid "Activity Stream - by date" msgstr "" -#: ../../include/contact_selectors.php:59 -msgid "Daily" +#: ../../include/conversation.php:1467 +msgid "Starred" msgstr "" -#: ../../include/contact_selectors.php:60 -msgid "Weekly" +#: ../../include/conversation.php:1470 +msgid "Favourite Posts" msgstr "" -#: ../../include/contact_selectors.php:61 -msgid "Monthly" +#: ../../include/conversation.php:1477 +msgid "Spam" msgstr "" -#: ../../include/contact_selectors.php:76 -msgid "Friendica" +#: ../../include/conversation.php:1480 +msgid "Posts flagged as SPAM" msgstr "" -#: ../../include/contact_selectors.php:77 -msgid "OStatus" +#: ../../include/conversation.php:1516 ../../mod/admin.php:867 +msgid "Channel" msgstr "" -#: ../../include/contact_selectors.php:78 -msgid "RSS/Atom" +#: ../../include/conversation.php:1519 +msgid "Status Messages and Posts" msgstr "" -#: ../../include/contact_selectors.php:80 -msgid "Diaspora" +#: ../../include/conversation.php:1528 +msgid "About" msgstr "" -#: ../../include/contact_selectors.php:81 -msgid "Facebook" +#: ../../include/conversation.php:1531 +msgid "Profile Details" msgstr "" -#: ../../include/contact_selectors.php:82 -msgid "Zot!" +#: ../../include/conversation.php:1549 +msgid "Files and Storage" msgstr "" -#: ../../include/contact_selectors.php:83 -msgid "LinkedIn" +#: ../../include/conversation.php:1558 ../../include/conversation.php:1561 +msgid "Chatrooms" msgstr "" -#: ../../include/contact_selectors.php:84 -msgid "XMPP/IM" +#: ../../include/conversation.php:1573 +msgid "Saved Bookmarks" msgstr "" -#: ../../include/contact_selectors.php:85 -msgid "MySpace" +#: ../../include/conversation.php:1584 +msgid "Manage Webpages" msgstr "" -#: ../../include/event.php:11 ../../include/bb2diaspora.php:439 -msgid "l F d, Y \\@ g:i A" +#: ../../include/auth.php:116 +msgid "Logged out." msgstr "" -#: ../../include/event.php:20 ../../include/bb2diaspora.php:445 -msgid "Starts:" +#: ../../include/auth.php:257 +msgid "Failed authentication" msgstr "" -#: ../../include/event.php:30 ../../include/bb2diaspora.php:453 -msgid "Finishes:" +#: ../../include/auth.php:271 ../../mod/openid.php:190 +msgid "Login failed." msgstr "" -#: ../../include/event.php:326 -msgid "This event has been added to your calendar." +#: ../../include/text.php:321 +msgid "prev" msgstr "" -#: ../../include/profile_selectors.php:6 -#: ../../include/profile_selectors.php:23 -msgid "Male" +#: ../../include/text.php:323 +msgid "first" msgstr "" -#: ../../include/profile_selectors.php:6 -#: ../../include/profile_selectors.php:23 -msgid "Female" +#: ../../include/text.php:352 +msgid "last" msgstr "" -#: ../../include/profile_selectors.php:6 -msgid "Currently Male" +#: ../../include/text.php:355 +msgid "next" msgstr "" -#: ../../include/profile_selectors.php:6 -msgid "Currently Female" +#: ../../include/text.php:367 +msgid "older" msgstr "" -#: ../../include/profile_selectors.php:6 -msgid "Mostly Male" +#: ../../include/text.php:369 +msgid "newer" msgstr "" -#: ../../include/profile_selectors.php:6 -msgid "Mostly Female" +#: ../../include/text.php:736 +msgid "No connections" msgstr "" -#: ../../include/profile_selectors.php:6 -msgid "Transgender" -msgstr "" +#: ../../include/text.php:749 +#, php-format +msgid "%d Connection" +msgid_plural "%d Connections" +msgstr[0] "" +msgstr[1] "" -#: ../../include/profile_selectors.php:6 -msgid "Intersex" +#: ../../include/text.php:762 +msgid "View Connections" msgstr "" -#: ../../include/profile_selectors.php:6 -msgid "Transsexual" +#: ../../include/text.php:901 +msgid "poke" msgstr "" -#: ../../include/profile_selectors.php:6 -msgid "Hermaphrodite" +#: ../../include/text.php:902 +msgid "ping" msgstr "" -#: ../../include/profile_selectors.php:6 -msgid "Neuter" +#: ../../include/text.php:902 +msgid "pinged" msgstr "" -#: ../../include/profile_selectors.php:6 -msgid "Non-specific" +#: ../../include/text.php:903 +msgid "prod" msgstr "" -#: ../../include/profile_selectors.php:6 -msgid "Undecided" +#: ../../include/text.php:903 +msgid "prodded" msgstr "" -#: ../../include/profile_selectors.php:42 -#: ../../include/profile_selectors.php:61 -msgid "Males" +#: ../../include/text.php:904 +msgid "slap" msgstr "" -#: ../../include/profile_selectors.php:42 -#: ../../include/profile_selectors.php:61 -msgid "Females" +#: ../../include/text.php:904 +msgid "slapped" msgstr "" -#: ../../include/profile_selectors.php:42 -msgid "Gay" +#: ../../include/text.php:905 +msgid "finger" msgstr "" -#: ../../include/profile_selectors.php:42 -msgid "Lesbian" +#: ../../include/text.php:905 +msgid "fingered" msgstr "" -#: ../../include/profile_selectors.php:42 -msgid "No Preference" +#: ../../include/text.php:906 +msgid "rebuff" msgstr "" -#: ../../include/profile_selectors.php:42 -msgid "Bisexual" +#: ../../include/text.php:906 +msgid "rebuffed" msgstr "" -#: ../../include/profile_selectors.php:42 -msgid "Autosexual" +#: ../../include/text.php:915 +msgid "happy" msgstr "" -#: ../../include/profile_selectors.php:42 -msgid "Abstinent" +#: ../../include/text.php:916 +msgid "sad" msgstr "" -#: ../../include/profile_selectors.php:42 -msgid "Virgin" +#: ../../include/text.php:917 +msgid "mellow" msgstr "" -#: ../../include/profile_selectors.php:42 -msgid "Deviant" +#: ../../include/text.php:918 +msgid "tired" msgstr "" -#: ../../include/profile_selectors.php:42 -msgid "Fetish" +#: ../../include/text.php:919 +msgid "perky" msgstr "" -#: ../../include/profile_selectors.php:42 -msgid "Oodles" +#: ../../include/text.php:920 +msgid "angry" msgstr "" -#: ../../include/profile_selectors.php:42 -msgid "Nonsexual" +#: ../../include/text.php:921 +msgid "stupified" msgstr "" -#: ../../include/profile_selectors.php:80 -#: ../../include/profile_selectors.php:97 -msgid "Single" +#: ../../include/text.php:922 +msgid "puzzled" msgstr "" -#: ../../include/profile_selectors.php:80 -msgid "Lonely" +#: ../../include/text.php:923 +msgid "interested" msgstr "" -#: ../../include/profile_selectors.php:80 -msgid "Available" +#: ../../include/text.php:924 +msgid "bitter" msgstr "" -#: ../../include/profile_selectors.php:80 -msgid "Unavailable" +#: ../../include/text.php:925 +msgid "cheerful" msgstr "" -#: ../../include/profile_selectors.php:80 -msgid "Has crush" +#: ../../include/text.php:926 +msgid "alive" msgstr "" -#: ../../include/profile_selectors.php:80 -msgid "Infatuated" +#: ../../include/text.php:927 +msgid "annoyed" msgstr "" -#: ../../include/profile_selectors.php:80 -#: ../../include/profile_selectors.php:97 -msgid "Dating" +#: ../../include/text.php:928 +msgid "anxious" msgstr "" -#: ../../include/profile_selectors.php:80 -msgid "Unfaithful" +#: ../../include/text.php:929 +msgid "cranky" msgstr "" -#: ../../include/profile_selectors.php:80 -msgid "Sex Addict" +#: ../../include/text.php:930 +msgid "disturbed" msgstr "" -#: ../../include/profile_selectors.php:80 -msgid "Friends/Benefits" +#: ../../include/text.php:931 +msgid "frustrated" msgstr "" -#: ../../include/profile_selectors.php:80 -msgid "Casual" +#: ../../include/text.php:932 +msgid "depressed" msgstr "" -#: ../../include/profile_selectors.php:80 -msgid "Engaged" +#: ../../include/text.php:933 +msgid "motivated" msgstr "" -#: ../../include/profile_selectors.php:80 -#: ../../include/profile_selectors.php:97 -msgid "Married" +#: ../../include/text.php:934 +msgid "relaxed" msgstr "" -#: ../../include/profile_selectors.php:80 -msgid "Imaginarily married" +#: ../../include/text.php:935 +msgid "surprised" msgstr "" -#: ../../include/profile_selectors.php:80 -msgid "Partners" +#: ../../include/text.php:1099 +msgid "Monday" msgstr "" -#: ../../include/profile_selectors.php:80 -#: ../../include/profile_selectors.php:97 -msgid "Cohabiting" +#: ../../include/text.php:1099 +msgid "Tuesday" msgstr "" -#: ../../include/profile_selectors.php:80 -msgid "Common law" +#: ../../include/text.php:1099 +msgid "Wednesday" msgstr "" -#: ../../include/profile_selectors.php:80 -msgid "Happy" +#: ../../include/text.php:1099 +msgid "Thursday" msgstr "" -#: ../../include/profile_selectors.php:80 -msgid "Not looking" +#: ../../include/text.php:1099 +msgid "Friday" msgstr "" -#: ../../include/profile_selectors.php:80 -msgid "Swinger" +#: ../../include/text.php:1099 +msgid "Saturday" msgstr "" -#: ../../include/profile_selectors.php:80 -msgid "Betrayed" +#: ../../include/text.php:1099 +msgid "Sunday" msgstr "" -#: ../../include/profile_selectors.php:80 -#: ../../include/profile_selectors.php:97 -msgid "Separated" +#: ../../include/text.php:1103 +msgid "January" msgstr "" -#: ../../include/profile_selectors.php:80 -msgid "Unstable" +#: ../../include/text.php:1103 +msgid "February" msgstr "" -#: ../../include/profile_selectors.php:80 -#: ../../include/profile_selectors.php:97 -msgid "Divorced" +#: ../../include/text.php:1103 +msgid "March" msgstr "" -#: ../../include/profile_selectors.php:80 -msgid "Imaginarily divorced" +#: ../../include/text.php:1103 +msgid "April" msgstr "" -#: ../../include/profile_selectors.php:80 -#: ../../include/profile_selectors.php:97 -msgid "Widowed" +#: ../../include/text.php:1103 +msgid "May" msgstr "" -#: ../../include/profile_selectors.php:80 -msgid "Uncertain" +#: ../../include/text.php:1103 +msgid "June" msgstr "" -#: ../../include/profile_selectors.php:80 -#: ../../include/profile_selectors.php:97 -msgid "It's complicated" +#: ../../include/text.php:1103 +msgid "July" msgstr "" -#: ../../include/profile_selectors.php:80 -msgid "Don't care" +#: ../../include/text.php:1103 +msgid "August" msgstr "" -#: ../../include/profile_selectors.php:80 -msgid "Ask me" +#: ../../include/text.php:1103 +msgid "September" msgstr "" -#: ../../include/account.php:23 -msgid "Not a valid email address" +#: ../../include/text.php:1103 +msgid "October" msgstr "" -#: ../../include/account.php:25 -msgid "Your email domain is not among those allowed on this site" +#: ../../include/text.php:1103 +msgid "November" msgstr "" -#: ../../include/account.php:31 -msgid "Your email address is already registered at this site." +#: ../../include/text.php:1103 +msgid "December" msgstr "" -#: ../../include/account.php:64 -msgid "An invitation is required." +#: ../../include/text.php:1181 +msgid "unknown.???" msgstr "" -#: ../../include/account.php:68 -msgid "Invitation could not be verified." +#: ../../include/text.php:1182 +msgid "bytes" msgstr "" -#: ../../include/account.php:119 -msgid "Please enter the required information." +#: ../../include/text.php:1221 +msgid "remove category" msgstr "" -#: ../../include/account.php:187 -msgid "Failed to store account information." +#: ../../include/text.php:1291 +msgid "remove from file" msgstr "" -#: ../../include/account.php:245 -#, php-format -msgid "Registration confirmation for %s" +#: ../../include/text.php:1356 ../../include/text.php:1368 +msgid "Click to open/close" msgstr "" -#: ../../include/account.php:313 -#, php-format -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" +#: ../../include/text.php:1523 ../../mod/events.php:409 +msgid "Link to Source" msgstr "" -#: ../../include/account.php:486 -msgid "Account verified. Please login." +#: ../../include/text.php:1542 +msgid "Select a page layout: " msgstr "" -#: ../../include/account.php:647 ../../include/account.php:649 -msgid "Click here to upgrade." +#: ../../include/text.php:1545 ../../include/text.php:1610 +msgid "default" msgstr "" -#: ../../include/account.php:655 -msgid "This action exceeds the limits set by your subscription plan." +#: ../../include/text.php:1581 +msgid "Page content type: " msgstr "" -#: ../../include/account.php:660 -msgid "This action is not available under your subscription plan." +#: ../../include/text.php:1622 +msgid "Select an alternate language" msgstr "" -#: ../../include/oembed.php:171 -msgid "Embedded content" +#: ../../include/text.php:1756 +msgid "activity" msgstr "" -#: ../../include/oembed.php:180 -msgid "Embedding disabled" +#: ../../include/text.php:2028 +msgid "Design" msgstr "" -#: ../../include/zot.php:655 -msgid "Invalid data packet" +#: ../../include/text.php:2030 +msgid "Blocks" msgstr "" -#: ../../include/zot.php:671 -msgid "Unable to verify channel signature" +#: ../../include/text.php:2031 +msgid "Menus" msgstr "" -#: ../../include/zot.php:1757 -#, php-format -msgid "Unable to verify site signature for %s" +#: ../../include/text.php:2032 +msgid "Layouts" msgstr "" -#: ../../include/network.php:590 -msgid "view full size" +#: ../../include/text.php:2033 +msgid "Pages" msgstr "" -#: ../../include/dba/dba_driver.php:50 +#: ../../include/bookmarks.php:35 #, php-format -msgid "Cannot locate DNS info for database server '%s'" +msgid "%1$s's bookmarks" msgstr "" -#: ../../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." +#: ../../include/taxonomy.php:210 +msgid "Tags" msgstr "" -#: ../../include/group.php:234 -msgid "Default privacy group for new contacts" +#: ../../include/taxonomy.php:227 +msgid "Keywords" msgstr "" -#: ../../include/group.php:253 ../../mod/admin.php:737 -msgid "All Channels" +#: ../../include/taxonomy.php:252 +msgid "have" msgstr "" -#: ../../include/group.php:275 -msgid "edit" +#: ../../include/taxonomy.php:252 +msgid "has" msgstr "" -#: ../../include/group.php:297 -msgid "Collections" +#: ../../include/taxonomy.php:253 +msgid "want" msgstr "" -#: ../../include/group.php:298 -msgid "Edit collection" +#: ../../include/taxonomy.php:253 +msgid "wants" msgstr "" -#: ../../include/group.php:299 -msgid "Create a new collection" +#: ../../include/taxonomy.php:254 ../../include/ItemObject.php:221 +msgid "like" msgstr "" -#: ../../include/group.php:300 -msgid "Channels not in any collection" +#: ../../include/taxonomy.php:254 +msgid "likes" msgstr "" -#: ../../include/group.php:302 ../../include/widgets.php:273 -msgid "add" +#: ../../include/taxonomy.php:255 ../../include/ItemObject.php:222 +msgid "dislike" msgstr "" -#: ../../include/attach.php:221 ../../include/attach.php:275 -msgid "Item was not found." +#: ../../include/taxonomy.php:255 +msgid "dislikes" msgstr "" -#: ../../include/attach.php:331 -msgid "No source file." +#: ../../include/comanche.php:35 ../../view/theme/apw/php/config.php:185 +msgid "Default" msgstr "" -#: ../../include/attach.php:348 -msgid "Cannot locate file to replace" +#: ../../include/contact_selectors.php:56 +msgid "Frequently" msgstr "" -#: ../../include/attach.php:366 -msgid "Cannot locate file to revise/update" +#: ../../include/contact_selectors.php:57 +msgid "Hourly" msgstr "" -#: ../../include/attach.php:377 -#, php-format -msgid "File exceeds size limit of %d" +#: ../../include/contact_selectors.php:58 +msgid "Twice daily" msgstr "" -#: ../../include/attach.php:389 -#, php-format -msgid "You have reached your limit of %1$.0f Mbytes attachment storage." +#: ../../include/contact_selectors.php:59 +msgid "Daily" msgstr "" -#: ../../include/attach.php:472 -msgid "File upload failed. Possible system limit or action terminated." +#: ../../include/contact_selectors.php:60 +msgid "Weekly" msgstr "" -#: ../../include/attach.php:484 -msgid "Stored file could not be verified. Upload failed." +#: ../../include/contact_selectors.php:61 +msgid "Monthly" msgstr "" -#: ../../include/attach.php:526 ../../include/attach.php:543 -msgid "Path not available." +#: ../../include/contact_selectors.php:76 +msgid "Friendica" msgstr "" -#: ../../include/attach.php:589 -msgid "Empty pathname" +#: ../../include/contact_selectors.php:77 +msgid "OStatus" msgstr "" -#: ../../include/attach.php:605 -msgid "duplicate filename or path" +#: ../../include/contact_selectors.php:78 +msgid "RSS/Atom" msgstr "" -#: ../../include/attach.php:629 -msgid "Path not found." +#: ../../include/contact_selectors.php:79 ../../mod/admin.php:728 +#: ../../mod/admin.php:737 ../../boot.php:1498 +msgid "Email" msgstr "" -#: ../../include/attach.php:680 -msgid "mkdir failed." +#: ../../include/contact_selectors.php:80 +msgid "Diaspora" msgstr "" -#: ../../include/attach.php:684 -msgid "database storage failed." +#: ../../include/contact_selectors.php:81 +msgid "Facebook" msgstr "" -#: ../../include/ItemObject.php:89 ../../include/conversation.php:645 -#: ../../mod/photos.php:862 -msgid "Private Message" +#: ../../include/contact_selectors.php:82 +msgid "Zot!" msgstr "" -#: ../../include/ItemObject.php:126 ../../include/conversation.php:637 -msgid "Select" +#: ../../include/contact_selectors.php:83 +msgid "LinkedIn" msgstr "" -#: ../../include/ItemObject.php:130 -msgid "Save to Folder" +#: ../../include/contact_selectors.php:84 +msgid "XMPP/IM" msgstr "" -#: ../../include/ItemObject.php:142 ../../include/ItemObject.php:154 -msgid "View all" +#: ../../include/contact_selectors.php:85 +msgid "MySpace" msgstr "" -#: ../../include/ItemObject.php:151 -msgctxt "noun" -msgid "Dislike" -msgid_plural "Dislikes" +#: ../../include/contact_widgets.php:14 +#, php-format +msgid "%d invitation available" +msgid_plural "%d invitations available" msgstr[0] "" msgstr[1] "" -#: ../../include/ItemObject.php:179 -msgid "Add Star" +#: ../../include/contact_widgets.php:19 ../../mod/admin.php:418 +msgid "Advanced" msgstr "" -#: ../../include/ItemObject.php:180 -msgid "Remove Star" +#: ../../include/contact_widgets.php:22 +msgid "Find Channels" msgstr "" -#: ../../include/ItemObject.php:181 -msgid "Toggle Star Status" +#: ../../include/contact_widgets.php:23 +msgid "Enter name or interest" msgstr "" -#: ../../include/ItemObject.php:185 -msgid "starred" +#: ../../include/contact_widgets.php:24 +msgid "Connect/Follow" msgstr "" -#: ../../include/ItemObject.php:194 ../../include/conversation.php:652 -msgid "Message signature validated" +#: ../../include/contact_widgets.php:25 +msgid "Examples: Robert Morgenstein, Fishing" msgstr "" -#: ../../include/ItemObject.php:195 ../../include/conversation.php:653 -msgid "Message signature incorrect" +#: ../../include/contact_widgets.php:26 ../../mod/connections.php:412 +#: ../../mod/directory.php:222 ../../mod/directory.php:227 +msgid "Find" msgstr "" -#: ../../include/ItemObject.php:203 -msgid "Add Tag" +#: ../../include/contact_widgets.php:27 ../../mod/suggest.php:59 +msgid "Channel Suggestions" msgstr "" -#: ../../include/ItemObject.php:221 ../../mod/photos.php:992 -msgid "I like this (toggle)" +#: ../../include/contact_widgets.php:29 +msgid "Random Profile" msgstr "" -#: ../../include/ItemObject.php:222 ../../mod/photos.php:993 -msgid "I don't like this (toggle)" +#: ../../include/contact_widgets.php:30 +msgid "Invite Friends" msgstr "" -#: ../../include/ItemObject.php:226 -msgid "Share This" +#: ../../include/contact_widgets.php:32 +msgid "Exammple: name=fred and country=iceland" msgstr "" -#: ../../include/ItemObject.php:226 -msgid "share" +#: ../../include/contact_widgets.php:33 +msgid "Advanced Find" msgstr "" -#: ../../include/ItemObject.php:249 ../../include/ItemObject.php:250 +#: ../../include/contact_widgets.php:126 #, php-format -msgid "View %s's profile - %s" +msgid "%d connection in common" +msgid_plural "%d connections in common" +msgstr[0] "" +msgstr[1] "" + +#: ../../include/contact_widgets.php:131 +msgid "show more" msgstr "" -#: ../../include/ItemObject.php:251 -msgid "to" +#: ../../include/event.php:11 ../../include/bb2diaspora.php:458 +msgid "l F d, Y \\@ g:i A" msgstr "" -#: ../../include/ItemObject.php:252 -msgid "via" +#: ../../include/event.php:20 ../../include/bb2diaspora.php:464 +msgid "Starts:" msgstr "" -#: ../../include/ItemObject.php:253 -msgid "Wall-to-Wall" +#: ../../include/event.php:30 ../../include/bb2diaspora.php:472 +msgid "Finishes:" msgstr "" -#: ../../include/ItemObject.php:254 -msgid "via Wall-To-Wall:" +#: ../../include/event.php:326 +msgid "This event has been added to your calendar." msgstr "" -#: ../../include/ItemObject.php:265 ../../include/conversation.php:698 -#, php-format -msgid " from %s" +#: ../../include/account.php:23 +msgid "Not a valid email address" msgstr "" -#: ../../include/ItemObject.php:268 ../../include/conversation.php:701 -#, php-format -msgid "last edited: %s" -msgstr "" - -#: ../../include/ItemObject.php:269 ../../include/conversation.php:702 -#, php-format -msgid "Expires: %s" +#: ../../include/account.php:25 +msgid "Your email domain is not among those allowed on this site" msgstr "" -#: ../../include/ItemObject.php:290 -msgid "Save Bookmarks" +#: ../../include/account.php:31 +msgid "Your email address is already registered at this site." msgstr "" -#: ../../include/ItemObject.php:291 -msgid "Add to Calendar" +#: ../../include/account.php:64 +msgid "An invitation is required." msgstr "" -#: ../../include/ItemObject.php:299 -msgctxt "noun" -msgid "Likes" +#: ../../include/account.php:68 +msgid "Invitation could not be verified." msgstr "" -#: ../../include/ItemObject.php:300 -msgctxt "noun" -msgid "Dislikes" +#: ../../include/account.php:119 +msgid "Please enter the required information." msgstr "" -#: ../../include/ItemObject.php:305 ../../include/acl_selectors.php:249 -msgid "Close" +#: ../../include/account.php:187 +msgid "Failed to store account information." msgstr "" -#: ../../include/ItemObject.php:310 ../../include/conversation.php:719 -#: ../../include/conversation.php:1153 ../../mod/photos.php:995 -#: ../../mod/editpost.php:121 ../../mod/editwebpage.php:152 -#: ../../mod/mail.php:234 ../../mod/mail.php:349 ../../mod/editblock.php:120 -#: ../../mod/editlayout.php:115 -msgid "Please wait" +#: ../../include/account.php:245 +#, php-format +msgid "Registration confirmation for %s" msgstr "" -#: ../../include/ItemObject.php:331 +#: ../../include/account.php:313 #, php-format -msgid "%d comment" -msgid_plural "%d comments" -msgstr[0] "" -msgstr[1] "" - -#: ../../include/ItemObject.php:596 ../../mod/photos.php:1011 -#: ../../mod/photos.php:1098 -msgid "This is you" +msgid "Registration request at %s" msgstr "" -#: ../../include/ItemObject.php:600 -msgid "Bold" +#: ../../include/account.php:315 ../../include/account.php:342 +#: ../../include/account.php:399 +msgid "Administrator" msgstr "" -#: ../../include/ItemObject.php:601 -msgid "Italic" +#: ../../include/account.php:337 +msgid "your registration password" msgstr "" -#: ../../include/ItemObject.php:602 -msgid "Underline" +#: ../../include/account.php:340 ../../include/account.php:397 +#, php-format +msgid "Registration details for %s" msgstr "" -#: ../../include/ItemObject.php:603 -msgid "Quote" +#: ../../include/account.php:406 +msgid "Account approved." msgstr "" -#: ../../include/ItemObject.php:604 -msgid "Code" +#: ../../include/account.php:440 +#, php-format +msgid "Registration revoked for %s" msgstr "" -#: ../../include/ItemObject.php:605 -msgid "Image" +#: ../../include/account.php:486 +msgid "Account verified. Please login." msgstr "" -#: ../../include/ItemObject.php:606 -msgid "Link" +#: ../../include/account.php:647 ../../include/account.php:649 +msgid "Click here to upgrade." msgstr "" -#: ../../include/ItemObject.php:607 -msgid "Video" +#: ../../include/account.php:655 +msgid "This action exceeds the limits set by your subscription plan." msgstr "" -#: ../../include/ItemObject.php:611 ../../include/conversation.php:1179 -#: ../../mod/editpost.php:148 ../../mod/mail.php:240 ../../mod/mail.php:354 -msgid "Encrypt text" +#: ../../include/account.php:660 +msgid "This action is not available under your subscription plan." msgstr "" -#: ../../include/security.php:320 -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:95 ../../include/nav.php:128 ../../boot.php:1495 +msgid "Logout" msgstr "" -#: ../../include/text.php:321 -msgid "prev" +#: ../../include/nav.php:95 ../../include/nav.php:128 +msgid "End this session" msgstr "" -#: ../../include/text.php:323 -msgid "first" +#: ../../include/nav.php:98 ../../include/nav.php:159 +msgid "Home" msgstr "" -#: ../../include/text.php:352 -msgid "last" +#: ../../include/nav.php:98 +msgid "Your posts and conversations" msgstr "" -#: ../../include/text.php:355 -msgid "next" +#: ../../include/nav.php:99 +msgid "Your profile page" msgstr "" -#: ../../include/text.php:367 -msgid "older" +#: ../../include/nav.php:101 +msgid "Edit Profiles" msgstr "" -#: ../../include/text.php:369 -msgid "newer" +#: ../../include/nav.php:101 +msgid "Manage/Edit profiles" msgstr "" -#: ../../include/text.php:736 -msgid "No connections" +#: ../../include/nav.php:103 +msgid "Edit your profile" msgstr "" -#: ../../include/text.php:749 -#, php-format -msgid "%d Connection" -msgid_plural "%d Connections" -msgstr[0] "" -msgstr[1] "" - -#: ../../include/text.php:762 -msgid "View Connections" +#: ../../include/nav.php:105 +msgid "Your photos" msgstr "" -#: ../../include/text.php:822 ../../include/text.php:834 -#: ../../include/nav.php:173 ../../include/apps.php:145 -#: ../../mod/search.php:30 -msgid "Search" +#: ../../include/nav.php:106 +msgid "Your files" msgstr "" -#: ../../include/text.php:823 ../../include/text.php:835 -#: ../../include/widgets.php:193 ../../mod/admin.php:1341 -#: ../../mod/admin.php:1362 ../../mod/filer.php:50 ../../mod/rbmark.php:28 -#: ../../mod/rbmark.php:98 -msgid "Save" +#: ../../include/nav.php:111 +msgid "Your chatrooms" msgstr "" -#: ../../include/text.php:901 -msgid "poke" +#: ../../include/nav.php:117 +msgid "Your bookmarks" msgstr "" -#: ../../include/text.php:901 ../../include/conversation.php:243 -msgid "poked" +#: ../../include/nav.php:121 +msgid "Your webpages" msgstr "" -#: ../../include/text.php:902 -msgid "ping" +#: ../../include/nav.php:125 +msgid "Sign in" msgstr "" -#: ../../include/text.php:902 -msgid "pinged" +#: ../../include/nav.php:142 +#, php-format +msgid "%s - click to logout" msgstr "" -#: ../../include/text.php:903 -msgid "prod" +#: ../../include/nav.php:145 +msgid "Remote authentication" msgstr "" -#: ../../include/text.php:903 -msgid "prodded" +#: ../../include/nav.php:145 +msgid "Click to authenticate to your home hub" msgstr "" -#: ../../include/text.php:904 -msgid "slap" +#: ../../include/nav.php:159 +msgid "Home Page" msgstr "" -#: ../../include/text.php:904 -msgid "slapped" +#: ../../include/nav.php:163 ../../mod/register.php:220 ../../boot.php:1472 +msgid "Register" msgstr "" -#: ../../include/text.php:905 -msgid "finger" +#: ../../include/nav.php:163 +msgid "Create an account" msgstr "" -#: ../../include/text.php:905 -msgid "fingered" +#: ../../include/nav.php:168 +msgid "Help and documentation" msgstr "" -#: ../../include/text.php:906 -msgid "rebuff" +#: ../../include/nav.php:171 +msgid "Applications, utilities, links, games" msgstr "" -#: ../../include/text.php:906 -msgid "rebuffed" +#: ../../include/nav.php:173 +msgid "Search site content" msgstr "" -#: ../../include/text.php:915 -msgid "happy" +#: ../../include/nav.php:176 +msgid "Channel Locator" msgstr "" -#: ../../include/text.php:916 -msgid "sad" +#: ../../include/nav.php:190 +msgid "Your matrix" msgstr "" -#: ../../include/text.php:917 -msgid "mellow" +#: ../../include/nav.php:191 +msgid "Mark all matrix notifications seen" msgstr "" -#: ../../include/text.php:918 -msgid "tired" +#: ../../include/nav.php:193 +msgid "Channel home" msgstr "" -#: ../../include/text.php:919 -msgid "perky" +#: ../../include/nav.php:194 +msgid "Mark all channel notifications seen" msgstr "" -#: ../../include/text.php:920 -msgid "angry" +#: ../../include/nav.php:197 ../../mod/connections.php:406 +msgid "Connections" msgstr "" -#: ../../include/text.php:921 -msgid "stupified" +#: ../../include/nav.php:200 +msgid "Notices" msgstr "" -#: ../../include/text.php:922 -msgid "puzzled" +#: ../../include/nav.php:200 +msgid "Notifications" msgstr "" -#: ../../include/text.php:923 -msgid "interested" +#: ../../include/nav.php:201 +msgid "See all notifications" msgstr "" -#: ../../include/text.php:924 -msgid "bitter" +#: ../../include/nav.php:202 ../../mod/notifications.php:99 +msgid "Mark all system notifications seen" msgstr "" -#: ../../include/text.php:925 -msgid "cheerful" +#: ../../include/nav.php:204 +msgid "Private mail" msgstr "" -#: ../../include/text.php:926 -msgid "alive" +#: ../../include/nav.php:205 +msgid "See all private messages" msgstr "" -#: ../../include/text.php:927 -msgid "annoyed" +#: ../../include/nav.php:206 +msgid "Mark all private messages seen" msgstr "" -#: ../../include/text.php:928 -msgid "anxious" +#: ../../include/nav.php:207 +msgid "Inbox" msgstr "" -#: ../../include/text.php:929 -msgid "cranky" +#: ../../include/nav.php:208 +msgid "Outbox" msgstr "" -#: ../../include/text.php:930 -msgid "disturbed" +#: ../../include/nav.php:212 +msgid "Event Calendar" msgstr "" -#: ../../include/text.php:931 -msgid "frustrated" +#: ../../include/nav.php:213 +msgid "See all events" msgstr "" -#: ../../include/text.php:932 -msgid "depressed" +#: ../../include/nav.php:214 +msgid "Mark all events seen" msgstr "" -#: ../../include/text.php:933 -msgid "motivated" +#: ../../include/nav.php:216 +msgid "Manage Your Channels" msgstr "" -#: ../../include/text.php:934 -msgid "relaxed" -msgstr "" - -#: ../../include/text.php:935 -msgid "surprised" -msgstr "" - -#: ../../include/text.php:1099 -msgid "Monday" -msgstr "" - -#: ../../include/text.php:1099 -msgid "Tuesday" -msgstr "" - -#: ../../include/text.php:1099 -msgid "Wednesday" -msgstr "" - -#: ../../include/text.php:1099 -msgid "Thursday" -msgstr "" - -#: ../../include/text.php:1099 -msgid "Friday" -msgstr "" - -#: ../../include/text.php:1099 -msgid "Saturday" -msgstr "" - -#: ../../include/text.php:1099 -msgid "Sunday" -msgstr "" - -#: ../../include/text.php:1103 -msgid "January" -msgstr "" - -#: ../../include/text.php:1103 -msgid "February" -msgstr "" - -#: ../../include/text.php:1103 -msgid "March" -msgstr "" - -#: ../../include/text.php:1103 -msgid "April" -msgstr "" - -#: ../../include/text.php:1103 -msgid "May" -msgstr "" - -#: ../../include/text.php:1103 -msgid "June" -msgstr "" - -#: ../../include/text.php:1103 -msgid "July" -msgstr "" - -#: ../../include/text.php:1103 -msgid "August" -msgstr "" - -#: ../../include/text.php:1103 -msgid "September" -msgstr "" - -#: ../../include/text.php:1103 -msgid "October" -msgstr "" - -#: ../../include/text.php:1103 -msgid "November" -msgstr "" - -#: ../../include/text.php:1103 -msgid "December" -msgstr "" - -#: ../../include/text.php:1181 -msgid "unknown.???" -msgstr "" - -#: ../../include/text.php:1182 -msgid "bytes" -msgstr "" - -#: ../../include/text.php:1221 -msgid "remove category" -msgstr "" - -#: ../../include/text.php:1291 -msgid "remove from file" -msgstr "" - -#: ../../include/text.php:1356 ../../include/text.php:1368 -msgid "Click to open/close" -msgstr "" - -#: ../../include/text.php:1523 ../../mod/events.php:414 -msgid "Link to Source" -msgstr "" - -#: ../../include/text.php:1542 -msgid "Select a page layout: " -msgstr "" - -#: ../../include/text.php:1545 ../../include/text.php:1610 -msgid "default" -msgstr "" - -#: ../../include/text.php:1581 -msgid "Page content type: " -msgstr "" - -#: ../../include/text.php:1622 -msgid "Select an alternate language" -msgstr "" - -#: ../../include/text.php:1743 ../../include/conversation.php:120 -#: ../../include/diaspora.php:1924 ../../mod/subthread.php:72 -#: ../../mod/subthread.php:174 ../../mod/tagger.php:45 ../../mod/like.php:294 -msgid "photo" -msgstr "" - -#: ../../include/text.php:1746 ../../include/conversation.php:123 -#: ../../mod/tagger.php:49 -msgid "event" -msgstr "" - -#: ../../include/text.php:1749 ../../include/conversation.php:148 -#: ../../include/diaspora.php:1924 ../../mod/subthread.php:72 -#: ../../mod/subthread.php:174 ../../mod/tagger.php:53 ../../mod/like.php:294 -msgid "status" -msgstr "" - -#: ../../include/text.php:1751 ../../include/conversation.php:150 -#: ../../mod/tagger.php:55 -msgid "comment" -msgstr "" - -#: ../../include/text.php:1756 -msgid "activity" -msgstr "" - -#: ../../include/text.php:2028 -msgid "Design" -msgstr "" - -#: ../../include/text.php:2030 -msgid "Blocks" +#: ../../include/nav.php:218 +msgid "Account/Channel Settings" msgstr "" -#: ../../include/text.php:2031 -msgid "Menus" +#: ../../include/nav.php:226 ../../mod/admin.php:123 +msgid "Admin" msgstr "" -#: ../../include/text.php:2032 -msgid "Layouts" +#: ../../include/nav.php:226 +msgid "Site Setup and Configuration" msgstr "" -#: ../../include/text.php:2033 -msgid "Pages" +#: ../../include/nav.php:262 +msgid "Please wait..." msgstr "" #: ../../include/dir_fns.php:56 @@ -2400,43 +2229,8 @@ msgstr "" msgid "Safe Mode" msgstr "" -#: ../../include/bbcode.php:112 ../../include/bbcode.php:653 -#: ../../include/bbcode.php:656 ../../include/bbcode.php:661 -#: ../../include/bbcode.php:664 ../../include/bbcode.php:667 -#: ../../include/bbcode.php:670 ../../include/bbcode.php:675 -#: ../../include/bbcode.php:678 ../../include/bbcode.php:683 -#: ../../include/bbcode.php:686 ../../include/bbcode.php:689 -#: ../../include/bbcode.php:692 -msgid "Image/photo" -msgstr "" - -#: ../../include/bbcode.php:147 ../../include/bbcode.php:703 -msgid "Encrypted content" -msgstr "" - -#: ../../include/bbcode.php:165 -msgid "Install design element: " -msgstr "" - -#: ../../include/bbcode.php:171 -msgid "QR code" -msgstr "" - -#: ../../include/bbcode.php:220 -#, php-format -msgid "%1$s wrote the following %2$s %3$s" -msgstr "" - -#: ../../include/bbcode.php:222 -msgid "post" -msgstr "" - -#: ../../include/bbcode.php:621 -msgid "$1 spoiler" -msgstr "" - -#: ../../include/bbcode.php:641 -msgid "$1 wrote:" +#: ../../include/bb2diaspora.php:379 +msgid "Attachments:" msgstr "" #: ../../include/enotify.php:41 @@ -2634,293 +2428,56 @@ msgstr "" msgid "[Red:Notify]" msgstr "" -#: ../../include/bookmarks.php:35 -#, php-format -msgid "%1$s's bookmarks" +#: ../../include/chat.php:10 +msgid "Missing room name" msgstr "" -#: ../../include/nav.php:95 ../../include/nav.php:128 -msgid "End this session" +#: ../../include/chat.php:19 +msgid "Duplicate room name" msgstr "" -#: ../../include/nav.php:98 ../../include/nav.php:159 -msgid "Home" +#: ../../include/chat.php:68 ../../include/chat.php:76 +msgid "Invalid room specifier." msgstr "" -#: ../../include/nav.php:98 -msgid "Your posts and conversations" +#: ../../include/chat.php:105 +msgid "Room not found." msgstr "" -#: ../../include/nav.php:99 ../../include/conversation.php:945 -#: ../../mod/connedit.php:415 ../../mod/connedit.php:529 -msgid "View Profile" +#: ../../include/chat.php:126 +msgid "Room is full" msgstr "" -#: ../../include/nav.php:99 -msgid "Your profile page" +#: ../../include/features.php:23 +msgid "General Features" msgstr "" -#: ../../include/nav.php:101 -msgid "Edit Profiles" +#: ../../include/features.php:25 +msgid "Content Expiration" msgstr "" -#: ../../include/nav.php:101 -msgid "Manage/Edit profiles" +#: ../../include/features.php:25 +msgid "Remove posts/comments and/or private messages at a future time" msgstr "" -#: ../../include/nav.php:103 -msgid "Edit your profile" +#: ../../include/features.php:26 +msgid "Multiple Profiles" msgstr "" -#: ../../include/nav.php:105 ../../include/apps.php:137 -#: ../../include/conversation.php:1537 ../../mod/fbrowser.php:25 -msgid "Photos" +#: ../../include/features.php:26 +msgid "Ability to create multiple profiles" msgstr "" -#: ../../include/nav.php:105 -msgid "Your photos" +#: ../../include/features.php:27 +msgid "Advanced Profiles" msgstr "" -#: ../../include/nav.php:106 -msgid "Your files" +#: ../../include/features.php:27 +msgid "Additional profile sections and selections" msgstr "" -#: ../../include/nav.php:111 ../../include/apps.php:144 -msgid "Chat" -msgstr "" - -#: ../../include/nav.php:111 -msgid "Your chatrooms" -msgstr "" - -#: ../../include/nav.php:117 ../../include/apps.php:127 -#: ../../include/conversation.php:1570 -msgid "Bookmarks" -msgstr "" - -#: ../../include/nav.php:117 -msgid "Your bookmarks" -msgstr "" - -#: ../../include/nav.php:121 ../../include/apps.php:134 -#: ../../include/conversation.php:1581 ../../mod/webpages.php:129 -msgid "Webpages" -msgstr "" - -#: ../../include/nav.php:121 -msgid "Your webpages" -msgstr "" - -#: ../../include/nav.php:125 -msgid "Sign in" -msgstr "" - -#: ../../include/nav.php:142 -#, php-format -msgid "%s - click to logout" -msgstr "" - -#: ../../include/nav.php:145 -msgid "Remote authentication" -msgstr "" - -#: ../../include/nav.php:145 -msgid "Click to authenticate to your home hub" -msgstr "" - -#: ../../include/nav.php:159 -msgid "Home Page" -msgstr "" - -#: ../../include/nav.php:163 -msgid "Create an account" -msgstr "" - -#: ../../include/nav.php:168 ../../include/apps.php:140 ../../mod/help.php:60 -#: ../../mod/help.php:65 -msgid "Help" -msgstr "" - -#: ../../include/nav.php:168 -msgid "Help and documentation" -msgstr "" - -#: ../../include/nav.php:171 ../../include/widgets.php:86 -#: ../../mod/apps.php:33 -msgid "Apps" -msgstr "" - -#: ../../include/nav.php:171 -msgid "Applications, utilities, links, games" -msgstr "" - -#: ../../include/nav.php:173 -msgid "Search site content" -msgstr "" - -#: ../../include/nav.php:176 ../../include/apps.php:139 -#: ../../mod/directory.php:226 -msgid "Directory" -msgstr "" - -#: ../../include/nav.php:176 -msgid "Channel Locator" -msgstr "" - -#: ../../include/nav.php:190 ../../include/apps.php:131 -msgid "Matrix" -msgstr "" - -#: ../../include/nav.php:190 -msgid "Your matrix" -msgstr "" - -#: ../../include/nav.php:191 -msgid "Mark all matrix notifications seen" -msgstr "" - -#: ../../include/nav.php:193 ../../include/apps.php:135 -msgid "Channel Home" -msgstr "" - -#: ../../include/nav.php:193 -msgid "Channel home" -msgstr "" - -#: ../../include/nav.php:194 -msgid "Mark all channel notifications seen" -msgstr "" - -#: ../../include/nav.php:197 ../../mod/connections.php:406 -msgid "Connections" -msgstr "" - -#: ../../include/nav.php:200 -msgid "Notices" -msgstr "" - -#: ../../include/nav.php:200 -msgid "Notifications" -msgstr "" - -#: ../../include/nav.php:201 -msgid "See all notifications" -msgstr "" - -#: ../../include/nav.php:202 ../../mod/notifications.php:99 -msgid "Mark all system notifications seen" -msgstr "" - -#: ../../include/nav.php:204 ../../include/apps.php:141 -msgid "Mail" -msgstr "" - -#: ../../include/nav.php:204 -msgid "Private mail" -msgstr "" - -#: ../../include/nav.php:205 -msgid "See all private messages" -msgstr "" - -#: ../../include/nav.php:206 -msgid "Mark all private messages seen" -msgstr "" - -#: ../../include/nav.php:207 -msgid "Inbox" -msgstr "" - -#: ../../include/nav.php:208 -msgid "Outbox" -msgstr "" - -#: ../../include/nav.php:209 ../../include/widgets.php:545 -msgid "New Message" -msgstr "" - -#: ../../include/nav.php:212 ../../include/apps.php:138 -#: ../../mod/events.php:436 -msgid "Events" -msgstr "" - -#: ../../include/nav.php:212 -msgid "Event Calendar" -msgstr "" - -#: ../../include/nav.php:213 -msgid "See all events" -msgstr "" - -#: ../../include/nav.php:214 -msgid "Mark all events seen" -msgstr "" - -#: ../../include/nav.php:216 ../../include/apps.php:130 -#: ../../mod/manage.php:148 -msgid "Channel Manager" -msgstr "" - -#: ../../include/nav.php:216 -msgid "Manage Your Channels" -msgstr "" - -#: ../../include/nav.php:218 ../../include/apps.php:132 -#: ../../include/widgets.php:521 ../../mod/admin.php:953 -#: ../../mod/admin.php:1158 -msgid "Settings" -msgstr "" - -#: ../../include/nav.php:218 -msgid "Account/Channel Settings" -msgstr "" - -#: ../../include/nav.php:226 ../../mod/admin.php:123 -msgid "Admin" -msgstr "" - -#: ../../include/nav.php:226 -msgid "Site Setup and Configuration" -msgstr "" - -#: ../../include/nav.php:257 ../../include/conversation.php:847 -msgid "Loading..." -msgstr "" - -#: ../../include/nav.php:262 -msgid "Please wait..." -msgstr "" - -#: ../../include/features.php:23 -msgid "General Features" -msgstr "" - -#: ../../include/features.php:25 -msgid "Content Expiration" -msgstr "" - -#: ../../include/features.php:25 -msgid "Remove posts/comments and/or private messages at a future time" -msgstr "" - -#: ../../include/features.php:26 -msgid "Multiple Profiles" -msgstr "" - -#: ../../include/features.php:26 -msgid "Ability to create multiple profiles" -msgstr "" - -#: ../../include/features.php:27 -msgid "Advanced Profiles" -msgstr "" - -#: ../../include/features.php:27 -msgid "Additional profile sections and selections" -msgstr "" - -#: ../../include/features.php:28 -msgid "Profile Import/Export" +#: ../../include/features.php:28 +msgid "Profile Import/Export" msgstr "" #: ../../include/features.php:28 @@ -2999,11 +2556,6 @@ msgstr "" msgid "Allow previewing posts and comments before publishing them" msgstr "" -#: ../../include/features.php:49 ../../include/widgets.php:510 -#: ../../mod/sources.php:88 -msgid "Channel Sources" -msgstr "" - #: ../../include/features.php:49 msgid "Automatically import channel content from other channels or feeds" msgstr "" @@ -3037,10 +2589,6 @@ msgstr "" msgid "Enable widget to display Network posts only from selected collections" msgstr "" -#: ../../include/features.php:58 ../../include/widgets.php:272 -msgid "Saved Searches" -msgstr "" - #: ../../include/features.php:58 msgid "Save search terms for re-use" msgstr "" @@ -3133,2605 +2681,2609 @@ msgstr "" msgid "Provide a personal tag cloud on your channel page" msgstr "" -#: ../../include/notify.php:23 -msgid "created a new post" +#: ../../include/follow.php:26 +msgid "Channel is blocked on this site." msgstr "" -#: ../../include/notify.php:24 -#, php-format -msgid "commented on %s's post" +#: ../../include/follow.php:31 +msgid "Channel location missing." msgstr "" -#: ../../include/apps.php:126 -msgid "Site Admin" +#: ../../include/follow.php:80 +msgid "Response from remote channel was incomplete." msgstr "" -#: ../../include/apps.php:128 -msgid "Address Book" +#: ../../include/follow.php:97 +msgid "Channel was deleted and no longer exists." msgstr "" -#: ../../include/apps.php:142 ../../mod/mood.php:131 -msgid "Mood" +#: ../../include/follow.php:133 ../../include/follow.php:202 +msgid "Protocol disabled." msgstr "" -#: ../../include/apps.php:143 ../../include/conversation.php:951 -msgid "Poke" +#: ../../include/follow.php:176 +msgid "Channel discovery failed." msgstr "" -#: ../../include/apps.php:146 -msgid "Probe" +#: ../../include/follow.php:192 +msgid "local account not found." msgstr "" -#: ../../include/apps.php:147 -msgid "Suggest" +#: ../../include/follow.php:219 +msgid "Cannot connect to yourself." msgstr "" -#: ../../include/apps.php:148 -msgid "Random Channel" -msgstr "" +#: ../../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 "" -#: ../../include/apps.php:149 -msgid "Invite" +#: ../../include/group.php:234 +msgid "Default privacy group for new contacts" msgstr "" -#: ../../include/apps.php:150 -msgid "Features" +#: ../../include/group.php:253 ../../mod/admin.php:737 +msgid "All Channels" msgstr "" -#: ../../include/apps.php:151 -msgid "Language" +#: ../../include/group.php:275 +msgid "edit" msgstr "" -#: ../../include/apps.php:152 -msgid "Post" +#: ../../include/group.php:297 +msgid "Collections" msgstr "" -#: ../../include/apps.php:153 -msgid "Profile Photo" +#: ../../include/group.php:298 +msgid "Edit collection" msgstr "" -#: ../../include/apps.php:242 ../../mod/settings.php:79 -#: ../../mod/settings.php:545 -msgid "Update" +#: ../../include/group.php:299 +msgid "Create a new collection" msgstr "" -#: ../../include/apps.php:242 -msgid "Install" +#: ../../include/group.php:300 +msgid "Channels not in any collection" msgstr "" -#: ../../include/apps.php:247 -msgid "Purchase" +#: ../../include/bbcode.php:112 ../../include/bbcode.php:653 +#: ../../include/bbcode.php:656 ../../include/bbcode.php:661 +#: ../../include/bbcode.php:664 ../../include/bbcode.php:667 +#: ../../include/bbcode.php:670 ../../include/bbcode.php:675 +#: ../../include/bbcode.php:678 ../../include/bbcode.php:683 +#: ../../include/bbcode.php:686 ../../include/bbcode.php:689 +#: ../../include/bbcode.php:692 +msgid "Image/photo" msgstr "" -#: ../../include/api.php:1072 -msgid "Public Timeline" +#: ../../include/bbcode.php:147 ../../include/bbcode.php:703 +msgid "Encrypted content" msgstr "" -#: ../../include/chat.php:10 -msgid "Missing room name" +#: ../../include/bbcode.php:165 +msgid "Install design element: " msgstr "" -#: ../../include/chat.php:19 -msgid "Duplicate room name" +#: ../../include/bbcode.php:171 +msgid "QR code" msgstr "" -#: ../../include/chat.php:68 ../../include/chat.php:76 -msgid "Invalid room specifier." +#: ../../include/bbcode.php:220 +#, php-format +msgid "%1$s wrote the following %2$s %3$s" msgstr "" -#: ../../include/chat.php:105 -msgid "Room not found." +#: ../../include/bbcode.php:222 +msgid "post" msgstr "" -#: ../../include/chat.php:126 -msgid "Room is full" +#: ../../include/bbcode.php:621 +msgid "$1 spoiler" msgstr "" -#: ../../include/conversation.php:126 ../../mod/like.php:89 -msgid "channel" +#: ../../include/bbcode.php:641 +msgid "$1 wrote:" msgstr "" -#: ../../include/conversation.php:164 ../../include/diaspora.php:1953 -#: ../../mod/like.php:331 -#, php-format -msgid "%1$s likes %2$s's %3$s" +#: ../../include/RedDAV/RedBrowser.php:106 +#: ../../include/RedDAV/RedBrowser.php:249 +msgid "parent" msgstr "" -#: ../../include/conversation.php:167 ../../mod/like.php:333 -#, php-format -msgid "%1$s doesn't like %2$s's %3$s" +#: ../../include/RedDAV/RedBrowser.php:130 +msgid "Collection" msgstr "" -#: ../../include/conversation.php:204 -#, php-format -msgid "%1$s is now connected with %2$s" +#: ../../include/RedDAV/RedBrowser.php:133 +msgid "Principal" msgstr "" -#: ../../include/conversation.php:239 -#, php-format -msgid "%1$s poked %2$s" +#: ../../include/RedDAV/RedBrowser.php:136 +msgid "Addressbook" msgstr "" -#: ../../include/conversation.php:261 ../../mod/mood.php:63 +#: ../../include/RedDAV/RedBrowser.php:139 +msgid "Calendar" +msgstr "" + +#: ../../include/RedDAV/RedBrowser.php:142 +msgid "Schedule Inbox" +msgstr "" + +#: ../../include/RedDAV/RedBrowser.php:145 +msgid "Schedule Outbox" +msgstr "" + +#: ../../include/RedDAV/RedBrowser.php:223 #, php-format -msgctxt "mood" -msgid "%1$s is %2$s" +msgid "%1$s used" msgstr "" -#: ../../include/conversation.php:674 +#: ../../include/RedDAV/RedBrowser.php:228 #, php-format -msgid "View %s's profile @ %s" +msgid "%1$s used of %2$s (%3$s%)" msgstr "" -#: ../../include/conversation.php:689 -msgid "Categories:" +#: ../../include/RedDAV/RedBrowser.php:245 ../../mod/settings.php:521 +#: ../../mod/settings.php:547 ../../mod/admin.php:868 +msgid "Name" msgstr "" -#: ../../include/conversation.php:690 -msgid "Filed under:" +#: ../../include/RedDAV/RedBrowser.php:246 +msgid "Type" msgstr "" -#: ../../include/conversation.php:717 -msgid "View in context" +#: ../../include/RedDAV/RedBrowser.php:247 +msgid "Size" msgstr "" -#: ../../include/conversation.php:843 -msgid "remove" +#: ../../include/RedDAV/RedBrowser.php:248 +msgid "Last Modified" msgstr "" -#: ../../include/conversation.php:848 -msgid "Delete Selected Items" +#: ../../include/RedDAV/RedBrowser.php:252 +msgid "Total" msgstr "" -#: ../../include/conversation.php:942 -msgid "View Source" +#: ../../include/RedDAV/RedBrowser.php:305 +msgid "Create new folder" msgstr "" -#: ../../include/conversation.php:943 -msgid "Follow Thread" +#: ../../include/RedDAV/RedBrowser.php:306 ../../mod/mitem.php:142 +#: ../../mod/menu.php:84 ../../mod/new_channel.php:122 +msgid "Create" msgstr "" -#: ../../include/conversation.php:944 -msgid "View Status" +#: ../../include/RedDAV/RedBrowser.php:307 +msgid "Upload file" msgstr "" -#: ../../include/conversation.php:946 -msgid "View Photos" +#: ../../include/RedDAV/RedBrowser.php:308 ../../mod/photos.php:745 +#: ../../mod/photos.php:1226 ../../mod/profile_photo.php:361 +msgid "Upload" msgstr "" -#: ../../include/conversation.php:947 -msgid "Matrix Activity" +#: ../../include/message.php:18 +msgid "No recipient provided." msgstr "" -#: ../../include/conversation.php:949 -msgid "Edit Contact" +#: ../../include/message.php:23 +msgid "[no subject]" msgstr "" -#: ../../include/conversation.php:950 -msgid "Send PM" +#: ../../include/message.php:45 +msgid "Unable to determine sender." msgstr "" -#: ../../include/conversation.php:1024 -#, php-format -msgid "%s likes this." +#: ../../include/message.php:200 +msgid "Stored post could not be verified." msgstr "" -#: ../../include/conversation.php:1024 -#, php-format -msgid "%s doesn't like this." +#: ../../include/ItemObject.php:130 +msgid "Save to Folder" msgstr "" -#: ../../include/conversation.php:1028 -#, php-format -msgid "%2$d people like this." -msgid_plural "%2$d people like this." -msgstr[0] "" -msgstr[1] "" +#: ../../include/ItemObject.php:142 ../../include/ItemObject.php:154 +msgid "View all" +msgstr "" -#: ../../include/conversation.php:1030 -#, php-format -msgid "%2$d people don't like this." -msgid_plural "%2$d people don't like this." +#: ../../include/ItemObject.php:151 +msgctxt "noun" +msgid "Dislike" +msgid_plural "Dislikes" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1036 -msgid "and" +#: ../../include/ItemObject.php:179 +msgid "Add Star" msgstr "" -#: ../../include/conversation.php:1039 -#, php-format -msgid ", and %d other people" -msgid_plural ", and %d other people" -msgstr[0] "" -msgstr[1] "" - -#: ../../include/conversation.php:1040 -#, php-format -msgid "%s like this." +#: ../../include/ItemObject.php:180 +msgid "Remove Star" msgstr "" -#: ../../include/conversation.php:1040 -#, php-format -msgid "%s don't like this." +#: ../../include/ItemObject.php:181 +msgid "Toggle Star Status" msgstr "" -#: ../../include/conversation.php:1097 -msgid "Visible to everybody" +#: ../../include/ItemObject.php:185 +msgid "starred" msgstr "" -#: ../../include/conversation.php:1098 ../../mod/mail.php:170 -#: ../../mod/mail.php:282 -msgid "Please enter a link URL:" +#: ../../include/ItemObject.php:203 +msgid "Add Tag" msgstr "" -#: ../../include/conversation.php:1099 -msgid "Please enter a video link/URL:" +#: ../../include/ItemObject.php:221 ../../mod/photos.php:990 +msgid "I like this (toggle)" msgstr "" -#: ../../include/conversation.php:1100 -msgid "Please enter an audio link/URL:" +#: ../../include/ItemObject.php:222 ../../mod/photos.php:991 +msgid "I don't like this (toggle)" msgstr "" -#: ../../include/conversation.php:1101 -msgid "Tag term:" +#: ../../include/ItemObject.php:226 +msgid "Share This" msgstr "" -#: ../../include/conversation.php:1102 ../../mod/filer.php:49 -msgid "Save to Folder:" +#: ../../include/ItemObject.php:226 +msgid "share" msgstr "" -#: ../../include/conversation.php:1103 -msgid "Where are you right now?" +#: ../../include/ItemObject.php:249 ../../include/ItemObject.php:250 +#, php-format +msgid "View %s's profile - %s" msgstr "" -#: ../../include/conversation.php:1104 ../../mod/editpost.php:52 -#: ../../mod/mail.php:171 ../../mod/mail.php:283 -msgid "Expires YYYY-MM-DD HH:MM" +#: ../../include/ItemObject.php:251 +msgid "to" msgstr "" -#: ../../include/conversation.php:1128 ../../mod/photos.php:994 -#: ../../mod/editwebpage.php:201 ../../mod/layouts.php:122 -#: ../../mod/editblock.php:168 ../../mod/editlayout.php:161 -msgid "Share" +#: ../../include/ItemObject.php:252 +msgid "via" msgstr "" -#: ../../include/conversation.php:1130 ../../mod/editwebpage.php:139 -msgid "Page link title" +#: ../../include/ItemObject.php:253 +msgid "Wall-to-Wall" msgstr "" -#: ../../include/conversation.php:1133 -msgid "Post as" +#: ../../include/ItemObject.php:254 +msgid "via Wall-To-Wall:" msgstr "" -#: ../../include/conversation.php:1134 ../../mod/editpost.php:113 -#: ../../mod/editwebpage.php:144 ../../mod/mail.php:231 ../../mod/mail.php:345 -#: ../../mod/editblock.php:112 ../../mod/editlayout.php:107 -msgid "Upload photo" +#: ../../include/ItemObject.php:290 +msgid "Save Bookmarks" msgstr "" -#: ../../include/conversation.php:1135 -msgid "upload photo" +#: ../../include/ItemObject.php:291 +msgid "Add to Calendar" msgstr "" -#: ../../include/conversation.php:1136 ../../mod/editpost.php:114 -#: ../../mod/editwebpage.php:145 ../../mod/mail.php:232 ../../mod/mail.php:346 -#: ../../mod/editblock.php:113 ../../mod/editlayout.php:108 -msgid "Attach file" +#: ../../include/ItemObject.php:299 +msgctxt "noun" +msgid "Likes" msgstr "" -#: ../../include/conversation.php:1137 -msgid "attach file" +#: ../../include/ItemObject.php:300 +msgctxt "noun" +msgid "Dislikes" msgstr "" -#: ../../include/conversation.php:1138 ../../mod/editpost.php:115 -#: ../../mod/editwebpage.php:146 ../../mod/mail.php:233 ../../mod/mail.php:347 -#: ../../mod/editblock.php:114 ../../mod/editlayout.php:109 -msgid "Insert web link" +#: ../../include/ItemObject.php:331 +#, php-format +msgid "%d comment" +msgid_plural "%d comments" +msgstr[0] "" +msgstr[1] "" + +#: ../../include/ItemObject.php:332 ../../include/js_strings.php:7 +msgid "[+] show all" msgstr "" -#: ../../include/conversation.php:1139 -msgid "web link" +#: ../../include/ItemObject.php:596 ../../mod/photos.php:1009 +#: ../../mod/photos.php:1096 +msgid "This is you" msgstr "" -#: ../../include/conversation.php:1140 -msgid "Insert video link" +#: ../../include/ItemObject.php:598 ../../include/js_strings.php:6 +#: ../../mod/photos.php:1011 ../../mod/photos.php:1098 +msgid "Comment" msgstr "" -#: ../../include/conversation.php:1141 -msgid "video link" +#: ../../include/ItemObject.php:599 ../../mod/mood.php:135 +#: ../../mod/photos.php:563 ../../mod/photos.php:672 ../../mod/photos.php:972 +#: ../../mod/photos.php:1012 ../../mod/photos.php:1099 +#: ../../mod/settings.php:519 ../../mod/settings.php:631 +#: ../../mod/settings.php:660 ../../mod/settings.php:684 +#: ../../mod/settings.php:760 ../../mod/settings.php:945 +#: ../../mod/poke.php:166 ../../mod/profiles.php:615 ../../mod/events.php:587 +#: ../../mod/chat.php:177 ../../mod/chat.php:211 ../../mod/connect.php:92 +#: ../../mod/connedit.php:540 ../../mod/setup.php:307 ../../mod/setup.php:350 +#: ../../mod/pdledit.php:58 ../../mod/sources.php:104 +#: ../../mod/sources.php:138 ../../mod/filestorage.php:146 +#: ../../mod/fsuggest.php:108 ../../mod/group.php:81 ../../mod/admin.php:414 +#: ../../mod/admin.php:725 ../../mod/admin.php:861 ../../mod/admin.php:994 +#: ../../mod/admin.php:1193 ../../mod/admin.php:1280 ../../mod/thing.php:284 +#: ../../mod/thing.php:327 ../../mod/import.php:480 ../../mod/invite.php:142 +#: ../../mod/mail.php:348 ../../mod/appman.php:99 ../../mod/poll.php:68 +#: ../../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 "" -#: ../../include/conversation.php:1142 -msgid "Insert audio link" +#: ../../include/ItemObject.php:600 +msgid "Bold" msgstr "" -#: ../../include/conversation.php:1143 -msgid "audio link" +#: ../../include/ItemObject.php:601 +msgid "Italic" msgstr "" -#: ../../include/conversation.php:1144 ../../mod/editpost.php:119 -#: ../../mod/editwebpage.php:150 ../../mod/editblock.php:118 -#: ../../mod/editlayout.php:113 -msgid "Set your location" +#: ../../include/ItemObject.php:602 +msgid "Underline" msgstr "" -#: ../../include/conversation.php:1145 -msgid "set location" +#: ../../include/ItemObject.php:603 +msgid "Quote" msgstr "" -#: ../../include/conversation.php:1146 ../../mod/editpost.php:120 -#: ../../mod/editwebpage.php:151 ../../mod/editblock.php:119 -#: ../../mod/editlayout.php:114 -msgid "Clear browser location" +#: ../../include/ItemObject.php:604 +msgid "Code" msgstr "" -#: ../../include/conversation.php:1147 -msgid "clear location" +#: ../../include/ItemObject.php:605 +msgid "Image" msgstr "" -#: ../../include/conversation.php:1149 ../../mod/editpost.php:132 -#: ../../mod/editwebpage.php:167 ../../mod/editblock.php:132 -#: ../../mod/editlayout.php:126 -msgid "Set title" +#: ../../include/ItemObject.php:606 +msgid "Link" msgstr "" -#: ../../include/conversation.php:1152 ../../mod/editpost.php:134 -#: ../../mod/editwebpage.php:169 ../../mod/events.php:560 -#: ../../mod/editblock.php:135 ../../mod/editlayout.php:129 -msgid "Categories (comma-separated list)" +#: ../../include/ItemObject.php:607 +msgid "Video" msgstr "" -#: ../../include/conversation.php:1154 ../../mod/editpost.php:122 -#: ../../mod/editwebpage.php:153 ../../mod/editblock.php:121 -#: ../../mod/editlayout.php:116 -msgid "Permission settings" +#: ../../include/js_strings.php:5 +msgid "Delete this item?" msgstr "" -#: ../../include/conversation.php:1155 -msgid "permissions" +#: ../../include/js_strings.php:8 +msgid "[-] show less" msgstr "" -#: ../../include/conversation.php:1162 ../../mod/editpost.php:129 -#: ../../mod/editwebpage.php:162 ../../mod/editblock.php:129 -#: ../../mod/editlayout.php:123 -msgid "Public post" +#: ../../include/js_strings.php:9 +msgid "[+] expand" msgstr "" -#: ../../include/conversation.php:1164 ../../mod/editpost.php:135 -#: ../../mod/editwebpage.php:170 ../../mod/editblock.php:136 -#: ../../mod/editlayout.php:130 -msgid "Example: bob@example.com, mary@example.com" +#: ../../include/js_strings.php:10 +msgid "[-] collapse" msgstr "" -#: ../../include/conversation.php:1177 ../../mod/editpost.php:146 -#: ../../mod/editwebpage.php:179 ../../mod/mail.php:238 ../../mod/mail.php:352 -#: ../../mod/editblock.php:146 ../../mod/editlayout.php:140 -msgid "Set expiration date" +#: ../../include/js_strings.php:11 +msgid "Password too short" msgstr "" -#: ../../include/conversation.php:1181 ../../mod/editpost.php:150 -#: ../../mod/events.php:567 -msgid "OK" +#: ../../include/js_strings.php:12 +msgid "Passwords do not match" msgstr "" -#: ../../include/conversation.php:1182 ../../mod/settings.php:520 -#: ../../mod/settings.php:546 ../../mod/fbrowser.php:82 -#: ../../mod/fbrowser.php:117 ../../mod/editpost.php:151 -#: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/events.php:566 -msgid "Cancel" +#: ../../include/js_strings.php:13 ../../mod/photos.php:39 +msgid "everybody" msgstr "" -#: ../../include/conversation.php:1426 -msgid "Discover" +#: ../../include/js_strings.php:14 +msgid "Secret Passphrase" msgstr "" -#: ../../include/conversation.php:1429 -msgid "Imported public streams" +#: ../../include/js_strings.php:15 +msgid "Passphrase hint" msgstr "" -#: ../../include/conversation.php:1434 -msgid "Commented Order" +#: ../../include/js_strings.php:16 +msgid "Notice: Permissions have changed but have not yet been submitted." msgstr "" -#: ../../include/conversation.php:1437 -msgid "Sort by Comment Date" +#: ../../include/js_strings.php:17 +msgid "close all" msgstr "" -#: ../../include/conversation.php:1441 -msgid "Posted Order" +#: ../../include/js_strings.php:18 +msgid "Nothing new here" msgstr "" -#: ../../include/conversation.php:1444 -msgid "Sort by Post Date" +#: ../../include/js_strings.php:20 +msgid "timeago.prefixAgo" msgstr "" -#: ../../include/conversation.php:1449 ../../include/widgets.php:89 -msgid "Personal" +#: ../../include/js_strings.php:21 +msgid "timeago.prefixFromNow" msgstr "" -#: ../../include/conversation.php:1452 -msgid "Posts that mention or involve you" +#: ../../include/js_strings.php:22 +msgid "ago" msgstr "" -#: ../../include/conversation.php:1458 ../../mod/connections.php:211 -#: ../../mod/connections.php:224 ../../mod/menu.php:61 -msgid "New" +#: ../../include/js_strings.php:23 +msgid "from now" msgstr "" -#: ../../include/conversation.php:1461 -msgid "Activity Stream - by date" +#: ../../include/js_strings.php:24 +msgid "less than a minute" msgstr "" -#: ../../include/conversation.php:1467 -msgid "Starred" +#: ../../include/js_strings.php:25 +msgid "about a minute" msgstr "" -#: ../../include/conversation.php:1470 -msgid "Favourite Posts" +#: ../../include/js_strings.php:26 +#, php-format +msgid "%d minutes" msgstr "" -#: ../../include/conversation.php:1477 -msgid "Spam" +#: ../../include/js_strings.php:27 +msgid "about an hour" msgstr "" -#: ../../include/conversation.php:1480 -msgid "Posts flagged as SPAM" +#: ../../include/js_strings.php:28 +#, php-format +msgid "about %d hours" msgstr "" -#: ../../include/conversation.php:1516 ../../mod/admin.php:867 -msgid "Channel" +#: ../../include/js_strings.php:29 +msgid "a day" msgstr "" -#: ../../include/conversation.php:1519 -msgid "Status Messages and Posts" +#: ../../include/js_strings.php:30 +#, php-format +msgid "%d days" msgstr "" -#: ../../include/conversation.php:1528 -msgid "About" +#: ../../include/js_strings.php:31 +msgid "about a month" msgstr "" -#: ../../include/conversation.php:1531 -msgid "Profile Details" +#: ../../include/js_strings.php:32 +#, php-format +msgid "%d months" msgstr "" -#: ../../include/conversation.php:1549 -msgid "Files and Storage" +#: ../../include/js_strings.php:33 +msgid "about a year" msgstr "" -#: ../../include/conversation.php:1558 ../../include/conversation.php:1561 -msgid "Chatrooms" +#: ../../include/js_strings.php:34 +#, php-format +msgid "%d years" msgstr "" -#: ../../include/conversation.php:1573 -msgid "Saved Bookmarks" +#: ../../include/js_strings.php:35 +msgid " " msgstr "" -#: ../../include/conversation.php:1584 -msgid "Manage Webpages" +#: ../../include/js_strings.php:36 +msgid "timeago.numbers" msgstr "" -#: ../../include/bb2diaspora.php:360 -msgid "Attachments:" +#: ../../include/Contact.php:123 +msgid "New window" msgstr "" -#: ../../include/acl_selectors.php:240 -msgid "Visible to your default audience" +#: ../../include/Contact.php:124 +msgid "Open the selected location in a different window or browser tab" msgstr "" -#: ../../include/acl_selectors.php:241 -msgid "Show" +#: ../../include/Contact.php:211 ../../mod/admin.php:649 +#, php-format +msgid "User '%s' deleted" msgstr "" -#: ../../include/acl_selectors.php:242 -msgid "Don't show" +#: ../../include/profile_selectors.php:6 +#: ../../include/profile_selectors.php:23 +msgid "Male" msgstr "" -#: ../../include/acl_selectors.php:248 ../../mod/filestorage.php:137 -#: ../../mod/photos.php:604 ../../mod/photos.php:970 ../../mod/chat.php:209 -#: ../../mod/events.php:585 -msgid "Permissions" +#: ../../include/profile_selectors.php:6 +#: ../../include/profile_selectors.php:23 +msgid "Female" msgstr "" -#: ../../include/widgets.php:87 -msgid "System" +#: ../../include/profile_selectors.php:6 +msgid "Currently Male" msgstr "" -#: ../../include/widgets.php:90 -msgid "Create Personal App" +#: ../../include/profile_selectors.php:6 +msgid "Currently Female" msgstr "" -#: ../../include/widgets.php:91 -msgid "Edit Personal App" +#: ../../include/profile_selectors.php:6 +msgid "Mostly Male" msgstr "" -#: ../../include/widgets.php:137 ../../mod/suggest.php:53 -msgid "Ignore/Hide" +#: ../../include/profile_selectors.php:6 +msgid "Mostly Female" msgstr "" -#: ../../include/widgets.php:143 ../../mod/connections.php:267 -msgid "Suggestions" +#: ../../include/profile_selectors.php:6 +msgid "Transgender" msgstr "" -#: ../../include/widgets.php:144 -msgid "See more..." +#: ../../include/profile_selectors.php:6 +msgid "Intersex" msgstr "" -#: ../../include/widgets.php:166 -#, php-format -msgid "You have %1$.0f of %2$.0f allowed connections." +#: ../../include/profile_selectors.php:6 +msgid "Transsexual" msgstr "" -#: ../../include/widgets.php:172 -msgid "Add New Connection" +#: ../../include/profile_selectors.php:6 +msgid "Hermaphrodite" msgstr "" -#: ../../include/widgets.php:173 -msgid "Enter the channel address" +#: ../../include/profile_selectors.php:6 +msgid "Neuter" msgstr "" -#: ../../include/widgets.php:174 -msgid "Example: bob@example.com, http://example.com/barbara" +#: ../../include/profile_selectors.php:6 +msgid "Non-specific" msgstr "" -#: ../../include/widgets.php:191 -msgid "Notes" +#: ../../include/profile_selectors.php:6 +#: ../../include/profile_selectors.php:23 +#: ../../include/profile_selectors.php:61 +#: ../../include/profile_selectors.php:97 ../../include/permissions.php:746 +msgid "Other" msgstr "" -#: ../../include/widgets.php:263 -msgid "Remove term" +#: ../../include/profile_selectors.php:6 +msgid "Undecided" msgstr "" -#: ../../include/widgets.php:342 -msgid "Archives" +#: ../../include/profile_selectors.php:42 +#: ../../include/profile_selectors.php:61 +msgid "Males" msgstr "" -#: ../../include/widgets.php:404 -msgid "Refresh" +#: ../../include/profile_selectors.php:42 +#: ../../include/profile_selectors.php:61 +msgid "Females" msgstr "" -#: ../../include/widgets.php:405 ../../mod/connedit.php:492 -msgid "Me" +#: ../../include/profile_selectors.php:42 +msgid "Gay" msgstr "" -#: ../../include/widgets.php:406 ../../mod/connedit.php:494 -msgid "Best Friends" +#: ../../include/profile_selectors.php:42 +msgid "Lesbian" msgstr "" -#: ../../include/widgets.php:408 -msgid "Co-workers" +#: ../../include/profile_selectors.php:42 +msgid "No Preference" msgstr "" -#: ../../include/widgets.php:409 ../../mod/connedit.php:496 -msgid "Former Friends" +#: ../../include/profile_selectors.php:42 +msgid "Bisexual" msgstr "" -#: ../../include/widgets.php:410 ../../mod/connedit.php:497 -msgid "Acquaintances" +#: ../../include/profile_selectors.php:42 +msgid "Autosexual" msgstr "" -#: ../../include/widgets.php:411 -msgid "Everybody" +#: ../../include/profile_selectors.php:42 +msgid "Abstinent" msgstr "" -#: ../../include/widgets.php:443 -msgid "Account settings" +#: ../../include/profile_selectors.php:42 +msgid "Virgin" msgstr "" -#: ../../include/widgets.php:449 -msgid "Channel settings" +#: ../../include/profile_selectors.php:42 +msgid "Deviant" msgstr "" -#: ../../include/widgets.php:455 -msgid "Additional features" +#: ../../include/profile_selectors.php:42 +msgid "Fetish" msgstr "" -#: ../../include/widgets.php:461 -msgid "Feature settings" +#: ../../include/profile_selectors.php:42 +msgid "Oodles" msgstr "" -#: ../../include/widgets.php:467 -msgid "Display settings" +#: ../../include/profile_selectors.php:42 +msgid "Nonsexual" msgstr "" -#: ../../include/widgets.php:473 -msgid "Connected apps" +#: ../../include/profile_selectors.php:80 +#: ../../include/profile_selectors.php:97 +msgid "Single" msgstr "" -#: ../../include/widgets.php:479 -msgid "Export channel" +#: ../../include/profile_selectors.php:80 +msgid "Lonely" msgstr "" -#: ../../include/widgets.php:485 -msgid "Export content" +#: ../../include/profile_selectors.php:80 +msgid "Available" msgstr "" -#: ../../include/widgets.php:491 -msgid "Automatic Permissions (Advanced)" +#: ../../include/profile_selectors.php:80 +msgid "Unavailable" msgstr "" -#: ../../include/widgets.php:501 -msgid "Premium Channel Settings" +#: ../../include/profile_selectors.php:80 +msgid "Has crush" msgstr "" -#: ../../include/widgets.php:535 ../../mod/message.php:31 -#: ../../mod/mail.php:124 -msgid "Messages" +#: ../../include/profile_selectors.php:80 +msgid "Infatuated" msgstr "" -#: ../../include/widgets.php:540 -msgid "Check Mail" +#: ../../include/profile_selectors.php:80 +#: ../../include/profile_selectors.php:97 +msgid "Dating" msgstr "" -#: ../../include/widgets.php:621 -msgid "Chat Rooms" +#: ../../include/profile_selectors.php:80 +msgid "Unfaithful" msgstr "" -#: ../../include/widgets.php:639 -msgid "Bookmarked Chatrooms" +#: ../../include/profile_selectors.php:80 +msgid "Sex Addict" msgstr "" -#: ../../include/widgets.php:657 -msgid "Suggested Chatrooms" +#: ../../include/profile_selectors.php:80 +msgid "Friends/Benefits" msgstr "" -#: ../../include/follow.php:26 -msgid "Channel is blocked on this site." +#: ../../include/profile_selectors.php:80 +msgid "Casual" msgstr "" -#: ../../include/follow.php:31 -msgid "Channel location missing." +#: ../../include/profile_selectors.php:80 +msgid "Engaged" msgstr "" -#: ../../include/follow.php:80 -msgid "Response from remote channel was incomplete." +#: ../../include/profile_selectors.php:80 +#: ../../include/profile_selectors.php:97 +msgid "Married" msgstr "" -#: ../../include/follow.php:97 -msgid "Channel was deleted and no longer exists." +#: ../../include/profile_selectors.php:80 +msgid "Imaginarily married" msgstr "" -#: ../../include/follow.php:133 ../../include/follow.php:202 -msgid "Protocol disabled." +#: ../../include/profile_selectors.php:80 +msgid "Partners" msgstr "" -#: ../../include/follow.php:176 -msgid "Channel discovery failed." +#: ../../include/profile_selectors.php:80 +#: ../../include/profile_selectors.php:97 +msgid "Cohabiting" msgstr "" -#: ../../include/follow.php:192 -msgid "local account not found." +#: ../../include/profile_selectors.php:80 +msgid "Common law" msgstr "" -#: ../../include/follow.php:219 -msgid "Cannot connect to yourself." +#: ../../include/profile_selectors.php:80 +msgid "Happy" msgstr "" -#: ../../mod/post.php:229 -msgid "" -"Remote authentication blocked. You are logged into this site locally. Please " -"logout and retry." +#: ../../include/profile_selectors.php:80 +msgid "Not looking" msgstr "" -#: ../../mod/post.php:261 ../../mod/openid.php:72 ../../mod/openid.php:180 -#, php-format -msgid "Welcome %s. Remote authentication successful." +#: ../../include/profile_selectors.php:80 +msgid "Swinger" msgstr "" -#: ../../mod/settings.php:71 -msgid "Name is required" +#: ../../include/profile_selectors.php:80 +msgid "Betrayed" msgstr "" -#: ../../mod/settings.php:75 -msgid "Key and Secret are required" +#: ../../include/profile_selectors.php:80 +#: ../../include/profile_selectors.php:97 +msgid "Separated" msgstr "" -#: ../../mod/settings.php:198 -msgid "Passwords do not match. Password unchanged." +#: ../../include/profile_selectors.php:80 +msgid "Unstable" msgstr "" -#: ../../mod/settings.php:202 -msgid "Empty passwords are not allowed. Password unchanged." +#: ../../include/profile_selectors.php:80 +#: ../../include/profile_selectors.php:97 +msgid "Divorced" msgstr "" -#: ../../mod/settings.php:216 -msgid "Password changed." +#: ../../include/profile_selectors.php:80 +msgid "Imaginarily divorced" msgstr "" -#: ../../mod/settings.php:218 -msgid "Password update failed. Please try again." +#: ../../include/profile_selectors.php:80 +#: ../../include/profile_selectors.php:97 +msgid "Widowed" msgstr "" -#: ../../mod/settings.php:232 -msgid "Not valid email." +#: ../../include/profile_selectors.php:80 +msgid "Uncertain" msgstr "" -#: ../../mod/settings.php:235 -msgid "Protected email address. Cannot change to that email." +#: ../../include/profile_selectors.php:80 +#: ../../include/profile_selectors.php:97 +msgid "It's complicated" msgstr "" -#: ../../mod/settings.php:244 -msgid "System failure storing new email. Please try again." +#: ../../include/profile_selectors.php:80 +msgid "Don't care" msgstr "" -#: ../../mod/settings.php:447 -msgid "Settings updated." +#: ../../include/profile_selectors.php:80 +msgid "Ask me" msgstr "" -#: ../../mod/settings.php:518 ../../mod/settings.php:544 -#: ../../mod/settings.php:580 -msgid "Add application" +#: ../../include/permissions.php:13 +msgid "Can view my normal stream and posts" msgstr "" -#: ../../mod/settings.php:521 -msgid "Name of application" +#: ../../include/permissions.php:14 +msgid "Can view my default channel profile" msgstr "" -#: ../../mod/settings.php:522 ../../mod/settings.php:548 -msgid "Consumer Key" +#: ../../include/permissions.php:15 +msgid "Can view my photo albums" msgstr "" -#: ../../mod/settings.php:522 ../../mod/settings.php:523 -msgid "Automatically generated - change if desired. Max length 20" +#: ../../include/permissions.php:16 +msgid "Can view my connections" msgstr "" -#: ../../mod/settings.php:523 ../../mod/settings.php:549 -msgid "Consumer Secret" +#: ../../include/permissions.php:17 +msgid "Can view my file storage" msgstr "" -#: ../../mod/settings.php:524 ../../mod/settings.php:550 -msgid "Redirect" +#: ../../include/permissions.php:18 +msgid "Can view my webpages" msgstr "" -#: ../../mod/settings.php:524 -msgid "" -"Redirect URI - leave blank unless your application specifically requires this" +#: ../../include/permissions.php:21 +msgid "Can send me their channel stream and posts" msgstr "" -#: ../../mod/settings.php:525 ../../mod/settings.php:551 -msgid "Icon url" +#: ../../include/permissions.php:22 +msgid "Can post on my channel page (\"wall\")" msgstr "" -#: ../../mod/settings.php:525 -msgid "Optional" +#: ../../include/permissions.php:23 +msgid "Can comment on or like my posts" msgstr "" -#: ../../mod/settings.php:536 -msgid "You can't edit this application." +#: ../../include/permissions.php:24 +msgid "Can send me private mail messages" msgstr "" -#: ../../mod/settings.php:579 -msgid "Connected Apps" +#: ../../include/permissions.php:25 +msgid "Can post photos to my photo albums" msgstr "" -#: ../../mod/settings.php:583 -msgid "Client key starts with" +#: ../../include/permissions.php:26 +msgid "Can like/dislike stuff" msgstr "" -#: ../../mod/settings.php:584 -msgid "No name" +#: ../../include/permissions.php:26 +msgid "Profiles and things other than posts/comments" msgstr "" -#: ../../mod/settings.php:585 -msgid "Remove authorization" +#: ../../include/permissions.php:28 +msgid "Can forward to all my channel contacts via post @mentions" msgstr "" -#: ../../mod/settings.php:596 -msgid "No feature settings configured" +#: ../../include/permissions.php:28 +msgid "Advanced - useful for creating group forum channels" msgstr "" -#: ../../mod/settings.php:604 -msgid "Feature Settings" +#: ../../include/permissions.php:29 +msgid "Can chat with me (when available)" msgstr "" -#: ../../mod/settings.php:627 -msgid "Account Settings" +#: ../../include/permissions.php:30 +msgid "Can write to my file storage" msgstr "" -#: ../../mod/settings.php:628 -msgid "Password Settings" +#: ../../include/permissions.php:31 +msgid "Can edit my webpages" msgstr "" -#: ../../mod/settings.php:629 -msgid "New Password:" +#: ../../include/permissions.php:33 +msgid "Can source my public posts in derived channels" msgstr "" -#: ../../mod/settings.php:630 -msgid "Confirm:" +#: ../../include/permissions.php:33 +msgid "Somewhat advanced - very useful in open communities" msgstr "" -#: ../../mod/settings.php:630 -msgid "Leave password fields blank unless changing" +#: ../../include/permissions.php:35 +msgid "Can administer my channel resources" msgstr "" -#: ../../mod/settings.php:632 ../../mod/settings.php:954 -msgid "Email Address:" +#: ../../include/permissions.php:35 +msgid "Extremely advanced. Leave this alone unless you know what you are doing" msgstr "" -#: ../../mod/settings.php:633 ../../mod/removeaccount.php:61 -msgid "Remove Account" +#: ../../include/permissions.php:738 +msgid "Social Networking" msgstr "" -#: ../../mod/settings.php:634 -msgid "Remove this account from this server including all its channels" +#: ../../include/permissions.php:739 ../../include/permissions.php:741 +#: ../../include/permissions.php:743 ../../include/permissions.php:745 +msgid "Mostly Public" msgstr "" -#: ../../mod/settings.php:635 ../../mod/settings.php:1019 -msgid "Warning: This action is permanent and cannot be reversed." +#: ../../include/permissions.php:739 ../../include/permissions.php:741 +#: ../../include/permissions.php:743 +msgid "Restricted" msgstr "" -#: ../../mod/settings.php:651 -msgid "Off" +#: ../../include/permissions.php:739 ../../include/permissions.php:741 +msgid "Private" msgstr "" -#: ../../mod/settings.php:651 -msgid "On" +#: ../../include/permissions.php:740 +msgid "Community Forum" msgstr "" -#: ../../mod/settings.php:658 -msgid "Additional Features" +#: ../../include/permissions.php:742 +msgid "Feed Republish" msgstr "" -#: ../../mod/settings.php:683 -msgid "Connector Settings" +#: ../../include/permissions.php:744 +msgid "Celebrity/Soapbox" msgstr "" -#: ../../mod/settings.php:713 ../../mod/admin.php:362 -msgid "No special theme for mobile devices" +#: ../../include/permissions.php:747 +msgid "Custom/Expert Mode" msgstr "" -#: ../../mod/settings.php:722 -#, php-format -msgid "%s - (Experimental)" +#: ../../include/datetime.php:43 ../../include/datetime.php:45 +msgid "Miscellaneous" msgstr "" -#: ../../mod/settings.php:758 -msgid "Display Settings" +#: ../../include/datetime.php:238 +msgid "never" msgstr "" -#: ../../mod/settings.php:764 -msgid "Display Theme:" +#: ../../include/datetime.php:244 +msgid "less than a second ago" msgstr "" -#: ../../mod/settings.php:765 -msgid "Mobile Theme:" +#: ../../include/datetime.php:247 +msgid "year" msgstr "" -#: ../../mod/settings.php:766 -msgid "Enable user zoom on mobile devices" +#: ../../include/datetime.php:247 +msgid "years" msgstr "" -#: ../../mod/settings.php:767 -msgid "Update browser every xx seconds" +#: ../../include/datetime.php:248 +msgid "month" msgstr "" -#: ../../mod/settings.php:767 -msgid "Minimum of 10 seconds, no maximum" +#: ../../include/datetime.php:248 +msgid "months" msgstr "" -#: ../../mod/settings.php:768 -msgid "Maximum number of conversations to load at any time:" +#: ../../include/datetime.php:249 +msgid "week" msgstr "" -#: ../../mod/settings.php:768 -msgid "Maximum of 100 items" +#: ../../include/datetime.php:249 +msgid "weeks" msgstr "" -#: ../../mod/settings.php:769 -msgid "Don't show emoticons" +#: ../../include/datetime.php:250 +msgid "day" msgstr "" -#: ../../mod/settings.php:770 -msgid "Link post titles to source" +#: ../../include/datetime.php:250 +msgid "days" msgstr "" -#: ../../mod/settings.php:771 -msgid "System Page Layout Editor - (advanced)" +#: ../../include/datetime.php:251 +msgid "hour" msgstr "" -#: ../../mod/settings.php:807 -msgid "Nobody except yourself" +#: ../../include/datetime.php:251 +msgid "hours" msgstr "" -#: ../../mod/settings.php:808 -msgid "Only those you specifically allow" +#: ../../include/datetime.php:252 +msgid "minute" msgstr "" -#: ../../mod/settings.php:809 -msgid "Approved connections" +#: ../../include/datetime.php:252 +msgid "minutes" msgstr "" -#: ../../mod/settings.php:810 -msgid "Any connections" +#: ../../include/datetime.php:253 +msgid "second" msgstr "" -#: ../../mod/settings.php:811 -msgid "Anybody on this website" +#: ../../include/datetime.php:253 +msgid "seconds" msgstr "" -#: ../../mod/settings.php:812 -msgid "Anybody in this network" +#: ../../include/datetime.php:262 +#, php-format +msgid "%1$d %2$s ago" msgstr "" -#: ../../mod/settings.php:813 -msgid "Anybody authenticated" +#: ../../include/datetime.php:467 +#, php-format +msgid "%1$s's birthday" msgstr "" -#: ../../mod/settings.php:814 -msgid "Anybody on the internet" +#: ../../include/datetime.php:468 +#, php-format +msgid "Happy Birthday %1$s" msgstr "" -#: ../../mod/settings.php:891 -msgid "Publish your default profile in the network directory" +#: ../../mod/mood.php:132 +msgid "Set your current mood and tell your friends" msgstr "" -#: ../../mod/settings.php:891 ../../mod/settings.php:896 -#: ../../mod/settings.php:973 ../../mod/admin.php:392 -#: ../../mod/profiles.php:602 ../../mod/api.php:106 -msgid "No" +#: ../../mod/photos.php:77 +msgid "Page owner information could not be retrieved." msgstr "" -#: ../../mod/settings.php:891 ../../mod/settings.php:896 -#: ../../mod/settings.php:973 ../../mod/admin.php:394 -#: ../../mod/profiles.php:601 ../../mod/api.php:105 -msgid "Yes" +#: ../../mod/photos.php:97 +msgid "Album not found." msgstr "" -#: ../../mod/settings.php:896 -msgid "Allow us to suggest you as a potential friend to new members?" +#: ../../mod/photos.php:119 ../../mod/photos.php:673 +msgid "Delete Album" msgstr "" -#: ../../mod/settings.php:900 ../../mod/profile_photo.php:365 -msgid "or" +#: ../../mod/photos.php:159 ../../mod/photos.php:973 +msgid "Delete Photo" msgstr "" -#: ../../mod/settings.php:905 -msgid "Your channel address is" +#: ../../mod/photos.php:443 ../../mod/search.php:13 ../../mod/directory.php:15 +#: ../../mod/dirprofile.php:9 ../../mod/display.php:9 +#: ../../mod/viewconnections.php:17 +msgid "Public access denied." msgstr "" -#: ../../mod/settings.php:943 -msgid "Channel Settings" +#: ../../mod/photos.php:453 +msgid "No photos selected" msgstr "" -#: ../../mod/settings.php:952 -msgid "Basic Settings" +#: ../../mod/photos.php:500 +msgid "Access to this item is restricted." msgstr "" -#: ../../mod/settings.php:955 -msgid "Your Timezone:" +#: ../../mod/photos.php:574 +#, php-format +msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage." msgstr "" -#: ../../mod/settings.php:956 -msgid "Default Post Location:" +#: ../../mod/photos.php:577 +#, php-format +msgid "You have used %1$.2f Mbytes of photo storage." msgstr "" -#: ../../mod/settings.php:956 -msgid "Geographical location to display on your posts" +#: ../../mod/photos.php:596 +msgid "Upload Photos" msgstr "" -#: ../../mod/settings.php:957 -msgid "Use Browser Location:" +#: ../../mod/photos.php:600 ../../mod/photos.php:668 +msgid "New album name: " msgstr "" -#: ../../mod/settings.php:959 -msgid "Adult Content" +#: ../../mod/photos.php:601 +msgid "or existing album name: " msgstr "" -#: ../../mod/settings.php:959 -msgid "" -"This channel frequently or regularly publishes adult content. (Please tag " -"any adult material and/or nudity with #NSFW)" +#: ../../mod/photos.php:602 +msgid "Do not show a status post for this upload" msgstr "" -#: ../../mod/settings.php:961 -msgid "Security and Privacy Settings" +#: ../../mod/photos.php:622 +msgid "Album name could not be decoded" msgstr "" -#: ../../mod/settings.php:963 -msgid "Your permissions are already configured. Click to view/adjust" +#: ../../mod/photos.php:657 ../../mod/photos.php:679 ../../mod/photos.php:1148 +#: ../../mod/photos.php:1163 +msgid "Contact Photos" msgstr "" -#: ../../mod/settings.php:965 -msgid "Hide my online presence" +#: ../../mod/photos.php:681 +msgid "Edit Album" msgstr "" -#: ../../mod/settings.php:965 -msgid "Prevents displaying in your profile that you are online" +#: ../../mod/photos.php:687 +msgid "Show Newest First" msgstr "" -#: ../../mod/settings.php:967 -msgid "Simple Privacy Settings:" +#: ../../mod/photos.php:689 +msgid "Show Oldest First" msgstr "" -#: ../../mod/settings.php:968 -msgid "" -"Very Public - extremely permissive (should be used with caution)" +#: ../../mod/photos.php:716 ../../mod/photos.php:1195 +msgid "View Photo" msgstr "" -#: ../../mod/settings.php:969 -msgid "" -"Typical - default public, privacy when desired (similar to social " -"network permissions but with improved privacy)" +#: ../../mod/photos.php:794 +msgid "Permission denied. Access to this item may be restricted." msgstr "" -#: ../../mod/settings.php:970 -msgid "Private - default private, never open or public" +#: ../../mod/photos.php:796 +msgid "Photo not available" msgstr "" -#: ../../mod/settings.php:971 -msgid "Blocked - default blocked to/from everybody" +#: ../../mod/photos.php:856 +msgid "Use as profile photo" msgstr "" -#: ../../mod/settings.php:973 -msgid "Allow others to tag your posts" +#: ../../mod/photos.php:863 +msgid "Private Photo" msgstr "" -#: ../../mod/settings.php:973 -msgid "" -"Often used by the community to retro-actively flag inappropriate content" +#: ../../mod/photos.php:874 ../../mod/events.php:433 +msgid "Previous" msgstr "" -#: ../../mod/settings.php:975 -msgid "Advanced Privacy Settings" +#: ../../mod/photos.php:878 +msgid "View Full Size" msgstr "" -#: ../../mod/settings.php:977 -msgid "Expire other channel content after this many days" +#: ../../mod/photos.php:883 ../../mod/events.php:434 ../../mod/setup.php:261 +msgid "Next" msgstr "" -#: ../../mod/settings.php:977 -msgid "0 or blank prevents expiration" +#: ../../mod/photos.php:922 ../../mod/delegate.php:130 ../../mod/tagrm.php:93 +msgid "Remove" msgstr "" -#: ../../mod/settings.php:978 -msgid "Maximum Friend Requests/Day:" +#: ../../mod/photos.php:956 +msgid "Edit photo" msgstr "" -#: ../../mod/settings.php:978 -msgid "May reduce spam activity" +#: ../../mod/photos.php:958 +msgid "Rotate CW (right)" msgstr "" -#: ../../mod/settings.php:979 -msgid "Default Post Permissions" +#: ../../mod/photos.php:959 +msgid "Rotate CCW (left)" msgstr "" -#: ../../mod/settings.php:980 ../../mod/mitem.php:134 ../../mod/mitem.php:177 -msgid "(click to open/close)" +#: ../../mod/photos.php:962 +msgid "New album name" msgstr "" -#: ../../mod/settings.php:991 -msgid "Maximum private messages per day from unknown people:" +#: ../../mod/photos.php:965 +msgid "Caption" msgstr "" -#: ../../mod/settings.php:991 -msgid "Useful to reduce spamming" +#: ../../mod/photos.php:967 +msgid "Add a Tag" msgstr "" -#: ../../mod/settings.php:994 -msgid "Notification Settings" +#: ../../mod/photos.php:970 +msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" msgstr "" -#: ../../mod/settings.php:995 -msgid "By default post a status message when:" +#: ../../mod/photos.php:1125 +msgid "In This Photo:" msgstr "" -#: ../../mod/settings.php:996 -msgid "accepting a friend request" +#: ../../mod/photos.php:1201 +msgid "View Album" msgstr "" -#: ../../mod/settings.php:997 -msgid "joining a forum/community" +#: ../../mod/photos.php:1224 +msgid "Recent Photos" msgstr "" -#: ../../mod/settings.php:998 -msgid "making an interesting profile change" +#: ../../mod/mitem.php:14 ../../mod/menu.php:92 +msgid "Menu not found." msgstr "" -#: ../../mod/settings.php:999 -msgid "Send a notification email when:" +#: ../../mod/mitem.php:47 +msgid "Menu element updated." msgstr "" -#: ../../mod/settings.php:1000 -msgid "You receive a connection request" +#: ../../mod/mitem.php:51 +msgid "Unable to update menu element." msgstr "" -#: ../../mod/settings.php:1001 -msgid "Your connections are confirmed" +#: ../../mod/mitem.php:57 +msgid "Menu element added." msgstr "" -#: ../../mod/settings.php:1002 -msgid "Someone writes on your profile wall" +#: ../../mod/mitem.php:61 +msgid "Unable to add menu element." msgstr "" -#: ../../mod/settings.php:1003 -msgid "Someone writes a followup comment" +#: ../../mod/mitem.php:78 ../../mod/dirprofile.php:175 ../../mod/menu.php:120 +#: ../../mod/xchan.php:38 +msgid "Not found." msgstr "" -#: ../../mod/settings.php:1004 -msgid "You receive a private message" +#: ../../mod/mitem.php:96 +msgid "Manage Menu Elements" msgstr "" -#: ../../mod/settings.php:1005 -msgid "You receive a friend suggestion" +#: ../../mod/mitem.php:99 +msgid "Edit menu" msgstr "" -#: ../../mod/settings.php:1006 -msgid "You are tagged in a post" +#: ../../mod/mitem.php:102 +msgid "Edit element" msgstr "" -#: ../../mod/settings.php:1007 -msgid "You are poked/prodded/etc. in a post" +#: ../../mod/mitem.php:103 +msgid "Drop element" msgstr "" -#: ../../mod/settings.php:1010 -msgid "Advanced Account/Page Type Settings" +#: ../../mod/mitem.php:104 +msgid "New element" msgstr "" -#: ../../mod/settings.php:1011 -msgid "Change the behaviour of this account for special situations" +#: ../../mod/mitem.php:105 +msgid "Edit this menu container" msgstr "" -#: ../../mod/settings.php:1014 -msgid "" -"Please enable expert mode (in Settings > " -"Additional features) to adjust!" +#: ../../mod/mitem.php:106 +msgid "Add menu element" msgstr "" -#: ../../mod/settings.php:1015 -msgid "Miscellaneous Settings" +#: ../../mod/mitem.php:107 +msgid "Delete this menu item" msgstr "" -#: ../../mod/settings.php:1017 -msgid "Personal menu to display in your channel pages" +#: ../../mod/mitem.php:108 +msgid "Edit this menu item" msgstr "" -#: ../../mod/settings.php:1018 -msgid "Remove this channel" +#: ../../mod/mitem.php:131 +msgid "New Menu Element" msgstr "" -#: ../../mod/filestorage.php:76 -msgid "Permission Denied." +#: ../../mod/mitem.php:133 ../../mod/mitem.php:176 +msgid "Menu Item Permissions" msgstr "" -#: ../../mod/filestorage.php:92 -msgid "File not found." +#: ../../mod/mitem.php:134 ../../mod/mitem.php:177 ../../mod/settings.php:980 +msgid "(click to open/close)" msgstr "" -#: ../../mod/filestorage.php:131 -msgid "Edit file permissions" +#: ../../mod/mitem.php:136 ../../mod/mitem.php:180 +msgid "Link text" msgstr "" -#: ../../mod/filestorage.php:140 -msgid "Set/edit permissions" +#: ../../mod/mitem.php:137 ../../mod/mitem.php:181 +msgid "URL of link" msgstr "" -#: ../../mod/filestorage.php:141 -msgid "Include all files and sub folders" +#: ../../mod/mitem.php:138 ../../mod/mitem.php:182 +msgid "Use Red magic-auth if available" msgstr "" -#: ../../mod/filestorage.php:142 -msgid "Return to file list" +#: ../../mod/mitem.php:139 ../../mod/mitem.php:183 +msgid "Open link in new window" msgstr "" -#: ../../mod/filestorage.php:144 -msgid "Copy/paste this code to attach file to a post" +#: ../../mod/mitem.php:141 ../../mod/mitem.php:185 +msgid "Order in list" msgstr "" -#: ../../mod/filestorage.php:145 -msgid "Copy/paste this URL to link file from a web page" +#: ../../mod/mitem.php:141 ../../mod/mitem.php:185 +msgid "Higher numbers will sink to bottom of listing" msgstr "" -#: ../../mod/home.php:46 -msgid "Red Matrix - "The Network"" +#: ../../mod/mitem.php:154 +msgid "Menu item not found." msgstr "" -#: ../../mod/home.php:101 -#, php-format -msgid "Welcome to %s" +#: ../../mod/mitem.php:163 +msgid "Menu item deleted." msgstr "" -#: ../../mod/probe.php:23 ../../mod/probe.php:29 -#, php-format -msgid "Fetching URL returns error: %1$s" +#: ../../mod/mitem.php:165 +msgid "Menu item could not be deleted." msgstr "" -#: ../../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]" +#: ../../mod/mitem.php:174 +msgid "Edit Menu Element" msgstr "" -#: ../../mod/new_channel.php:109 -msgid "Add a Channel" +#: ../../mod/mitem.php:186 ../../mod/menu.php:114 +msgid "Modify" msgstr "" -#: ../../mod/new_channel.php:110 -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." +#: ../../mod/achievements.php:34 +msgid "Some blurb about what to do when you're new here" msgstr "" -#: ../../mod/new_channel.php:112 ../../mod/sources.php:103 -#: ../../mod/sources.php:137 -msgid "Channel Name" +#: ../../mod/ping.php:237 +msgid "sent you a private message" msgstr "" -#: ../../mod/new_channel.php:113 -msgid "" -"Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation " -"Group\" " +#: ../../mod/ping.php:288 +msgid "added your channel" msgstr "" -#: ../../mod/new_channel.php:114 -msgid "Choose a short nickname" +#: ../../mod/ping.php:329 +msgid "posted an event" msgstr "" -#: ../../mod/new_channel.php:115 -msgid "" -"Your nickname will be used to create an easily remembered channel address " -"(like an email address) which you can share with others." +#: ../../mod/acl.php:244 +msgid "network" msgstr "" -#: ../../mod/new_channel.php:116 -msgid "" -"Or import an existing channel from another location" +#: ../../mod/settings.php:71 +msgid "Name is required" msgstr "" -#: ../../mod/new_channel.php:118 -msgid "Channel Type" +#: ../../mod/settings.php:75 +msgid "Key and Secret are required" msgstr "" -#: ../../mod/new_channel.php:119 -msgid "" -"Please choose a channel type (such as social networking or community forum) " -"and privacy requirements so we can select the best permissions for you" +#: ../../mod/settings.php:198 +msgid "Passwords do not match. Password unchanged." msgstr "" -#: ../../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." +#: ../../mod/settings.php:202 +msgid "Empty passwords are not allowed. Password unchanged." msgstr "" -#: ../../mod/rmagic.php:38 -msgid "The error message was:" +#: ../../mod/settings.php:216 +msgid "Password changed." msgstr "" -#: ../../mod/rmagic.php:42 -msgid "Authentication failed." +#: ../../mod/settings.php:218 +msgid "Password update failed. Please try again." msgstr "" -#: ../../mod/rmagic.php:82 -msgid "Remote Authentication" +#: ../../mod/settings.php:232 +msgid "Not valid email." msgstr "" -#: ../../mod/rmagic.php:83 -msgid "Enter your channel address (e.g. channel@example.com)" +#: ../../mod/settings.php:235 +msgid "Protected email address. Cannot change to that email." msgstr "" -#: ../../mod/rmagic.php:84 -msgid "Authenticate" +#: ../../mod/settings.php:244 +msgid "System failure storing new email. Please try again." msgstr "" -#: ../../mod/admin.php:52 -msgid "Theme settings updated." +#: ../../mod/settings.php:447 +msgid "Settings updated." msgstr "" -#: ../../mod/admin.php:97 ../../mod/admin.php:413 -msgid "Site" +#: ../../mod/settings.php:518 ../../mod/settings.php:544 +#: ../../mod/settings.php:580 +msgid "Add application" msgstr "" -#: ../../mod/admin.php:98 -msgid "Accounts" +#: ../../mod/settings.php:521 +msgid "Name of application" msgstr "" -#: ../../mod/admin.php:99 ../../mod/admin.php:860 -msgid "Channels" +#: ../../mod/settings.php:522 ../../mod/settings.php:548 +msgid "Consumer Key" msgstr "" -#: ../../mod/admin.php:100 ../../mod/admin.php:951 ../../mod/admin.php:993 -msgid "Plugins" +#: ../../mod/settings.php:522 ../../mod/settings.php:523 +msgid "Automatically generated - change if desired. Max length 20" msgstr "" -#: ../../mod/admin.php:101 ../../mod/admin.php:1156 ../../mod/admin.php:1192 -msgid "Themes" +#: ../../mod/settings.php:523 ../../mod/settings.php:549 +msgid "Consumer Secret" msgstr "" -#: ../../mod/admin.php:102 ../../mod/admin.php:515 -msgid "Server" +#: ../../mod/settings.php:524 ../../mod/settings.php:550 +msgid "Redirect" msgstr "" -#: ../../mod/admin.php:103 -msgid "Profile Config" +#: ../../mod/settings.php:524 +msgid "" +"Redirect URI - leave blank unless your application specifically requires this" msgstr "" -#: ../../mod/admin.php:104 -msgid "DB updates" +#: ../../mod/settings.php:525 ../../mod/settings.php:551 +msgid "Icon url" msgstr "" -#: ../../mod/admin.php:118 ../../mod/admin.php:125 ../../mod/admin.php:1279 -msgid "Logs" +#: ../../mod/settings.php:525 +msgid "Optional" msgstr "" -#: ../../mod/admin.php:124 -msgid "Plugin Features" +#: ../../mod/settings.php:536 +msgid "You can't edit this application." msgstr "" -#: ../../mod/admin.php:126 -msgid "User registrations waiting for confirmation" +#: ../../mod/settings.php:579 +msgid "Connected Apps" msgstr "" -#: ../../mod/admin.php:206 -msgid "Message queues" +#: ../../mod/settings.php:583 +msgid "Client key starts with" msgstr "" -#: ../../mod/admin.php:211 ../../mod/admin.php:412 ../../mod/admin.php:514 -#: ../../mod/admin.php:723 ../../mod/admin.php:859 ../../mod/admin.php:950 -#: ../../mod/admin.php:992 ../../mod/admin.php:1155 ../../mod/admin.php:1191 -#: ../../mod/admin.php:1278 -msgid "Administration" +#: ../../mod/settings.php:584 +msgid "No name" msgstr "" -#: ../../mod/admin.php:212 -msgid "Summary" -msgstr "" - -#: ../../mod/admin.php:214 -msgid "Registered users" +#: ../../mod/settings.php:585 +msgid "Remove authorization" msgstr "" -#: ../../mod/admin.php:216 ../../mod/admin.php:518 -msgid "Pending registrations" +#: ../../mod/settings.php:596 +msgid "No feature settings configured" msgstr "" -#: ../../mod/admin.php:217 -msgid "Version" +#: ../../mod/settings.php:604 +msgid "Feature Settings" msgstr "" -#: ../../mod/admin.php:219 ../../mod/admin.php:519 -msgid "Active plugins" +#: ../../mod/settings.php:627 +msgid "Account Settings" msgstr "" -#: ../../mod/admin.php:333 -msgid "Site settings updated." +#: ../../mod/settings.php:628 +msgid "Password Settings" msgstr "" -#: ../../mod/admin.php:364 -msgid "No special theme for accessibility" +#: ../../mod/settings.php:629 +msgid "New Password:" msgstr "" -#: ../../mod/admin.php:393 -msgid "Yes - with approval" +#: ../../mod/settings.php:630 +msgid "Confirm:" msgstr "" -#: ../../mod/admin.php:399 -msgid "My site is not a public server" +#: ../../mod/settings.php:630 +msgid "Leave password fields blank unless changing" msgstr "" -#: ../../mod/admin.php:400 -msgid "My site has paid access only" +#: ../../mod/settings.php:632 ../../mod/settings.php:954 +msgid "Email Address:" msgstr "" -#: ../../mod/admin.php:401 -msgid "My site has free access only" +#: ../../mod/settings.php:633 ../../mod/removeaccount.php:61 +msgid "Remove Account" msgstr "" -#: ../../mod/admin.php:402 -msgid "My site offers free accounts with optional paid upgrades" +#: ../../mod/settings.php:634 +msgid "Remove this account from this server including all its channels" msgstr "" -#: ../../mod/admin.php:415 ../../mod/register.php:203 -msgid "Registration" +#: ../../mod/settings.php:635 ../../mod/settings.php:1019 +msgid "Warning: This action is permanent and cannot be reversed." msgstr "" -#: ../../mod/admin.php:416 -msgid "File upload" +#: ../../mod/settings.php:651 +msgid "Off" msgstr "" -#: ../../mod/admin.php:417 -msgid "Policies" +#: ../../mod/settings.php:651 +msgid "On" msgstr "" -#: ../../mod/admin.php:422 -msgid "Site name" +#: ../../mod/settings.php:658 +msgid "Additional Features" msgstr "" -#: ../../mod/admin.php:423 -msgid "Banner/Logo" +#: ../../mod/settings.php:683 +msgid "Connector Settings" msgstr "" -#: ../../mod/admin.php:424 -msgid "Administrator Information" +#: ../../mod/settings.php:713 ../../mod/admin.php:362 +msgid "No special theme for mobile devices" msgstr "" -#: ../../mod/admin.php:424 -msgid "" -"Contact information for site administrators. Displayed on siteinfo page. " -"BBCode can be used here" +#: ../../mod/settings.php:722 +#, php-format +msgid "%s - (Experimental)" msgstr "" -#: ../../mod/admin.php:425 -msgid "System language" +#: ../../mod/settings.php:758 +msgid "Display Settings" msgstr "" -#: ../../mod/admin.php:426 -msgid "System theme" +#: ../../mod/settings.php:764 +msgid "Display Theme:" msgstr "" -#: ../../mod/admin.php:426 -msgid "" -"Default system theme - may be over-ridden by user profiles - change theme settings" +#: ../../mod/settings.php:765 +msgid "Mobile Theme:" msgstr "" -#: ../../mod/admin.php:427 -msgid "Mobile system theme" +#: ../../mod/settings.php:766 +msgid "Enable user zoom on mobile devices" msgstr "" -#: ../../mod/admin.php:427 -msgid "Theme for mobile devices" +#: ../../mod/settings.php:767 +msgid "Update browser every xx seconds" msgstr "" -#: ../../mod/admin.php:428 -msgid "Accessibility system theme" +#: ../../mod/settings.php:767 +msgid "Minimum of 10 seconds, no maximum" msgstr "" -#: ../../mod/admin.php:428 -msgid "Accessibility theme" +#: ../../mod/settings.php:768 +msgid "Maximum number of conversations to load at any time:" msgstr "" -#: ../../mod/admin.php:430 -msgid "Enable Diaspora Protocol" +#: ../../mod/settings.php:768 +msgid "Maximum of 100 items" msgstr "" -#: ../../mod/admin.php:430 -msgid "Communicate with Diaspora and Friendica - experimental" +#: ../../mod/settings.php:769 +msgid "Don't show emoticons" msgstr "" -#: ../../mod/admin.php:431 -msgid "Allow Feeds as Connections" +#: ../../mod/settings.php:770 +msgid "Link post titles to source" msgstr "" -#: ../../mod/admin.php:431 -msgid "(Heavy system resource usage)" +#: ../../mod/settings.php:771 +msgid "System Page Layout Editor - (advanced)" msgstr "" -#: ../../mod/admin.php:432 -msgid "Maximum image size" +#: ../../mod/settings.php:807 +msgid "Nobody except yourself" msgstr "" -#: ../../mod/admin.php:432 -msgid "" -"Maximum size in bytes of uploaded images. Default is 0, which means no " -"limits." +#: ../../mod/settings.php:808 +msgid "Only those you specifically allow" msgstr "" -#: ../../mod/admin.php:433 -msgid "Does this site allow new member registration?" +#: ../../mod/settings.php:809 +msgid "Approved connections" msgstr "" -#: ../../mod/admin.php:434 -msgid "Which best describes the types of account offered by this hub?" +#: ../../mod/settings.php:810 +msgid "Any connections" msgstr "" -#: ../../mod/admin.php:435 -msgid "Register text" +#: ../../mod/settings.php:811 +msgid "Anybody on this website" msgstr "" -#: ../../mod/admin.php:435 -msgid "Will be displayed prominently on the registration page." +#: ../../mod/settings.php:812 +msgid "Anybody in this network" msgstr "" -#: ../../mod/admin.php:436 -msgid "Accounts abandoned after x days" +#: ../../mod/settings.php:813 +msgid "Anybody authenticated" msgstr "" -#: ../../mod/admin.php:436 -msgid "" -"Will not waste system resources polling external sites for abandonded " -"accounts. Enter 0 for no time limit." +#: ../../mod/settings.php:814 +msgid "Anybody on the internet" msgstr "" -#: ../../mod/admin.php:437 -msgid "Allowed friend domains" +#: ../../mod/settings.php:891 +msgid "Publish your default profile in the network directory" msgstr "" -#: ../../mod/admin.php:437 -msgid "" -"Comma separated list of domains which are allowed to establish friendships " -"with this site. Wildcards are accepted. Empty to allow any domains" +#: ../../mod/settings.php:891 ../../mod/settings.php:896 +#: ../../mod/settings.php:973 ../../mod/api.php:106 ../../mod/profiles.php:574 +#: ../../mod/admin.php:392 +msgid "No" msgstr "" -#: ../../mod/admin.php:438 -msgid "Allowed email domains" +#: ../../mod/settings.php:891 ../../mod/settings.php:896 +#: ../../mod/settings.php:973 ../../mod/api.php:105 ../../mod/profiles.php:573 +#: ../../mod/admin.php:394 +msgid "Yes" msgstr "" -#: ../../mod/admin.php:438 -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" +#: ../../mod/settings.php:896 +msgid "Allow us to suggest you as a potential friend to new members?" msgstr "" -#: ../../mod/admin.php:439 -msgid "Block public" +#: ../../mod/settings.php:900 ../../mod/profile_photo.php:365 +msgid "or" msgstr "" -#: ../../mod/admin.php:439 -msgid "" -"Check to block public access to all otherwise public personal pages on this " -"site unless you are currently logged in." +#: ../../mod/settings.php:905 +msgid "Your channel address is" msgstr "" -#: ../../mod/admin.php:440 -msgid "Verify Email Addresses" +#: ../../mod/settings.php:943 +msgid "Channel Settings" msgstr "" -#: ../../mod/admin.php:440 -msgid "" -"Check to verify email addresses used in account registration (recommended)." +#: ../../mod/settings.php:952 +msgid "Basic Settings" msgstr "" -#: ../../mod/admin.php:441 -msgid "Force publish" +#: ../../mod/settings.php:955 +msgid "Your Timezone:" msgstr "" -#: ../../mod/admin.php:441 -msgid "" -"Check to force all profiles on this site to be listed in the site directory." +#: ../../mod/settings.php:956 +msgid "Default Post Location:" msgstr "" -#: ../../mod/admin.php:442 -msgid "Disable discovery tab" +#: ../../mod/settings.php:956 +msgid "Geographical location to display on your posts" msgstr "" -#: ../../mod/admin.php:442 -msgid "" -"Remove the tab in the network view with public content pulled from sources " -"chosen for this site." +#: ../../mod/settings.php:957 +msgid "Use Browser Location:" msgstr "" -#: ../../mod/admin.php:443 -msgid "No login on Homepage" +#: ../../mod/settings.php:959 +msgid "Adult Content" msgstr "" -#: ../../mod/admin.php:443 +#: ../../mod/settings.php:959 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)." +"This channel frequently or regularly publishes adult content. (Please tag " +"any adult material and/or nudity with #NSFW)" msgstr "" -#: ../../mod/admin.php:445 -msgid "Proxy user" +#: ../../mod/settings.php:961 +msgid "Security and Privacy Settings" msgstr "" -#: ../../mod/admin.php:446 -msgid "Proxy URL" +#: ../../mod/settings.php:963 +msgid "Your permissions are already configured. Click to view/adjust" msgstr "" -#: ../../mod/admin.php:447 -msgid "Network timeout" +#: ../../mod/settings.php:965 +msgid "Hide my online presence" msgstr "" -#: ../../mod/admin.php:447 -msgid "Value is in seconds. Set to 0 for unlimited (not recommended)." +#: ../../mod/settings.php:965 +msgid "Prevents displaying in your profile that you are online" msgstr "" -#: ../../mod/admin.php:448 -msgid "Delivery interval" +#: ../../mod/settings.php:967 +msgid "Simple Privacy Settings:" msgstr "" -#: ../../mod/admin.php:448 +#: ../../mod/settings.php:968 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." +"Very Public - extremely permissive (should be used with caution)" msgstr "" -#: ../../mod/admin.php:449 -msgid "Poll interval" -msgstr "" - -#: ../../mod/admin.php:449 -msgid "" -"Delay background polling processes by this many seconds to reduce system " -"load. If 0, use delivery interval." -msgstr "" - -#: ../../mod/admin.php:450 -msgid "Maximum Load Average" -msgstr "" - -#: ../../mod/admin.php:450 +#: ../../mod/settings.php:969 msgid "" -"Maximum system load before delivery and poll processes are deferred - " -"default 50." +"Typical - default public, privacy when desired (similar to social " +"network permissions but with improved privacy)" msgstr "" -#: ../../mod/admin.php:506 -msgid "No server found" +#: ../../mod/settings.php:970 +msgid "Private - default private, never open or public" msgstr "" -#: ../../mod/admin.php:513 ../../mod/admin.php:737 -msgid "ID" +#: ../../mod/settings.php:971 +msgid "Blocked - default blocked to/from everybody" msgstr "" -#: ../../mod/admin.php:513 -msgid "for channel" +#: ../../mod/settings.php:973 +msgid "Allow others to tag your posts" msgstr "" -#: ../../mod/admin.php:513 -msgid "on server" +#: ../../mod/settings.php:973 +msgid "" +"Often used by the community to retro-actively flag inappropriate content" msgstr "" -#: ../../mod/admin.php:513 -msgid "Status" +#: ../../mod/settings.php:975 +msgid "Advanced Privacy Settings" msgstr "" -#: ../../mod/admin.php:534 -msgid "Update has been marked successful" +#: ../../mod/settings.php:977 +msgid "Expire other channel content after this many days" msgstr "" -#: ../../mod/admin.php:544 -#, php-format -msgid "Executing %s failed. Check system logs." +#: ../../mod/settings.php:977 +msgid "0 or blank prevents expiration" msgstr "" -#: ../../mod/admin.php:547 -#, php-format -msgid "Update %s was successfully applied." +#: ../../mod/settings.php:978 +msgid "Maximum Friend Requests/Day:" msgstr "" -#: ../../mod/admin.php:551 -#, php-format -msgid "Update %s did not return a status. Unknown if it succeeded." +#: ../../mod/settings.php:978 +msgid "May reduce spam activity" msgstr "" -#: ../../mod/admin.php:554 -#, php-format -msgid "Update function %s could not be found." +#: ../../mod/settings.php:979 +msgid "Default Post Permissions" msgstr "" -#: ../../mod/admin.php:569 -msgid "No failed updates." +#: ../../mod/settings.php:991 +msgid "Maximum private messages per day from unknown people:" msgstr "" -#: ../../mod/admin.php:573 -msgid "Failed Updates" +#: ../../mod/settings.php:991 +msgid "Useful to reduce spamming" msgstr "" -#: ../../mod/admin.php:575 -msgid "Mark success (if update was manually applied)" +#: ../../mod/settings.php:994 +msgid "Notification Settings" msgstr "" -#: ../../mod/admin.php:576 -msgid "Attempt to execute this update step automatically" +#: ../../mod/settings.php:995 +msgid "By default post a status message when:" msgstr "" -#: ../../mod/admin.php:602 -#, php-format -msgid "%s user blocked/unblocked" -msgid_plural "%s users blocked/unblocked" -msgstr[0] "" -msgstr[1] "" - -#: ../../mod/admin.php:609 -#, php-format -msgid "%s user deleted" -msgid_plural "%s users deleted" -msgstr[0] "" -msgstr[1] "" - -#: ../../mod/admin.php:638 -msgid "Account not found" +#: ../../mod/settings.php:996 +msgid "accepting a friend request" msgstr "" -#: ../../mod/admin.php:658 -#, php-format -msgid "User '%s' unblocked" +#: ../../mod/settings.php:997 +msgid "joining a forum/community" msgstr "" -#: ../../mod/admin.php:658 -#, php-format -msgid "User '%s' blocked" +#: ../../mod/settings.php:998 +msgid "making an interesting profile change" msgstr "" -#: ../../mod/admin.php:724 ../../mod/admin.php:736 -msgid "Users" +#: ../../mod/settings.php:999 +msgid "Send a notification email when:" msgstr "" -#: ../../mod/admin.php:726 ../../mod/admin.php:862 -msgid "select all" +#: ../../mod/settings.php:1000 +msgid "You receive a connection request" msgstr "" -#: ../../mod/admin.php:727 -msgid "User registrations waiting for confirm" +#: ../../mod/settings.php:1001 +msgid "Your connections are confirmed" msgstr "" -#: ../../mod/admin.php:728 -msgid "Request date" +#: ../../mod/settings.php:1002 +msgid "Someone writes on your profile wall" msgstr "" -#: ../../mod/admin.php:729 -msgid "No registrations." +#: ../../mod/settings.php:1003 +msgid "Someone writes a followup comment" msgstr "" -#: ../../mod/admin.php:730 -msgid "Approve" +#: ../../mod/settings.php:1004 +msgid "You receive a private message" msgstr "" -#: ../../mod/admin.php:731 -msgid "Deny" +#: ../../mod/settings.php:1005 +msgid "You receive a friend suggestion" msgstr "" -#: ../../mod/admin.php:733 ../../mod/connedit.php:436 -#: ../../mod/connedit.php:579 -msgid "Block" +#: ../../mod/settings.php:1006 +msgid "You are tagged in a post" msgstr "" -#: ../../mod/admin.php:734 ../../mod/connedit.php:436 -#: ../../mod/connedit.php:579 -msgid "Unblock" +#: ../../mod/settings.php:1007 +msgid "You are poked/prodded/etc. in a post" msgstr "" -#: ../../mod/admin.php:737 -msgid "Register date" +#: ../../mod/settings.php:1010 +msgid "Advanced Account/Page Type Settings" msgstr "" -#: ../../mod/admin.php:737 -msgid "Last login" +#: ../../mod/settings.php:1011 +msgid "Change the behaviour of this account for special situations" msgstr "" -#: ../../mod/admin.php:737 -msgid "Expires" +#: ../../mod/settings.php:1014 +msgid "" +"Please enable expert mode (in Settings > " +"Additional features) to adjust!" msgstr "" -#: ../../mod/admin.php:737 -msgid "Service Class" +#: ../../mod/settings.php:1015 +msgid "Miscellaneous Settings" msgstr "" -#: ../../mod/admin.php:739 -msgid "" -"Selected users will be deleted!\\n\\nEverything these users had posted on " -"this site will be permanently deleted!\\n\\nAre you sure?" +#: ../../mod/settings.php:1017 +msgid "Personal menu to display in your channel pages" msgstr "" -#: ../../mod/admin.php:740 -msgid "" -"The user {0} will be deleted!\\n\\nEverything this user has posted on this " -"site will be permanently deleted!\\n\\nAre you sure?" +#: ../../mod/settings.php:1018 +msgid "Remove this channel" msgstr "" -#: ../../mod/admin.php:773 -#, php-format -msgid "%s channel censored/uncensored" -msgid_plural "%s channels censored/uncensored" -msgstr[0] "" -msgstr[1] "" - -#: ../../mod/admin.php:780 -#, php-format -msgid "%s channel deleted" -msgid_plural "%s channels deleted" -msgstr[0] "" -msgstr[1] "" - -#: ../../mod/admin.php:799 -msgid "Channel not found" +#: ../../mod/poke.php:159 +msgid "Poke/Prod" msgstr "" -#: ../../mod/admin.php:810 -#, php-format -msgid "Channel '%s' deleted" +#: ../../mod/poke.php:160 +msgid "poke, prod or do other things to somebody" msgstr "" -#: ../../mod/admin.php:821 -#, php-format -msgid "Channel '%s' uncensored" +#: ../../mod/poke.php:161 +msgid "Recipient" msgstr "" -#: ../../mod/admin.php:821 -#, php-format -msgid "Channel '%s' censored" +#: ../../mod/poke.php:162 +msgid "Choose what you wish to do to recipient" msgstr "" -#: ../../mod/admin.php:864 -msgid "Censor" +#: ../../mod/poke.php:165 +msgid "Make this post private" msgstr "" -#: ../../mod/admin.php:865 -msgid "Uncensor" +#: ../../mod/api.php:76 ../../mod/api.php:102 +msgid "Authorize application connection" msgstr "" -#: ../../mod/admin.php:868 -msgid "UID" +#: ../../mod/api.php:77 +msgid "Return to your app and insert this Securty Code:" msgstr "" -#: ../../mod/admin.php:868 ../../mod/profiles.php:433 -msgid "Address" +#: ../../mod/api.php:89 +msgid "Please login to continue." msgstr "" -#: ../../mod/admin.php:870 +#: ../../mod/api.php:104 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?" +"Do you want to authorize this application to access your posts and contacts, " +"and/or create new posts for you?" msgstr "" -#: ../../mod/admin.php:871 +#: ../../mod/post.php:229 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?" +"Remote authentication blocked. You are logged into this site locally. Please " +"logout and retry." msgstr "" -#: ../../mod/admin.php:910 +#: ../../mod/post.php:261 ../../mod/openid.php:72 ../../mod/openid.php:180 #, php-format -msgid "Plugin %s disabled." +msgid "Welcome %s. Remote authentication successful." msgstr "" -#: ../../mod/admin.php:914 -#, php-format -msgid "Plugin %s enabled." +#: ../../mod/attach.php:9 +msgid "Item not available." msgstr "" -#: ../../mod/admin.php:924 ../../mod/admin.php:1126 -msgid "Disable" +#: ../../mod/probe.php:23 ../../mod/probe.php:29 +#, php-format +msgid "Fetching URL returns error: %1$s" msgstr "" -#: ../../mod/admin.php:926 ../../mod/admin.php:1128 -msgid "Enable" +#: ../../mod/block.php:27 ../../mod/page.php:33 +msgid "Invalid item." msgstr "" -#: ../../mod/admin.php:952 ../../mod/admin.php:1157 -msgid "Toggle" +#: ../../mod/block.php:39 ../../mod/page.php:45 ../../mod/wall_upload.php:28 +msgid "Channel not found." msgstr "" -#: ../../mod/admin.php:960 ../../mod/admin.php:1167 -msgid "Author: " +#: ../../mod/block.php:75 ../../mod/page.php:81 ../../mod/display.php:102 +#: ../../mod/help.php:72 ../../index.php:240 +msgid "Page not found." msgstr "" -#: ../../mod/admin.php:961 ../../mod/admin.php:1168 -msgid "Maintainer: " -msgstr "" - -#: ../../mod/admin.php:1090 -msgid "No themes found." +#: ../../mod/siteinfo.php:90 +#, php-format +msgid "Version %s" msgstr "" -#: ../../mod/admin.php:1149 -msgid "Screenshot" +#: ../../mod/siteinfo.php:111 +msgid "Installed plugins/addons/apps:" msgstr "" -#: ../../mod/admin.php:1197 -msgid "[Experimental]" +#: ../../mod/siteinfo.php:124 +msgid "No installed plugins/addons/apps" msgstr "" -#: ../../mod/admin.php:1198 -msgid "[Unsupported]" +#: ../../mod/siteinfo.php:132 +msgid "Red" msgstr "" -#: ../../mod/admin.php:1225 -msgid "Log settings updated." +#: ../../mod/siteinfo.php:133 +msgid "" +"This is a hub of the Red Matrix - a global cooperative network of " +"decentralized privacy enhanced websites." msgstr "" -#: ../../mod/admin.php:1281 -msgid "Clear" +#: ../../mod/siteinfo.php:137 +msgid "Running at web location" msgstr "" -#: ../../mod/admin.php:1287 -msgid "Debugging" +#: ../../mod/siteinfo.php:138 +msgid "" +"Please visit GetZot.com to learn more " +"about the Red Matrix." msgstr "" -#: ../../mod/admin.php:1288 -msgid "Log file" +#: ../../mod/siteinfo.php:139 +msgid "Bug reports and issues: please visit" msgstr "" -#: ../../mod/admin.php:1288 +#: ../../mod/siteinfo.php:142 msgid "" -"Must be writable by web server. Relative to your Red top-level directory." +"Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot com" msgstr "" -#: ../../mod/admin.php:1289 -msgid "Log level" +#: ../../mod/siteinfo.php:144 +msgid "Site Administrators" msgstr "" -#: ../../mod/admin.php:1336 -msgid "New Profile Field" +#: ../../mod/blocks.php:62 +msgid "Block Name" msgstr "" -#: ../../mod/admin.php:1337 ../../mod/admin.php:1358 -msgid "Field nickname" +#: ../../mod/bookmarks.php:38 +msgid "Bookmark added" msgstr "" -#: ../../mod/admin.php:1337 ../../mod/admin.php:1358 -msgid "System name of field" +#: ../../mod/bookmarks.php:60 +msgid "My Bookmarks" msgstr "" -#: ../../mod/admin.php:1338 ../../mod/admin.php:1359 -msgid "Input type" +#: ../../mod/bookmarks.php:71 +msgid "My Connections Bookmarks" msgstr "" -#: ../../mod/admin.php:1339 ../../mod/admin.php:1360 -msgid "Field Name" +#: ../../mod/profiles.php:18 ../../mod/profiles.php:165 +#: ../../mod/profiles.php:222 ../../mod/profiles.php:547 +msgid "Profile not found." msgstr "" -#: ../../mod/admin.php:1339 ../../mod/admin.php:1360 -msgid "Label on profile pages" +#: ../../mod/profiles.php:38 +msgid "Profile deleted." msgstr "" -#: ../../mod/admin.php:1340 ../../mod/admin.php:1361 -msgid "Help text" +#: ../../mod/profiles.php:56 ../../mod/profiles.php:92 +msgid "Profile-" msgstr "" -#: ../../mod/admin.php:1340 ../../mod/admin.php:1361 -msgid "Additional info (optional)" +#: ../../mod/profiles.php:77 ../../mod/profiles.php:120 +msgid "New profile created." msgstr "" -#: ../../mod/admin.php:1351 -msgid "Field definition not found" +#: ../../mod/profiles.php:98 +msgid "Profile unavailable to clone." msgstr "" -#: ../../mod/admin.php:1357 -msgid "Edit Profile Field" +#: ../../mod/profiles.php:136 +msgid "Profile unavailable to export." msgstr "" -#: ../../mod/filer.php:49 -msgid "- select -" +#: ../../mod/profiles.php:232 +msgid "Profile Name is required." msgstr "" -#: ../../mod/connections.php:37 ../../mod/connedit.php:64 -msgid "Could not access contact record." +#: ../../mod/profiles.php:362 +msgid "Marital Status" msgstr "" -#: ../../mod/connections.php:51 ../../mod/connedit.php:78 -msgid "Could not locate selected profile." +#: ../../mod/profiles.php:366 +msgid "Romantic Partner" msgstr "" -#: ../../mod/connections.php:94 ../../mod/connedit.php:132 -msgid "Connection updated." +#: ../../mod/profiles.php:370 +msgid "Likes" msgstr "" -#: ../../mod/connections.php:96 ../../mod/connedit.php:134 -msgid "Failed to update connection record." +#: ../../mod/profiles.php:374 +msgid "Dislikes" msgstr "" -#: ../../mod/connections.php:191 ../../mod/connections.php:292 -msgid "Blocked" +#: ../../mod/profiles.php:378 +msgid "Work/Employment" msgstr "" -#: ../../mod/connections.php:196 ../../mod/connections.php:299 -msgid "Ignored" +#: ../../mod/profiles.php:381 +msgid "Religion" msgstr "" -#: ../../mod/connections.php:201 ../../mod/connections.php:313 -msgid "Hidden" +#: ../../mod/profiles.php:385 +msgid "Political Views" msgstr "" -#: ../../mod/connections.php:206 ../../mod/connections.php:306 -msgid "Archived" +#: ../../mod/profiles.php:389 +msgid "Gender" msgstr "" -#: ../../mod/connections.php:230 ../../mod/connections.php:245 -msgid "All" +#: ../../mod/profiles.php:393 +msgid "Sexual Preference" msgstr "" -#: ../../mod/connections.php:270 -msgid "Suggest new connections" +#: ../../mod/profiles.php:397 +msgid "Homepage" msgstr "" -#: ../../mod/connections.php:273 -msgid "New Connections" +#: ../../mod/profiles.php:401 +msgid "Interests" msgstr "" -#: ../../mod/connections.php:276 -msgid "Show pending (new) connections" +#: ../../mod/profiles.php:405 ../../mod/admin.php:868 +msgid "Address" msgstr "" -#: ../../mod/connections.php:279 ../../mod/profperm.php:139 -msgid "All Connections" +#: ../../mod/profiles.php:412 ../../mod/pubsites.php:25 +msgid "Location" msgstr "" -#: ../../mod/connections.php:282 -msgid "Show all connections" +#: ../../mod/profiles.php:495 +msgid "Profile updated." msgstr "" -#: ../../mod/connections.php:285 -msgid "Unblocked" +#: ../../mod/profiles.php:572 +msgid "Hide your contact/friend list from viewers of this profile?" msgstr "" -#: ../../mod/connections.php:288 -msgid "Only show unblocked connections" +#: ../../mod/profiles.php:614 +msgid "Edit Profile Details" msgstr "" -#: ../../mod/connections.php:295 -msgid "Only show blocked connections" +#: ../../mod/profiles.php:616 +msgid "View this profile" msgstr "" -#: ../../mod/connections.php:302 -msgid "Only show ignored connections" +#: ../../mod/profiles.php:618 +msgid "Change Profile Photo" msgstr "" -#: ../../mod/connections.php:309 -msgid "Only show archived connections" +#: ../../mod/profiles.php:619 +msgid "Create a new profile using these settings" msgstr "" -#: ../../mod/connections.php:316 -msgid "Only show hidden connections" +#: ../../mod/profiles.php:620 +msgid "Clone this profile" msgstr "" -#: ../../mod/connections.php:371 -#, php-format -msgid "%1$s [%2$s]" +#: ../../mod/profiles.php:621 +msgid "Delete this profile" msgstr "" -#: ../../mod/connections.php:372 -msgid "Edit connection" +#: ../../mod/profiles.php:623 +msgid "Import profile from file" msgstr "" -#: ../../mod/connections.php:410 -msgid "Search your connections" +#: ../../mod/profiles.php:624 +msgid "Export profile to file" msgstr "" -#: ../../mod/connections.php:411 -msgid "Finding: " +#: ../../mod/profiles.php:625 +msgid "Profile Name:" msgstr "" -#: ../../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." +#: ../../mod/profiles.php:626 +msgid "Your Full Name:" msgstr "" -#: ../../mod/dirprofile.php:92 ../../mod/directory.php:143 -#: ../../mod/profiles.php:704 -msgid "Age: " +#: ../../mod/profiles.php:627 +msgid "Title/Description:" msgstr "" -#: ../../mod/dirprofile.php:95 ../../mod/directory.php:146 -msgid "Gender: " +#: ../../mod/profiles.php:628 +msgid "Your Gender:" msgstr "" -#: ../../mod/dirprofile.php:108 -msgid "Status: " +#: ../../mod/profiles.php:629 +msgid "Birthday :" msgstr "" -#: ../../mod/dirprofile.php:109 -msgid "Sexual Preference: " +#: ../../mod/profiles.php:630 +msgid "Street Address:" msgstr "" -#: ../../mod/dirprofile.php:111 -msgid "Homepage: " +#: ../../mod/profiles.php:631 +msgid "Locality/City:" msgstr "" -#: ../../mod/dirprofile.php:112 -msgid "Hometown: " +#: ../../mod/profiles.php:632 +msgid "Postal/Zip Code:" msgstr "" -#: ../../mod/dirprofile.php:114 -msgid "About: " +#: ../../mod/profiles.php:633 +msgid "Country:" msgstr "" -#: ../../mod/dirprofile.php:162 -msgid "Keywords: " +#: ../../mod/profiles.php:634 +msgid "Region/State:" msgstr "" -#: ../../mod/dirprofile.php:175 ../../mod/mitem.php:78 ../../mod/xchan.php:38 -#: ../../mod/menu.php:120 -msgid "Not found." +#: ../../mod/profiles.php:635 +msgid "♥ Marital Status:" msgstr "" -#: ../../mod/photos.php:77 -msgid "Page owner information could not be retrieved." +#: ../../mod/profiles.php:636 +msgid "Who: (if applicable)" msgstr "" -#: ../../mod/photos.php:97 -msgid "Album not found." +#: ../../mod/profiles.php:637 +msgid "Examples: cathy123, Cathy Williams, cathy@example.com" msgstr "" -#: ../../mod/photos.php:119 ../../mod/photos.php:673 -msgid "Delete Album" +#: ../../mod/profiles.php:638 +msgid "Since [date]:" msgstr "" -#: ../../mod/photos.php:159 ../../mod/photos.php:975 -msgid "Delete Photo" +#: ../../mod/profiles.php:640 +msgid "Homepage URL:" msgstr "" -#: ../../mod/photos.php:453 -msgid "No photos selected" +#: ../../mod/profiles.php:643 +msgid "Religious Views:" msgstr "" -#: ../../mod/photos.php:500 -msgid "Access to this item is restricted." +#: ../../mod/profiles.php:644 +msgid "Keywords:" msgstr "" -#: ../../mod/photos.php:574 -#, php-format -msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage." +#: ../../mod/profiles.php:647 +msgid "Example: fishing photography software" msgstr "" -#: ../../mod/photos.php:577 -#, php-format -msgid "You have used %1$.2f Mbytes of photo storage." +#: ../../mod/profiles.php:648 +msgid "Used in directory listings" msgstr "" -#: ../../mod/photos.php:596 -msgid "Upload Photos" +#: ../../mod/profiles.php:649 +msgid "Tell us about yourself..." msgstr "" -#: ../../mod/photos.php:600 ../../mod/photos.php:668 -msgid "New album name: " +#: ../../mod/profiles.php:650 +msgid "Hobbies/Interests" msgstr "" -#: ../../mod/photos.php:601 -msgid "or existing album name: " +#: ../../mod/profiles.php:651 +msgid "Contact information and Social Networks" msgstr "" -#: ../../mod/photos.php:602 -msgid "Do not show a status post for this upload" +#: ../../mod/profiles.php:652 +msgid "My other channels" msgstr "" -#: ../../mod/photos.php:622 -msgid "Album name could not be decoded" +#: ../../mod/profiles.php:653 +msgid "Musical interests" msgstr "" -#: ../../mod/photos.php:657 ../../mod/photos.php:679 ../../mod/photos.php:1148 -#: ../../mod/photos.php:1163 -msgid "Contact Photos" +#: ../../mod/profiles.php:654 +msgid "Books, literature" msgstr "" -#: ../../mod/photos.php:681 -msgid "Edit Album" +#: ../../mod/profiles.php:655 +msgid "Television" msgstr "" -#: ../../mod/photos.php:687 -msgid "Show Newest First" +#: ../../mod/profiles.php:656 +msgid "Film/dance/culture/entertainment" msgstr "" -#: ../../mod/photos.php:689 -msgid "Show Oldest First" +#: ../../mod/profiles.php:657 +msgid "Love/romance" msgstr "" -#: ../../mod/photos.php:716 ../../mod/photos.php:1195 -msgid "View Photo" +#: ../../mod/profiles.php:658 +msgid "Work/employment" msgstr "" -#: ../../mod/photos.php:794 -msgid "Permission denied. Access to this item may be restricted." +#: ../../mod/profiles.php:659 +msgid "School/education" msgstr "" -#: ../../mod/photos.php:796 -msgid "Photo not available" +#: ../../mod/profiles.php:665 +msgid "This is your default profile." msgstr "" -#: ../../mod/photos.php:856 -msgid "Use as profile photo" +#: ../../mod/profiles.php:676 ../../mod/directory.php:143 +#: ../../mod/dirprofile.php:92 +msgid "Age: " msgstr "" -#: ../../mod/photos.php:880 -msgid "View Full Size" +#: ../../mod/profiles.php:719 +msgid "Edit/Manage Profiles" msgstr "" -#: ../../mod/photos.php:924 ../../mod/delegate.php:130 ../../mod/tagrm.php:93 -msgid "Remove" +#: ../../mod/profiles.php:720 +msgid "Add profile things" msgstr "" -#: ../../mod/photos.php:958 -msgid "Edit photo" +#: ../../mod/profiles.php:721 +msgid "Include desirable objects in your profile" msgstr "" -#: ../../mod/photos.php:960 -msgid "Rotate CW (right)" +#: ../../mod/profperm.php:29 ../../mod/profperm.php:58 +msgid "Invalid profile identifier." msgstr "" -#: ../../mod/photos.php:961 -msgid "Rotate CCW (left)" +#: ../../mod/profperm.php:110 +msgid "Profile Visibility Editor" msgstr "" -#: ../../mod/photos.php:964 -msgid "New album name" +#: ../../mod/profperm.php:114 +msgid "Click on a contact to add or remove." msgstr "" -#: ../../mod/photos.php:967 -msgid "Caption" +#: ../../mod/profperm.php:123 +msgid "Visible To" msgstr "" -#: ../../mod/photos.php:969 -msgid "Add a Tag" +#: ../../mod/profperm.php:139 ../../mod/connections.php:279 +msgid "All Connections" msgstr "" -#: ../../mod/photos.php:972 -msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" +#: ../../mod/events.php:81 +msgid "Event can not end before it has started." msgstr "" -#: ../../mod/photos.php:1125 -msgid "In This Photo:" +#: ../../mod/events.php:86 +msgid "Event title and start time are required." msgstr "" -#: ../../mod/photos.php:1201 -msgid "View Album" +#: ../../mod/events.php:100 +msgid "Event not found." msgstr "" -#: ../../mod/photos.php:1224 -msgid "Recent Photos" +#: ../../mod/events.php:364 +msgid "l, F j" msgstr "" -#: ../../mod/mitem.php:14 ../../mod/menu.php:92 -msgid "Menu not found." +#: ../../mod/events.php:386 +msgid "Edit event" msgstr "" -#: ../../mod/mitem.php:47 -msgid "Menu element updated." +#: ../../mod/events.php:432 +msgid "Create New Event" msgstr "" -#: ../../mod/mitem.php:51 -msgid "Unable to update menu element." +#: ../../mod/events.php:560 +msgid "Event details" msgstr "" -#: ../../mod/mitem.php:57 -msgid "Menu element added." +#: ../../mod/events.php:561 +msgid "Starting date and Title are required." msgstr "" -#: ../../mod/mitem.php:61 -msgid "Unable to add menu element." +#: ../../mod/events.php:565 +msgid "Event Starts:" msgstr "" -#: ../../mod/mitem.php:96 -msgid "Manage Menu Elements" +#: ../../mod/events.php:565 ../../mod/events.php:581 ../../mod/appman.php:91 +#: ../../mod/appman.php:92 +msgid "Required" msgstr "" -#: ../../mod/mitem.php:99 -msgid "Edit menu" +#: ../../mod/events.php:571 +msgid "Finish date/time is not known or not relevant" msgstr "" -#: ../../mod/mitem.php:102 -msgid "Edit element" +#: ../../mod/events.php:573 +msgid "Event Finishes:" msgstr "" -#: ../../mod/mitem.php:103 -msgid "Drop element" +#: ../../mod/events.php:575 +msgid "Adjust for viewer timezone" msgstr "" -#: ../../mod/mitem.php:104 -msgid "New element" +#: ../../mod/events.php:577 +msgid "Description:" msgstr "" -#: ../../mod/mitem.php:105 -msgid "Edit this menu container" +#: ../../mod/events.php:581 +msgid "Title:" msgstr "" -#: ../../mod/mitem.php:106 -msgid "Add menu element" +#: ../../mod/events.php:583 +msgid "Share this event" msgstr "" -#: ../../mod/mitem.php:107 -msgid "Delete this menu item" +#: ../../mod/pubsites.php:16 +msgid "Public Sites" msgstr "" -#: ../../mod/mitem.php:108 -msgid "Edit this menu item" +#: ../../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 "" -#: ../../mod/mitem.php:131 -msgid "New Menu Element" +#: ../../mod/pubsites.php:25 +msgid "Site URL" msgstr "" -#: ../../mod/mitem.php:133 ../../mod/mitem.php:176 -msgid "Menu Item Permissions" +#: ../../mod/pubsites.php:25 +msgid "Access Type" msgstr "" -#: ../../mod/mitem.php:136 ../../mod/mitem.php:180 -msgid "Link text" +#: ../../mod/pubsites.php:25 +msgid "Registration Policy" msgstr "" -#: ../../mod/mitem.php:137 ../../mod/mitem.php:181 -msgid "URL of link" +#: ../../mod/channel.php:25 ../../mod/chat.php:19 +msgid "You must be logged in to see this page." msgstr "" -#: ../../mod/mitem.php:138 ../../mod/mitem.php:182 -msgid "Use Red magic-auth if available" +#: ../../mod/channel.php:86 +msgid "Insufficient permissions. Request redirected to profile page." msgstr "" -#: ../../mod/mitem.php:139 ../../mod/mitem.php:183 -msgid "Open link in new window" +#: ../../mod/rbmark.php:88 +msgid "Select a bookmark folder" msgstr "" -#: ../../mod/mitem.php:141 ../../mod/mitem.php:185 -msgid "Order in list" +#: ../../mod/rbmark.php:93 +msgid "Save Bookmark" msgstr "" -#: ../../mod/mitem.php:141 ../../mod/mitem.php:185 -msgid "Higher numbers will sink to bottom of listing" +#: ../../mod/rbmark.php:94 +msgid "URL of bookmark" msgstr "" -#: ../../mod/mitem.php:154 -msgid "Menu item not found." +#: ../../mod/rbmark.php:95 ../../mod/appman.php:93 +msgid "Description" msgstr "" -#: ../../mod/mitem.php:163 -msgid "Menu item deleted." +#: ../../mod/rbmark.php:99 +msgid "Or enter new bookmark folder name" msgstr "" -#: ../../mod/mitem.php:165 -msgid "Menu item could not be deleted." +#: ../../mod/chat.php:167 +msgid "Room not found" msgstr "" -#: ../../mod/mitem.php:174 -msgid "Edit Menu Element" +#: ../../mod/chat.php:178 +msgid "Leave Room" msgstr "" -#: ../../mod/mitem.php:186 ../../mod/menu.php:114 -msgid "Modify" +#: ../../mod/chat.php:179 +msgid "Delete This Room" msgstr "" -#: ../../mod/subthread.php:103 -#, php-format -msgid "%1$s is following %2$s's %3$s" +#: ../../mod/chat.php:180 +msgid "I am away right now" msgstr "" -#: ../../mod/regmod.php:11 -msgid "Please login." +#: ../../mod/chat.php:181 +msgid "I am online" msgstr "" -#: ../../mod/mood.php:132 -msgid "Set your current mood and tell your friends" +#: ../../mod/chat.php:183 +msgid "Bookmark this room" msgstr "" -#: ../../mod/impel.php:33 -msgid "webpage" +#: ../../mod/chat.php:207 ../../mod/chat.php:229 +msgid "New Chatroom" msgstr "" -#: ../../mod/impel.php:38 -msgid "block" +#: ../../mod/chat.php:208 +msgid "Chatroom Name" msgstr "" -#: ../../mod/impel.php:43 -msgid "layout" +#: ../../mod/chat.php:225 +#, php-format +msgid "%1$s's Chatrooms" msgstr "" -#: ../../mod/impel.php:117 -#, php-format -msgid "%s element installed" +#: ../../mod/register.php:42 +msgid "Maximum daily site registrations exceeded. Please try again tomorrow." msgstr "" -#: ../../mod/lockview.php:31 -msgid "Remote privacy information not available." +#: ../../mod/register.php:48 +msgid "" +"Please indicate acceptance of the Terms of Service. Registration failed." msgstr "" -#: ../../mod/lockview.php:52 -msgid "Visible to:" +#: ../../mod/register.php:82 +msgid "Passwords do not match." msgstr "" -#: ../../mod/rbmark.php:88 -msgid "Select a bookmark folder" +#: ../../mod/register.php:115 +msgid "" +"Registration successful. Please check your email for validation instructions." msgstr "" -#: ../../mod/rbmark.php:93 -msgid "Save Bookmark" +#: ../../mod/register.php:121 +msgid "Your registration is pending approval by the site owner." msgstr "" -#: ../../mod/rbmark.php:94 -msgid "URL of bookmark" +#: ../../mod/register.php:124 +msgid "Your registration can not be processed." msgstr "" -#: ../../mod/rbmark.php:95 ../../mod/appman.php:93 -msgid "Description" +#: ../../mod/register.php:161 +msgid "Registration on this site/hub is by approval only." msgstr "" -#: ../../mod/rbmark.php:99 -msgid "Or enter new bookmark folder name" +#: ../../mod/register.php:162 +msgid "Register at another affiliated site/hub" msgstr "" -#: ../../mod/pdledit.php:13 -msgid "Layout updated." +#: ../../mod/register.php:170 +msgid "" +"This site has exceeded the number of allowed daily account registrations. " +"Please try again tomorrow." msgstr "" -#: ../../mod/pdledit.php:28 ../../mod/pdledit.php:53 -msgid "Edit System Page Description" +#: ../../mod/register.php:181 +msgid "Terms of Service" msgstr "" -#: ../../mod/pdledit.php:48 -msgid "Layout not found." +#: ../../mod/register.php:187 +#, php-format +msgid "I accept the %s for this website" msgstr "" -#: ../../mod/pdledit.php:54 -msgid "Module Name:" +#: ../../mod/register.php:189 +#, php-format +msgid "I am over 13 years of age and accept the %s for this website" msgstr "" -#: ../../mod/pdledit.php:55 ../../mod/layouts.php:59 -msgid "Layout Help" +#: ../../mod/register.php:203 ../../mod/admin.php:415 +msgid "Registration" msgstr "" -#: ../../mod/profile_photo.php:108 -msgid "Image uploaded but image cropping failed." +#: ../../mod/register.php:208 +msgid "Membership on this site is by invitation only." msgstr "" -#: ../../mod/profile_photo.php:161 -msgid "Image resize failed." +#: ../../mod/register.php:209 +msgid "Please enter your invitation code" msgstr "" -#: ../../mod/profile_photo.php:205 -msgid "" -"Shift-reload the page or clear browser cache if the new photo does not " -"display immediately." +#: ../../mod/register.php:212 +msgid "Your email address" msgstr "" -#: ../../mod/profile_photo.php:232 -#, php-format -msgid "Image exceeds size limit of %d" +#: ../../mod/register.php:213 +msgid "Choose a password" msgstr "" -#: ../../mod/profile_photo.php:241 -msgid "Unable to process image." +#: ../../mod/register.php:214 +msgid "Please re-enter your password" msgstr "" -#: ../../mod/profile_photo.php:290 ../../mod/profile_photo.php:339 -msgid "Photo not available." +#: ../../mod/chatsvc.php:111 +msgid "Away" msgstr "" -#: ../../mod/profile_photo.php:358 -msgid "Upload File:" +#: ../../mod/chatsvc.php:115 +msgid "Online" msgstr "" -#: ../../mod/profile_photo.php:359 -msgid "Select a profile:" +#: ../../mod/regmod.php:11 +msgid "Please login." msgstr "" -#: ../../mod/profile_photo.php:360 -msgid "Upload Profile Photo" +#: ../../mod/removeme.php:29 +msgid "" +"Channel removals are not allowed within 48 hours of changing the account " +"password." msgstr "" -#: ../../mod/profile_photo.php:365 -msgid "skip this step" +#: ../../mod/removeme.php:57 +msgid "Remove This Channel" msgstr "" -#: ../../mod/profile_photo.php:365 -msgid "select a photo from your photo albums" +#: ../../mod/removeme.php:58 +msgid "" +"This will completely remove this channel from the network. Once this has " +"been done it is not recoverable." msgstr "" -#: ../../mod/profile_photo.php:381 -msgid "Crop Image" +#: ../../mod/removeme.php:59 ../../mod/removeaccount.php:59 +msgid "Please enter your password for verification:" msgstr "" -#: ../../mod/profile_photo.php:382 -msgid "Please adjust the image cropping for optimum viewing." +#: ../../mod/removeme.php:60 +msgid "Remove this channel and all its clones from the network" msgstr "" -#: ../../mod/profile_photo.php:384 -msgid "Done Editing" +#: ../../mod/removeme.php:60 +msgid "" +"By default only the instance of the channel located on this hub will be " +"removed from the network" msgstr "" -#: ../../mod/profile_photo.php:427 -msgid "Image uploaded successfully." +#: ../../mod/removeme.php:61 +msgid "Remove Channel" msgstr "" -#: ../../mod/profile_photo.php:429 -msgid "Image upload failed." +#: ../../mod/common.php:10 +msgid "No channel." msgstr "" -#: ../../mod/profile_photo.php:438 -#, php-format -msgid "Image size reduction [%s] failed." +#: ../../mod/common.php:39 +msgid "Common connections" msgstr "" -#: ../../mod/acl.php:244 -msgid "network" +#: ../../mod/common.php:44 +msgid "No connections in common." msgstr "" -#: ../../mod/menu.php:21 -msgid "Menu updated." +#: ../../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 "" -#: ../../mod/menu.php:25 -msgid "Unable to update menu." +#: ../../mod/rmagic.php:38 +msgid "The error message was:" msgstr "" -#: ../../mod/menu.php:30 -msgid "Menu created." +#: ../../mod/rmagic.php:42 +msgid "Authentication failed." msgstr "" -#: ../../mod/menu.php:34 -msgid "Unable to create menu." +#: ../../mod/rmagic.php:82 +msgid "Remote Authentication" msgstr "" -#: ../../mod/menu.php:57 -msgid "Manage Menus" +#: ../../mod/rmagic.php:83 +msgid "Enter your channel address (e.g. channel@example.com)" msgstr "" -#: ../../mod/menu.php:60 -msgid "Drop" +#: ../../mod/rmagic.php:84 +msgid "Authenticate" msgstr "" -#: ../../mod/menu.php:62 -msgid "Create a new menu" +#: ../../mod/connect.php:55 ../../mod/connect.php:103 +msgid "Continue" msgstr "" -#: ../../mod/menu.php:63 -msgid "Delete this menu" +#: ../../mod/connect.php:84 +msgid "Premium Channel Setup" msgstr "" -#: ../../mod/menu.php:64 ../../mod/menu.php:109 -msgid "Edit menu contents" +#: ../../mod/connect.php:86 +msgid "Enable premium channel connection restrictions" msgstr "" -#: ../../mod/menu.php:65 -msgid "Edit this menu" +#: ../../mod/connect.php:87 +msgid "" +"Please enter your restrictions or conditions, such as paypal receipt, usage " +"guidelines, etc." msgstr "" -#: ../../mod/menu.php:80 -msgid "New Menu" +#: ../../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 "" -#: ../../mod/menu.php:81 ../../mod/menu.php:110 -msgid "Menu name" +#: ../../mod/connect.php:90 +msgid "" +"Potential connections will then see the following text before proceeding:" msgstr "" -#: ../../mod/menu.php:81 ../../mod/menu.php:110 -msgid "Must be unique, only seen by you" +#: ../../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 "" -#: ../../mod/menu.php:82 ../../mod/menu.php:111 -msgid "Menu title" +#: ../../mod/connect.php:100 +msgid "(No specific instructions have been provided by the channel owner.)" msgstr "" -#: ../../mod/menu.php:82 ../../mod/menu.php:111 -msgid "Menu title as seen by others" +#: ../../mod/connect.php:108 +msgid "Restricted or Premium Channel" msgstr "" -#: ../../mod/menu.php:83 ../../mod/menu.php:112 -msgid "Allow bookmarks" +#: ../../mod/network.php:79 +msgid "No such group" msgstr "" -#: ../../mod/menu.php:83 ../../mod/menu.php:112 -msgid "Menu may be used to store saved bookmarks" +#: ../../mod/network.php:118 +msgid "Search Results For:" msgstr "" -#: ../../mod/menu.php:98 -msgid "Menu deleted." +#: ../../mod/network.php:172 +msgid "Collection is empty" msgstr "" -#: ../../mod/menu.php:100 -msgid "Menu could not be deleted." +#: ../../mod/network.php:180 +msgid "Collection: " msgstr "" -#: ../../mod/menu.php:106 -msgid "Edit Menu" +#: ../../mod/network.php:193 +msgid "Connection: " msgstr "" -#: ../../mod/menu.php:108 -msgid "Add or remove entries to this menu" +#: ../../mod/network.php:196 +msgid "Invalid connection." msgstr "" -#: ../../mod/block.php:27 ../../mod/page.php:35 -msgid "Invalid item." +#: ../../mod/connections.php:37 ../../mod/connedit.php:64 +msgid "Could not access contact record." msgstr "" -#: ../../mod/block.php:39 ../../mod/wall_upload.php:28 ../../mod/page.php:47 -msgid "Channel not found." +#: ../../mod/connections.php:51 ../../mod/connedit.php:78 +msgid "Could not locate selected profile." msgstr "" -#: ../../mod/block.php:75 ../../mod/help.php:72 ../../mod/display.php:102 -#: ../../mod/page.php:83 ../../index.php:240 -msgid "Page not found." +#: ../../mod/connections.php:94 ../../mod/connedit.php:132 +msgid "Connection updated." msgstr "" -#: ../../mod/tagger.php:98 +#: ../../mod/connections.php:96 ../../mod/connedit.php:134 +msgid "Failed to update connection record." +msgstr "" + +#: ../../mod/connections.php:191 ../../mod/connections.php:292 +msgid "Blocked" +msgstr "" + +#: ../../mod/connections.php:196 ../../mod/connections.php:299 +msgid "Ignored" +msgstr "" + +#: ../../mod/connections.php:201 ../../mod/connections.php:313 +msgid "Hidden" +msgstr "" + +#: ../../mod/connections.php:206 ../../mod/connections.php:306 +msgid "Archived" +msgstr "" + +#: ../../mod/connections.php:230 ../../mod/connections.php:245 +msgid "All" +msgstr "" + +#: ../../mod/connections.php:270 +msgid "Suggest new connections" +msgstr "" + +#: ../../mod/connections.php:273 +msgid "New Connections" +msgstr "" + +#: ../../mod/connections.php:276 +msgid "Show pending (new) connections" +msgstr "" + +#: ../../mod/connections.php:282 +msgid "Show all connections" +msgstr "" + +#: ../../mod/connections.php:285 +msgid "Unblocked" +msgstr "" + +#: ../../mod/connections.php:288 +msgid "Only show unblocked connections" +msgstr "" + +#: ../../mod/connections.php:295 +msgid "Only show blocked connections" +msgstr "" + +#: ../../mod/connections.php:302 +msgid "Only show ignored connections" +msgstr "" + +#: ../../mod/connections.php:309 +msgid "Only show archived connections" +msgstr "" + +#: ../../mod/connections.php:316 +msgid "Only show hidden connections" +msgstr "" + +#: ../../mod/connections.php:371 #, php-format -msgid "%1$s tagged %2$s's %3$s with %4$s" +msgid "%1$s [%2$s]" msgstr "" -#: ../../mod/wall_upload.php:34 -msgid "Wall Photos" +#: ../../mod/connections.php:372 +msgid "Edit connection" msgstr "" -#: ../../mod/openid.php:26 -msgid "OpenID protocol error. No ID returned." +#: ../../mod/connections.php:410 +msgid "Search your connections" msgstr "" -#: ../../mod/suggest.php:35 -msgid "" -"No suggestions available. If this is a new site, please try again in 24 " -"hours." +#: ../../mod/connections.php:411 +msgid "Finding: " +msgstr "" + +#: ../../mod/rpost.php:97 ../../mod/editpost.php:42 +msgid "Edit post" msgstr "" #: ../../mod/connedit.php:181 @@ -5817,6 +5369,16 @@ msgstr "" msgid "View recent posts and comments" msgstr "" +#: ../../mod/connedit.php:436 ../../mod/connedit.php:579 +#: ../../mod/admin.php:734 +msgid "Unblock" +msgstr "" + +#: ../../mod/connedit.php:436 ../../mod/connedit.php:579 +#: ../../mod/admin.php:733 +msgid "Block" +msgstr "" + #: ../../mod/connedit.php:439 msgid "Block or Unblock this connection" msgstr "" @@ -6036,32 +5598,87 @@ msgid "" "Replies/likes to your public posts may still be visible" msgstr "" -#: ../../mod/message.php:41 -msgid "Conversation removed." +#: ../../mod/delegate.php:95 +msgid "No potential page delegates located." msgstr "" -#: ../../mod/message.php:56 -msgid "No messages." +#: ../../mod/delegate.php:121 +msgid "Delegate Page Management" msgstr "" -#: ../../mod/message.php:72 ../../mod/mail.php:329 -msgid "Delete conversation" +#: ../../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 "" -#: ../../mod/message.php:74 -msgid "D, d M Y - g:i A" +#: ../../mod/delegate.php:124 +msgid "Existing Page Managers" msgstr "" -#: ../../mod/ping.php:237 -msgid "sent you a private message" +#: ../../mod/delegate.php:126 +msgid "Existing Page Delegates" msgstr "" -#: ../../mod/ping.php:288 -msgid "added your channel" +#: ../../mod/delegate.php:128 +msgid "Potential Delegates" msgstr "" -#: ../../mod/ping.php:329 -msgid "posted an event" +#: ../../mod/delegate.php:131 +msgid "Add" +msgstr "" + +#: ../../mod/delegate.php:132 +msgid "No entries." +msgstr "" + +#: ../../mod/directory.php:146 ../../mod/dirprofile.php:95 +msgid "Gender: " +msgstr "" + +#: ../../mod/directory.php:223 +msgid "Finding:" +msgstr "" + +#: ../../mod/directory.php:228 +msgid "next page" +msgstr "" + +#: ../../mod/directory.php:228 +msgid "previous page" +msgstr "" + +#: ../../mod/directory.php:245 +msgid "No entries (some entries may be hidden)." +msgstr "" + +#: ../../mod/dirprofile.php:108 +msgid "Status: " +msgstr "" + +#: ../../mod/dirprofile.php:109 +msgid "Sexual Preference: " +msgstr "" + +#: ../../mod/dirprofile.php:111 +msgid "Homepage: " +msgstr "" + +#: ../../mod/dirprofile.php:112 +msgid "Hometown: " +msgstr "" + +#: ../../mod/dirprofile.php:114 +msgid "About: " +msgstr "" + +#: ../../mod/dirprofile.php:162 +msgid "Keywords: " +msgstr "" + +#: ../../mod/dirsearch.php:21 +msgid "This site is not a directory server" msgstr "" #: ../../mod/setup.php:162 @@ -6100,10 +5717,6 @@ msgstr "" msgid "System check" msgstr "" -#: ../../mod/setup.php:261 ../../mod/events.php:439 -msgid "Next" -msgstr "" - #: ../../mod/setup.php:262 msgid "Check again" msgstr "" @@ -6445,1591 +6058,2142 @@ msgid "" "IMPORTANT: You will need to [manually] setup a scheduled task for the poller." msgstr "" -#: ../../mod/magic.php:70 -msgid "Hub not found." +#: ../../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 "" -#: ../../mod/invite.php:25 -msgid "Total invitation limit exceeded." +#: ../../mod/editblock.php:77 +msgid "Edit Block" msgstr "" -#: ../../mod/invite.php:49 -#, php-format -msgid "%s : Not a valid email address." +#: ../../mod/editblock.php:87 +msgid "Delete block?" msgstr "" -#: ../../mod/invite.php:76 -msgid "Please join us on Red" +#: ../../mod/editblock.php:115 ../../mod/editlayout.php:110 +#: ../../mod/editpost.php:116 ../../mod/editwebpage.php:147 +msgid "Insert YouTube video" msgstr "" -#: ../../mod/invite.php:87 -msgid "Invitation limit exceeded. Please contact your site administrator." +#: ../../mod/editblock.php:116 ../../mod/editlayout.php:111 +#: ../../mod/editpost.php:117 ../../mod/editwebpage.php:148 +msgid "Insert Vorbis [.ogg] video" msgstr "" -#: ../../mod/invite.php:92 -#, php-format -msgid "%s : Message delivery failed." +#: ../../mod/editblock.php:117 ../../mod/editlayout.php:112 +#: ../../mod/editpost.php:118 ../../mod/editwebpage.php:149 +msgid "Insert Vorbis [.ogg] audio" msgstr "" -#: ../../mod/invite.php:96 -#, php-format -msgid "%d message sent." -msgid_plural "%d messages sent." -msgstr[0] "" -msgstr[1] "" +#: ../../mod/editblock.php:153 +msgid "Delete Block" +msgstr "" -#: ../../mod/invite.php:115 -msgid "You have no more invitations available" +#: ../../mod/pdledit.php:13 +msgid "Layout updated." msgstr "" -#: ../../mod/invite.php:129 -msgid "Send invitations" +#: ../../mod/pdledit.php:28 ../../mod/pdledit.php:53 +msgid "Edit System Page Description" msgstr "" -#: ../../mod/invite.php:130 -msgid "Enter email addresses, one per line:" +#: ../../mod/pdledit.php:48 +msgid "Layout not found." msgstr "" -#: ../../mod/invite.php:131 ../../mod/mail.php:228 ../../mod/mail.php:341 -msgid "Your message:" +#: ../../mod/pdledit.php:54 +msgid "Module Name:" msgstr "" -#: ../../mod/invite.php:132 -msgid "Please join my community on RedMatrix." +#: ../../mod/pdledit.php:55 ../../mod/layouts.php:59 +msgid "Layout Help" msgstr "" -#: ../../mod/invite.php:134 -msgid "You will need to supply this invitation code: " +#: ../../mod/editlayout.php:72 +msgid "Edit Layout" msgstr "" -#: ../../mod/invite.php:135 -msgid "1. Register at any RedMatrix location (they are all inter-connected)" +#: ../../mod/editlayout.php:82 +msgid "Delete layout?" msgstr "" -#: ../../mod/invite.php:137 -msgid "2. Enter my RedMatrix network address into the site searchbar." +#: ../../mod/editlayout.php:146 +msgid "Delete Layout" msgstr "" -#: ../../mod/invite.php:138 -msgid "or visit " +#: ../../mod/editpost.php:31 +msgid "Item is not editable" msgstr "" -#: ../../mod/invite.php:140 -msgid "3. Click [Connect]" +#: ../../mod/editpost.php:53 +msgid "Delete item?" msgstr "" -#: ../../mod/thing.php:96 -msgid "Thing updated" +#: ../../mod/editwebpage.php:106 +msgid "Edit Webpage" msgstr "" -#: ../../mod/thing.php:156 -msgid "Object store: failed" +#: ../../mod/editwebpage.php:116 +msgid "Delete webpage?" msgstr "" -#: ../../mod/thing.php:160 -msgid "Thing added" +#: ../../mod/editwebpage.php:186 +msgid "Delete Webpage" msgstr "" -#: ../../mod/thing.php:180 -#, php-format -msgid "OBJ: %1$s %2$s %3$s" +#: ../../mod/cloud.php:130 +msgid "RedMatrix - Guests: Username: {your email address}, Password: +++" msgstr "" -#: ../../mod/thing.php:232 -msgid "Show Thing" +#: ../../mod/profile_photo.php:108 +msgid "Image uploaded but image cropping failed." msgstr "" -#: ../../mod/thing.php:239 -msgid "item not found." +#: ../../mod/profile_photo.php:161 +msgid "Image resize failed." msgstr "" -#: ../../mod/thing.php:270 -msgid "Edit Thing" +#: ../../mod/profile_photo.php:205 +msgid "" +"Shift-reload the page or clear browser cache if the new photo does not " +"display immediately." msgstr "" -#: ../../mod/thing.php:272 ../../mod/thing.php:319 -msgid "Select a profile" +#: ../../mod/profile_photo.php:232 +#, php-format +msgid "Image exceeds size limit of %d" msgstr "" -#: ../../mod/thing.php:276 ../../mod/thing.php:322 -msgid "Post an activity" +#: ../../mod/profile_photo.php:241 +msgid "Unable to process image." msgstr "" -#: ../../mod/thing.php:276 ../../mod/thing.php:322 -msgid "Only sends to viewers of the applicable profile" +#: ../../mod/profile_photo.php:290 ../../mod/profile_photo.php:339 +msgid "Photo not available." msgstr "" -#: ../../mod/thing.php:278 ../../mod/thing.php:324 -msgid "Name of thing e.g. something" +#: ../../mod/profile_photo.php:358 +msgid "Upload File:" msgstr "" -#: ../../mod/thing.php:280 ../../mod/thing.php:325 -msgid "URL of thing (optional)" +#: ../../mod/profile_photo.php:359 +msgid "Select a profile:" msgstr "" -#: ../../mod/thing.php:282 ../../mod/thing.php:326 -msgid "URL for photo of thing (optional)" +#: ../../mod/profile_photo.php:360 +msgid "Upload Profile Photo" msgstr "" -#: ../../mod/thing.php:317 -msgid "Add Thing to your Profile" +#: ../../mod/profile_photo.php:365 +msgid "skip this step" msgstr "" -#: ../../mod/oexchange.php:23 -msgid "Unable to find your hub." +#: ../../mod/profile_photo.php:365 +msgid "select a photo from your photo albums" msgstr "" -#: ../../mod/oexchange.php:37 -msgid "Post successful." +#: ../../mod/profile_photo.php:381 +msgid "Crop Image" msgstr "" -#: ../../mod/help.php:43 ../../mod/help.php:49 ../../mod/help.php:55 -msgid "Help:" +#: ../../mod/profile_photo.php:382 +msgid "Please adjust the image cropping for optimum viewing." msgstr "" -#: ../../mod/help.php:69 ../../index.php:237 -msgid "Not Found" +#: ../../mod/profile_photo.php:384 +msgid "Done Editing" msgstr "" -#: ../../mod/viewconnections.php:58 -msgid "No connections." +#: ../../mod/profile_photo.php:427 +msgid "Image uploaded successfully." msgstr "" -#: ../../mod/viewconnections.php:71 -#, php-format -msgid "Visit %s's profile [%s]" +#: ../../mod/profile_photo.php:429 +msgid "Image upload failed." msgstr "" -#: ../../mod/viewconnections.php:86 -msgid "View Connnections" +#: ../../mod/profile_photo.php:438 +#, php-format +msgid "Image size reduction [%s] failed." msgstr "" -#: ../../mod/removeaccount.php:30 -msgid "" -"Account removals are not allowed within 48 hours of changing the account " -"password." +#: ../../mod/sources.php:32 +msgid "Failed to create source. No channel selected." msgstr "" -#: ../../mod/removeaccount.php:57 -msgid "Remove This Account" +#: ../../mod/sources.php:45 +msgid "Source created." msgstr "" -#: ../../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." +#: ../../mod/sources.php:57 +msgid "Source updated." msgstr "" -#: ../../mod/removeaccount.php:59 ../../mod/removeme.php:59 -msgid "Please enter your password for verification:" +#: ../../mod/sources.php:82 +msgid "*" msgstr "" -#: ../../mod/removeaccount.php:60 -msgid "" -"Remove this account, all its channels and all its channel clones from the " -"network" +#: ../../mod/sources.php:89 +msgid "Manage remote sources of content for your channel." msgstr "" -#: ../../mod/removeaccount.php:60 -msgid "" -"By default only the instances of the channels located on this hub will be " -"removed from the network" +#: ../../mod/sources.php:90 ../../mod/sources.php:100 +msgid "New Source" msgstr "" -#: ../../mod/profperm.php:29 ../../mod/profperm.php:58 -msgid "Invalid profile identifier." +#: ../../mod/sources.php:101 ../../mod/sources.php:133 +msgid "" +"Import all or selected content from the following channel into this channel " +"and distribute it according to your channel settings." msgstr "" -#: ../../mod/profperm.php:110 -msgid "Profile Visibility Editor" +#: ../../mod/sources.php:102 ../../mod/sources.php:134 +msgid "Only import content with these words (one per line)" msgstr "" -#: ../../mod/profperm.php:114 -msgid "Click on a contact to add or remove." +#: ../../mod/sources.php:102 ../../mod/sources.php:134 +msgid "Leave blank to import all public content" msgstr "" -#: ../../mod/profperm.php:123 -msgid "Visible To" +#: ../../mod/sources.php:103 ../../mod/sources.php:137 +#: ../../mod/new_channel.php:112 +msgid "Channel Name" msgstr "" -#: ../../mod/register.php:42 -msgid "Maximum daily site registrations exceeded. Please try again tomorrow." +#: ../../mod/sources.php:123 ../../mod/sources.php:150 +msgid "Source not found." msgstr "" -#: ../../mod/register.php:48 -msgid "" -"Please indicate acceptance of the Terms of Service. Registration failed." +#: ../../mod/sources.php:130 +msgid "Edit Source" msgstr "" -#: ../../mod/register.php:82 -msgid "Passwords do not match." +#: ../../mod/sources.php:131 +msgid "Delete Source" msgstr "" -#: ../../mod/register.php:115 -msgid "" -"Registration successful. Please check your email for validation instructions." +#: ../../mod/sources.php:158 +msgid "Source removed" msgstr "" -#: ../../mod/register.php:121 -msgid "Your registration is pending approval by the site owner." +#: ../../mod/sources.php:160 +msgid "Unable to remove source." msgstr "" -#: ../../mod/register.php:124 -msgid "Your registration can not be processed." +#: ../../mod/filer.php:49 +msgid "- select -" msgstr "" -#: ../../mod/register.php:161 -msgid "Registration on this site/hub is by approval only." +#: ../../mod/filestorage.php:76 +msgid "Permission Denied." msgstr "" -#: ../../mod/register.php:162 -msgid "Register at another affiliated site/hub" +#: ../../mod/filestorage.php:92 +msgid "File not found." msgstr "" -#: ../../mod/register.php:170 -msgid "" -"This site has exceeded the number of allowed daily account registrations. " -"Please try again tomorrow." +#: ../../mod/filestorage.php:131 +msgid "Edit file permissions" msgstr "" -#: ../../mod/register.php:181 -msgid "Terms of Service" +#: ../../mod/filestorage.php:140 +msgid "Set/edit permissions" msgstr "" -#: ../../mod/register.php:187 -#, php-format -msgid "I accept the %s for this website" +#: ../../mod/filestorage.php:141 +msgid "Include all files and sub folders" msgstr "" -#: ../../mod/register.php:189 -#, php-format -msgid "I am over 13 years of age and accept the %s for this website" +#: ../../mod/filestorage.php:142 +msgid "Return to file list" msgstr "" -#: ../../mod/register.php:208 -msgid "Membership on this site is by invitation only." +#: ../../mod/filestorage.php:144 +msgid "Copy/paste this code to attach file to a post" msgstr "" -#: ../../mod/register.php:209 -msgid "Please enter your invitation code" +#: ../../mod/filestorage.php:145 +msgid "Copy/paste this URL to link file from a web page" msgstr "" -#: ../../mod/register.php:212 -msgid "Your email address" +#: ../../mod/follow.php:25 +msgid "Channel added." msgstr "" -#: ../../mod/register.php:213 -msgid "Choose a password" +#: ../../mod/subthread.php:103 +#, php-format +msgid "%1$s is following %2$s's %3$s" msgstr "" -#: ../../mod/register.php:214 -msgid "Please re-enter your password" +#: ../../mod/fsuggest.php:20 ../../mod/fsuggest.php:92 +msgid "Contact not found." msgstr "" -#: ../../mod/network.php:79 -msgid "No such group" +#: ../../mod/fsuggest.php:63 +msgid "Friend suggestion sent." msgstr "" -#: ../../mod/network.php:118 -msgid "Search Results For:" +#: ../../mod/fsuggest.php:97 +msgid "Suggest Friends" msgstr "" -#: ../../mod/network.php:172 -msgid "Collection is empty" +#: ../../mod/fsuggest.php:99 +#, php-format +msgid "Suggest a friend for %s" msgstr "" -#: ../../mod/network.php:180 -msgid "Collection: " +#: ../../mod/suggest.php:35 +msgid "" +"No suggestions available. If this is a new site, please try again in 24 " +"hours." msgstr "" -#: ../../mod/network.php:193 -msgid "Connection: " +#: ../../mod/group.php:20 +msgid "Collection created." msgstr "" -#: ../../mod/network.php:196 -msgid "Invalid connection." +#: ../../mod/group.php:26 +msgid "Could not create collection." msgstr "" -#: ../../mod/delegate.php:95 -msgid "No potential page delegates located." +#: ../../mod/group.php:54 +msgid "Collection updated." msgstr "" -#: ../../mod/delegate.php:121 -msgid "Delegate Page Management" +#: ../../mod/group.php:86 +msgid "Create a collection of channels." msgstr "" -#: ../../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." +#: ../../mod/group.php:87 ../../mod/group.php:183 +msgid "Collection Name: " msgstr "" -#: ../../mod/delegate.php:124 -msgid "Existing Page Managers" +#: ../../mod/group.php:89 ../../mod/group.php:186 +msgid "Members are visible to other channels" msgstr "" -#: ../../mod/delegate.php:126 -msgid "Existing Page Delegates" +#: ../../mod/group.php:107 +msgid "Collection removed." msgstr "" -#: ../../mod/delegate.php:128 -msgid "Potential Delegates" +#: ../../mod/group.php:109 +msgid "Unable to remove collection." msgstr "" -#: ../../mod/delegate.php:131 -msgid "Add" +#: ../../mod/group.php:182 +msgid "Collection Editor" msgstr "" -#: ../../mod/delegate.php:132 -msgid "No entries." +#: ../../mod/group.php:196 +msgid "Members" msgstr "" -#: ../../mod/connect.php:55 ../../mod/connect.php:103 -msgid "Continue" +#: ../../mod/group.php:198 +msgid "All Connected Channels" msgstr "" -#: ../../mod/connect.php:84 -msgid "Premium Channel Setup" +#: ../../mod/group.php:233 +msgid "Click on a channel to add or remove." msgstr "" -#: ../../mod/connect.php:86 -msgid "Enable premium channel connection restrictions" +#: ../../mod/tagger.php:98 +#, php-format +msgid "%1$s tagged %2$s's %3$s with %4$s" msgstr "" -#: ../../mod/connect.php:87 -msgid "" -"Please enter your restrictions or conditions, such as paypal receipt, usage " -"guidelines, etc." +#: ../../mod/help.php:43 ../../mod/help.php:49 ../../mod/help.php:55 +msgid "Help:" msgstr "" -#: ../../mod/connect.php:89 ../../mod/connect.php:109 -msgid "" -"This channel may require additional steps or acknowledgement of the " -"following conditions prior to connecting:" +#: ../../mod/help.php:69 ../../index.php:237 +msgid "Not Found" msgstr "" -#: ../../mod/connect.php:90 -msgid "" -"Potential connections will then see the following text before proceeding:" +#: ../../mod/tagrm.php:41 +msgid "Tag removed" msgstr "" -#: ../../mod/connect.php:91 ../../mod/connect.php:112 -msgid "" -"By continuing, I certify that I have complied with any instructions provided " -"on this page." +#: ../../mod/tagrm.php:79 +msgid "Remove Item Tag" msgstr "" -#: ../../mod/connect.php:100 -msgid "(No specific instructions have been provided by the channel owner.)" +#: ../../mod/tagrm.php:81 +msgid "Select a tag to remove: " msgstr "" -#: ../../mod/connect.php:108 -msgid "Restricted or Premium Channel" +#: ../../mod/admin.php:52 +msgid "Theme settings updated." msgstr "" -#: ../../mod/fsuggest.php:20 ../../mod/fsuggest.php:92 -msgid "Contact not found." +#: ../../mod/admin.php:97 ../../mod/admin.php:413 +msgid "Site" msgstr "" -#: ../../mod/fsuggest.php:63 -msgid "Friend suggestion sent." +#: ../../mod/admin.php:98 +msgid "Accounts" msgstr "" -#: ../../mod/fsuggest.php:97 -msgid "Suggest Friends" +#: ../../mod/admin.php:99 ../../mod/admin.php:860 +msgid "Channels" msgstr "" -#: ../../mod/fsuggest.php:99 -#, php-format -msgid "Suggest a friend for %s" +#: ../../mod/admin.php:100 ../../mod/admin.php:951 ../../mod/admin.php:993 +msgid "Plugins" msgstr "" -#: ../../mod/manage.php:136 -#, php-format -msgid "You have created %1$.0f of %2$.0f allowed channels." +#: ../../mod/admin.php:101 ../../mod/admin.php:1156 ../../mod/admin.php:1192 +msgid "Themes" msgstr "" -#: ../../mod/manage.php:144 -msgid "Create a new channel" +#: ../../mod/admin.php:102 ../../mod/admin.php:515 +msgid "Server" msgstr "" -#: ../../mod/manage.php:149 -msgid "Current Channel" +#: ../../mod/admin.php:103 +msgid "Profile Config" msgstr "" -#: ../../mod/manage.php:151 -msgid "Attach to one of your channels by selecting it." +#: ../../mod/admin.php:104 +msgid "DB updates" msgstr "" -#: ../../mod/manage.php:152 -msgid "Default Channel" +#: ../../mod/admin.php:118 ../../mod/admin.php:125 ../../mod/admin.php:1279 +msgid "Logs" +msgstr "" + +#: ../../mod/admin.php:124 +msgid "Plugin Features" +msgstr "" + +#: ../../mod/admin.php:126 +msgid "User registrations waiting for confirmation" +msgstr "" + +#: ../../mod/admin.php:206 +msgid "Message queues" +msgstr "" + +#: ../../mod/admin.php:211 ../../mod/admin.php:412 ../../mod/admin.php:514 +#: ../../mod/admin.php:723 ../../mod/admin.php:859 ../../mod/admin.php:950 +#: ../../mod/admin.php:992 ../../mod/admin.php:1155 ../../mod/admin.php:1191 +#: ../../mod/admin.php:1278 +msgid "Administration" +msgstr "" + +#: ../../mod/admin.php:212 +msgid "Summary" +msgstr "" + +#: ../../mod/admin.php:214 +msgid "Registered users" +msgstr "" + +#: ../../mod/admin.php:216 ../../mod/admin.php:518 +msgid "Pending registrations" +msgstr "" + +#: ../../mod/admin.php:217 +msgid "Version" +msgstr "" + +#: ../../mod/admin.php:219 ../../mod/admin.php:519 +msgid "Active plugins" +msgstr "" + +#: ../../mod/admin.php:333 +msgid "Site settings updated." +msgstr "" + +#: ../../mod/admin.php:364 +msgid "No special theme for accessibility" +msgstr "" + +#: ../../mod/admin.php:393 +msgid "Yes - with approval" +msgstr "" + +#: ../../mod/admin.php:399 +msgid "My site is not a public server" +msgstr "" + +#: ../../mod/admin.php:400 +msgid "My site has paid access only" +msgstr "" + +#: ../../mod/admin.php:401 +msgid "My site has free access only" +msgstr "" + +#: ../../mod/admin.php:402 +msgid "My site offers free accounts with optional paid upgrades" +msgstr "" + +#: ../../mod/admin.php:416 +msgid "File upload" +msgstr "" + +#: ../../mod/admin.php:417 +msgid "Policies" +msgstr "" + +#: ../../mod/admin.php:422 +msgid "Site name" +msgstr "" + +#: ../../mod/admin.php:423 +msgid "Banner/Logo" +msgstr "" + +#: ../../mod/admin.php:424 +msgid "Administrator Information" +msgstr "" + +#: ../../mod/admin.php:424 +msgid "" +"Contact information for site administrators. Displayed on siteinfo page. " +"BBCode can be used here" +msgstr "" + +#: ../../mod/admin.php:425 +msgid "System language" +msgstr "" + +#: ../../mod/admin.php:426 +msgid "System theme" +msgstr "" + +#: ../../mod/admin.php:426 +msgid "" +"Default system theme - may be over-ridden by user profiles - change theme settings" +msgstr "" + +#: ../../mod/admin.php:427 +msgid "Mobile system theme" +msgstr "" + +#: ../../mod/admin.php:427 +msgid "Theme for mobile devices" +msgstr "" + +#: ../../mod/admin.php:428 +msgid "Accessibility system theme" +msgstr "" + +#: ../../mod/admin.php:428 +msgid "Accessibility theme" +msgstr "" + +#: ../../mod/admin.php:430 +msgid "Enable Diaspora Protocol" +msgstr "" + +#: ../../mod/admin.php:430 +msgid "Communicate with Diaspora and Friendica - experimental" +msgstr "" + +#: ../../mod/admin.php:431 +msgid "Allow Feeds as Connections" +msgstr "" + +#: ../../mod/admin.php:431 +msgid "(Heavy system resource usage)" +msgstr "" + +#: ../../mod/admin.php:432 +msgid "Maximum image size" +msgstr "" + +#: ../../mod/admin.php:432 +msgid "" +"Maximum size in bytes of uploaded images. Default is 0, which means no " +"limits." +msgstr "" + +#: ../../mod/admin.php:433 +msgid "Does this site allow new member registration?" +msgstr "" + +#: ../../mod/admin.php:434 +msgid "Which best describes the types of account offered by this hub?" +msgstr "" + +#: ../../mod/admin.php:435 +msgid "Register text" +msgstr "" + +#: ../../mod/admin.php:435 +msgid "Will be displayed prominently on the registration page." +msgstr "" + +#: ../../mod/admin.php:436 +msgid "Accounts abandoned after x days" +msgstr "" + +#: ../../mod/admin.php:436 +msgid "" +"Will not waste system resources polling external sites for abandonded " +"accounts. Enter 0 for no time limit." +msgstr "" + +#: ../../mod/admin.php:437 +msgid "Allowed friend domains" +msgstr "" + +#: ../../mod/admin.php:437 +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:438 +msgid "Allowed email domains" +msgstr "" + +#: ../../mod/admin.php:438 +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:439 +msgid "Block public" +msgstr "" + +#: ../../mod/admin.php:439 +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:440 +msgid "Verify Email Addresses" +msgstr "" + +#: ../../mod/admin.php:440 +msgid "" +"Check to verify email addresses used in account registration (recommended)." +msgstr "" + +#: ../../mod/admin.php:441 +msgid "Force publish" +msgstr "" + +#: ../../mod/admin.php:441 +msgid "" +"Check to force all profiles on this site to be listed in the site directory." +msgstr "" + +#: ../../mod/admin.php:442 +msgid "Disable discovery tab" +msgstr "" + +#: ../../mod/admin.php:442 +msgid "" +"Remove the tab in the network view with public content pulled from sources " +"chosen for this site." +msgstr "" + +#: ../../mod/admin.php:443 +msgid "No login on Homepage" +msgstr "" + +#: ../../mod/admin.php:443 +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:445 +msgid "Proxy user" +msgstr "" + +#: ../../mod/admin.php:446 +msgid "Proxy URL" +msgstr "" + +#: ../../mod/admin.php:447 +msgid "Network timeout" +msgstr "" + +#: ../../mod/admin.php:447 +msgid "Value is in seconds. Set to 0 for unlimited (not recommended)." +msgstr "" + +#: ../../mod/admin.php:448 +msgid "Delivery interval" +msgstr "" + +#: ../../mod/admin.php:448 +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:449 +msgid "Poll interval" +msgstr "" + +#: ../../mod/admin.php:449 +msgid "" +"Delay background polling processes by this many seconds to reduce system " +"load. If 0, use delivery interval." +msgstr "" + +#: ../../mod/admin.php:450 +msgid "Maximum Load Average" +msgstr "" + +#: ../../mod/admin.php:450 +msgid "" +"Maximum system load before delivery and poll processes are deferred - " +"default 50." +msgstr "" + +#: ../../mod/admin.php:506 +msgid "No server found" +msgstr "" + +#: ../../mod/admin.php:513 ../../mod/admin.php:737 +msgid "ID" +msgstr "" + +#: ../../mod/admin.php:513 +msgid "for channel" +msgstr "" + +#: ../../mod/admin.php:513 +msgid "on server" +msgstr "" + +#: ../../mod/admin.php:513 +msgid "Status" +msgstr "" + +#: ../../mod/admin.php:534 +msgid "Update has been marked successful" +msgstr "" + +#: ../../mod/admin.php:544 +#, php-format +msgid "Executing %s failed. Check system logs." +msgstr "" + +#: ../../mod/admin.php:547 +#, php-format +msgid "Update %s was successfully applied." +msgstr "" + +#: ../../mod/admin.php:551 +#, php-format +msgid "Update %s did not return a status. Unknown if it succeeded." +msgstr "" + +#: ../../mod/admin.php:554 +#, php-format +msgid "Update function %s could not be found." +msgstr "" + +#: ../../mod/admin.php:569 +msgid "No failed updates." msgstr "" -#: ../../mod/manage.php:153 -msgid "Make Default" +#: ../../mod/admin.php:573 +msgid "Failed Updates" msgstr "" -#: ../../mod/removeme.php:29 +#: ../../mod/admin.php:575 +msgid "Mark success (if update was manually applied)" +msgstr "" + +#: ../../mod/admin.php:576 +msgid "Attempt to execute this update step automatically" +msgstr "" + +#: ../../mod/admin.php:602 +#, php-format +msgid "%s user blocked/unblocked" +msgid_plural "%s users blocked/unblocked" +msgstr[0] "" +msgstr[1] "" + +#: ../../mod/admin.php:609 +#, php-format +msgid "%s user deleted" +msgid_plural "%s users deleted" +msgstr[0] "" +msgstr[1] "" + +#: ../../mod/admin.php:638 +msgid "Account not found" +msgstr "" + +#: ../../mod/admin.php:658 +#, php-format +msgid "User '%s' unblocked" +msgstr "" + +#: ../../mod/admin.php:658 +#, php-format +msgid "User '%s' blocked" +msgstr "" + +#: ../../mod/admin.php:724 ../../mod/admin.php:736 +msgid "Users" +msgstr "" + +#: ../../mod/admin.php:726 ../../mod/admin.php:862 +msgid "select all" +msgstr "" + +#: ../../mod/admin.php:727 +msgid "User registrations waiting for confirm" +msgstr "" + +#: ../../mod/admin.php:728 +msgid "Request date" +msgstr "" + +#: ../../mod/admin.php:729 +msgid "No registrations." +msgstr "" + +#: ../../mod/admin.php:730 +msgid "Approve" +msgstr "" + +#: ../../mod/admin.php:731 +msgid "Deny" +msgstr "" + +#: ../../mod/admin.php:737 +msgid "Register date" +msgstr "" + +#: ../../mod/admin.php:737 +msgid "Last login" +msgstr "" + +#: ../../mod/admin.php:737 +msgid "Expires" +msgstr "" + +#: ../../mod/admin.php:737 +msgid "Service Class" +msgstr "" + +#: ../../mod/admin.php:739 msgid "" -"Channel removals are not allowed within 48 hours of changing the account " -"password." +"Selected users will be deleted!\\n\\nEverything these users had posted on " +"this site will be permanently deleted!\\n\\nAre you sure?" msgstr "" -#: ../../mod/removeme.php:57 -msgid "Remove This Channel" +#: ../../mod/admin.php:740 +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/removeme.php:58 +#: ../../mod/admin.php:773 +#, php-format +msgid "%s channel censored/uncensored" +msgid_plural "%s channels censored/uncensored" +msgstr[0] "" +msgstr[1] "" + +#: ../../mod/admin.php:780 +#, php-format +msgid "%s channel deleted" +msgid_plural "%s channels deleted" +msgstr[0] "" +msgstr[1] "" + +#: ../../mod/admin.php:799 +msgid "Channel not found" +msgstr "" + +#: ../../mod/admin.php:810 +#, php-format +msgid "Channel '%s' deleted" +msgstr "" + +#: ../../mod/admin.php:821 +#, php-format +msgid "Channel '%s' uncensored" +msgstr "" + +#: ../../mod/admin.php:821 +#, php-format +msgid "Channel '%s' censored" +msgstr "" + +#: ../../mod/admin.php:864 +msgid "Censor" +msgstr "" + +#: ../../mod/admin.php:865 +msgid "Uncensor" +msgstr "" + +#: ../../mod/admin.php:868 +msgid "UID" +msgstr "" + +#: ../../mod/admin.php:870 msgid "" -"This will completely remove this channel from the network. Once this has " -"been done it is not recoverable." +"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/removeme.php:60 -msgid "Remove this channel and all its clones from the network" +#: ../../mod/admin.php:871 +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/removeme.php:60 +#: ../../mod/admin.php:910 +#, php-format +msgid "Plugin %s disabled." +msgstr "" + +#: ../../mod/admin.php:914 +#, php-format +msgid "Plugin %s enabled." +msgstr "" + +#: ../../mod/admin.php:924 ../../mod/admin.php:1126 +msgid "Disable" +msgstr "" + +#: ../../mod/admin.php:926 ../../mod/admin.php:1128 +msgid "Enable" +msgstr "" + +#: ../../mod/admin.php:952 ../../mod/admin.php:1157 +msgid "Toggle" +msgstr "" + +#: ../../mod/admin.php:960 ../../mod/admin.php:1167 +msgid "Author: " +msgstr "" + +#: ../../mod/admin.php:961 ../../mod/admin.php:1168 +msgid "Maintainer: " +msgstr "" + +#: ../../mod/admin.php:1090 +msgid "No themes found." +msgstr "" + +#: ../../mod/admin.php:1149 +msgid "Screenshot" +msgstr "" + +#: ../../mod/admin.php:1197 +msgid "[Experimental]" +msgstr "" + +#: ../../mod/admin.php:1198 +msgid "[Unsupported]" +msgstr "" + +#: ../../mod/admin.php:1225 +msgid "Log settings updated." +msgstr "" + +#: ../../mod/admin.php:1281 +msgid "Clear" +msgstr "" + +#: ../../mod/admin.php:1287 +msgid "Debugging" +msgstr "" + +#: ../../mod/admin.php:1288 +msgid "Log file" +msgstr "" + +#: ../../mod/admin.php:1288 msgid "" -"By default only the instance of the channel located on this hub will be " -"removed from the network" +"Must be writable by web server. Relative to your Red top-level directory." msgstr "" -#: ../../mod/removeme.php:61 -msgid "Remove Channel" +#: ../../mod/admin.php:1289 +msgid "Log level" msgstr "" -#: ../../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" +#: ../../mod/admin.php:1336 +msgid "New Profile Field" +msgstr "" + +#: ../../mod/admin.php:1337 ../../mod/admin.php:1358 +msgid "Field nickname" +msgstr "" + +#: ../../mod/admin.php:1337 ../../mod/admin.php:1358 +msgid "System name of field" +msgstr "" + +#: ../../mod/admin.php:1338 ../../mod/admin.php:1359 +msgid "Input type" +msgstr "" + +#: ../../mod/admin.php:1339 ../../mod/admin.php:1360 +msgid "Field Name" +msgstr "" + +#: ../../mod/admin.php:1339 ../../mod/admin.php:1360 +msgid "Label on profile pages" +msgstr "" + +#: ../../mod/admin.php:1340 ../../mod/admin.php:1361 +msgid "Help text" msgstr "" -#: ../../mod/editpost.php:31 -msgid "Item is not editable" +#: ../../mod/admin.php:1340 ../../mod/admin.php:1361 +msgid "Additional info (optional)" msgstr "" -#: ../../mod/editpost.php:42 ../../mod/rpost.php:97 -msgid "Edit post" +#: ../../mod/admin.php:1351 +msgid "Field definition not found" msgstr "" -#: ../../mod/editpost.php:53 -msgid "Delete item?" +#: ../../mod/admin.php:1357 +msgid "Edit Profile Field" msgstr "" -#: ../../mod/editpost.php:116 ../../mod/editwebpage.php:147 -#: ../../mod/editblock.php:115 ../../mod/editlayout.php:110 -msgid "Insert YouTube video" +#: ../../mod/thing.php:96 +msgid "Thing updated" msgstr "" -#: ../../mod/editpost.php:117 ../../mod/editwebpage.php:148 -#: ../../mod/editblock.php:116 ../../mod/editlayout.php:111 -msgid "Insert Vorbis [.ogg] video" +#: ../../mod/thing.php:156 +msgid "Object store: failed" msgstr "" -#: ../../mod/editpost.php:118 ../../mod/editwebpage.php:149 -#: ../../mod/editblock.php:117 ../../mod/editlayout.php:112 -msgid "Insert Vorbis [.ogg] audio" +#: ../../mod/thing.php:160 +msgid "Thing added" msgstr "" -#: ../../mod/editwebpage.php:106 -msgid "Edit Webpage" +#: ../../mod/thing.php:180 +#, php-format +msgid "OBJ: %1$s %2$s %3$s" msgstr "" -#: ../../mod/editwebpage.php:116 -msgid "Delete webpage?" +#: ../../mod/thing.php:232 +msgid "Show Thing" msgstr "" -#: ../../mod/editwebpage.php:186 -msgid "Delete Webpage" +#: ../../mod/thing.php:239 +msgid "item not found." msgstr "" -#: ../../mod/poke.php:159 -msgid "Poke/Prod" +#: ../../mod/thing.php:270 +msgid "Edit Thing" msgstr "" -#: ../../mod/poke.php:160 -msgid "poke, prod or do other things to somebody" +#: ../../mod/thing.php:272 ../../mod/thing.php:319 +msgid "Select a profile" msgstr "" -#: ../../mod/poke.php:161 -msgid "Recipient" +#: ../../mod/thing.php:276 ../../mod/thing.php:322 +msgid "Post an activity" msgstr "" -#: ../../mod/poke.php:162 -msgid "Choose what you wish to do to recipient" +#: ../../mod/thing.php:276 ../../mod/thing.php:322 +msgid "Only sends to viewers of the applicable profile" msgstr "" -#: ../../mod/poke.php:165 -msgid "Make this post private" +#: ../../mod/thing.php:278 ../../mod/thing.php:324 +msgid "Name of thing e.g. something" msgstr "" -#: ../../mod/blocks.php:62 -msgid "Block Name" +#: ../../mod/thing.php:280 ../../mod/thing.php:325 +msgid "URL of thing (optional)" msgstr "" -#: ../../mod/group.php:20 -msgid "Collection created." +#: ../../mod/thing.php:282 ../../mod/thing.php:326 +msgid "URL for photo of thing (optional)" msgstr "" -#: ../../mod/group.php:26 -msgid "Could not create collection." +#: ../../mod/thing.php:317 +msgid "Add Thing to your Profile" msgstr "" -#: ../../mod/group.php:54 -msgid "Collection updated." +#: ../../mod/import.php:25 +#, php-format +msgid "Your service plan only allows %d channels." msgstr "" -#: ../../mod/group.php:86 -msgid "Create a collection of channels." +#: ../../mod/import.php:51 +msgid "Nothing to import." msgstr "" -#: ../../mod/group.php:87 ../../mod/group.php:183 -msgid "Collection Name: " +#: ../../mod/import.php:75 +msgid "Unable to download data from old server" msgstr "" -#: ../../mod/group.php:89 ../../mod/group.php:186 -msgid "Members are visible to other channels" +#: ../../mod/import.php:81 +msgid "Imported file is empty." msgstr "" -#: ../../mod/group.php:107 -msgid "Collection removed." +#: ../../mod/import.php:105 +msgid "" +"Cannot create a duplicate channel identifier on this system. Import failed." msgstr "" -#: ../../mod/group.php:109 -msgid "Unable to remove collection." +#: ../../mod/import.php:123 +msgid "Channel clone failed. Import failed." msgstr "" -#: ../../mod/group.php:182 -msgid "Collection Editor" +#: ../../mod/import.php:133 +msgid "Cloned channel not found. Import failed." msgstr "" -#: ../../mod/group.php:196 -msgid "Members" +#: ../../mod/import.php:451 +msgid "Import completed." msgstr "" -#: ../../mod/group.php:198 -msgid "All Connected Channels" +#: ../../mod/import.php:463 +msgid "You must be logged in to use this feature." msgstr "" -#: ../../mod/group.php:233 -msgid "Click on a channel to add or remove." +#: ../../mod/import.php:468 +msgid "Import Channel" msgstr "" -#: ../../mod/tagrm.php:41 -msgid "Tag removed" +#: ../../mod/import.php:469 +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 " +"provide an export file. Only identity and connections/relationships will be " +"imported. Importation of content is not yet available." msgstr "" -#: ../../mod/tagrm.php:79 -msgid "Remove Item Tag" +#: ../../mod/import.php:470 +msgid "File to Upload" msgstr "" -#: ../../mod/tagrm.php:81 -msgid "Select a tag to remove: " +#: ../../mod/import.php:471 +msgid "Or provide the old server/hub details" msgstr "" -#: ../../mod/attach.php:9 -msgid "Item not available." +#: ../../mod/import.php:472 +msgid "Your old identity address (xyz@example.com)" msgstr "" -#: ../../mod/service_limits.php:19 -msgid "No service class restrictions found." +#: ../../mod/import.php:473 +msgid "Your old login email address" msgstr "" -#: ../../mod/item.php:150 -msgid "Unable to locate original post." +#: ../../mod/import.php:474 +msgid "Your old login password" msgstr "" -#: ../../mod/item.php:383 -msgid "Empty post discarded." +#: ../../mod/import.php:475 +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 " +"able to post from either location, but only one can be marked as the primary " +"location for files, photos, and media." msgstr "" -#: ../../mod/item.php:425 -msgid "Executable content type not permitted to this channel." +#: ../../mod/import.php:476 +msgid "Make this hub my primary location" msgstr "" -#: ../../mod/item.php:855 -msgid "System error. Post not saved." +#: ../../mod/import.php:477 +msgid "Import existing posts if possible" msgstr "" -#: ../../mod/item.php:1324 -#, php-format -msgid "You have reached your limit of %1$.0f top level posts." +#: ../../mod/invite.php:25 +msgid "Total invitation limit exceeded." msgstr "" -#: ../../mod/item.php:1330 +#: ../../mod/invite.php:49 #, php-format -msgid "You have reached your limit of %1$.0f webpages." +msgid "%s : Not a valid email address." msgstr "" -#: ../../mod/cloud.php:130 -msgid "RedMatrix - Guests: Username: {your email address}, Password: +++" +#: ../../mod/invite.php:76 +msgid "Please join us on Red" msgstr "" -#: ../../mod/chatsvc.php:111 -msgid "Away" +#: ../../mod/invite.php:87 +msgid "Invitation limit exceeded. Please contact your site administrator." msgstr "" -#: ../../mod/chatsvc.php:115 -msgid "Online" +#: ../../mod/invite.php:92 +#, php-format +msgid "%s : Message delivery failed." msgstr "" -#: ../../mod/directory.php:223 -msgid "Finding:" -msgstr "" +#: ../../mod/invite.php:96 +#, php-format +msgid "%d message sent." +msgid_plural "%d messages sent." +msgstr[0] "" +msgstr[1] "" -#: ../../mod/directory.php:228 -msgid "next page" +#: ../../mod/invite.php:115 +msgid "You have no more invitations available" msgstr "" -#: ../../mod/directory.php:228 -msgid "previous page" +#: ../../mod/invite.php:129 +msgid "Send invitations" msgstr "" -#: ../../mod/directory.php:245 -msgid "No entries (some entries may be hidden)." +#: ../../mod/invite.php:130 +msgid "Enter email addresses, one per line:" msgstr "" -#: ../../mod/match.php:16 -msgid "Profile Match" +#: ../../mod/invite.php:131 ../../mod/mail.php:228 ../../mod/mail.php:341 +msgid "Your message:" msgstr "" -#: ../../mod/match.php:24 -msgid "No keywords to match. Please add keywords to your default profile." +#: ../../mod/invite.php:132 +msgid "Please join my community on RedMatrix." msgstr "" -#: ../../mod/match.php:61 -msgid "is interested in:" +#: ../../mod/invite.php:134 +msgid "You will need to supply this invitation code: " msgstr "" -#: ../../mod/match.php:69 -msgid "No matches" +#: ../../mod/invite.php:135 +msgid "1. Register at any RedMatrix location (they are all inter-connected)" msgstr "" -#: ../../mod/dirsearch.php:21 -msgid "This site is not a directory server" +#: ../../mod/invite.php:137 +msgid "2. Enter my RedMatrix network address into the site searchbar." msgstr "" -#: ../../mod/siteinfo.php:90 -#, php-format -msgid "Version %s" +#: ../../mod/invite.php:138 +msgid "or visit " msgstr "" -#: ../../mod/siteinfo.php:111 -msgid "Installed plugins/addons/apps:" +#: ../../mod/invite.php:140 +msgid "3. Click [Connect]" msgstr "" -#: ../../mod/siteinfo.php:124 -msgid "No installed plugins/addons/apps" +#: ../../mod/item.php:150 +msgid "Unable to locate original post." msgstr "" -#: ../../mod/siteinfo.php:132 -msgid "Red" +#: ../../mod/item.php:409 +msgid "Empty post discarded." msgstr "" -#: ../../mod/siteinfo.php:133 -msgid "" -"This is a hub of the Red Matrix - a global cooperative network of " -"decentralized privacy enhanced websites." +#: ../../mod/item.php:451 +msgid "Executable content type not permitted to this channel." msgstr "" -#: ../../mod/siteinfo.php:137 -msgid "Running at web location" +#: ../../mod/item.php:881 +msgid "System error. Post not saved." msgstr "" -#: ../../mod/siteinfo.php:138 -msgid "" -"Please visit GetZot.com to learn more " -"about the Red Matrix." +#: ../../mod/item.php:1349 +#, php-format +msgid "You have reached your limit of %1$.0f top level posts." msgstr "" -#: ../../mod/siteinfo.php:139 -msgid "Bug reports and issues: please visit" +#: ../../mod/item.php:1355 +#, php-format +msgid "You have reached your limit of %1$.0f webpages." msgstr "" -#: ../../mod/siteinfo.php:142 -msgid "" -"Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot com" +#: ../../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 "" -#: ../../mod/siteinfo.php:144 -msgid "Site Administrators" +#: ../../mod/layouts.php:62 +msgid "Help with this feature" msgstr "" -#: ../../mod/appman.php:28 ../../mod/appman.php:44 -msgid "App installed." +#: ../../mod/layouts.php:85 +msgid "Layout Name" msgstr "" -#: ../../mod/appman.php:37 -msgid "Malformed app." +#: ../../mod/like.php:15 +msgid "Like/Dislike" msgstr "" -#: ../../mod/appman.php:80 -msgid "Embed code" +#: ../../mod/like.php:20 +msgid "This action is restricted to members." msgstr "" -#: ../../mod/appman.php:86 -msgid "Edit App" +#: ../../mod/like.php:21 +msgid "" +"Please login with your RedMatrix ID or register as a new RedMatrix member to continue." msgstr "" -#: ../../mod/appman.php:86 -msgid "Create App" +#: ../../mod/like.php:77 ../../mod/like.php:104 ../../mod/like.php:142 +msgid "Invalid request." msgstr "" -#: ../../mod/appman.php:91 -msgid "Name of app" +#: ../../mod/like.php:119 +msgid "thing" msgstr "" -#: ../../mod/appman.php:91 ../../mod/appman.php:92 ../../mod/events.php:562 -#: ../../mod/events.php:581 -msgid "Required" +#: ../../mod/like.php:165 +msgid "Channel unavailable." msgstr "" -#: ../../mod/appman.php:92 -msgid "Location (URL) of app" +#: ../../mod/like.php:204 +msgid "Previous action reversed." msgstr "" -#: ../../mod/appman.php:94 -msgid "Photo icon URL" +#: ../../mod/like.php:417 +msgid "Action completed." msgstr "" -#: ../../mod/appman.php:94 -msgid "80 x 80 pixels - optional" +#: ../../mod/like.php:418 +msgid "Thank you." msgstr "" -#: ../../mod/appman.php:95 -msgid "Version ID" +#: ../../mod/lockview.php:31 +msgid "Remote privacy information not available." msgstr "" -#: ../../mod/appman.php:96 -msgid "Price of app" +#: ../../mod/lockview.php:52 +msgid "Visible to:" msgstr "" -#: ../../mod/appman.php:97 -msgid "Location (URL) to purchase app" +#: ../../mod/viewconnections.php:58 +msgid "No connections." msgstr "" -#: ../../mod/sources.php:32 -msgid "Failed to create source. No channel selected." +#: ../../mod/viewconnections.php:71 +#, php-format +msgid "Visit %s's profile [%s]" msgstr "" -#: ../../mod/sources.php:45 -msgid "Source created." +#: ../../mod/viewconnections.php:86 +msgid "View Connnections" msgstr "" -#: ../../mod/sources.php:57 -msgid "Source updated." +#: ../../mod/lostpass.php:15 +msgid "No valid account found." msgstr "" -#: ../../mod/sources.php:82 -msgid "*" +#: ../../mod/lostpass.php:29 +msgid "Password reset request issued. Check your email." msgstr "" -#: ../../mod/sources.php:89 -msgid "Manage remote sources of content for your channel." +#: ../../mod/lostpass.php:35 ../../mod/lostpass.php:102 +#, php-format +msgid "Site Member (%s)" msgstr "" -#: ../../mod/sources.php:90 ../../mod/sources.php:100 -msgid "New Source" +#: ../../mod/lostpass.php:40 +#, php-format +msgid "Password reset requested at %s" msgstr "" -#: ../../mod/sources.php:101 ../../mod/sources.php:133 +#: ../../mod/lostpass.php:63 msgid "" -"Import all or selected content from the following channel into this channel " -"and distribute it according to your channel settings." +"Request could not be verified. (You may have previously submitted it.) " +"Password reset failed." msgstr "" -#: ../../mod/sources.php:102 ../../mod/sources.php:134 -msgid "Only import content with these words (one per line)" +#: ../../mod/lostpass.php:85 ../../boot.php:1506 +msgid "Password Reset" msgstr "" -#: ../../mod/sources.php:102 ../../mod/sources.php:134 -msgid "Leave blank to import all public content" +#: ../../mod/lostpass.php:86 +msgid "Your password has been reset as requested." msgstr "" -#: ../../mod/sources.php:123 ../../mod/sources.php:150 -msgid "Source not found." +#: ../../mod/lostpass.php:87 +msgid "Your new password is" msgstr "" -#: ../../mod/sources.php:130 -msgid "Edit Source" +#: ../../mod/lostpass.php:88 +msgid "Save or copy your new password - and then" msgstr "" -#: ../../mod/sources.php:131 -msgid "Delete Source" +#: ../../mod/lostpass.php:89 +msgid "click here to login" msgstr "" -#: ../../mod/sources.php:158 -msgid "Source removed" +#: ../../mod/lostpass.php:90 +msgid "" +"Your password may be changed from the Settings page after " +"successful login." msgstr "" -#: ../../mod/sources.php:160 -msgid "Unable to remove source." +#: ../../mod/lostpass.php:107 +#, php-format +msgid "Your password has changed at %s" msgstr "" -#: ../../mod/pubsites.php:16 -msgid "Public Sites" +#: ../../mod/lostpass.php:122 +msgid "Forgot your Password?" msgstr "" -#: ../../mod/pubsites.php:19 +#: ../../mod/lostpass.php:123 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 "" - -#: ../../mod/pubsites.php:25 -msgid "Site URL" +"Enter your email address and submit to have your password reset. Then check " +"your email for further instructions." msgstr "" -#: ../../mod/pubsites.php:25 -msgid "Access Type" +#: ../../mod/lostpass.php:124 +msgid "Email Address" msgstr "" -#: ../../mod/pubsites.php:25 -msgid "Registration Policy" +#: ../../mod/lostpass.php:125 +msgid "Reset" msgstr "" -#: ../../mod/pubsites.php:25 ../../mod/profiles.php:440 -msgid "Location" +#: ../../mod/magic.php:70 +msgid "Hub not found." msgstr "" -#: ../../mod/import.php:25 -#, php-format -msgid "Your service plan only allows %d channels." +#: ../../mod/vote.php:97 +msgid "Total votes" msgstr "" -#: ../../mod/import.php:51 -msgid "Nothing to import." +#: ../../mod/vote.php:98 +msgid "Average Rating" msgstr "" -#: ../../mod/import.php:75 -msgid "Unable to download data from old server" +#: ../../mod/mail.php:33 +msgid "Unable to lookup recipient." msgstr "" -#: ../../mod/import.php:81 -msgid "Imported file is empty." +#: ../../mod/mail.php:41 +msgid "Unable to communicate with requested channel." msgstr "" -#: ../../mod/import.php:105 -msgid "" -"Cannot create a duplicate channel identifier on this system. Import failed." +#: ../../mod/mail.php:48 +msgid "Cannot verify requested channel." msgstr "" -#: ../../mod/import.php:123 -msgid "Channel clone failed. Import failed." +#: ../../mod/mail.php:74 +msgid "Selected channel has private message restrictions. Send failed." msgstr "" -#: ../../mod/import.php:133 -msgid "Cloned channel not found. Import failed." +#: ../../mod/mail.php:135 +msgid "Message deleted." msgstr "" -#: ../../mod/import.php:451 -msgid "Import completed." +#: ../../mod/mail.php:152 +msgid "Message recalled." msgstr "" -#: ../../mod/import.php:463 -msgid "You must be logged in to use this feature." +#: ../../mod/mail.php:218 +msgid "Send Private Message" msgstr "" -#: ../../mod/import.php:468 -msgid "Import Channel" +#: ../../mod/mail.php:219 ../../mod/mail.php:336 +msgid "To:" msgstr "" -#: ../../mod/import.php:469 -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 " -"provide an export file. Only identity and connections/relationships will be " -"imported. Importation of content is not yet available." +#: ../../mod/mail.php:224 ../../mod/mail.php:338 +msgid "Subject:" msgstr "" -#: ../../mod/import.php:470 -msgid "File to Upload" +#: ../../mod/mail.php:235 +msgid "Send" msgstr "" -#: ../../mod/import.php:471 -msgid "Or provide the old server/hub details" +#: ../../mod/mail.php:262 +msgid "Message not found." msgstr "" -#: ../../mod/import.php:472 -msgid "Your old identity address (xyz@example.com)" +#: ../../mod/mail.php:305 +msgid "Delete message" msgstr "" -#: ../../mod/import.php:473 -msgid "Your old login email address" +#: ../../mod/mail.php:306 +msgid "Recall message" msgstr "" -#: ../../mod/import.php:474 -msgid "Your old login password" +#: ../../mod/mail.php:308 +msgid "Message has been recalled." msgstr "" -#: ../../mod/import.php:475 -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 " -"able to post from either location, but only one can be marked as the primary " -"location for files, photos, and media." +#: ../../mod/mail.php:325 +msgid "Private Conversation" msgstr "" -#: ../../mod/import.php:476 -msgid "Make this hub my primary location" +#: ../../mod/mail.php:329 ../../mod/message.php:72 +msgid "Delete conversation" msgstr "" -#: ../../mod/import.php:477 -msgid "Import existing posts if possible" +#: ../../mod/mail.php:331 +msgid "" +"No secure communications available. You may be able to " +"respond from the sender's profile page." msgstr "" -#: ../../mod/zfinger.php:23 -msgid "invalid target signature" +#: ../../mod/mail.php:335 +msgid "Send Reply" msgstr "" -#: ../../mod/mail.php:33 -msgid "Unable to lookup recipient." +#: ../../mod/manage.php:136 +#, php-format +msgid "You have created %1$.0f of %2$.0f allowed channels." msgstr "" -#: ../../mod/mail.php:41 -msgid "Unable to communicate with requested channel." +#: ../../mod/manage.php:144 +msgid "Create a new channel" msgstr "" -#: ../../mod/mail.php:48 -msgid "Cannot verify requested channel." +#: ../../mod/manage.php:149 +msgid "Current Channel" msgstr "" -#: ../../mod/mail.php:74 -msgid "Selected channel has private message restrictions. Send failed." +#: ../../mod/manage.php:151 +msgid "Attach to one of your channels by selecting it." msgstr "" -#: ../../mod/mail.php:135 -msgid "Message deleted." +#: ../../mod/manage.php:152 +msgid "Default Channel" msgstr "" -#: ../../mod/mail.php:152 -msgid "Message recalled." +#: ../../mod/manage.php:153 +msgid "Make Default" msgstr "" -#: ../../mod/mail.php:218 -msgid "Send Private Message" +#: ../../mod/wall_upload.php:34 +msgid "Wall Photos" msgstr "" -#: ../../mod/mail.php:219 ../../mod/mail.php:336 -msgid "To:" +#: ../../mod/match.php:16 +msgid "Profile Match" msgstr "" -#: ../../mod/mail.php:224 ../../mod/mail.php:338 -msgid "Subject:" +#: ../../mod/match.php:24 +msgid "No keywords to match. Please add keywords to your default profile." msgstr "" -#: ../../mod/mail.php:235 -msgid "Send" +#: ../../mod/match.php:61 +msgid "is interested in:" msgstr "" -#: ../../mod/mail.php:262 -msgid "Message not found." +#: ../../mod/match.php:69 +msgid "No matches" msgstr "" -#: ../../mod/mail.php:305 -msgid "Delete message" +#: ../../mod/menu.php:21 +msgid "Menu updated." msgstr "" -#: ../../mod/mail.php:306 -msgid "Recall message" +#: ../../mod/menu.php:25 +msgid "Unable to update menu." msgstr "" -#: ../../mod/mail.php:308 -msgid "Message has been recalled." +#: ../../mod/menu.php:30 +msgid "Menu created." msgstr "" -#: ../../mod/mail.php:325 -msgid "Private Conversation" +#: ../../mod/menu.php:34 +msgid "Unable to create menu." msgstr "" -#: ../../mod/mail.php:331 -msgid "" -"No secure communications available. You may be able to " -"respond from the sender's profile page." +#: ../../mod/menu.php:57 +msgid "Manage Menus" msgstr "" -#: ../../mod/mail.php:335 -msgid "Send Reply" +#: ../../mod/menu.php:60 +msgid "Drop" msgstr "" -#: ../../mod/channel.php:25 ../../mod/chat.php:19 -msgid "You must be logged in to see this page." +#: ../../mod/menu.php:62 +msgid "Create a new menu" msgstr "" -#: ../../mod/channel.php:86 -msgid "Insufficient permissions. Request redirected to profile page." +#: ../../mod/menu.php:63 +msgid "Delete this menu" msgstr "" -#: ../../mod/profiles.php:18 ../../mod/profiles.php:165 -#: ../../mod/profiles.php:222 ../../mod/profiles.php:575 -msgid "Profile not found." +#: ../../mod/menu.php:64 ../../mod/menu.php:109 +msgid "Edit menu contents" msgstr "" -#: ../../mod/profiles.php:38 -msgid "Profile deleted." +#: ../../mod/menu.php:65 +msgid "Edit this menu" msgstr "" -#: ../../mod/profiles.php:56 ../../mod/profiles.php:92 -msgid "Profile-" +#: ../../mod/menu.php:80 +msgid "New Menu" msgstr "" -#: ../../mod/profiles.php:77 ../../mod/profiles.php:120 -msgid "New profile created." +#: ../../mod/menu.php:81 ../../mod/menu.php:110 +msgid "Menu name" msgstr "" -#: ../../mod/profiles.php:98 -msgid "Profile unavailable to clone." +#: ../../mod/menu.php:81 ../../mod/menu.php:110 +msgid "Must be unique, only seen by you" msgstr "" -#: ../../mod/profiles.php:136 -msgid "Profile unavailable to export." +#: ../../mod/menu.php:82 ../../mod/menu.php:111 +msgid "Menu title" msgstr "" -#: ../../mod/profiles.php:232 -msgid "Profile Name is required." +#: ../../mod/menu.php:82 ../../mod/menu.php:111 +msgid "Menu title as seen by others" msgstr "" -#: ../../mod/profiles.php:390 -msgid "Marital Status" +#: ../../mod/menu.php:83 ../../mod/menu.php:112 +msgid "Allow bookmarks" msgstr "" -#: ../../mod/profiles.php:394 -msgid "Romantic Partner" +#: ../../mod/menu.php:83 ../../mod/menu.php:112 +msgid "Menu may be used to store saved bookmarks" msgstr "" -#: ../../mod/profiles.php:398 -msgid "Likes" +#: ../../mod/menu.php:98 +msgid "Menu deleted." msgstr "" -#: ../../mod/profiles.php:402 -msgid "Dislikes" +#: ../../mod/menu.php:100 +msgid "Menu could not be deleted." msgstr "" -#: ../../mod/profiles.php:406 -msgid "Work/Employment" +#: ../../mod/menu.php:106 +msgid "Edit Menu" msgstr "" -#: ../../mod/profiles.php:409 -msgid "Religion" +#: ../../mod/menu.php:108 +msgid "Add or remove entries to this menu" msgstr "" -#: ../../mod/profiles.php:413 -msgid "Political Views" +#: ../../mod/message.php:41 +msgid "Conversation removed." msgstr "" -#: ../../mod/profiles.php:417 -msgid "Gender" +#: ../../mod/message.php:56 +msgid "No messages." msgstr "" -#: ../../mod/profiles.php:421 -msgid "Sexual Preference" +#: ../../mod/message.php:74 +msgid "D, d M Y - g:i A" msgstr "" -#: ../../mod/profiles.php:425 -msgid "Homepage" +#: ../../mod/new_channel.php:109 +msgid "Add a Channel" msgstr "" -#: ../../mod/profiles.php:429 -msgid "Interests" +#: ../../mod/new_channel.php:110 +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 "" -#: ../../mod/profiles.php:523 -msgid "Profile updated." +#: ../../mod/new_channel.php:113 +msgid "" +"Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation " +"Group\" " msgstr "" -#: ../../mod/profiles.php:600 -msgid "Hide your contact/friend list from viewers of this profile?" +#: ../../mod/new_channel.php:114 +msgid "Choose a short nickname" msgstr "" -#: ../../mod/profiles.php:642 -msgid "Edit Profile Details" +#: ../../mod/new_channel.php:115 +msgid "" +"Your nickname will be used to create an easily remembered channel address " +"(like an email address) which you can share with others." msgstr "" -#: ../../mod/profiles.php:644 -msgid "View this profile" +#: ../../mod/new_channel.php:116 +msgid "" +"Or import an existing channel from another location" msgstr "" -#: ../../mod/profiles.php:646 -msgid "Change Profile Photo" +#: ../../mod/new_channel.php:118 +msgid "Channel Type" msgstr "" -#: ../../mod/profiles.php:647 -msgid "Create a new profile using these settings" +#: ../../mod/new_channel.php:119 +msgid "" +"Please choose a channel type (such as social networking or community forum) " +"and privacy requirements so we can select the best permissions for you" msgstr "" -#: ../../mod/profiles.php:648 -msgid "Clone this profile" +#: ../../mod/home.php:46 +msgid "Red Matrix - "The Network"" msgstr "" -#: ../../mod/profiles.php:649 -msgid "Delete this profile" +#: ../../mod/home.php:101 +#, php-format +msgid "Welcome to %s" msgstr "" -#: ../../mod/profiles.php:651 -msgid "Import profile from file" +#: ../../mod/notifications.php:26 +msgid "Invalid request identifier." msgstr "" -#: ../../mod/profiles.php:652 -msgid "Export profile to file" +#: ../../mod/notifications.php:35 +msgid "Discard" msgstr "" -#: ../../mod/profiles.php:653 -msgid "Profile Name:" +#: ../../mod/notifications.php:94 ../../mod/notify.php:53 +msgid "No more system notifications." msgstr "" -#: ../../mod/profiles.php:654 -msgid "Your Full Name:" +#: ../../mod/notifications.php:98 ../../mod/notify.php:57 +msgid "System Notifications" msgstr "" -#: ../../mod/profiles.php:655 -msgid "Title/Description:" +#: ../../mod/oexchange.php:23 +msgid "Unable to find your hub." msgstr "" -#: ../../mod/profiles.php:656 -msgid "Your Gender:" +#: ../../mod/oexchange.php:37 +msgid "Post successful." msgstr "" -#: ../../mod/profiles.php:657 -#, php-format -msgid "Birthday (%s):" +#: ../../mod/zfinger.php:23 +msgid "invalid target signature" msgstr "" -#: ../../mod/profiles.php:658 -msgid "Street Address:" +#: ../../mod/openid.php:26 +msgid "OpenID protocol error. No ID returned." msgstr "" -#: ../../mod/profiles.php:659 -msgid "Locality/City:" +#: ../../mod/appman.php:28 ../../mod/appman.php:44 +msgid "App installed." msgstr "" -#: ../../mod/profiles.php:660 -msgid "Postal/Zip Code:" +#: ../../mod/appman.php:37 +msgid "Malformed app." msgstr "" -#: ../../mod/profiles.php:661 -msgid "Country:" +#: ../../mod/appman.php:80 +msgid "Embed code" msgstr "" -#: ../../mod/profiles.php:662 -msgid "Region/State:" +#: ../../mod/appman.php:86 +msgid "Edit App" msgstr "" -#: ../../mod/profiles.php:663 -msgid "♥ Marital Status:" +#: ../../mod/appman.php:86 +msgid "Create App" msgstr "" -#: ../../mod/profiles.php:664 -msgid "Who: (if applicable)" +#: ../../mod/appman.php:91 +msgid "Name of app" msgstr "" -#: ../../mod/profiles.php:665 -msgid "Examples: cathy123, Cathy Williams, cathy@example.com" +#: ../../mod/appman.php:92 +msgid "Location (URL) of app" msgstr "" -#: ../../mod/profiles.php:666 -msgid "Since [date]:" +#: ../../mod/appman.php:94 +msgid "Photo icon URL" msgstr "" -#: ../../mod/profiles.php:668 -msgid "Homepage URL:" +#: ../../mod/appman.php:94 +msgid "80 x 80 pixels - optional" msgstr "" -#: ../../mod/profiles.php:671 -msgid "Religious Views:" +#: ../../mod/appman.php:95 +msgid "Version ID" msgstr "" -#: ../../mod/profiles.php:672 -msgid "Keywords:" +#: ../../mod/appman.php:96 +msgid "Price of app" msgstr "" -#: ../../mod/profiles.php:675 -msgid "Example: fishing photography software" +#: ../../mod/appman.php:97 +msgid "Location (URL) to purchase app" msgstr "" -#: ../../mod/profiles.php:676 -msgid "Used in directory listings" +#: ../../mod/poll.php:64 +msgid "Poll" msgstr "" -#: ../../mod/profiles.php:677 -msgid "Tell us about yourself..." +#: ../../mod/poll.php:69 +msgid "View Results" msgstr "" -#: ../../mod/profiles.php:678 -msgid "Hobbies/Interests" +#: ../../mod/removeaccount.php:30 +msgid "" +"Account removals are not allowed within 48 hours of changing the account " +"password." msgstr "" -#: ../../mod/profiles.php:679 -msgid "Contact information and Social Networks" +#: ../../mod/removeaccount.php:57 +msgid "Remove This Account" msgstr "" -#: ../../mod/profiles.php:680 -msgid "My other channels" +#: ../../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 "" -#: ../../mod/profiles.php:681 -msgid "Musical interests" +#: ../../mod/removeaccount.php:60 +msgid "" +"Remove this account, all its channels and all its channel clones from the " +"network" msgstr "" -#: ../../mod/profiles.php:682 -msgid "Books, literature" +#: ../../mod/removeaccount.php:60 +msgid "" +"By default only the instances of the channels located on this hub will be " +"removed from the network" msgstr "" -#: ../../mod/profiles.php:683 -msgid "Television" +#: ../../mod/service_limits.php:19 +msgid "No service class restrictions found." msgstr "" -#: ../../mod/profiles.php:684 -msgid "Film/dance/culture/entertainment" +#: ../../mod/impel.php:33 +msgid "webpage" msgstr "" -#: ../../mod/profiles.php:685 -msgid "Love/romance" +#: ../../mod/impel.php:38 +msgid "block" msgstr "" -#: ../../mod/profiles.php:686 -msgid "Work/employment" +#: ../../mod/impel.php:43 +msgid "layout" msgstr "" -#: ../../mod/profiles.php:687 -msgid "School/education" +#: ../../mod/impel.php:117 +#, php-format +msgid "%s element installed" msgstr "" -#: ../../mod/profiles.php:693 -msgid "This is your default profile." +#: ../../mod/locs.php:47 ../../mod/locs.php:74 +msgid "Location not found." msgstr "" -#: ../../mod/profiles.php:747 -msgid "Edit/Manage Profiles" +#: ../../mod/locs.php:78 +msgid "Primary location cannot be removed." msgstr "" -#: ../../mod/profiles.php:748 -msgid "Add profile things" +#: ../../view/theme/apw/php/config.php:202 +#: ../../view/theme/apw/php/config.php:236 +msgid "Schema Default" msgstr "" -#: ../../mod/profiles.php:749 -msgid "Include desirable objects in your profile" +#: ../../view/theme/apw/php/config.php:203 +msgid "Sans-Serif" msgstr "" -#: ../../mod/bookmarks.php:38 -msgid "Bookmark added" +#: ../../view/theme/apw/php/config.php:204 +msgid "Monospace" msgstr "" -#: ../../mod/bookmarks.php:60 -msgid "My Bookmarks" +#: ../../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 "" -#: ../../mod/bookmarks.php:71 -msgid "My Connections Bookmarks" +#: ../../view/theme/apw/php/config.php:260 +#: ../../view/theme/redbasic/php/config.php:103 +msgid "Set scheme" msgstr "" -#: ../../mod/common.php:10 -msgid "No channel." +#: ../../view/theme/apw/php/config.php:261 +#: ../../view/theme/redbasic/php/config.php:124 +msgid "Set font-size for posts and comments" msgstr "" -#: ../../mod/common.php:39 -msgid "Common connections" +#: ../../view/theme/apw/php/config.php:262 +msgid "Set font face" msgstr "" -#: ../../mod/common.php:44 -msgid "No connections in common." +#: ../../view/theme/apw/php/config.php:263 +msgid "Set iconset" msgstr "" -#: ../../mod/like.php:15 -msgid "Like/Dislike" +#: ../../view/theme/apw/php/config.php:264 +msgid "Set big shadow size, default 15px 15px 15px" msgstr "" -#: ../../mod/like.php:20 -msgid "This action is restricted to members." +#: ../../view/theme/apw/php/config.php:265 +msgid "Set small shadow size, default 5px 5px 5px" msgstr "" -#: ../../mod/like.php:21 -msgid "" -"Please login with your RedMatrix ID or register as a new RedMatrix member to continue." +#: ../../view/theme/apw/php/config.php:266 +msgid "Set shadow color, default #000" msgstr "" -#: ../../mod/like.php:77 ../../mod/like.php:104 ../../mod/like.php:142 -msgid "Invalid request." +#: ../../view/theme/apw/php/config.php:267 +msgid "Set radius size, default 5px" msgstr "" -#: ../../mod/like.php:119 -msgid "thing" +#: ../../view/theme/apw/php/config.php:268 +msgid "Set line-height for posts and comments" msgstr "" -#: ../../mod/like.php:165 -msgid "Channel unavailable." +#: ../../view/theme/apw/php/config.php:269 +msgid "Set background image" msgstr "" -#: ../../mod/like.php:204 -msgid "Previous action reversed." +#: ../../view/theme/apw/php/config.php:270 +msgid "Set background attachment" msgstr "" -#: ../../mod/like.php:417 -msgid "Action completed." +#: ../../view/theme/apw/php/config.php:271 +msgid "Set background color" msgstr "" -#: ../../mod/like.php:418 -msgid "Thank you." +#: ../../view/theme/apw/php/config.php:272 +msgid "Set section background image" msgstr "" -#: ../../mod/notify.php:53 ../../mod/notifications.php:94 -msgid "No more system notifications." +#: ../../view/theme/apw/php/config.php:273 +msgid "Set section background color" msgstr "" -#: ../../mod/notify.php:57 ../../mod/notifications.php:98 -msgid "System Notifications" +#: ../../view/theme/apw/php/config.php:274 +msgid "Set color of items - use hex" msgstr "" -#: ../../mod/api.php:76 ../../mod/api.php:102 -msgid "Authorize application connection" +#: ../../view/theme/apw/php/config.php:275 +msgid "Set color of links - use hex" msgstr "" -#: ../../mod/api.php:77 -msgid "Return to your app and insert this Securty Code:" +#: ../../view/theme/apw/php/config.php:276 +msgid "Set max-width for items. Default 400px" msgstr "" -#: ../../mod/api.php:89 -msgid "Please login to continue." +#: ../../view/theme/apw/php/config.php:277 +msgid "Set min-width for items. Default 240px" msgstr "" -#: ../../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?" +#: ../../view/theme/apw/php/config.php:278 +msgid "Set the generic content wrapper width. Default 48%" msgstr "" -#: ../../mod/chat.php:167 -msgid "Room not found" +#: ../../view/theme/apw/php/config.php:279 +msgid "Set color of fonts - use hex" msgstr "" -#: ../../mod/chat.php:178 -msgid "Leave Room" +#: ../../view/theme/apw/php/config.php:280 +msgid "Set background-size element" msgstr "" -#: ../../mod/chat.php:179 -msgid "Delete This Room" +#: ../../view/theme/apw/php/config.php:281 +msgid "Item opacity" msgstr "" -#: ../../mod/chat.php:180 -msgid "I am away right now" +#: ../../view/theme/apw/php/config.php:282 +msgid "Display post previews only" msgstr "" -#: ../../mod/chat.php:181 -msgid "I am online" +#: ../../view/theme/apw/php/config.php:283 +msgid "Display side bar on channel page" msgstr "" -#: ../../mod/chat.php:183 -msgid "Bookmark this room" +#: ../../view/theme/apw/php/config.php:284 +msgid "Colour of the navigation bar" msgstr "" -#: ../../mod/chat.php:207 ../../mod/chat.php:229 -msgid "New Chatroom" +#: ../../view/theme/apw/php/config.php:285 +msgid "Item float" msgstr "" -#: ../../mod/chat.php:208 -msgid "Chatroom Name" +#: ../../view/theme/apw/php/config.php:286 +msgid "Left offset of the section element" msgstr "" -#: ../../mod/chat.php:225 -#, php-format -msgid "%1$s's Chatrooms" +#: ../../view/theme/apw/php/config.php:287 +msgid "Right offset of the section element" msgstr "" -#: ../../mod/events.php:91 -msgid "Event title and start time are required." +#: ../../view/theme/apw/php/config.php:288 +msgid "Section width" msgstr "" -#: ../../mod/events.php:105 -msgid "Event not found." +#: ../../view/theme/apw/php/config.php:289 +msgid "Left offset of the aside" msgstr "" -#: ../../mod/events.php:369 -msgid "l, F j" +#: ../../view/theme/apw/php/config.php:290 +msgid "Right offset of the aside element" msgstr "" -#: ../../mod/events.php:391 -msgid "Edit event" +#: ../../view/theme/blogga/php/config.php:47 +#: ../../view/theme/blogga/view/theme/blog/config.php:47 +msgid "None" msgstr "" -#: ../../mod/events.php:437 -msgid "Create New Event" +#: ../../view/theme/blogga/php/config.php:70 +#: ../../view/theme/blogga/view/theme/blog/config.php:70 +msgid "Header image" msgstr "" -#: ../../mod/events.php:438 -msgid "Previous" +#: ../../view/theme/blogga/php/config.php:71 +#: ../../view/theme/blogga/view/theme/blog/config.php:71 +msgid "Header image only on profile pages" msgstr "" -#: ../../mod/events.php:536 -msgid "hour:minute" +#: ../../view/theme/redbasic/php/config.php:84 +msgid "Light (Red Matrix default)" msgstr "" -#: ../../mod/events.php:556 -msgid "Event details" +#: ../../view/theme/redbasic/php/config.php:104 +msgid "Narrow navbar" msgstr "" -#: ../../mod/events.php:557 -#, php-format -msgid "Format is %s %s." +#: ../../view/theme/redbasic/php/config.php:105 +msgid "Navigation bar background color" msgstr "" -#: ../../mod/events.php:558 -msgid "Starting date and Title are required." +#: ../../view/theme/redbasic/php/config.php:106 +msgid "Navigation bar gradient top color" msgstr "" -#: ../../mod/events.php:562 -msgid "Event Starts:" +#: ../../view/theme/redbasic/php/config.php:107 +msgid "Navigation bar gradient bottom color" msgstr "" -#: ../../mod/events.php:570 -msgid "Finish date/time is not known or not relevant" +#: ../../view/theme/redbasic/php/config.php:108 +msgid "Navigation active button gradient top color" msgstr "" -#: ../../mod/events.php:572 -msgid "Event Finishes:" +#: ../../view/theme/redbasic/php/config.php:109 +msgid "Navigation active button gradient bottom color" msgstr "" -#: ../../mod/events.php:575 -msgid "Adjust for viewer timezone" +#: ../../view/theme/redbasic/php/config.php:110 +msgid "Navigation bar border color " msgstr "" -#: ../../mod/events.php:577 -msgid "Description:" +#: ../../view/theme/redbasic/php/config.php:111 +msgid "Navigation bar icon color " msgstr "" -#: ../../mod/events.php:581 -msgid "Title:" +#: ../../view/theme/redbasic/php/config.php:112 +msgid "Navigation bar active icon color " msgstr "" -#: ../../mod/events.php:583 -msgid "Share this event" +#: ../../view/theme/redbasic/php/config.php:113 +msgid "link color" msgstr "" -#: ../../mod/notifications.php:26 -msgid "Invalid request identifier." +#: ../../view/theme/redbasic/php/config.php:114 +msgid "Set font-color for banner" msgstr "" -#: ../../mod/notifications.php:35 -msgid "Discard" +#: ../../view/theme/redbasic/php/config.php:115 +msgid "Set the background color" msgstr "" -#: ../../mod/lostpass.php:15 -msgid "No valid account found." +#: ../../view/theme/redbasic/php/config.php:116 +msgid "Set the background image" msgstr "" -#: ../../mod/lostpass.php:29 -msgid "Password reset request issued. Check your email." +#: ../../view/theme/redbasic/php/config.php:117 +msgid "Set the background color of items" msgstr "" -#: ../../mod/lostpass.php:35 ../../mod/lostpass.php:102 -#, php-format -msgid "Site Member (%s)" +#: ../../view/theme/redbasic/php/config.php:118 +msgid "Set the background color of comments" msgstr "" -#: ../../mod/lostpass.php:40 -#, php-format -msgid "Password reset requested at %s" +#: ../../view/theme/redbasic/php/config.php:119 +msgid "Set the border color of comments" msgstr "" -#: ../../mod/lostpass.php:63 -msgid "" -"Request could not be verified. (You may have previously submitted it.) " -"Password reset failed." +#: ../../view/theme/redbasic/php/config.php:120 +msgid "Set the indent for comments" msgstr "" -#: ../../mod/lostpass.php:86 -msgid "Your password has been reset as requested." +#: ../../view/theme/redbasic/php/config.php:121 +msgid "Set the basic color for item icons" msgstr "" -#: ../../mod/lostpass.php:87 -msgid "Your new password is" +#: ../../view/theme/redbasic/php/config.php:122 +msgid "Set the hover color for item icons" msgstr "" -#: ../../mod/lostpass.php:88 -msgid "Save or copy your new password - and then" +#: ../../view/theme/redbasic/php/config.php:123 +msgid "Set font-size for the entire application" msgstr "" -#: ../../mod/lostpass.php:89 -msgid "click here to login" +#: ../../view/theme/redbasic/php/config.php:125 +msgid "Set font-color for posts and comments" msgstr "" -#: ../../mod/lostpass.php:90 -msgid "" -"Your password may be changed from the Settings page after " -"successful login." +#: ../../view/theme/redbasic/php/config.php:126 +msgid "Set radius of corners" msgstr "" -#: ../../mod/lostpass.php:107 -#, php-format -msgid "Your password has changed at %s" +#: ../../view/theme/redbasic/php/config.php:127 +msgid "Set shadow depth of photos" msgstr "" -#: ../../mod/lostpass.php:122 -msgid "Forgot your Password?" +#: ../../view/theme/redbasic/php/config.php:128 +msgid "Set maximum width of conversation regions" msgstr "" -#: ../../mod/lostpass.php:123 -msgid "" -"Enter your email address and submit to have your password reset. Then check " -"your email for further instructions." +#: ../../view/theme/redbasic/php/config.php:129 +msgid "Center conversation regions" msgstr "" -#: ../../mod/lostpass.php:124 -msgid "Email Address" +#: ../../view/theme/redbasic/php/config.php:130 +msgid "Set minimum opacity of nav bar - to hide it" msgstr "" -#: ../../mod/lostpass.php:125 -msgid "Reset" +#: ../../view/theme/redbasic/php/config.php:131 +msgid "Set size of conversation author photo" msgstr "" -#: ../../mod/layouts.php:62 -msgid "Help with this feature" +#: ../../view/theme/redbasic/php/config.php:132 +msgid "Set size of followup author photos" msgstr "" -#: ../../mod/layouts.php:85 -msgid "Layout Name" +#: ../../view/theme/redbasic/php/config.php:133 +msgid "Sloppy photo albums" msgstr "" -#: ../../mod/editblock.php:77 -msgid "Edit Block" +#: ../../view/theme/redbasic/php/config.php:133 +msgid "Are you a clean desk or a messy desk person?" msgstr "" -#: ../../mod/editblock.php:87 -msgid "Delete block?" +#: ../../boot.php:1294 +#, php-format +msgid "Update %s failed. See error logs." msgstr "" -#: ../../mod/editblock.php:153 -msgid "Delete Block" +#: ../../boot.php:1297 +#, php-format +msgid "Update Error at %s" msgstr "" -#: ../../mod/achievements.php:34 -msgid "Some blurb about what to do when you're new here" +#: ../../boot.php:1471 +msgid "" +"Create an account to access services and applications within the Red Matrix" msgstr "" -#: ../../mod/editlayout.php:72 -msgid "Edit Layout" +#: ../../boot.php:1499 +msgid "Password" msgstr "" -#: ../../mod/editlayout.php:82 -msgid "Delete layout?" +#: ../../boot.php:1500 +msgid "Remember me" msgstr "" -#: ../../mod/editlayout.php:146 -msgid "Delete Layout" +#: ../../boot.php:1505 +msgid "Forgot your password?" msgstr "" -#: ../../mod/follow.php:25 -msgid "Channel added." +#: ../../boot.php:1570 +msgid "permission denied" msgstr "" -#: ../../mod/locs.php:47 ../../mod/locs.php:74 -msgid "Location not found." +#: ../../boot.php:1571 +msgid "Got Zot?" msgstr "" -#: ../../mod/locs.php:78 -msgid "Primary location cannot be removed." +#: ../../boot.php:2005 +msgid "toggle mobile" msgstr "" diff --git a/version.inc b/version.inc index e93632a42..98534153c 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2014-10-23.837 +2014-10-24.838 -- cgit v1.2.3 From 1845ddc4c3d3f729dde3905f0f87741ac3d3bf66 Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 24 Oct 2014 04:17:48 -0700 Subject: don't decrypt the message body more than once. --- include/bb2diaspora.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php index 4f37e5aa8..d094e33c2 100644 --- a/include/bb2diaspora.php +++ b/include/bb2diaspora.php @@ -340,8 +340,13 @@ function bb2diaspora_itembody($item,$force_update = false) { if(array_key_exists('item_flags',$item) && ($item['item_flags'] & ITEM_OBSCURED)) { $key = get_config('system','prvkey'); - $newitem['title'] = (($item['title']) ? crypto_unencapsulate(json_decode($item['title'],true),$key) : ''); - $newitem['body'] = (($item['body']) ? crypto_unencapsulate(json_decode($item['body'],true),$key) : ''); + $b = json_decode($item['title'],true); + // if called from diaspora_process_outbound, this decoding has already been done. + // Everything else that calls us will not yet be decoded. + if($b && is_array($b) && array_key_exists('iv',$b)) { + $newitem['title'] = (($item['title']) ? crypto_unencapsulate(json_decode($item['title'],true),$key) : ''); + $newitem['body'] = (($item['body']) ? crypto_unencapsulate(json_decode($item['body'],true),$key) : ''); + } } bb2diaspora_itemwallwall($newitem); -- cgit v1.2.3 From d98fcdf3fb6fa7d9e300bdcc470f0d77e470d205 Mon Sep 17 00:00:00 2001 From: zottel Date: Fri, 24 Oct 2014 17:08:50 +0200 Subject: update to German help --- doc/de/about.bb | 2 +- doc/de/channels.bb | 6 +++--- doc/de/features.bb | 10 ++++------ doc/de/main.bb | 17 ++++++----------- doc/de/profiles.bb | 2 +- doc/de/registration.bb | 4 ++-- doc/macros/de/addons_footer.bb | 2 ++ doc/macros/de/cloud_footer.bb | 2 ++ doc/macros/de/main_footer.bb | 1 + doc/macros/de/troubleshooting_footer.bb | 2 ++ 10 files changed, 24 insertions(+), 24 deletions(-) create mode 100644 doc/macros/de/addons_footer.bb create mode 100644 doc/macros/de/cloud_footer.bb create mode 100644 doc/macros/de/main_footer.bb create mode 100644 doc/macros/de/troubleshooting_footer.bb diff --git a/doc/de/about.bb b/doc/de/about.bb index 581f55569..313337f17 100644 --- a/doc/de/about.bb +++ b/doc/de/about.bb @@ -20,4 +20,4 @@ Dabei bietet Red einige einzigartige Leckerbissen: [b]Privatsphäre:[/b] Red-Identitäten (Zot-IDs) können gelöscht, gesichert/heruntergeladen und geklont werden. Du hast volle Kontrolle über Deine Daten. Wenn Du Dich entscheidest, all Deine Daten und Deine Zot-ID zu löschen, musst Du nur auf einen Link klicken, und sie werden sofort von dem Server gelöscht. Keine Fragen, keine Umstände. -[url=[baseurl]/help]Zurück zur Hilfe-Startseite[/url] +#include doc/macros/main_footer.bb; diff --git a/doc/de/channels.bb b/doc/de/channels.bb index 0308d4689..41ea68404 100644 --- a/doc/de/channels.bb +++ b/doc/de/channels.bb @@ -11,9 +11,9 @@ Die wichtigsten Funktionen für einen Kanal, der einen selbst repräsentiert, si Kurz gesagt, ein Kanal der Dich repräsentiert ist sozusagen „Ich im Internet“. -Du musst Deinen ersten Kanal erstellen, während Du Dich anmeldest. Du kannst auch weitere Kanäle erstellen und zwischen ihnen wechseln, indem Du auf „Kanal-Auswahl“ klickst. +Du musst Deinen ersten Kanal erstellen, während Du Dich anmeldest. Du kannst auch weitere Kanäle erstellen und zwischen ihnen wechseln, indem Du auf „Kanal-Manager“ im Menü unter Deinem Profilbild klickst. -Du wirst nach einem Kanalnamen und einem kurzen Spitznamen gefragt. Für einen Kanal, der Dich repräsentiert, ist es eine gute Idee, hier Deinen Realnamen anzugeben, damit Deine Freunde Dich finden und sich mit Dir verbinden können. Der Spitzname wird genutzt, um Deinen „Webbie“ zu erstellen. Das ist so etwas wie ein Username und sieht aus wie eine E-Mail-Adresse, zum Beispiel spitzname@red-hub.de. Überlege ein bisschen, was Du als Spitzname nutzen willst. Stell Dir vor, Du wirst nach Deinem Webbie gefragt und musst Deinem bekannten dann buchstabieren, dass Dein Webbie „llamas.sind-cool_274@example.com“ ist. „llamassindcool@exmaple.com“ wäre da viel einfacher gewesen. +Du wirst nach einem Kanalnamen und einem kurzen Spitznamen gefragt. Für einen Kanal, der Dich repräsentiert, ist es eine gute Idee, hier Deinen Realnamen anzugeben, damit Deine Freunde Dich finden und sich mit Dir verbinden können. Der Spitzname wird genutzt, um Deinen „Webbie“ zu erstellen. Das ist so etwas wie ein Username und sieht aus wie eine E-Mail-Adresse, zum Beispiel spitzname@red-hub.de. Überlege ein bisschen, was Du als Spitzname nutzen willst. Stell Dir vor, Du wirst nach Deinem Webbie gefragt und musst Deinem Bekannten dann buchstabieren, dass Dein Webbie „llamas.sind-cool_274@example.com“ ist. „llamassindcool@exmaple.com“ wäre da viel einfacher gewesen. Nachdem Du Deinen Kanal erstellt hast, wirst Du zu den Einstellungen weitergeleitet. Hier kannst Du Deinen Kanal einrichten und die Standard-Berechtigungen setzen. @@ -23,4 +23,4 @@ Die „Matrix“-Seite enthält alle neuen Beiträge aus der gesamten Red Matrix Wie zu Anfang erwähnt sind viele Arten von Kanälen möglich, diese unterscheiden sich hauptsächlich durch die Berechtigungen. Das Anlegen dieser Kanäle unterscheidet sich dagegen nicht. Beispiel: Um einen Kanal zum Austausch von Dokumenten zu erstellen, wirst du vermutlich die Berechtigung „Kann in meinen öffentlichen Dateiordner schreiben“ freizügiger einstellen. Für weitere Informationen sieh bitte in der Hilfe unter Zugriffsrechte nach. -[url=[baseurl]/help]Zurück zur Hilfe-Startseite[/url] +#include doc/macros/main_footer.bb; diff --git a/doc/de/features.bb b/doc/de/features.bb index 65ea45679..41dee301a 100644 --- a/doc/de/features.bb +++ b/doc/de/features.bb @@ -1,12 +1,10 @@ -[size=24][b]Features der Red-Matrix[/b][/size] - -[url=[baseurl]/help]Zurück zur Hilfe-Startseite[/url] +[size=large][b]Features der Red-Matrix[/b][/size] Die Red-Matrix ist ein Allzweck-Kommunikationsnetzwerk mit einigen einzigartigen Features. Sie wurde für eine große Bandbreite von Nutzern entwickelt, von Nutzern sozialer Netzwerke über technisch nicht interessierte Blogger bis hin zu PHP-Experten und erfahrenen Systemadministratoren. Diese Seite listet einige der Kern-Features von Red auf, die in der offiziellen Distribution enthalten sind. Wie immer bei freier Open-Source-Software sind den Möglichkeiten keine Grenzen gesetzt. Beliebige Erweiterungen, Addons, Themes und Konfigurationen sind möglich. -[b][size=18]Entwickelt für Privatsphäre und Freiheit[/size][/b] +[h2]Entwickelt für Privatsphäre und Freiheit[/h2] Eines der Design-Ziele von Red ist einfache Kommunikations über das Web, ohne die Privatsphäre zu vernachlässigen, wenn die Nutzer das Wünschen. Um dieses Ziel zu erreichen, verfügt Red über einige Features, die beliebige Stufen des Privatsphäre-Schutzes ermöglichen: @@ -83,7 +81,7 @@ Solche Backups sind ein Weg, um Klone zu erstellen, und können genutzt werden, Konten und Kanäle können sofort gelöscht werden, indem Du einfach auf einen Link klickst. Das wars. Alle damit verbundenen Inhalte werden sofort aus der Matrix gelöscht (inklusiver aller Beiträge und sonstiger Inhalte, die von dem gelöschten Konto/Kanal erzeugt wurden). -[b][size=18]Erstellen von Inhalten[/size][/b] +[h2]Erstellen von Inhalten[/h2] [b]Beiträge schreiben[/b] @@ -105,4 +103,4 @@ Genau wie jedes andere Blog-System, soziale Netzwerk oder Mikro-Blogging-Dienst Vor dem Absenden kann eine Vorschau von Beiträgen betrachtet werden. -[url=[baseurl]/help]Zurück zur Hilfe-Startseite[/url] +#include doc/macros/main_footer.bb; diff --git a/doc/de/main.bb b/doc/de/main.bb index fe90a075d..a3582e17c 100644 --- a/doc/de/main.bb +++ b/doc/de/main.bb @@ -24,7 +24,7 @@ Zot ist das großartige neue Kommunikationsprotokoll, das extra für die Red-Mat [zrl=[baseurl]/help/cloud]Cloud-Speicher[/zrl] [zrl=[baseurl]/help/remove_account]Einen Kanal oder das ganze Konto löschen[/zrl] -[size=large][b]Nutzung der Red-Matrix[/b][/size] +[size=large][b]Hilfe für RedMatrix-Mitglieder[/b][/size] [zrl=[baseurl]/help/tags_and_mentions]Tags und Erwähnungen[/zrl] [zrl=[baseurl]/help/webpages]Webseiten[/zrl] [zrl=[baseurl]/help/bbcode]BBcode-Referenz für Posts und Kommentare[/zrl] @@ -32,25 +32,19 @@ Zot ist das großartige neue Kommunikationsprotokoll, das extra für die Red-Mat [zrl=[baseurl]/help/cloud_desktop_clients]Desktop-Anwendungen und die Cloud[/zrl] [zrl=[baseurl]/help/AdvancedSearch]Fortgeschrittene Suche im Kanalverzeichnis[/zrl] [zrl=[baseurl]/help/addons]Hilfe zu Addons[/zrl] -[zrl=[baseurl]/help/nomadic-identity]Got Zot? Nomadische Identität, Kanal-Klone und mehr[/zrl] [zrl=[baseurl]/help/diaspora_compat]Kompatibilität zum Diaspora-Protokoll (zur Kommunikation mit Kontakten aus Diaspora und Friendica)[/zrl] +[zrl=[baseurl]/help/faq_members]FAQ für Mitglieder[/zrl] - -[size=large][b]Häufig gestellte Fragen für Nutzer[/b][/size] -[zrl=[baseurl]/help/faq_users]FAQ für Nutzer[/zrl] - -[size=large][b]Für Administratoren[/b][/size] +[size=large][b]Hilfe für Administratoren[/b][/size] [zrl=[baseurl]/help/install]Installation[/zrl] [zrl=[baseurl]/help/debian_install]Einfache Installation unter Debian mit einem Skript[/zrl] [zrl=[baseurl]/help/red2pi]Red auf einem Raspberry Pi installieren[/zrl] -[zrl=[baseurl]/help/problems-following-an-update]Probleme nach einem Software-Update[/zrl] [zrl=[baseurl]/help/troubleshooting]Troubleshooting-Tipps[/zrl] - -[size=large][b]Häufig gestellte Fragen für Hub-Admins[/b][/size] +[zrl=[baseurl]/help/hidden_configs]Versteckte Konfigurations-Optionen[/zrl] [zrl=[baseurl]/help/faq_admins]FAQ für Admins[/zrl] [size=large][b]Technische Dokumentation[/b][/size] -[zrl=[baseurl]/help/Zot---A-High-Level-Overview]Zot – ein erster Überblick[/zrl] +[zrl=[baseurl]/help/Zot---A-High-Level-Overview]Zot – ein grober Überblick[/zrl] [zrl=[baseurl]/help/zot]Eine Einführung ins Zot-Protokoll[/zrl] [zrl=[baseurl]/help/zot_structures]Zot-Strukturen[/zrl] [zrl=[baseurl]/help/comanche]Seitenbeschreibung in Comanche[/zrl] @@ -79,5 +73,6 @@ Zot ist das großartige neue Kommunikationsprotokoll, das extra für die Red-Mat [url=https://github.com/friendica/red-addons]Addons-Website[/url] [url=https://zothub.com/channel/one]Entwickler-Kanal[/url] +[url=[baseurl]/help/credits]RedMatrix Credits[/url] [size=large][b]Über diesen Red-Server[/b][/size] [zrl=[baseurl]/siteinfo]Informationen zu diesem Server und der Red-Version[/zrl] diff --git a/doc/de/profiles.bb b/doc/de/profiles.bb index d6603dd38..cc2d94fb6 100644 --- a/doc/de/profiles.bb +++ b/doc/de/profiles.bb @@ -36,4 +36,4 @@ Im Verzeichnis (Kanal-Anzeiger) kannst Du nach Leuten suchen, die ihre Profile v Auf Deiner „Verbindungen“-Seite und im Verzeichnis (Kanal-Anzeiger) gibt es einen Link „Vorschläge“ bzw. „Kanal-Vorschläge“. Dort findest Du Kanäle, die gleiche oder ähnliche Schlüsselwörter im Profil haben wie Du. Je mehr Schlüsselwörter Du in Dein Standard-Profil einträgst, desto besser werden die Suchergebnisse. Sie sind nach relevanz sortiert. -[zrl=[baseurl]/help]Zurück zur Hilfe-Startseite[/zrl] +#include doc/macros/main_footer.bb; diff --git a/doc/de/registration.bb b/doc/de/registration.bb index e6c11810a..fa331e561 100644 --- a/doc/de/registration.bb +++ b/doc/de/registration.bb @@ -27,10 +27,10 @@ Der Kanal-Name ist der Titel oder eine kurze Beschreibung des Kanals. Der „Spi Wenn Dein Kanal angelegt ist, geht es direkt weiter zu den Einstellungen. Dort kannst Du Zugriffsrechte setzen, Funktionen zu- oder abschalten und so weiter. Diese Punkte werden auf den entsprechenden Hilfeseiten erklärt. Siehe auch -[zrl=[baseurl]/help/accounts_profiles_channels_basics]Konten, Profile und Kanäle kurz erklärt[/zrl] +[zrl=[baseurl]/help/accounts_profiles_channels_basics]Grundlagen zu Identitäten in der RedMatrix[/zrl] [zrl=[baseurl]/help/accounts]Konten[/zrl] [zrl=[baseurl]/help/profiles]Profile[/zrl] [zrl=[baseurl]/help/permissions]Zugriffsrechte[/zrl] [zrl=[baseurl]/help/remove_account]Konto löschen[/zrl] -[url=[baseurl]/help]Zurück zur Hilfe-Startseite[/url] +#include doc/macros/main_footer.bb; diff --git a/doc/macros/de/addons_footer.bb b/doc/macros/de/addons_footer.bb new file mode 100644 index 000000000..068bb7ec7 --- /dev/null +++ b/doc/macros/de/addons_footer.bb @@ -0,0 +1,2 @@ +Zurück zur [zrl=[baseurl]/help/addons]Addons-Hilfe[/zrl] +Zurück zur [zrl=[baseurl]/help/main]Hilfe-Startseite[/zrl] diff --git a/doc/macros/de/cloud_footer.bb b/doc/macros/de/cloud_footer.bb new file mode 100644 index 000000000..921448a3c --- /dev/null +++ b/doc/macros/de/cloud_footer.bb @@ -0,0 +1,2 @@ +Zurück zur [zrl=[baseurl]/help/cloud]Cloud-Hilfe[/zrl] +Zurück zur [zrl=[baseurl]/help/main]Hilfe-Startseite[/zrl] diff --git a/doc/macros/de/main_footer.bb b/doc/macros/de/main_footer.bb new file mode 100644 index 000000000..e71603626 --- /dev/null +++ b/doc/macros/de/main_footer.bb @@ -0,0 +1 @@ +Zurück zur [zrl=[baseurl]/help/main]Hilfe-Startseite[/zrl] diff --git a/doc/macros/de/troubleshooting_footer.bb b/doc/macros/de/troubleshooting_footer.bb new file mode 100644 index 000000000..be8c13a28 --- /dev/null +++ b/doc/macros/de/troubleshooting_footer.bb @@ -0,0 +1,2 @@ +Zurück zur [zrl=[baseurl]/help/troubleshooting]Troubleshooting-Startseite[/zrl] +Zurück zur [zrl=[baseurl]/help/troubleshooting]Hilfe-Startseite[/zrl] -- cgit v1.2.3 From 4d0455befd674e622a5dd9f4baf586e38feca3f8 Mon Sep 17 00:00:00 2001 From: zottel Date: Fri, 24 Oct 2014 17:09:37 +0200 Subject: correction to addon footer --- doc/macros/addons_footer.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/macros/addons_footer.bb b/doc/macros/addons_footer.bb index f6b687a23..32814c59b 100644 --- a/doc/macros/addons_footer.bb +++ b/doc/macros/addons_footer.bb @@ -1,2 +1,2 @@ Return to the [zrl=[baseurl]/help/addons]Addons documentation[/zrl] -Return to the [zrl=[baseurl]/help/addons]Main documentation[/zrl] +Return to the [zrl=[baseurl]/help/main]Main documentation[/zrl] -- cgit v1.2.3 From 38801f802f9fd0eedd68e00ddf6707ace7220eba Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Fri, 24 Oct 2014 17:46:31 +0100 Subject: Issue #661 --- mod/item.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/item.php b/mod/item.php index ad567b21f..dd6d0e217 100644 --- a/mod/item.php +++ b/mod/item.php @@ -77,7 +77,7 @@ function item_post(&$a) { $preview = ((x($_REQUEST,'preview')) ? intval($_REQUEST['preview']) : 0); $categories = ((x($_REQUEST,'category')) ? escape_tags($_REQUEST['category']) : ''); $webpage = ((x($_REQUEST,'webpage')) ? intval($_REQUEST['webpage']) : 0); - $pagetitle = ((x($_REQUEST,'pagetitle')) ? escape_tags($_REQUEST['pagetitle']) : ''); + $pagetitle = ((x($_REQUEST,'pagetitle')) ? escape_tags(urlencode($_REQUEST['pagetitle'])) : ''); $layout_mid = ((x($_REQUEST,'layout_mid')) ? escape_tags($_REQUEST['layout_mid']): ''); $plink = ((x($_REQUEST,'permalink')) ? escape_tags($_REQUEST['permalink']) : ''); -- cgit v1.2.3 From 5b04b9480e19d756a7cbc8456ffaa09b40a61164 Mon Sep 17 00:00:00 2001 From: zottel Date: Fri, 24 Oct 2014 21:17:56 +0200 Subject: make bbcode/html includes work in markdown help pages and vice versa --- mod/help.php | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/mod/help.php b/mod/help.php index 81ecd6ba9..4823f1c07 100644 --- a/mod/help.php +++ b/mod/help.php @@ -34,8 +34,6 @@ function help_content(&$a) { $doctype = 'markdown'; - require_once('library/markdown.php'); - $text = ''; if(argc() > 1) { @@ -73,17 +71,22 @@ function help_content(&$a) { )); } - $text = preg_replace_callback("/#include (.*?)\;/ism", 'preg_callback_help_include', $text); - if($doctype === 'html') $content = $text; - if($doctype === 'markdown') + if($doctype === 'markdown') { + require_once('library/markdown.php'); + # escape #include tags + $text = preg_replace('/#include/ism', '%%include', $text); $content = Markdown($text); + $content = preg_replace('/%%include/ism', '#include', $content); + } if($doctype === 'bbcode') { require_once('include/bbcode.php'); $content = bbcode($text); } + $content = preg_replace_callback("/#include (.*?)\;/ism", 'preg_callback_help_include', $content); + return replace_macros(get_markup_template("help.tpl"), array( '$content' => $content )); @@ -93,8 +96,17 @@ function help_content(&$a) { function preg_callback_help_include($matches) { - if($matches[1]) - return str_replace($matches[0],load_doc_file($matches[1]),$matches[0]); + if($matches[1]) { + $include = str_replace($matches[0],load_doc_file($matches[1]),$matches[0]); + if(preg_match('/\.bb$/', $matches[1])) { + require_once('include/bbcode.php'); + $include = bbcode($include); + } elseif(preg_match('/\.md$/', $matches[1])) { + require_once('library/markdown.php'); + $include = Markdown($include); + } + return $include; + } } -- cgit v1.2.3 From cf05266b15e49020c217107fd81896171d5ef26b Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 24 Oct 2014 14:04:32 -0700 Subject: should probably check the body since the title is only going to be rarely set. --- include/bb2diaspora.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php index d094e33c2..8a178d1ac 100644 --- a/include/bb2diaspora.php +++ b/include/bb2diaspora.php @@ -340,7 +340,7 @@ function bb2diaspora_itembody($item,$force_update = false) { if(array_key_exists('item_flags',$item) && ($item['item_flags'] & ITEM_OBSCURED)) { $key = get_config('system','prvkey'); - $b = json_decode($item['title'],true); + $b = json_decode($item['body'],true); // if called from diaspora_process_outbound, this decoding has already been done. // Everything else that calls us will not yet be decoded. if($b && is_array($b) && array_key_exists('iv',$b)) { -- cgit v1.2.3 From ce8a891682a7d8ceca71ec762063367744428a53 Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 24 Oct 2014 14:18:02 -0700 Subject: doh - this needs to be markdown, not bbcode --- include/items.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/items.php b/include/items.php index 8d46f64c1..41c211953 100755 --- a/include/items.php +++ b/include/items.php @@ -2532,8 +2532,8 @@ function store_diaspora_comment_sig($datarray, $channel, $parent_item, $post_id, logger('wall to wall comment',LOGGER_DEBUG); // post will come across with the owner's identity. Throw a preamble onto the post to indicate the true author. $signed_body = "\n\n" - . '[img]' . $datarray['author']['xchan_photo_m'] . '[/img]' - . '[url=' . $datarray['author']['xchan_url'] . ']' . $datarray['author']['xchan_name'] . '[/url]' . "\n\n" + . '![' . $datarray['author']['xchan_name'] . '](' . $datarray['author']['xchan_photo_m'] . ')' + . '[' . $datarray['author']['xchan_name'] . '](' . $datarray['author']['xchan_url'] . ')' . "\n\n" . $signed_body; } -- cgit v1.2.3 From 98bce0e7197b680e03cb3778cb14545260cc58c1 Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 24 Oct 2014 14:31:21 -0700 Subject: the to-do list is getting longer again. --- doc/to_do_code.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/to_do_code.bb b/doc/to_do_code.bb index f4c685063..1ca1efecd 100644 --- a/doc/to_do_code.bb +++ b/doc/to_do_code.bb @@ -5,6 +5,9 @@ We need much more than this, but here are areas where developers can help. Pleas [li]Documentation - see Red Documentation Project To-Do List[/li] [li]Include TOS link in registration/verification email[/li] [li]Finish the anti-spam bayesian engine[/li] +[li]implement an email permission denied bounce message from the sys channel[/li] +[li]finish Wordpress connector - import wordpress comments back to redmatrix[/li] +[li]provide a way for xchans with a certain network type to upgrade (unknown to rss, rss to statusnet, friendica-over-diaspora to friendica, for instance) based on new knowledge and/or redmatrix ability[/li] [li]If DAV folders exist, add an option to the Settings page to set a default folder for attachment uploads.[/li] [li]Integrate the "open site" list with the register page[/li] [li]implement oembed provider interface[/li] -- cgit v1.2.3 From 59e19a1f45a3502559dd1df33c453aa2f99cb995 Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 25 Oct 2014 01:03:36 -0700 Subject: moved post_to_red to its own project ( https://github.com/friendica/wptored ), which I was planning to do anyway since it's kind of lost in the util folder, but also because having it there may present licensing issues, as it's GPL. --- util/wp/post_to_red/post_to_red.php | 493 ------------------------------------ util/wp/post_to_red/readme.txt | 39 --- version.inc | 2 +- 3 files changed, 1 insertion(+), 533 deletions(-) delete mode 100644 util/wp/post_to_red/post_to_red.php delete mode 100644 util/wp/post_to_red/readme.txt diff --git a/util/wp/post_to_red/post_to_red.php b/util/wp/post_to_red/post_to_red.php deleted file mode 100644 index ea6026ae2..000000000 --- a/util/wp/post_to_red/post_to_red.php +++ /dev/null @@ -1,493 +0,0 @@ -/Uis', '', $post->post_content); - - // get any tags and make them hashtags - $post_tags = get_the_tags($post_id); - if ($post_tags) { - foreach($post_tags as $tag) { - $tag_string .= "#" . $tag->name . " "; - } - } - - $message_id = site_url() . '/' . $post_id; - - if (isset($tag_string)) { - $message .= "
        $tag_string"; - } - - $cats = ''; - - $terms = get_the_terms($post_id,'category'); - if($terms) { - foreach($terms as $term) { - if(strlen($cats)) - $cats .= ','; - $cats .= htmlspecialchars_decode($term->name, ENT_COMPAT); - } - } - - - - $bbcode = xpost_to_html2bbcode($message); - - if($backlink) - $bbcode .= "\n\n" . _('Source:') . ' ' . '[url]' . get_permalink($post_id) . '[/url]'; - - $url = $seed_location . '/api/statuses/update'; - - $headers = array('Authorization' => 'Basic '.base64_encode("$user_name:$password")); - $body = array( - 'title' => xpost_to_html2bbcode($post->post_title), - 'status' => $bbcode, - 'source' => 'WordPress', - 'namespace' => 'wordpress', - 'remote_id' => $message_id, - 'permalink' => $post->guid - ); - if($channel) - $body['channel'] = $channel; - if($cats) - $body['category'] = $cats; - - // post: - $request = new WP_Http; - $result = $request->request($url , array( 'method' => 'POST', 'body' => $body, 'headers' => $headers)); - - } - - } -} - - -function post_to_red_delete_post($post_id) { - - $post = get_post($post_id); - - // if meta has been set - if ((get_post_meta($post_id, "post_to_red", true) == '1') || (get_post_meta($post_id, "post_from_red", true) == '1')) { - - $user_name = post_to_red_get_acct_name(); - $password = post_to_red_get_password(); - $seed_location = post_to_red_get_seed_location(); - $channel = post_to_red_get_channel_name(); - - if ((isset($user_name)) && (isset($password)) && (isset($seed_location))) { - - $message_id = site_url() . '/' . $post_id; - $url = $seed_location . '/api/statuses/destroy'; - - $headers = array('Authorization' => 'Basic '.base64_encode("$user_name:$password")); - $body = array( - 'namespace' => 'wordpress', - 'remote_id' => $message_id, - ); - if($channel) - $body['channel'] = $channel; - - // post: - $request = new WP_Http; - $result = $request->request($url , array( 'method' => 'POST', 'body' => $body, 'headers' => $headers)); - - } - - } -} - -function post_to_red_delete_comment($post_id) { - - // The comment may already be destroyed so we can't query it or the parent post. That means - // we have to make a network call for any deleted comment to see if it's registered on Red. - // We really need a "before_delete_comment" action in WP to make - // this more efficient. - - $user_name = post_to_red_get_acct_name(); - $password = post_to_red_get_password(); - $seed_location = post_to_red_get_seed_location(); - $channel = post_to_red_get_channel_name(); - - if ((isset($user_name)) && (isset($password)) && (isset($seed_location))) { - - $message_id = site_url() . '/' . $post_id; - $url = $seed_location . '/api/statuses/destroy'; - - $headers = array('Authorization' => 'Basic '.base64_encode("$user_name:$password")); - $body = array( - 'namespace' => 'wordpress', - 'comment_id' => $message_id, - ); - if($channel) - $body['channel'] = $channel; - - // post: - $request = new WP_Http; - $result = $request->request($url , array( 'method' => 'POST', 'body' => $body, 'headers' => $headers)); - } -} - - - - -function post_to_red_displayAdminContent() { - - $seed_url = post_to_red_get_seed_location(); - $password = post_to_red_get_password(); - $user_acct = post_to_red_get_acct_name(); - $channel = post_to_red_get_channel_name(); - $backlink = get_option('post_to_red_backlink'); - $backlink_checked = ((intval($backlink)) ? ' checked="checked" ' : ''); - // debug... - // echo "seed location: $seed_url
        "; - // echo "password: $password
        "; - // echo "user_acct: $user_acct
        "; - - echo << -

        CrossPost to Red Matrix

        -

        This plugin allows you to cross post to your Red Matrix channel.

        - - -
        -

        Configuration

        - - Enter the login details of your Red Matrix account

        - Login (email):
        - Password:
        - Red Matrix URL:
        - Optional channel nickname:
        - Add permalink to posts?
        - - -

        -
        -EOF; - - if(isset($_POST['submit'])) { - echo "
        Settings Saved!
        "; - } -} - -function post_to_red_post_checkbox() { - - add_meta_box( - 'post_to_red_meta_box_id', - 'Cross Post to Red Matrix', - 'post_to_red_post_meta_content', - 'post', - 'normal', - 'default' - ); -} - -function post_to_red_post_meta_content($post_id) { - wp_nonce_field(plugin_basename( __FILE__ ), 'post_to_red_nonce'); - echo ' Cross post?'; -} - -function post_to_red_post_field_data($post_id) { - - // check if this isn't an auto save - if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE) - return; - - // security check - if((! array_key_exists('post_to_red_nonce', $_POST)) - || (!wp_verify_nonce( $_POST['post_to_red_nonce'], plugin_basename( __FILE__ )))) - return; - - // now store data in custom fields based on checkboxes selected - if (isset($_POST['post_to_red'])) { - update_post_meta($post_id, 'post_to_red', '1'); - } -} - -function post_to_red_display_admin_page() { - - if ((isset($_REQUEST["post_to_red_acct_name"])) && (isset($_REQUEST["post_to_red_password"]))) { - - $password = $_REQUEST["post_to_red_password"]; - $red_url = $_REQUEST["post_to_red_url"]; - $channelname = $_REQUEST['post_to_red_channel']; - - - update_option('post_to_red_acct_name', $_REQUEST["post_to_red_acct_name"]); - update_option('post_to_red_channel_name', $channelname); - update_option('post_to_red_seed_location', $red_url); - update_option('post_to_red_password', $password); - update_option('post_to_red_backlink', $_REQUEST['post_to_red_backlink']); - } - - post_to_red_displayAdminContent(); -} - -function post_to_red_settings_link($links) { - $settings_link = 'Settings'; - array_unshift($links, $settings_link); - return $links; -} - -function post_to_red_admin() { - add_options_page("Crosspost to redmatrix", "Crosspost to redmatrix", "manage_options", "xpost-to-redmatrix", "post_to_red_display_admin_page"); -} - -register_deactivation_hook( __FILE__, 'post_to_red_deactivate' ); - -add_filter("plugin_action_links_$plugin", "post_to_red_settings_link"); - -add_action("admin_menu", "post_to_red_admin"); -add_action('publish_post', 'post_to_red_post'); -add_action('add_meta_boxes', 'post_to_red_post_checkbox'); -add_action('save_post', 'post_to_red_post_field_data'); -add_action('before_delete_post', 'post_to_red_delete_post'); - -add_action('delete_comment', 'post_to_red_delete_comment'); - -add_filter('xmlrpc_methods', 'red_xmlrpc_methods'); - -add_filter('get_avatar', 'post_to_red_get_avatar',10,5); - - -function red_xmlrpc_methods($methods) { - $methods['red.Comment'] = 'red_comment'; - return $methods; -} - -function red_comment($args) { - global $wp_xmlrpc_server; - $wp_xmlrpc_server->escape( $args ); - - $blog_id = $args[0]; - $username = $args[1]; - $password = $args[2]; - $post = $args[3]; - $content_struct = $args[4]; - - if ( ! $user = $wp_xmlrpc_server->login( $username, $password ) ) - return $wp_xmlrpc_server->error; - - if ( is_numeric($post) ) - $post_id = absint($post); - else - $post_id = url_to_postid($post); - - if ( ! $post_id ) - return new IXR_Error( 404, __( 'Invalid post ID.' ) ); - if ( ! get_post($post_id) ) - return new IXR_Error( 404, __( 'Invalid post ID.' ) ); - - $comment['comment_post_ID'] = $post_id; - - $comment['comment_author'] = ''; - if ( isset($content_struct['author']) ) - $comment['comment_author'] = $content_struct['author']; - - $comment['comment_author_email'] = ''; - if ( isset($content_struct['author_email']) ) - $comment['comment_author_email'] = $content_struct['author_email']; - - $comment['comment_author_url'] = ''; - if ( isset($content_struct['author_url']) ) - $comment['comment_author_url'] = $content_struct['author_url']; - - $comment['user_ID'] = 0; - - if ( get_option('require_name_email') ) { - if ( 6 > strlen($comment['comment_author_email']) || '' == $comment['comment_author'] ) - return new IXR_Error( 403, __( 'Comment author name and email are required' ) ); - elseif ( !is_email($comment['comment_author_email']) ) - return new IXR_Error( 403, __( 'A valid email address is required' ) ); - } - - if(isset($content_struct['comment_id'])) { - $comment['comment_ID'] = intval($content_struct['comment_id']); - $edit = true; - } - $comment['comment_post_ID'] = $post_id; - $comment['comment_parent'] = isset($content_struct['comment_parent']) ? absint($content_struct['comment_parent']) : 0; - $comment['comment_content'] = isset($content_struct['content']) ? $content_struct['content'] : null; - - do_action('xmlrpc_call', 'red.Comment'); - - if($edit) { - $result = wp_update_comment($comment); - $comment_ID = $comment['comment_ID']; - } - else { - $comment_ID = wp_new_comment( $comment ); - if($comment_ID) - wp_set_comment_status($comment_ID,'approve'); - } - - if(isset($content_struct['red_avatar'])) - add_comment_meta($comment_ID,'red_avatar',$content_struct['red_avatar'],true); - - do_action( 'xmlrpc_call_success_red_Comment', $comment_ID, $args ); - - return $comment_ID; -} - -function post_to_red_get_avatar($avatar,$id_or_email,$size,$default,$alt) { - - if(! is_object($id_or_email)) - return $avatar; - if((! array_key_exists('comment_author_email',$id_or_email)) || (empty($id_or_email->comment_author_email))) - return $avatar; - if((! array_key_exists('comment_ID', $id_or_email)) || (! intval($id_or_email->comment_ID))) - return $avatar; - $l = get_comment_meta($id_or_email->comment_ID,'red_avatar',true); - if($l) { - $safe_alt = esc_attr($alt); - $avatar = "{$safe_alt}"; - } - return $avatar; -} - - -// from: -// http://www.docgate.com/tutorial/php/how-to-convert-html-to-bbcode-with-php-script.html - -//function exists also in post to friendica plugin; load only if not yet loaded by that plugin -if(!function_exists('xpost_to_html2bbcode')) { - function xpost_to_html2bbcode($text) { - $htmltags = array( - '/\(.*?)\<\/b\>/is', - '/\(.*?)\<\/i\>/is', - '/\(.*?)\<\/u\>/is', - '/\(.*?)\<\/ul\>/is', - '/\(.*?)\<\/li\>/is', - '/\/is', // some smiley - '/\/is', - '/\/is', // some smiley - '/\
        (.*?)\<\/div\>/is', - '/\
        (.*?)\<\/div\>/is', - '/\
        (.*?)\<\/div\>/is', - '/\
        (.*?)\<\/div\>/is', - '/\(.*?)\<\/cite\>/is', - '/\(.*?)\<\/blockquote\>/is', - '/\(.*?)\<\/div\>/is', - '/\(.*?)\<\/code\>/is', - '/\/is', - '/\(.*?)\<\/strong\>/is', - '/\(.*?)\<\/em\>/is', - '/\(.*?)\<\/a\>/is', - '/\http:\/\/(.*?)\<\/a\>/is', - '/\(.*?)\<\/a\>/is' - ); - - $bbtags = array( - '[b]$1[/b]', - '[i]$1[/i]', - '[u]$1[/u]', - '[list]$1[/list]', - '[*]$1', - '$3', - '[img]http://$2[/img]' . "\n", - ':$3', - '[quote]$1[/quote]', - '[code]$1[/code]', - '', - '', - '', - '[quote]$1[/quote]', - '$1', - '[code]$1[/code]', - "\n", - '[b]$1[/b]', - '[i]$1[/i]', - '[email=$1]$3[/email]', - '[url]$1[/url]', - '[url=$1]$3[/url]' - ); - - $text = str_replace ("\n", ' ', $text); - $ntext = preg_replace ($htmltags, $bbtags, $text); - $ntext = preg_replace ($htmltags, $bbtags, $ntext); - - // for too large text and cannot handle by str_replace - if (!$ntext) { - $ntext = str_replace(array('
        ', '
        '), "\n", $text); - $ntext = str_replace(array('', ''), array('[b]', '[/b]'), $ntext); - $ntext = str_replace(array('', ''), array('[i]', '[/i]'), $ntext); - } - - $ntext = strip_tags($ntext); - - $ntext = trim(html_entity_decode($ntext,ENT_QUOTES,'UTF-8')); - return $ntext; - } -} - - diff --git a/util/wp/post_to_red/readme.txt b/util/wp/post_to_red/readme.txt deleted file mode 100644 index e27c46236..000000000 --- a/util/wp/post_to_red/readme.txt +++ /dev/null @@ -1,39 +0,0 @@ -=== CrossPost to redmatrix === -Contributors: duthied, macgirvin -Donate link: TBD -Tags: redmatrix, crosspost -Requires at least: 3.2 -Tested up to: 3.2 -Stable tag: 1.2 - -CrossPost to Red Matrix for WordPress - -== Description == -This plugin allows you to cross post to your Red Matrix account. - -**Note, this plugin converts the html from wordpress into bbcode. -The bbcode conversion doesn't handle height and width of an image, so be warned that if you post a very large -image that is resized via height and with attributes, those attributes won't be honored in the resulatant post. - -== Changelog == -= 1.2 = -* ensured no function name collision - -= 1.1 = -* Added feedback to settings form post. - -= 1.0 = -* Initial release. - -== Installation == - -1. Install the plugin from your Wordpress admin panel. - -OR - -1. Upload the plugin folder to the `/wp-content/plugins/` directory. -2. Activate the plugin through the 'Plugins' menu in WordPress. -3. On the settings page enter your account name and password and the nickname of the channel to post to - then click the submit button -4. To cross-post ensure the check box in the 'Cross Post To redmatrix' is checked before publishing. - -== Frequently Asked Questions == diff --git a/version.inc b/version.inc index 98534153c..ae378dbba 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2014-10-24.838 +2014-10-25.839 -- cgit v1.2.3 From 6497e78956825dc845eb8a998369154c4d823a95 Mon Sep 17 00:00:00 2001 From: marijus Date: Sat, 25 Oct 2014 15:23:20 +0200 Subject: some work on photos like/dislike --- mod/like.php | 1 - mod/photos.php | 40 +++++++++++++++++++++-- view/tpl/nav.tpl | 3 +- view/tpl/photo_view.tpl | 85 +++++++++++++++++++++++++++++++++++++++++++------ 4 files changed, 114 insertions(+), 15 deletions(-) diff --git a/mod/like.php b/mod/like.php index 916faf230..d17a42129 100755 --- a/mod/like.php +++ b/mod/like.php @@ -213,7 +213,6 @@ function like_content(&$a) { logger('like: verb ' . $verb . ' item ' . $item_id, LOGGER_DEBUG); - $r = q("SELECT * FROM item WHERE id = %d and item_restrict = 0 LIMIT 1", dbesc($item_id) ); diff --git a/mod/photos.php b/mod/photos.php index 06c566f47..003f7239d 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -1023,7 +1023,7 @@ function photos_content(&$a) { $like = ''; $dislike = ''; - // display comments + if($r) { foreach($r as $item) { @@ -1031,10 +1031,33 @@ function photos_content(&$a) { like_puller($a,$item,$dlike,'dislike'); } - $like = ((isset($alike[$link_item['id']])) ? format_like($alike[$link_item['id']],$alike[$link_item['id'] . '-l'],'like',$link_item['id']) : ''); - $dislike = ((isset($dlike[$link_item['id']])) ? format_like($dlike[$link_item['id']],$dlike[$link_item['id'] . '-l'],'dislike',$link_item['id']) : ''); + $like_count = ((x($alike,$link_item['mid'])) ? $alike[$link_item['mid']] : ''); + $like_list = ((x($alike,$link_item['mid'])) ? $alike[$link_item['mid'] . '-l'] : ''); + if (count($like_list) > MAX_LIKERS) { + $like_list_part = array_slice($like_list, 0, MAX_LIKERS); + array_push($like_list_part, '        ' . t('View all') . ''); + } else { + $like_list_part = ''; + } + $like_button_label = tt('Like','Likes',$like_count,'noun'); + + //if (feature_enabled($conv->get_profile_owner(),'dislike')) { + $dislike_count = ((x($dlike,$link_item['mid'])) ? $dlike[$link_item['mid']] : ''); + $dislike_list = ((x($dlike,$link_item['mid'])) ? $dlike[$link_item['mid'] . '-l'] : ''); + $dislike_button_label = tt('Dislike','Dislikes',$dislike_count,'noun'); + if (count($dislike_list) > MAX_LIKERS) { + $dislike_list_part = array_slice($dislike_list, 0, MAX_LIKERS); + array_push($dislike_list_part, '' . t('View all') . ''); + } else { + $dislike_list_part = ''; + } + //} + + $like = ((isset($alike[$link_item['mid']])) ? format_like($alike[$link_item['mid']],$alike[$link_item['mid'] . '-l'],'like',$link_item['mid']) : ''); + $dislike = ((isset($dlike[$link_item['mid']])) ? format_like($dlike[$link_item['mid']],$dlike[$link_item['mid'] . '-l'],'dislike',$link_item['mid']) : ''); + // display comments foreach($r as $item) { $comment = ''; @@ -1128,6 +1151,17 @@ function photos_content(&$a) { '$likebuttons' => $likebuttons, '$like' => $like_e, '$dislike' => $dislike_e, + '$like_count' => $like_count, + '$like_list' => $like_list, + '$like_list_part' => $like_list_part, + '$like_button_label' => $like_button_label, + '$like_modal_title' => t('Likes','noun'), + '$dislike_modal_title' => t('Dislikes','noun'), + '$dislike_count' => $dislike_count, //((feature_enabled($conv->get_profile_owner(),'dislike')) ? $dislike_count : ''), + '$dislike_list' => $dislike_list, //((feature_enabled($conv->get_profile_owner(),'dislike')) ? $dislike_list : ''), + '$dislike_list_part' => $dislike_list_part, //((feature_enabled($conv->get_profile_owner(),'dislike')) ? $dislike_list_part : ''), + '$dislike_button_label' => $dislike_button_label, //((feature_enabled($conv->get_profile_owner(),'dislike')) ? $dislike_button_label : ''), + '$modal_dismiss' => t('Close'), '$comments' => $comments, '$commentbox' => $commentbox, '$paginate' => $paginate, diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index a283b35a8..a8a7a7da7 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -50,7 +50,8 @@ {{if $nav.register}}
      • {{$nav.register.1}}
      • {{/if}} {{if !$userinfo}} {{if $nav.loginmenu}} -
        • + +
      + + + +
      + +
      +
      +
      + +
      + + + + +
      + +
      + +
      +
      +Classes | +Namespaces
      +
      +
      Importer.php File Reference
      +
      +
      + + + + +

      +Classes

      class  Redmatrix\Import\Import
       
      + + + +

      +Namespaces

      namespace  Redmatrix\Import
       
      +
      +
      + diff --git a/doc/html/classRedmatrix_1_1Import_1_1Import-members.html b/doc/html/classRedmatrix_1_1Import_1_1Import-members.html new file mode 100644 index 000000000..061fc11a4 --- /dev/null +++ b/doc/html/classRedmatrix_1_1Import_1_1Import-members.html @@ -0,0 +1,132 @@ + + + + + + +The Red Matrix: Member List + + + + + + + + + + + + + +
      +
      + + + + + + + +
      +
      The Red Matrix +
      +
      +
      + + + + + +
      +
      + +
      +
      +
      + +
      + + + + +
      + +
      + +
      +
      +
      Redmatrix\Import\Import Member List
      +
      +
      + +

      This is the complete list of members for Redmatrix\Import\Import, including all inherited members.

      + + + + + + + + + + + + + + + + +
      $credentialsRedmatrix\Import\Import
      $itemlistRedmatrix\Import\Import
      $itemsRedmatrix\Import\Import
      $src_itemsRedmatrix\Import\Import
      convert_child($child)Redmatrix\Import\Import
      convert_item($item_ident)Redmatrix\Import\Import
      convert_taxonomy($item_ident)Redmatrix\Import\Import
      get_children($item_ident)Redmatrix\Import\Import
      get_credentials()Redmatrix\Import\Import
      get_item($item_ident)Redmatrix\Import\Import
      get_item_ident($item)Redmatrix\Import\Import
      get_itemlist()Redmatrix\Import\Import
      get_taxonomy($item_ident)Redmatrix\Import\Import
      run()Redmatrix\Import\Import
      store($item, $update=false)Redmatrix\Import\Import
      +
      + diff --git a/doc/html/classRedmatrix_1_1Import_1_1Import.html b/doc/html/classRedmatrix_1_1Import_1_1Import.html new file mode 100644 index 000000000..6eec161c2 --- /dev/null +++ b/doc/html/classRedmatrix_1_1Import_1_1Import.html @@ -0,0 +1,407 @@ + + + + + + +The Red Matrix: Redmatrix\Import\Import Class Reference + + + + + + + + + + + + + +
      +
      + + + + + + + +
      +
      The Red Matrix +
      +
      +
      + + + + + +
      +
      + +
      +
      +
      + +
      + + + + +
      + +
      + +
      +
      +Public Member Functions | +Public Attributes | +List of all members
      +
      +
      Redmatrix\Import\Import Class Reference
      +
      +
      + + + + + + + + + + + + + + + + + + + + + + + + +

      +Public Member Functions

       get_credentials ()
       
       get_itemlist ()
       
       get_item_ident ($item)
       
       get_item ($item_ident)
       
       get_taxonomy ($item_ident)
       
       get_children ($item_ident)
       
       convert_item ($item_ident)
       
       convert_taxonomy ($item_ident)
       
       convert_child ($child)
       
       store ($item, $update=false)
       
       run ()
       
      + + + + + + + + + +

      +Public Attributes

       $credentials = null
       
       $itemlist = null
       
       $src_items = null
       
       $items = null
       
      +

      Member Function Documentation

      + +
      +
      + + + + + + + + +
      Redmatrix\Import\Import::convert_child ( $child)
      +
      + +

      Referenced by Redmatrix\Import\Import\run().

      + +
      +
      + +
      +
      + + + + + + + + +
      Redmatrix\Import\Import::convert_item ( $item_ident)
      +
      + +

      Referenced by Redmatrix\Import\Import\run().

      + +
      +
      + +
      +
      + + + + + + + + +
      Redmatrix\Import\Import::convert_taxonomy ( $item_ident)
      +
      + +

      Referenced by Redmatrix\Import\Import\run().

      + +
      +
      + +
      +
      + + + + + + + + +
      Redmatrix\Import\Import::get_children ( $item_ident)
      +
      + +

      Referenced by Redmatrix\Import\Import\run().

      + +
      +
      + +
      +
      + + + + + + + +
      Redmatrix\Import\Import::get_credentials ()
      +
      + +

      Referenced by Redmatrix\Import\Import\run().

      + +
      +
      + +
      +
      + + + + + + + + +
      Redmatrix\Import\Import::get_item ( $item_ident)
      +
      + +

      Referenced by Redmatrix\Import\Import\run().

      + +
      +
      + +
      +
      + + + + + + + + +
      Redmatrix\Import\Import::get_item_ident ( $item)
      +
      + +
      +
      + +
      +
      + + + + + + + +
      Redmatrix\Import\Import::get_itemlist ()
      +
      + +

      Referenced by Redmatrix\Import\Import\run().

      + +
      +
      + +
      +
      + + + + + + + + +
      Redmatrix\Import\Import::get_taxonomy ( $item_ident)
      +
      + +

      Referenced by Redmatrix\Import\Import\run().

      + +
      +
      + +
      +
      + + + + + + + +
      Redmatrix\Import\Import::run ()
      +
      + +
      +
      + +
      +
      + + + + + + + + + + + + + + + + + + +
      Redmatrix\Import\Import::store ( $item,
       $update = false 
      )
      +
      + +
      +
      +

      Member Data Documentation

      + +
      +
      + + + + +
      Redmatrix\Import\Import::$credentials = null
      +
      + +
      +
      + +
      +
      + + + + +
      Redmatrix\Import\Import::$itemlist = null
      +
      + +
      +
      + +
      +
      + + + + +
      Redmatrix\Import\Import::$items = null
      +
      + +
      +
      + +
      +
      + + + + +
      Redmatrix\Import\Import::$src_items = null
      +
      + +
      +
      +
      The documentation for this class was generated from the following file: +
      +
      + diff --git a/doc/html/classRedmatrix_1_1Import_1_1Import.js b/doc/html/classRedmatrix_1_1Import_1_1Import.js new file mode 100644 index 000000000..2a0e2eef0 --- /dev/null +++ b/doc/html/classRedmatrix_1_1Import_1_1Import.js @@ -0,0 +1,18 @@ +var classRedmatrix_1_1Import_1_1Import = +[ + [ "convert_child", "classRedmatrix_1_1Import_1_1Import.html#ad9c6677ea07c496d81914b97aeb5fba5", null ], + [ "convert_item", "classRedmatrix_1_1Import_1_1Import.html#add4d39232c883b59634595be14441336", null ], + [ "convert_taxonomy", "classRedmatrix_1_1Import_1_1Import.html#a5a54b41c30aed8ac9ca6e486fd0b4b97", null ], + [ "get_children", "classRedmatrix_1_1Import_1_1Import.html#a832a4cc0d33d0eea29cb450004054580", null ], + [ "get_credentials", "classRedmatrix_1_1Import_1_1Import.html#a76dd522e47a48d80e1678211230f2ff5", null ], + [ "get_item", "classRedmatrix_1_1Import_1_1Import.html#ae705dd1deb245b1d06baa73062330e43", null ], + [ "get_item_ident", "classRedmatrix_1_1Import_1_1Import.html#a4420d6acf6ba2f3723c655251b12abef", null ], + [ "get_itemlist", "classRedmatrix_1_1Import_1_1Import.html#a1af46c9f88257635f362d6027ea710c3", null ], + [ "get_taxonomy", "classRedmatrix_1_1Import_1_1Import.html#ab1e4a1d404b5a5a9c518c205d1428154", null ], + [ "run", "classRedmatrix_1_1Import_1_1Import.html#af432ecbc45b812a03d58dfb378a212f7", null ], + [ "store", "classRedmatrix_1_1Import_1_1Import.html#a70f9dd767d877530a7da7c6bd821e080", null ], + [ "$credentials", "classRedmatrix_1_1Import_1_1Import.html#afd251e6e5a18516bac4d1a40435602f1", null ], + [ "$itemlist", "classRedmatrix_1_1Import_1_1Import.html#a2f69f16ecb7de1fb1daffbc38e68c9f1", null ], + [ "$items", "classRedmatrix_1_1Import_1_1Import.html#a31d73d48e1aa93319159c692d0197a3a", null ], + [ "$src_items", "classRedmatrix_1_1Import_1_1Import.html#ac578e85e4c491bf9e09fbbfa33f9d6b7", null ] +]; \ No newline at end of file diff --git a/doc/html/dir_7edbbd0f8c514efef79942dcdc21f738.html b/doc/html/dir_7edbbd0f8c514efef79942dcdc21f738.html new file mode 100644 index 000000000..1042c0d0f --- /dev/null +++ b/doc/html/dir_7edbbd0f8c514efef79942dcdc21f738.html @@ -0,0 +1,112 @@ + + + + + + +The Red Matrix: include/Import Directory Reference + + + + + + + + + + + + + +
      +
      + + + + + + + +
      +
      The Red Matrix +
      +
      +
      + + + + +
      +
      + +
      +
      +
      + +
      + + + + +
      + +
      + +
      +
      +
      Import Directory Reference
      +
      +
      + + + + +

      +Files

      file  Importer.php
       
      +
      +
      + diff --git a/doc/html/dir_7edbbd0f8c514efef79942dcdc21f738.js b/doc/html/dir_7edbbd0f8c514efef79942dcdc21f738.js new file mode 100644 index 000000000..6e235895c --- /dev/null +++ b/doc/html/dir_7edbbd0f8c514efef79942dcdc21f738.js @@ -0,0 +1,6 @@ +var dir_7edbbd0f8c514efef79942dcdc21f738 = +[ + [ "Importer.php", "Importer_8php.html", [ + [ "Import", "classRedmatrix_1_1Import_1_1Import.html", "classRedmatrix_1_1Import_1_1Import" ] + ] ] +]; \ No newline at end of file diff --git a/doc/html/namespaceRedmatrix.html b/doc/html/namespaceRedmatrix.html new file mode 100644 index 000000000..2861c646a --- /dev/null +++ b/doc/html/namespaceRedmatrix.html @@ -0,0 +1,120 @@ + + + + + + +The Red Matrix: Redmatrix Namespace Reference + + + + + + + + + + + + + +
      +
      + + + + + + + +
      +
      The Red Matrix +
      +
      +
      + + + + + +
      +
      + +
      +
      +
      + +
      + + + + +
      + +
      + +
      +
      +Namespaces
      +
      +
      Redmatrix Namespace Reference
      +
      +
      + + + + +

      +Namespaces

      namespace  Import
       
      +
      +
      + diff --git a/doc/html/namespaceRedmatrix.js b/doc/html/namespaceRedmatrix.js new file mode 100644 index 000000000..161035822 --- /dev/null +++ b/doc/html/namespaceRedmatrix.js @@ -0,0 +1,4 @@ +var namespaceRedmatrix = +[ + [ "Import", "namespaceRedmatrix_1_1Import.html", "namespaceRedmatrix_1_1Import" ] +]; \ No newline at end of file diff --git a/doc/html/namespaceRedmatrix_1_1Import.html b/doc/html/namespaceRedmatrix_1_1Import.html new file mode 100644 index 000000000..b21ffdff2 --- /dev/null +++ b/doc/html/namespaceRedmatrix_1_1Import.html @@ -0,0 +1,120 @@ + + + + + + +The Red Matrix: Redmatrix\Import Namespace Reference + + + + + + + + + + + + + +
      +
      + + + + + + + +
      +
      The Red Matrix +
      +
      +
      + + + + + +
      +
      + +
      +
      +
      + +
      + + + + +
      + +
      + +
      +
      +Classes
      +
      +
      Redmatrix\Import Namespace Reference
      +
      +
      + + + + +

      +Classes

      class  Import
       
      +
      +
      + diff --git a/doc/html/namespaceRedmatrix_1_1Import.js b/doc/html/namespaceRedmatrix_1_1Import.js new file mode 100644 index 000000000..74692ac3b --- /dev/null +++ b/doc/html/namespaceRedmatrix_1_1Import.js @@ -0,0 +1,4 @@ +var namespaceRedmatrix_1_1Import = +[ + [ "Import", "classRedmatrix_1_1Import_1_1Import.html", "classRedmatrix_1_1Import_1_1Import" ] +]; \ No newline at end of file -- cgit v1.2.3 From a659ac8952306b5a78a468051d3c318f50294bcf Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 1 Nov 2014 00:36:21 -0700 Subject: disable request message response until we work through this --- include/notifier.php | 1 - include/zot.php | 3 +++ version.inc | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/include/notifier.php b/include/notifier.php index 57494885a..c193db116 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -192,7 +192,6 @@ function notifier_run($argv, $argc){ $recipients[] = $xchan; $packet_type = 'request'; $normal_mode = false; - } elseif($cmd === 'expire') { diff --git a/include/zot.php b/include/zot.php index c9a17562e..4c47d60b8 100644 --- a/include/zot.php +++ b/include/zot.php @@ -2812,6 +2812,9 @@ function import_author_zot($x) { function zot_process_message_request($data) { $ret = array('success' => false); + + return $ret; + if(! $data['message_id']) { $ret['message'] = 'no message_id'; logger('no message_id'); diff --git a/version.inc b/version.inc index 82ccb4199..bc1358c72 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2014-10-31.845 +2014-11-01.846 -- cgit v1.2.3 From 50c16c394fe2d966c62d30930600212a4e33303e Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 1 Nov 2014 01:52:27 -0700 Subject: check that we have valid data --- include/zot.php | 1 + mod/post.php | 26 ++++++++++++++++---------- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/include/zot.php b/include/zot.php index 4c47d60b8..24ace9cbb 100644 --- a/include/zot.php +++ b/include/zot.php @@ -2813,6 +2813,7 @@ function import_author_zot($x) { function zot_process_message_request($data) { $ret = array('success' => false); +// note: disabled until the loops stop. return $ret; if(! $data['message_id']) { diff --git a/mod/post.php b/mod/post.php index 8ffd3b5ad..c21af83e4 100644 --- a/mod/post.php +++ b/mod/post.php @@ -598,18 +598,24 @@ function post_post(&$a) { $ret['success'] = true; $ret['pickup'] = array(); foreach($r as $rr) { - $x = json_decode($rr['outq_msg'],true); + if($rr['outq_msg']) { + $x = json_decode($rr['outq_msg'],true); - if(array_key_exists('message_list',$x)) { - foreach($x['message_list'] as $xx) - $ret['pickup'][] = array('notify' => json_decode($rr['outq_notify'],true),'message' => $xx); - } - else - $ret['pickup'][] = array('notify' => json_decode($rr['outq_notify'],true),'message' => $x); + if(! $x) + continue; - $x = q("delete from outq where outq_hash = '%s' limit 1", - dbesc($rr['outq_hash']) - ); + if(array_key_exists('message_list',$x)) { + foreach($x['message_list'] as $xx) { + $ret['pickup'][] = array('notify' => json_decode($rr['outq_notify'],true),'message' => $xx); + } + } + else + $ret['pickup'][] = array('notify' => json_decode($rr['outq_notify'],true),'message' => $x); + + $x = q("delete from outq where outq_hash = '%s' limit 1", + dbesc($rr['outq_hash']) + ); + } } } -- cgit v1.2.3 From 30281b161c6e3089a89c5035498bb72a72e66e4a Mon Sep 17 00:00:00 2001 From: marijus Date: Sat, 1 Nov 2014 20:30:13 +0100 Subject: close the eventual open tool if the other opens --- view/tpl/photo_album.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/view/tpl/photo_album.tpl b/view/tpl/photo_album.tpl index 2c0b8e5b9..7b1566a15 100755 --- a/view/tpl/photo_album.tpl +++ b/view/tpl/photo_album.tpl @@ -1,11 +1,11 @@
      {{if $album_edit.1}} - + {{/if}} {{if $can_post}} - + {{/if}}

      {{$album}}

      -- cgit v1.2.3 From dc5e05d3349bc493e4c1f33fb2561bb80ddd0c7f Mon Sep 17 00:00:00 2001 From: marijus Date: Sat, 1 Nov 2014 23:55:36 +0100 Subject: even more photos work --- mod/photos.php | 20 ++++----- view/css/mod_photos.css | 62 ++------------------------ view/tpl/album_edit.tpl | 38 ++++++++-------- view/tpl/photo_album.tpl | 19 ++++---- view/tpl/photo_view.tpl | 109 ++++++++++++++++++++++----------------------- view/tpl/photos_upload.tpl | 15 +++---- 6 files changed, 103 insertions(+), 160 deletions(-) diff --git a/mod/photos.php b/mod/photos.php index d1f2b4993..48bc6d1e5 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -439,12 +439,8 @@ function photos_content(&$a) { // URLs: // photos/name - // photos/name/upload - // photos/name/upload/xxxxx (xxxxx is album name) - // photos/name/album/xxxxx - // photos/name/album/xxxxx/edit + // photos/name/album/xxxxx (xxxxx is album name) // photos/name/image/xxxxx - // photos/name/image/xxxxx/edit if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) { @@ -518,10 +514,6 @@ function photos_content(&$a) { $_is_owner = (local_user() && (local_user() == $owner_uid)); $o .= profile_tabs($a,$_is_owner, $a->data['channel']['channel_address']); - // - // dispatch request - // - /** * Display upload form */ @@ -590,6 +582,10 @@ function photos_content(&$a) { } + // + // dispatch request + // + /* * Display a single photo album */ @@ -644,7 +640,8 @@ function photos_content(&$a) { $albums = ((array_key_exists('albums', $a->data)) ? $a->data['albums'] : photos_albums_list($a->data['channel'],$a->data['observer'])); $edit_tpl = get_markup_template('album_edit.tpl'); $album_edit = replace_macros($edit_tpl,array( - '$nametext' => t('New album name: '), + '$nametext' => t('Enter a new album name'), + '$name_placeholder' => t('or select an existing one (doubleclick)'), '$nickname' => $a->data['channel']['channel_address'], '$album' => $album_e, '$albums' => $albums['albums'], @@ -928,7 +925,8 @@ function photos_content(&$a) { 'rotateccw' => t('Rotate CCW (left)'), 'albums' => $albums['albums'], 'album' => $album_e, - 'newalbum' => t('New album name'), + 'newalbum_label' => t('Enter a new album name'), + 'newalbum_placeholder' => t('or select an existing one (doubleclick)'), 'nickname' => $a->data['channel']['channel_address'], 'resource_id' => $ph[0]['resource_id'], 'capt_label' => t('Caption'), diff --git a/view/css/mod_photos.css b/view/css/mod_photos.css index 061f2f40a..c37cc3332 100644 --- a/view/css/mod_photos.css +++ b/view/css/mod_photos.css @@ -13,70 +13,16 @@ margin: 0 auto; } -#photo-photo-end { - clear: both; -} - -#photo-album-end { - clear: both; - margin-bottom: 25px; -} - -#photos-upload-album { - width: 100%; -} - -#photos-upload-new-end, #photos-upload-exist-end { - clear: both; -} -#photos-upload-exist-end { - margin-bottom: 15px; -} - -#photos-upload-select-files-text { - margin-top: 15px; - margin-bottom: 15px; -} - -#photo-edit-caption-label, #photo-edit-tags-label, #photo-edit-albumname-label, #photo-edit-rotate-label { - float: left; - width: 150px; -} - -#photo-edit-perms-end { - margin-bottom: 15px; -} - -#photo-edit-caption, #photo-edit-newtag, #photo-edit-albumname, #photo-edit-rotate { - float: left; - margin-bottom: 25px; -} -#photo-edit-link-wrap { - margin-bottom: 15px; -} - -#photo-edit-caption-end, #photo-edit-tags-end, #photo-edit-albumname-end, #photo-edit-rotate-end, #photos-upload-perms-end, #photos-upload-noshare-end{ - clear: both; - margin-bottom: 10px; -} - -#photo-edit-rotate-end { - margin-bottom: 15px; -} - - -#photo-edit-edit, +#photo-edit, #photo-album-edit-wrapper, #photo-upload-form { display: none; } -#photo-album-edit-submit, #photo-album-edit-drop { - margin-top: 15px; - margin-bottom: 15px; -} - #photos-usage-message { line-height: 22px; } +#photos-upload-choose { + padding: 2px 12px; +} diff --git a/view/tpl/album_edit.tpl b/view/tpl/album_edit.tpl index a6815352a..f5495f149 100755 --- a/view/tpl/album_edit.tpl +++ b/view/tpl/album_edit.tpl @@ -1,22 +1,22 @@
      - - - - - - - {{foreach $albums as $al}} - {{if $al.text}} - - -
      + +
      + + + + {{foreach $albums as $al}} + {{if $al.text}} + +
      +
      + + +
      + +
      +
      - - - -
      -
      diff --git a/view/tpl/photo_album.tpl b/view/tpl/photo_album.tpl index 7b1566a15..7175a62da 100755 --- a/view/tpl/photo_album.tpl +++ b/view/tpl/photo_album.tpl @@ -1,13 +1,16 @@
      -
      - {{if $album_edit.1}} - - {{/if}} - - {{if $can_post}} - - {{/if}} +
      + +
      + {{if $album_edit.1}} + + {{/if}} + {{if $can_post}} + + {{/if}} +
      +

      {{$album}}

      diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl index d1b077f36..37aab3c96 100755 --- a/view/tpl/photo_view.tpl +++ b/view/tpl/photo_view.tpl @@ -2,28 +2,28 @@
      +
      -
      - {{if $prevlink}} - - {{/if}} - {{if $nextlink}} - - {{/if}} -
      -
      {{if $tools}} - + {{/if}} - {{if $edit}} - - {{/if}} - - {{if $lock}} - - {{/if}} -   +
      + {{if $edit}} + + {{/if}} + {{if $lock}} + + {{/if}} +
      +
      + {{if $prevlink}} + + {{/if}} + {{if $nextlink}} + + {{/if}} +

      {{if $desc}}{{$desc}}{{elseif $filename}}{{$filename}}{{else}}{{$unknown}}{{/if}}

      @@ -31,55 +31,54 @@
      -
      +
      - - - {{if $edit.albums}} - - {{foreach $edit.albums as $al}} - {{if $al.text}} -
    -- cgit v1.2.3 From ca1df08d92fc05e7301f112faee7a6bbac653aeb Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 3 Nov 2014 16:57:30 -0800 Subject: posted-date-selector - spacing was slightly off in dropdown entries --- view/css/widgets.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/view/css/widgets.css b/view/css/widgets.css index df113b12e..d481a09d1 100644 --- a/view/css/widgets.css +++ b/view/css/widgets.css @@ -74,6 +74,10 @@ margin-top: 2px; } +#posted-date-selector-drop li:not(:first-child) { + margin-top: 2px; +} + /* categories */ -- cgit v1.2.3 From a80e696b772d75a6b2bc5c1846f84ba538ee6289 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 3 Nov 2014 17:35:42 -0800 Subject: wall posted comment to a top-level wall post which arrived via a route (e.g. was posted to a forum) had no route, hence downstream recipients report route mismatch --- mod/item.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mod/item.php b/mod/item.php index 3dea8809c..e7d886b00 100644 --- a/mod/item.php +++ b/mod/item.php @@ -112,6 +112,7 @@ function item_post(&$a) { $parent = ((x($_REQUEST,'parent')) ? intval($_REQUEST['parent']) : 0); $parent_mid = ((x($_REQUEST,'parent_mid')) ? trim($_REQUEST['parent_mid']) : ''); + $route = ''; $parent_item = null; $parent_contact = null; $thr_parent = ''; @@ -163,6 +164,7 @@ function item_post(&$a) { $thr_parent = $parent_mid; + $route = $parent_item['route']; } @@ -753,6 +755,7 @@ function item_post(&$a) { $datarray['comment_policy'] = map_scope($channel['channel_w_comment']); $datarray['term'] = $post_tags; $datarray['plink'] = $plink; + $datarray['route'] = $route; // preview mode - prepare the body for display and send it via json -- cgit v1.2.3 From ba73b60177df1f24564436bea0bb2d7b50d68b7a Mon Sep 17 00:00:00 2001 From: marijus Date: Tue, 4 Nov 2014 09:29:11 +0100 Subject: missing --- view/tpl/photos_upload.tpl | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/view/tpl/photos_upload.tpl b/view/tpl/photos_upload.tpl index 13fb41687..ae06b808a 100755 --- a/view/tpl/photos_upload.tpl +++ b/view/tpl/photos_upload.tpl @@ -42,8 +42,9 @@ -
    - {{$uploader}} +
    + {{$uploader}} +
    {{/if}} -- cgit v1.2.3 From 73e645fe3da80164d1970d31803727cfcf73f46b Mon Sep 17 00:00:00 2001 From: marijus Date: Tue, 4 Nov 2014 09:35:39 +0100 Subject: class > id mixup --- view/tpl/photos_upload.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/tpl/photos_upload.tpl b/view/tpl/photos_upload.tpl index ae06b808a..611068b6d 100755 --- a/view/tpl/photos_upload.tpl +++ b/view/tpl/photos_upload.tpl @@ -49,5 +49,5 @@ {{/if}} -
    +
    -- cgit v1.2.3 From 8163230e779f0b2150d008d3144440b46566ac76 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 4 Nov 2014 11:34:09 -0800 Subject: it appears bootbox was lost in a bootstrap upgrade --- library/bootstrap/js/bootbox.js | 894 ++++++++++++++++++++++++++++++++++++ library/bootstrap/js/bootbox.min.js | 6 + version.inc | 2 +- 3 files changed, 901 insertions(+), 1 deletion(-) create mode 100644 library/bootstrap/js/bootbox.js create mode 100644 library/bootstrap/js/bootbox.min.js diff --git a/library/bootstrap/js/bootbox.js b/library/bootstrap/js/bootbox.js new file mode 100644 index 000000000..a002e4a35 --- /dev/null +++ b/library/bootstrap/js/bootbox.js @@ -0,0 +1,894 @@ +/** + * bootbox.js [v4.3.0] + * + * http://bootboxjs.com/license.txt + */ + +// @see https://github.com/makeusabrew/bootbox/issues/180 +// @see https://github.com/makeusabrew/bootbox/issues/186 +(function (root, factory) { + + "use strict"; + if (typeof define === "function" && define.amd) { + // AMD. Register as an anonymous module. + define(["jquery"], factory); + } else if (typeof exports === "object") { + // Node. Does not work with strict CommonJS, but + // only CommonJS-like environments that support module.exports, + // like Node. + module.exports = factory(require("jquery")); + } else { + // Browser globals (root is window) + root.bootbox = factory(root.jQuery); + } + +}(this, function init($, undefined) { + + "use strict"; + + // the base DOM structure needed to create a modal + var templates = { + dialog: + "", + header: + "
    " + + "

    " + + "
    ", + footer: + "
    ", + closeButton: + "", + form: + "
    ", + inputs: { + text: + "", + textarea: + "", + email: + "", + select: + "", + checkbox: + "
    ", + date: + "", + time: + "", + number: + "", + password: + "" + } + }; + + var defaults = { + // default language + locale: "en", + // show backdrop or not + backdrop: true, + // animate the modal in/out + animate: true, + // additional class string applied to the top level dialog + className: null, + // whether or not to include a close button + closeButton: true, + // show the dialog immediately by default + show: true, + // dialog container + container: "body" + }; + + // our public object; augmented after our private API + var exports = {}; + + /** + * @private + */ + function _t(key) { + var locale = locales[defaults.locale]; + return locale ? locale[key] : locales.en[key]; + } + + function processCallback(e, dialog, callback) { + e.stopPropagation(); + e.preventDefault(); + + // by default we assume a callback will get rid of the dialog, + // although it is given the opportunity to override this + + // so, if the callback can be invoked and it *explicitly returns false* + // then we'll set a flag to keep the dialog active... + var preserveDialog = $.isFunction(callback) && callback(e) === false; + + // ... otherwise we'll bin it + if (!preserveDialog) { + dialog.modal("hide"); + } + } + + function getKeyLength(obj) { + // @TODO defer to Object.keys(x).length if available? + var k, t = 0; + for (k in obj) { + t ++; + } + return t; + } + + function each(collection, iterator) { + var index = 0; + $.each(collection, function(key, value) { + iterator(key, value, index++); + }); + } + + function sanitize(options) { + var buttons; + var total; + + if (typeof options !== "object") { + throw new Error("Please supply an object of options"); + } + + if (!options.message) { + throw new Error("Please specify a message"); + } + + // make sure any supplied options take precedence over defaults + options = $.extend({}, defaults, options); + + if (!options.buttons) { + options.buttons = {}; + } + + // we only support Bootstrap's "static" and false backdrop args + // supporting true would mean you could dismiss the dialog without + // explicitly interacting with it + options.backdrop = options.backdrop ? "static" : false; + + buttons = options.buttons; + + total = getKeyLength(buttons); + + each(buttons, function(key, button, index) { + + if ($.isFunction(button)) { + // short form, assume value is our callback. Since button + // isn't an object it isn't a reference either so re-assign it + button = buttons[key] = { + callback: button + }; + } + + // before any further checks make sure by now button is the correct type + if ($.type(button) !== "object") { + throw new Error("button with key " + key + " must be an object"); + } + + if (!button.label) { + // the lack of an explicit label means we'll assume the key is good enough + button.label = key; + } + + if (!button.className) { + if (total <= 2 && index === total-1) { + // always add a primary to the main option in a two-button dialog + button.className = "btn-primary"; + } else { + button.className = "btn-default"; + } + } + }); + + return options; + } + + /** + * map a flexible set of arguments into a single returned object + * if args.length is already one just return it, otherwise + * use the properties argument to map the unnamed args to + * object properties + * so in the latter case: + * mapArguments(["foo", $.noop], ["message", "callback"]) + * -> { message: "foo", callback: $.noop } + */ + function mapArguments(args, properties) { + var argn = args.length; + var options = {}; + + if (argn < 1 || argn > 2) { + throw new Error("Invalid argument length"); + } + + if (argn === 2 || typeof args[0] === "string") { + options[properties[0]] = args[0]; + options[properties[1]] = args[1]; + } else { + options = args[0]; + } + + return options; + } + + /** + * merge a set of default dialog options with user supplied arguments + */ + function mergeArguments(defaults, args, properties) { + return $.extend( + // deep merge + true, + // ensure the target is an empty, unreferenced object + {}, + // the base options object for this type of dialog (often just buttons) + defaults, + // args could be an object or array; if it's an array properties will + // map it to a proper options object + mapArguments( + args, + properties + ) + ); + } + + /** + * this entry-level method makes heavy use of composition to take a simple + * range of inputs and return valid options suitable for passing to bootbox.dialog + */ + function mergeDialogOptions(className, labels, properties, args) { + // build up a base set of dialog properties + var baseOptions = { + className: "bootbox-" + className, + buttons: createLabels.apply(null, labels) + }; + + // ensure the buttons properties generated, *after* merging + // with user args are still valid against the supplied labels + return validateButtons( + // merge the generated base properties with user supplied arguments + mergeArguments( + baseOptions, + args, + // if args.length > 1, properties specify how each arg maps to an object key + properties + ), + labels + ); + } + + /** + * from a given list of arguments return a suitable object of button labels + * all this does is normalise the given labels and translate them where possible + * e.g. "ok", "confirm" -> { ok: "OK, cancel: "Annuleren" } + */ + function createLabels() { + var buttons = {}; + + for (var i = 0, j = arguments.length; i < j; i++) { + var argument = arguments[i]; + var key = argument.toLowerCase(); + var value = argument.toUpperCase(); + + buttons[key] = { + label: _t(value) + }; + } + + return buttons; + } + + function validateButtons(options, buttons) { + var allowedButtons = {}; + each(buttons, function(key, value) { + allowedButtons[value] = true; + }); + + each(options.buttons, function(key) { + if (allowedButtons[key] === undefined) { + throw new Error("button key " + key + " is not allowed (options are " + buttons.join("\n") + ")"); + } + }); + + return options; + } + + exports.alert = function() { + var options; + + options = mergeDialogOptions("alert", ["ok"], ["message", "callback"], arguments); + + if (options.callback && !$.isFunction(options.callback)) { + throw new Error("alert requires callback property to be a function when provided"); + } + + /** + * overrides + */ + options.buttons.ok.callback = options.onEscape = function() { + if ($.isFunction(options.callback)) { + return options.callback(); + } + return true; + }; + + return exports.dialog(options); + }; + + exports.confirm = function() { + var options; + + options = mergeDialogOptions("confirm", ["cancel", "confirm"], ["message", "callback"], arguments); + + /** + * overrides; undo anything the user tried to set they shouldn't have + */ + options.buttons.cancel.callback = options.onEscape = function() { + return options.callback(false); + }; + + options.buttons.confirm.callback = function() { + return options.callback(true); + }; + + // confirm specific validation + if (!$.isFunction(options.callback)) { + throw new Error("confirm requires a callback"); + } + + return exports.dialog(options); + }; + + exports.prompt = function() { + var options; + var defaults; + var dialog; + var form; + var input; + var shouldShow; + var inputOptions; + + // we have to create our form first otherwise + // its value is undefined when gearing up our options + // @TODO this could be solved by allowing message to + // be a function instead... + form = $(templates.form); + + // prompt defaults are more complex than others in that + // users can override more defaults + // @TODO I don't like that prompt has to do a lot of heavy + // lifting which mergeDialogOptions can *almost* support already + // just because of 'value' and 'inputType' - can we refactor? + defaults = { + className: "bootbox-prompt", + buttons: createLabels("cancel", "confirm"), + value: "", + inputType: "text" + }; + + options = validateButtons( + mergeArguments(defaults, arguments, ["title", "callback"]), + ["cancel", "confirm"] + ); + + // capture the user's show value; we always set this to false before + // spawning the dialog to give us a chance to attach some handlers to + // it, but we need to make sure we respect a preference not to show it + shouldShow = (options.show === undefined) ? true : options.show; + + /** + * overrides; undo anything the user tried to set they shouldn't have + */ + options.message = form; + + options.buttons.cancel.callback = options.onEscape = function() { + return options.callback(null); + }; + + options.buttons.confirm.callback = function() { + var value; + + switch (options.inputType) { + case "text": + case "textarea": + case "email": + case "select": + case "date": + case "time": + case "number": + case "password": + value = input.val(); + break; + + case "checkbox": + var checkedItems = input.find("input:checked"); + + // we assume that checkboxes are always multiple, + // hence we default to an empty array + value = []; + + each(checkedItems, function(_, item) { + value.push($(item).val()); + }); + break; + } + + return options.callback(value); + }; + + options.show = false; + + // prompt specific validation + if (!options.title) { + throw new Error("prompt requires a title"); + } + + if (!$.isFunction(options.callback)) { + throw new Error("prompt requires a callback"); + } + + if (!templates.inputs[options.inputType]) { + throw new Error("invalid prompt type"); + } + + // create the input based on the supplied type + input = $(templates.inputs[options.inputType]); + + switch (options.inputType) { + case "text": + case "textarea": + case "email": + case "date": + case "time": + case "number": + case "password": + input.val(options.value); + break; + + case "select": + var groups = {}; + inputOptions = options.inputOptions || []; + + if (!inputOptions.length) { + throw new Error("prompt with select requires options"); + } + + each(inputOptions, function(_, option) { + + // assume the element to attach to is the input... + var elem = input; + + if (option.value === undefined || option.text === undefined) { + throw new Error("given options in wrong format"); + } + + + // ... but override that element if this option sits in a group + + if (option.group) { + // initialise group if necessary + if (!groups[option.group]) { + groups[option.group] = $("").attr("label", option.group); + } + + elem = groups[option.group]; + } + + elem.append(""); + }); + + each(groups, function(_, group) { + input.append(group); + }); + + // safe to set a select's value as per a normal input + input.val(options.value); + break; + + case "checkbox": + var values = $.isArray(options.value) ? options.value : [options.value]; + inputOptions = options.inputOptions || []; + + if (!inputOptions.length) { + throw new Error("prompt with checkbox requires options"); + } + + if (!inputOptions[0].value || !inputOptions[0].text) { + throw new Error("given options in wrong format"); + } + + // checkboxes have to nest within a containing element, so + // they break the rules a bit and we end up re-assigning + // our 'input' element to this container instead + input = $("
    "); + + each(inputOptions, function(_, option) { + var checkbox = $(templates.inputs[options.inputType]); + + checkbox.find("input").attr("value", option.value); + checkbox.find("label").append(option.text); + + // we've ensured values is an array so we can always iterate over it + each(values, function(_, value) { + if (value === option.value) { + checkbox.find("input").prop("checked", true); + } + }); + + input.append(checkbox); + }); + break; + } + + if (options.placeholder) { + input.attr("placeholder", options.placeholder); + } + + if(options.pattern){ + input.attr("pattern", options.pattern); + } + + // now place it in our form + form.append(input); + + form.on("submit", function(e) { + e.preventDefault(); + // Fix for SammyJS (or similar JS routing library) hijacking the form post. + e.stopPropagation(); + // @TODO can we actually click *the* button object instead? + // e.g. buttons.confirm.click() or similar + dialog.find(".btn-primary").click(); + }); + + dialog = exports.dialog(options); + + // clear the existing handler focusing the submit button... + dialog.off("shown.bs.modal"); + + // ...and replace it with one focusing our input, if possible + dialog.on("shown.bs.modal", function() { + input.focus(); + }); + + if (shouldShow === true) { + dialog.modal("show"); + } + + return dialog; + }; + + exports.dialog = function(options) { + options = sanitize(options); + + var dialog = $(templates.dialog); + var innerDialog = dialog.find(".modal-dialog"); + var body = dialog.find(".modal-body"); + var buttons = options.buttons; + var buttonStr = ""; + var callbacks = { + onEscape: options.onEscape + }; + + each(buttons, function(key, button) { + + // @TODO I don't like this string appending to itself; bit dirty. Needs reworking + // can we just build up button elements instead? slower but neater. Then button + // can just become a template too + buttonStr += ""; + callbacks[key] = button.callback; + }); + + body.find(".bootbox-body").html(options.message); + + if (options.animate === true) { + dialog.addClass("fade"); + } + + if (options.className) { + dialog.addClass(options.className); + } + + if (options.size === "large") { + innerDialog.addClass("modal-lg"); + } + + if (options.size === "small") { + innerDialog.addClass("modal-sm"); + } + + if (options.title) { + body.before(templates.header); + } + + if (options.closeButton) { + var closeButton = $(templates.closeButton); + + if (options.title) { + dialog.find(".modal-header").prepend(closeButton); + } else { + closeButton.css("margin-top", "-10px").prependTo(body); + } + } + + if (options.title) { + dialog.find(".modal-title").html(options.title); + } + + if (buttonStr.length) { + body.after(templates.footer); + dialog.find(".modal-footer").html(buttonStr); + } + + + /** + * Bootstrap event listeners; used handle extra + * setup & teardown required after the underlying + * modal has performed certain actions + */ + + dialog.on("hidden.bs.modal", function(e) { + // ensure we don't accidentally intercept hidden events triggered + // by children of the current dialog. We shouldn't anymore now BS + // namespaces its events; but still worth doing + if (e.target === this) { + dialog.remove(); + } + }); + + /* + dialog.on("show.bs.modal", function() { + // sadly this doesn't work; show is called *just* before + // the backdrop is added so we'd need a setTimeout hack or + // otherwise... leaving in as would be nice + if (options.backdrop) { + dialog.next(".modal-backdrop").addClass("bootbox-backdrop"); + } + }); + */ + + dialog.on("shown.bs.modal", function() { + dialog.find(".btn-primary:first").focus(); + }); + + /** + * Bootbox event listeners; experimental and may not last + * just an attempt to decouple some behaviours from their + * respective triggers + */ + + dialog.on("escape.close.bb", function(e) { + if (callbacks.onEscape) { + processCallback(e, dialog, callbacks.onEscape); + } + }); + + /** + * Standard jQuery event listeners; used to handle user + * interaction with our dialog + */ + + dialog.on("click", ".modal-footer button", function(e) { + var callbackKey = $(this).data("bb-handler"); + + processCallback(e, dialog, callbacks[callbackKey]); + + }); + + dialog.on("click", ".bootbox-close-button", function(e) { + // onEscape might be falsy but that's fine; the fact is + // if the user has managed to click the close button we + // have to close the dialog, callback or not + processCallback(e, dialog, callbacks.onEscape); + }); + + dialog.on("keyup", function(e) { + if (e.which === 27) { + dialog.trigger("escape.close.bb"); + } + }); + + // the remainder of this method simply deals with adding our + // dialogent to the DOM, augmenting it with Bootstrap's modal + // functionality and then giving the resulting object back + // to our caller + + $(options.container).append(dialog); + + dialog.modal({ + backdrop: options.backdrop, + keyboard: false, + show: false + }); + + if (options.show) { + dialog.modal("show"); + } + + // @TODO should we return the raw element here or should + // we wrap it in an object on which we can expose some neater + // methods, e.g. var d = bootbox.alert(); d.hide(); instead + // of d.modal("hide"); + + /* + function BBDialog(elem) { + this.elem = elem; + } + + BBDialog.prototype = { + hide: function() { + return this.elem.modal("hide"); + }, + show: function() { + return this.elem.modal("show"); + } + }; + */ + + return dialog; + + }; + + exports.setDefaults = function() { + var values = {}; + + if (arguments.length === 2) { + // allow passing of single key/value... + values[arguments[0]] = arguments[1]; + } else { + // ... and as an object too + values = arguments[0]; + } + + $.extend(defaults, values); + }; + + exports.hideAll = function() { + $(".bootbox").modal("hide"); + + return exports; + }; + + + /** + * standard locales. Please add more according to ISO 639-1 standard. Multiple language variants are + * unlikely to be required. If this gets too large it can be split out into separate JS files. + */ + var locales = { + br : { + OK : "OK", + CANCEL : "Cancelar", + CONFIRM : "Sim" + }, + cs : { + OK : "OK", + CANCEL : "Zrušit", + CONFIRM : "Potvrdit" + }, + da : { + OK : "OK", + CANCEL : "Annuller", + CONFIRM : "Accepter" + }, + de : { + OK : "OK", + CANCEL : "Abbrechen", + CONFIRM : "Akzeptieren" + }, + el : { + OK : "Εντάξει", + CANCEL : "Ακύρωση", + CONFIRM : "Επιβεβαίωση" + }, + en : { + OK : "OK", + CANCEL : "Cancel", + CONFIRM : "OK" + }, + es : { + OK : "OK", + CANCEL : "Cancelar", + CONFIRM : "Aceptar" + }, + et : { + OK : "OK", + CANCEL : "Katkesta", + CONFIRM : "OK" + }, + fi : { + OK : "OK", + CANCEL : "Peruuta", + CONFIRM : "OK" + }, + fr : { + OK : "OK", + CANCEL : "Annuler", + CONFIRM : "D'accord" + }, + he : { + OK : "אישור", + CANCEL : "ביטול", + CONFIRM : "אישור" + }, + id : { + OK : "OK", + CANCEL : "Batal", + CONFIRM : "OK" + }, + it : { + OK : "OK", + CANCEL : "Annulla", + CONFIRM : "Conferma" + }, + ja : { + OK : "OK", + CANCEL : "キャンセル", + CONFIRM : "確認" + }, + lt : { + OK : "Gerai", + CANCEL : "Atšaukti", + CONFIRM : "Patvirtinti" + }, + lv : { + OK : "Labi", + CANCEL : "Atcelt", + CONFIRM : "Apstiprināt" + }, + nl : { + OK : "OK", + CANCEL : "Annuleren", + CONFIRM : "Accepteren" + }, + no : { + OK : "OK", + CANCEL : "Avbryt", + CONFIRM : "OK" + }, + pl : { + OK : "OK", + CANCEL : "Anuluj", + CONFIRM : "Potwierdź" + }, + pt : { + OK : "OK", + CANCEL : "Cancelar", + CONFIRM : "Confirmar" + }, + ru : { + OK : "OK", + CANCEL : "Отмена", + CONFIRM : "Применить" + }, + sv : { + OK : "OK", + CANCEL : "Avbryt", + CONFIRM : "OK" + }, + tr : { + OK : "Tamam", + CANCEL : "İptal", + CONFIRM : "Onayla" + }, + zh_CN : { + OK : "OK", + CANCEL : "取消", + CONFIRM : "确认" + }, + zh_TW : { + OK : "OK", + CANCEL : "取消", + CONFIRM : "確認" + } + }; + + exports.init = function(_$) { + return init(_$ || $); + }; + + return exports; +})); diff --git a/library/bootstrap/js/bootbox.min.js b/library/bootstrap/js/bootbox.min.js new file mode 100644 index 000000000..a7ea24fe7 --- /dev/null +++ b/library/bootstrap/js/bootbox.min.js @@ -0,0 +1,6 @@ +/** + * bootbox.js v4.3.0 + * + * http://bootboxjs.com/license.txt + */ +!function(a,b){"use strict";"function"==typeof define&&define.amd?define(["jquery"],b):"object"==typeof exports?module.exports=b(require("jquery")):a.bootbox=b(a.jQuery)}(this,function a(b,c){"use strict";function d(a){var b=q[o.locale];return b?b[a]:q.en[a]}function e(a,c,d){a.stopPropagation(),a.preventDefault();var e=b.isFunction(d)&&d(a)===!1;e||c.modal("hide")}function f(a){var b,c=0;for(b in a)c++;return c}function g(a,c){var d=0;b.each(a,function(a,b){c(a,b,d++)})}function h(a){var c,d;if("object"!=typeof a)throw new Error("Please supply an object of options");if(!a.message)throw new Error("Please specify a message");return a=b.extend({},o,a),a.buttons||(a.buttons={}),a.backdrop=a.backdrop?"static":!1,c=a.buttons,d=f(c),g(c,function(a,e,f){if(b.isFunction(e)&&(e=c[a]={callback:e}),"object"!==b.type(e))throw new Error("button with key "+a+" must be an object");e.label||(e.label=a),e.className||(e.className=2>=d&&f===d-1?"btn-primary":"btn-default")}),a}function i(a,b){var c=a.length,d={};if(1>c||c>2)throw new Error("Invalid argument length");return 2===c||"string"==typeof a[0]?(d[b[0]]=a[0],d[b[1]]=a[1]):d=a[0],d}function j(a,c,d){return b.extend(!0,{},a,i(c,d))}function k(a,b,c,d){var e={className:"bootbox-"+a,buttons:l.apply(null,b)};return m(j(e,d,c),b)}function l(){for(var a={},b=0,c=arguments.length;c>b;b++){var e=arguments[b],f=e.toLowerCase(),g=e.toUpperCase();a[f]={label:d(g)}}return a}function m(a,b){var d={};return g(b,function(a,b){d[b]=!0}),g(a.buttons,function(a){if(d[a]===c)throw new Error("button key "+a+" is not allowed (options are "+b.join("\n")+")")}),a}var n={dialog:"",header:"

    ",footer:"
    ",closeButton:"",form:"
    ",inputs:{text:"",textarea:"",email:"",select:"",checkbox:"
    ",date:"",time:"",number:"",password:""}},o={locale:"en",backdrop:!0,animate:!0,className:null,closeButton:!0,show:!0,container:"body"},p={};p.alert=function(){var a;if(a=k("alert",["ok"],["message","callback"],arguments),a.callback&&!b.isFunction(a.callback))throw new Error("alert requires callback property to be a function when provided");return a.buttons.ok.callback=a.onEscape=function(){return b.isFunction(a.callback)?a.callback():!0},p.dialog(a)},p.confirm=function(){var a;if(a=k("confirm",["cancel","confirm"],["message","callback"],arguments),a.buttons.cancel.callback=a.onEscape=function(){return a.callback(!1)},a.buttons.confirm.callback=function(){return a.callback(!0)},!b.isFunction(a.callback))throw new Error("confirm requires a callback");return p.dialog(a)},p.prompt=function(){var a,d,e,f,h,i,k;if(f=b(n.form),d={className:"bootbox-prompt",buttons:l("cancel","confirm"),value:"",inputType:"text"},a=m(j(d,arguments,["title","callback"]),["cancel","confirm"]),i=a.show===c?!0:a.show,a.message=f,a.buttons.cancel.callback=a.onEscape=function(){return a.callback(null)},a.buttons.confirm.callback=function(){var c;switch(a.inputType){case"text":case"textarea":case"email":case"select":case"date":case"time":case"number":case"password":c=h.val();break;case"checkbox":var d=h.find("input:checked");c=[],g(d,function(a,d){c.push(b(d).val())})}return a.callback(c)},a.show=!1,!a.title)throw new Error("prompt requires a title");if(!b.isFunction(a.callback))throw new Error("prompt requires a callback");if(!n.inputs[a.inputType])throw new Error("invalid prompt type");switch(h=b(n.inputs[a.inputType]),a.inputType){case"text":case"textarea":case"email":case"date":case"time":case"number":case"password":h.val(a.value);break;case"select":var o={};if(k=a.inputOptions||[],!k.length)throw new Error("prompt with select requires options");g(k,function(a,d){var e=h;if(d.value===c||d.text===c)throw new Error("given options in wrong format");d.group&&(o[d.group]||(o[d.group]=b("").attr("label",d.group)),e=o[d.group]),e.append("")}),g(o,function(a,b){h.append(b)}),h.val(a.value);break;case"checkbox":var q=b.isArray(a.value)?a.value:[a.value];if(k=a.inputOptions||[],!k.length)throw new Error("prompt with checkbox requires options");if(!k[0].value||!k[0].text)throw new Error("given options in wrong format");h=b("
    "),g(k,function(c,d){var e=b(n.inputs[a.inputType]);e.find("input").attr("value",d.value),e.find("label").append(d.text),g(q,function(a,b){b===d.value&&e.find("input").prop("checked",!0)}),h.append(e)})}return a.placeholder&&h.attr("placeholder",a.placeholder),a.pattern&&h.attr("pattern",a.pattern),f.append(h),f.on("submit",function(a){a.preventDefault(),a.stopPropagation(),e.find(".btn-primary").click()}),e=p.dialog(a),e.off("shown.bs.modal"),e.on("shown.bs.modal",function(){h.focus()}),i===!0&&e.modal("show"),e},p.dialog=function(a){a=h(a);var c=b(n.dialog),d=c.find(".modal-dialog"),f=c.find(".modal-body"),i=a.buttons,j="",k={onEscape:a.onEscape};if(g(i,function(a,b){j+="",k[a]=b.callback}),f.find(".bootbox-body").html(a.message),a.animate===!0&&c.addClass("fade"),a.className&&c.addClass(a.className),"large"===a.size&&d.addClass("modal-lg"),"small"===a.size&&d.addClass("modal-sm"),a.title&&f.before(n.header),a.closeButton){var l=b(n.closeButton);a.title?c.find(".modal-header").prepend(l):l.css("margin-top","-10px").prependTo(f)}return a.title&&c.find(".modal-title").html(a.title),j.length&&(f.after(n.footer),c.find(".modal-footer").html(j)),c.on("hidden.bs.modal",function(a){a.target===this&&c.remove()}),c.on("shown.bs.modal",function(){c.find(".btn-primary:first").focus()}),c.on("escape.close.bb",function(a){k.onEscape&&e(a,c,k.onEscape)}),c.on("click",".modal-footer button",function(a){var d=b(this).data("bb-handler");e(a,c,k[d])}),c.on("click",".bootbox-close-button",function(a){e(a,c,k.onEscape)}),c.on("keyup",function(a){27===a.which&&c.trigger("escape.close.bb")}),b(a.container).append(c),c.modal({backdrop:a.backdrop,keyboard:!1,show:!1}),a.show&&c.modal("show"),c},p.setDefaults=function(){var a={};2===arguments.length?a[arguments[0]]=arguments[1]:a=arguments[0],b.extend(o,a)},p.hideAll=function(){return b(".bootbox").modal("hide"),p};var q={br:{OK:"OK",CANCEL:"Cancelar",CONFIRM:"Sim"},cs:{OK:"OK",CANCEL:"Zrušit",CONFIRM:"Potvrdit"},da:{OK:"OK",CANCEL:"Annuller",CONFIRM:"Accepter"},de:{OK:"OK",CANCEL:"Abbrechen",CONFIRM:"Akzeptieren"},el:{OK:"Εντάξει",CANCEL:"Ακύρωση",CONFIRM:"Επιβεβαίωση"},en:{OK:"OK",CANCEL:"Cancel",CONFIRM:"OK"},es:{OK:"OK",CANCEL:"Cancelar",CONFIRM:"Aceptar"},et:{OK:"OK",CANCEL:"Katkesta",CONFIRM:"OK"},fi:{OK:"OK",CANCEL:"Peruuta",CONFIRM:"OK"},fr:{OK:"OK",CANCEL:"Annuler",CONFIRM:"D'accord"},he:{OK:"אישור",CANCEL:"ביטול",CONFIRM:"אישור"},id:{OK:"OK",CANCEL:"Batal",CONFIRM:"OK"},it:{OK:"OK",CANCEL:"Annulla",CONFIRM:"Conferma"},ja:{OK:"OK",CANCEL:"キャンセル",CONFIRM:"確認"},lt:{OK:"Gerai",CANCEL:"Atšaukti",CONFIRM:"Patvirtinti"},lv:{OK:"Labi",CANCEL:"Atcelt",CONFIRM:"Apstiprināt"},nl:{OK:"OK",CANCEL:"Annuleren",CONFIRM:"Accepteren"},no:{OK:"OK",CANCEL:"Avbryt",CONFIRM:"OK"},pl:{OK:"OK",CANCEL:"Anuluj",CONFIRM:"Potwierdź"},pt:{OK:"OK",CANCEL:"Cancelar",CONFIRM:"Confirmar"},ru:{OK:"OK",CANCEL:"Отмена",CONFIRM:"Применить"},sv:{OK:"OK",CANCEL:"Avbryt",CONFIRM:"OK"},tr:{OK:"Tamam",CANCEL:"İptal",CONFIRM:"Onayla"},zh_CN:{OK:"OK",CANCEL:"取消",CONFIRM:"确认"},zh_TW:{OK:"OK",CANCEL:"取消",CONFIRM:"確認"}};return p.init=function(c){return a(c||b)},p}); \ No newline at end of file diff --git a/version.inc b/version.inc index 5e9a104d4..50fb9a9a8 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2014-11-03.848 +2014-11-04.849 -- cgit v1.2.3 From 474e7fff0059352b82734dc81716b646873705d8 Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Tue, 4 Nov 2014 19:40:00 +0000 Subject: Remove legacy custom/ --- index.php | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/index.php b/index.php index ae8a2e17d..7a61fd3b8 100755 --- a/index.php +++ b/index.php @@ -198,21 +198,10 @@ if(strlen($a->module)) { if(! $a->module_loaded) { - /* - * Traditionally we looked in custom first, but we're leaning toward a convention where site - * specific things are all in directories called 'site'. So custom will be going away. - * There are a very small number of folks affected. You know who you are. Once you've got things sorted, - * please remove the lines for "custom/" and push to the project repository. - */ - if(file_exists("mod/site/{$a->module}.php")) { include_once("mod/site/{$a->module}.php"); $a->module_loaded = true; } - elseif(file_exists("custom/{$a->module}.php")) { - include_once("custom/{$a->module}.php"); - $a->module_loaded = true; - } elseif(file_exists("mod/{$a->module}.php")) { include_once("mod/{$a->module}.php"); $a->module_loaded = true; -- cgit v1.2.3 From ba7f1bb8eee5f5374246a512b6c510f874f417ce Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 4 Nov 2014 15:24:24 -0800 Subject: configurable visual alerts/notifications --- boot.php | 16 ++++ mod/ping.php | 184 ++++++++++++++++++++++++++++------------------ mod/settings.php | 54 +++++++++++++- view/css/mod_settings.css | 2 +- view/tpl/settings.tpl | 23 ++++++ 5 files changed, 206 insertions(+), 73 deletions(-) diff --git a/boot.php b/boot.php index 1d940961b..af772b3d7 100755 --- a/boot.php +++ b/boot.php @@ -377,6 +377,22 @@ define ( 'NOTIFY_POKE', 0x0200 ); define ( 'NOTIFY_SYSTEM', 0x8000 ); +/** + * visual notification options + */ + +define ( 'VNOTIFY_NETWORK', 0x0001 ); +define ( 'VNOTIFY_CHANNEL', 0x0002 ); +define ( 'VNOTIFY_MAIL', 0x0004 ); +define ( 'VNOTIFY_EVENT', 0x0008 ); +define ( 'VNOTIFY_EVENTTODAY', 0x0010 ); +define ( 'VNOTIFY_BIRTHDAY', 0x0020 ); +define ( 'VNOTIFY_SYSTEM', 0x0040 ); +define ( 'VNOTIFY_INFO', 0x0080 ); +define ( 'VNOTIFY_ALERT', 0x0100 ); +define ( 'VNOTIFY_INTRO', 0x0200 ); +define ( 'VNOTIFY_REGISTER', 0x0400 ); + // We need a flag to designate that a site is a // global directory mirror, but probably doesn't diff --git a/mod/ping.php b/mod/ping.php index 49475de66..98584cb14 100644 --- a/mod/ping.php +++ b/mod/ping.php @@ -41,6 +41,19 @@ function ping_init(&$a) { header("content-type: application/json"); + $vnotify = false; + + if(local_user()) { + $vnotify = get_pconfig(local_user(),'system','vnotify'); + $evdays = intval(get_pconfig(local_user(),'system','evdays')); + } + + // if unset show all visual notification types + if($vnotify === false) + $vnotify = (-1); + if($evdays < 1) + $evdays = 3; + /** * If you have several windows open to this site and switch to a different channel * in one of them, the others may get into a confused state showing you a page or options @@ -71,6 +84,11 @@ function ping_init(&$a) { } unset($_SESSION['sysmsg_info']); } + if(! ($vnotify & VNOTIFY_INFO)) + $result['info'] = array(); + if(! ($vnotify & VNOTIFY_ALERT)) + $result['notice'] = array(); + if($a->install) { echo json_encode($result); @@ -303,7 +321,7 @@ function ping_init(&$a) { WHERE `event`.`uid` = %d AND start < '%s' AND start > '%s' and `ignore` = 0 ORDER BY `start` DESC ", intval(local_user()), - dbesc(datetime_convert('UTC', date_default_timezone_get(), 'now + 7 days')), + dbesc(datetime_convert('UTC', date_default_timezone_get(), 'now + ' . intval($evdays) . ' days')), dbesc(datetime_convert('UTC', date_default_timezone_get(), 'now - 1 days')) ); @@ -341,101 +359,125 @@ function ping_init(&$a) { * Normal ping - just the counts, no detail */ - $t = q("select count(*) as total from notify where uid = %d and seen = 0", - intval(local_user()) - ); - if($t) - $result['notify'] = intval($t[0]['total']); + if($vnotify & VNOTIFY_SYSTEM) { + $t = q("select count(*) as total from notify where uid = %d and seen = 0", + intval(local_user()) + ); + if($t) + $result['notify'] = intval($t[0]['total']); + } $t1 = dba_timer(); - $r = q("SELECT id, item_restrict, item_flags FROM item - WHERE (item_restrict = %d) and ( item_flags & %d ) and uid = %d", - intval(ITEM_VISIBLE), - intval(ITEM_UNSEEN), - intval(local_user()) - ); + if($vnotify & (VNOTIFY_NETWORK|VNOTIFY_CHANNEL)) { + $r = q("SELECT id, item_restrict, item_flags FROM item + WHERE (item_restrict = %d) and ( item_flags & %d ) and uid = %d", + intval(ITEM_VISIBLE), + intval(ITEM_UNSEEN), + intval(local_user()) + ); - if(count($r)) { - $arr = array('items' => $r); - call_hooks('network_ping', $arr); + if($r) { + $arr = array('items' => $r); + call_hooks('network_ping', $arr); - foreach ($r as $it) { - if($it['item_flags'] & ITEM_WALL) - $result['home'] ++; - else - $result['network'] ++; + foreach ($r as $it) { + if($it['item_flags'] & ITEM_WALL) + $result['home'] ++; + else + $result['network'] ++; + } } } + if(! ($vnotify & VNOTIFY_NETWORK)) + $result['network'] = 0; + if(! ($vnotify & VNOTIFY_CHANNEL)) + $result['home'] = 0; + $t2 = dba_timer(); - $intr = q("SELECT COUNT(abook.abook_id) AS total FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash where abook_channel = %d and (abook_flags & %d) and not ((abook_flags & %d) or (xchan_flags & %d))", - intval(local_user()), - intval(ABOOK_FLAG_PENDING), - intval(ABOOK_FLAG_SELF|ABOOK_FLAG_IGNORED), - intval(XCHAN_FLAGS_DELETED|XCHAN_FLAGS_ORPHAN) - ); + if($vnotify & VNOTIFY_INTRO) { + $intr = q("SELECT COUNT(abook.abook_id) AS total FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash where abook_channel = %d and (abook_flags & %d) and not ((abook_flags & %d) or (xchan_flags & %d))", + intval(local_user()), + intval(ABOOK_FLAG_PENDING), + intval(ABOOK_FLAG_SELF|ABOOK_FLAG_IGNORED), + intval(XCHAN_FLAGS_DELETED|XCHAN_FLAGS_ORPHAN) + ); - $t3 = dba_timer(); + $t3 = dba_timer(); - if($intr) - $result['intros'] = intval($intr[0]['total']); + if($intr) + $result['intros'] = intval($intr[0]['total']); + } $t4 = dba_timer(); $channel = get_app()->get_channel(); - $mails = q("SELECT count(id) as total from mail - WHERE channel_id = %d AND not (mail_flags & %d) and from_xchan != '%s' ", - intval(local_user()), - intval(MAIL_SEEN), - dbesc($channel['channel_hash']) - ); - if($mails) - $result['mail'] = intval($mails[0]['total']); - - if ($a->config['system']['register_policy'] == REGISTER_APPROVE && is_site_admin()) { - $regs = q("SELECT count(account_id) as total from account where (account_flags & %d)", - intval(ACCOUNT_PENDING) + if($vnotify & VNOTIFY_MAIL) { + $mails = q("SELECT count(id) as total from mail + WHERE channel_id = %d AND not (mail_flags & %d) and from_xchan != '%s' ", + intval(local_user()), + intval(MAIL_SEEN), + dbesc($channel['channel_hash']) ); - if($regs) - $result['register'] = intval($regs[0]['total']); + if($mails) + $result['mail'] = intval($mails[0]['total']); + } + + if($vnotify & VNOTIFY_REGISTER) { + if ($a->config['system']['register_policy'] == REGISTER_APPROVE && is_site_admin()) { + $regs = q("SELECT count(account_id) as total from account where (account_flags & %d)", + intval(ACCOUNT_PENDING) + ); + if($regs) + $result['register'] = intval($regs[0]['total']); + } } $t5 = dba_timer(); - $events = q("SELECT type, start, adjust FROM `event` - WHERE `event`.`uid` = %d AND start < '%s' AND start > '%s' and `ignore` = 0 - ORDER BY `start` ASC ", - intval(local_user()), - dbesc(datetime_convert('UTC', date_default_timezone_get(), 'now + 7 days')), - dbesc(datetime_convert('UTC', date_default_timezone_get(), 'now - 1 days')) - ); - - if($events) { - $result['all_events'] = count($events); - - if($result['all_events']) { - $str_now = datetime_convert('UTC', date_default_timezone_get(), 'now', 'Y-m-d'); - foreach($events as $x) { - $bd = false; - if($x['type'] === 'birthday') { - $result['birthdays'] ++; - $bd = true; - } - else { - $result['events'] ++; - } - if(datetime_convert('UTC', ((intval($x['adjust'])) ? date_default_timezone_get() : 'UTC'), $x['start'], 'Y-m-d') === $str_now) { - $result['all_events_today'] ++; - if($bd) - $result['birthdays_today'] ++; - else - $result['events_today'] ++; + if($vnotify & (VNOTIFY_EVENT|VNOTIFY_EVENTTODAY|VNOTIFY_BIRTHDAY)) { + $events = q("SELECT type, start, adjust FROM `event` + WHERE `event`.`uid` = %d AND start < '%s' AND start > '%s' and `ignore` = 0 + ORDER BY `start` ASC ", + intval(local_user()), + dbesc(datetime_convert('UTC', date_default_timezone_get(), 'now + ' . intval($evdays) . ' days')), + dbesc(datetime_convert('UTC', date_default_timezone_get(), 'now - 1 days')) + ); + + if($events) { + $result['all_events'] = count($events); + + if($result['all_events']) { + $str_now = datetime_convert('UTC', date_default_timezone_get(), 'now', 'Y-m-d'); + foreach($events as $x) { + $bd = false; + if($x['type'] === 'birthday') { + $result['birthdays'] ++; + $bd = true; + } + else { + $result['events'] ++; + } + if(datetime_convert('UTC', ((intval($x['adjust'])) ? date_default_timezone_get() : 'UTC'), $x['start'], 'Y-m-d') === $str_now) { + $result['all_events_today'] ++; + if($bd) + $result['birthdays_today'] ++; + else + $result['events_today'] ++; + } } } } } + if(! ($vnotify & VNOTIFY_EVENT)) + $result['all_events'] = $result['events'] = 0; + if(! ($vnotify & VNOTIFY_EVENTTODAY)) + $result['all_events_today'] = $result['events_today'] = 0; + if(! ($vnotify & VNOTIFY_BIRTHDAY)) + $result['birthdays'] = 0; + $x = json_encode($result); diff --git a/mod/settings.php b/mod/settings.php index 58257368e..b303bdacf 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -358,6 +358,8 @@ function settings_post(&$a) { $openid = ((x($_POST,'openid_url')) ? notags(trim($_POST['openid_url'])) : ''); $maxreq = ((x($_POST,'maxreq')) ? intval($_POST['maxreq']) : 0); $expire = ((x($_POST,'expire')) ? intval($_POST['expire']) : 0); + $evdays = ((x($_POST,'evdays')) ? intval($_POST['evdays']) : 3); + $channel_menu = ((x($_POST['channel_menu'])) ? htmlspecialchars_decode(trim($_POST['channel_menu']),ENT_QUOTES) : ''); $expire_items = ((x($_POST,'expire_items')) ? intval($_POST['expire_items']) : 0); @@ -404,6 +406,32 @@ function settings_post(&$a) { if(x($_POST,'notify8')) $notify += intval($_POST['notify8']); + + $vnotify = 0; + + if(x($_POST,'vnotify1')) + $vnotify += intval($_POST['vnotify1']); + if(x($_POST,'vnotify2')) + $vnotify += intval($_POST['vnotify2']); + if(x($_POST,'vnotify3')) + $vnotify += intval($_POST['vnotify3']); + if(x($_POST,'vnotify4')) + $vnotify += intval($_POST['vnotify4']); + if(x($_POST,'vnotify5')) + $vnotify += intval($_POST['vnotify5']); + if(x($_POST,'vnotify6')) + $vnotify += intval($_POST['vnotify6']); + if(x($_POST,'vnotify7')) + $vnotify += intval($_POST['vnotify7']); + if(x($_POST,'vnotify8')) + $vnotify += intval($_POST['vnotify8']); + if(x($_POST,'vnotify9')) + $vnotify += intval($_POST['vnotify9']); + if(x($_POST,'vnotify10')) + $vnotify += intval($_POST['vnotify10']); + if(x($_POST,'vnotify11')) + $vnotify += intval($_POST['vnotify11']); + $channel = $a->get_channel(); $err = ''; @@ -432,6 +460,8 @@ function settings_post(&$a) { set_pconfig(local_user(),'system','post_profilechange', $post_profilechange); set_pconfig(local_user(),'system','blocktags',$blocktags); set_pconfig(local_user(),'system','channel_menu',$channel_menu); + set_pconfig(local_user(),'system','vnotify',$vnotify); + set_pconfig(local_user(),'system','evdays',$evdays); $r = q("update channel set channel_name = '%s', channel_pageflags = %d, channel_timezone = '%s', channel_location = '%s', channel_notifyflags = %d, channel_max_anon_mail = %d, channel_max_friend_req = %d, channel_expire_days = %d $set_perms where channel_id = %d limit 1", dbesc($username), @@ -929,9 +959,15 @@ function settings_content(&$a) { } } + $evdays = get_pconfig(local_user(),'system','evdays'); + if(! $evdays) + $evdays = 3; $permissions_role = get_pconfig(local_user(),'system','permissions_role'); $permissions_set = (($permissions_role && $permissions_role != 'custom') ? true : false); + $vnotify = get_pconfig(local_user(),'system','vnotify'); + if($vnotify === false) + $vnotify = (-1); $o .= replace_macros($stpl,array( '$ptitle' => t('Channel Settings'), @@ -1001,7 +1037,23 @@ function settings_content(&$a) { '$notify7' => array('notify7', t('You are tagged in a post'), ($notify & NOTIFY_TAGSELF), NOTIFY_TAGSELF, ''), '$notify8' => array('notify8', t('You are poked/prodded/etc. in a post'), ($notify & NOTIFY_POKE), NOTIFY_POKE, ''), - + + '$lbl_vnot' => t('Show visual notifications including:'), + + '$vnotify1' => array('vnotify1', t('Unseen matrix activity'), ($vnotify & VNOTIFY_NETWORK), VNOTIFY_NETWORK, ''), + '$vnotify2' => array('vnotify2', t('Unseen channel activity'), ($vnotify & VNOTIFY_CHANNEL), VNOTIFY_CHANNEL, ''), + '$vnotify3' => array('vnotify3', t('Unseen private messages'), ($vnotify & VNOTIFY_MAIL), VNOTIFY_MAIL, t('Recommended')), + '$vnotify4' => array('vnotify4', t('Upcoming events'), ($vnotify & VNOTIFY_EVENT), VNOTIFY_EVENT, ''), + '$vnotify5' => array('vnotify5', t('Events today'), ($vnotify & VNOTIFY_EVENTTODAY), VNOTIFY_EVENTTODAY, ''), + '$vnotify6' => array('vnotify6', t('Upcoming birthdays'), ($vnotify & VNOTIFY_BIRTHDAY), VNOTIFY_BIRTHDAY, t('Not available in all themes')), + '$vnotify7' => array('vnotify7', t('Personal conversation updates'), ($vnotify & VNOTIFY_SYSTEM), VNOTIFY_SYSTEM, ''), + '$vnotify8' => array('vnotify8', t('System info messages'), ($vnotify & VNOTIFY_INFO), VNOTIFY_INFO, t('Recommended')), + '$vnotify9' => array('vnotify9', t('System critical alerts'), ($vnotify & VNOTIFY_ALERT), VNOTIFY_ALERT, t('Recommended')), + '$vnotify10' => array('vnotify10', t('New connections'), ($vnotify & VNOTIFY_INTRO), VNOTIFY_INTRO, t('Recommended')), + '$vnotify11' => array('vnotify11', t('System Registrations'), ($vnotify & VNOTIFY_REGISTER), VNOTIFY_REGISTER, ''), + + '$evdays' => array('evdays', t('Notify me of events this many days in advance'), $evdays, t('Must be greater than 0')), + '$h_advn' => t('Advanced Account/Page Type Settings'), '$h_descadvn' => t('Change the behaviour of this account for special situations'), '$pagetype' => $pagetype, diff --git a/view/css/mod_settings.css b/view/css/mod_settings.css index d0c970989..b03023e21 100644 --- a/view/css/mod_settings.css +++ b/view/css/mod_settings.css @@ -45,7 +45,7 @@ ul#settings-privacy-macros { margin-left: 20px; width: 330px; } -#settings-notify-desc, #settings-activity-desc { +#settings-notify-desc, #settings-activity-desc, #settings-vnotify-desc { font-weight: bold; margin-bottom: 15px; } diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl index 4c1b8eb8f..7fa52677b 100755 --- a/view/tpl/settings.tpl +++ b/view/tpl/settings.tpl @@ -100,6 +100,27 @@ {{include file="field_intcheckbox.tpl" field=$notify8}}
    +
    {{$lbl_vnot}}
    + +
    +{{include file="field_intcheckbox.tpl" field=$vnotify1}} +{{include file="field_intcheckbox.tpl" field=$vnotify2}} +{{include file="field_intcheckbox.tpl" field=$vnotify3}} +{{include file="field_intcheckbox.tpl" field=$vnotify4}} +{{include file="field_intcheckbox.tpl" field=$vnotify5}} +{{include file="field_intcheckbox.tpl" field=$vnotify6}} +{{include file="field_intcheckbox.tpl" field=$vnotify10}} +{{include file="field_intcheckbox.tpl" field=$vnotify7}} +{{include file="field_intcheckbox.tpl" field=$vnotify8}} +{{include file="field_intcheckbox.tpl" field=$vnotify9}} + +{{*include file="field_intcheckbox.tpl" field=$vnotify11*}} +
    + +{{include file="field_input.tpl" field=$evdays}} + + +
    @@ -110,6 +131,8 @@ {{if $menus}}

    {{$lbl_misc}}

    + +
    {{$menu_desc}}
    -- cgit v1.2.3 From 74b3e0a7eb03619de6ba7b602196a7534e242f56 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 4 Nov 2014 18:29:17 -0800 Subject: changed notification description --- mod/settings.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/settings.php b/mod/settings.php index b303bdacf..253e801a8 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -1046,7 +1046,7 @@ function settings_content(&$a) { '$vnotify4' => array('vnotify4', t('Upcoming events'), ($vnotify & VNOTIFY_EVENT), VNOTIFY_EVENT, ''), '$vnotify5' => array('vnotify5', t('Events today'), ($vnotify & VNOTIFY_EVENTTODAY), VNOTIFY_EVENTTODAY, ''), '$vnotify6' => array('vnotify6', t('Upcoming birthdays'), ($vnotify & VNOTIFY_BIRTHDAY), VNOTIFY_BIRTHDAY, t('Not available in all themes')), - '$vnotify7' => array('vnotify7', t('Personal conversation updates'), ($vnotify & VNOTIFY_SYSTEM), VNOTIFY_SYSTEM, ''), + '$vnotify7' => array('vnotify7', t('System (personal) notifications'), ($vnotify & VNOTIFY_SYSTEM), VNOTIFY_SYSTEM, ''), '$vnotify8' => array('vnotify8', t('System info messages'), ($vnotify & VNOTIFY_INFO), VNOTIFY_INFO, t('Recommended')), '$vnotify9' => array('vnotify9', t('System critical alerts'), ($vnotify & VNOTIFY_ALERT), VNOTIFY_ALERT, t('Recommended')), '$vnotify10' => array('vnotify10', t('New connections'), ($vnotify & VNOTIFY_INTRO), VNOTIFY_INTRO, t('Recommended')), -- cgit v1.2.3 From b16ee29cc338236264e62cf40248f54a1f785dbd Mon Sep 17 00:00:00 2001 From: marijus Date: Wed, 5 Nov 2014 10:32:30 +0100 Subject: release the navbar in landscape mode on small devices --- view/theme/redbasic/css/style.css | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index b9726590a..156e16687 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -2390,6 +2390,13 @@ aside .nav-pills > li > a { } +/* release the navbar in landscape view on small devices */ +@media screen and (max-height: 320px) { + .navbar-fixed-top { + position: absolute; + } +} + .shareable_element_text { height: 300px; width: 300px; -- cgit v1.2.3 From 1a445a17d8cc7c2877fe331c659abbefbc4164ad Mon Sep 17 00:00:00 2001 From: Stefan Parviainen Date: Wed, 5 Nov 2014 17:19:46 +0100 Subject: Fix duplicate element id --- view/tpl/jot.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index be896adb5..12da18ef1 100755 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -42,7 +42,7 @@
    - +
    + {{include file="field_checkbox.tpl" field=$edit.adult}} +
    {{$edit.aclselect}}
    -- cgit v1.2.3 From c4a07010f76a0cc7f4b3ed3d7e08912bce14dcb6 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 6 Nov 2014 18:05:02 -0800 Subject: visible flag reversed --- include/photos.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/photos.php b/include/photos.php index adb7c988a..23c1ea826 100644 --- a/include/photos.php +++ b/include/photos.php @@ -431,7 +431,7 @@ function photos_create_item($channel, $creator_hash, $photo, $visible = false) { // Create item container $item_flags = ITEM_WALL|ITEM_ORIGIN|ITEM_THREAD_TOP; - $item_restrict = (($visible) ? ITEM_HIDDEN : ITEM_VISIBLE); + $item_restrict = (($visible) ? ITEM_VISIBLE : ITEM_HIDDEN); $title = ''; $mid = item_message_id(); -- cgit v1.2.3 From 13fd91d6f5723774a1b96257f8096acb2873b4ed Mon Sep 17 00:00:00 2001 From: "Olivier van Helden (hal)" Date: Fri, 7 Nov 2014 05:14:01 +0100 Subject: fix nbsp tag typoes in french translation --- view/fr/messages.po | 6 +++--- view/fr/strings.php | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/view/fr/messages.po b/view/fr/messages.po index 79a60534f..d818c67ec 100644 --- a/view/fr/messages.po +++ b/view/fr/messages.po @@ -1859,7 +1859,7 @@ msgstr "Merci d'entrer l'URL d'une video :" #: ../../include/conversation.php:1077 msgid "Please enter an audio link/URL:" -msgstr "Merci d'entrer l'URL d'un contenu audio&nsbp;:" +msgstr "Merci d'entrer l'URL d'un contenu audio :" #: ../../include/conversation.php:1078 msgid "Tag term:" @@ -2672,7 +2672,7 @@ msgstr "Ville natale :" #: ../../include/identity.php:1042 msgid "Tags:" -msgstr "Étiquettes:" +msgstr "Étiquettes :" #: ../../include/identity.php:1044 ../../mod/profiles.php:616 msgid "Political Views:" @@ -2720,7 +2720,7 @@ msgstr "Télévision :" #: ../../include/identity.php:1067 msgid "Film/dance/culture/entertainment:" -msgstr "Cinéma/danse/culture/divertissement&nsbp;:" +msgstr "Cinéma/danse/culture/divertissement :" #: ../../include/identity.php:1069 msgid "Love/Romance:" diff --git a/view/fr/strings.php b/view/fr/strings.php index 750a9f38f..24efb1744 100644 --- a/view/fr/strings.php +++ b/view/fr/strings.php @@ -437,7 +437,7 @@ $a->strings["%s don't like this."] = "%s déteste ça."; $a->strings["Visible to everybody"] = "Visible par tout le monde"; $a->strings["Please enter a link URL:"] = "Merci d'entrer l'URL d'un lien :"; $a->strings["Please enter a video link/URL:"] = "Merci d'entrer l'URL d'une video :"; -$a->strings["Please enter an audio link/URL:"] = "Merci d'entrer l'URL d'un contenu audio&nsbp;:"; +$a->strings["Please enter an audio link/URL:"] = "Merci d'entrer l'URL d'un contenu audio :"; $a->strings["Tag term:"] = "Étiquette :"; $a->strings["Save to Folder:"] = "Classer dans le dossier :"; $a->strings["Where are you right now?"] = "Où êtes-vous présentement?"; @@ -625,7 +625,7 @@ $a->strings["Age:"] = "Age :"; $a->strings["for %1\$d %2\$s"] = "depuis %1\$d %2\$s"; $a->strings["Sexual Preference:"] = "Orientation sexuelle :"; $a->strings["Hometown:"] = "Ville natale :"; -$a->strings["Tags:"] = "Étiquettes:"; +$a->strings["Tags:"] = "Étiquettes :"; $a->strings["Political Views:"] = "Opinions politiques :"; $a->strings["Religion:"] = "Religion :"; $a->strings["About:"] = "À propos :"; @@ -637,7 +637,7 @@ $a->strings["My other channels:"] = "Mes autres canaux :"; $a->strings["Musical interests:"] = "Goûts musicaux :"; $a->strings["Books, literature:"] = "Lectures, goûts littéraires :"; $a->strings["Television:"] = "Télévision :"; -$a->strings["Film/dance/culture/entertainment:"] = "Cinéma/danse/culture/divertissement&nsbp;:"; +$a->strings["Film/dance/culture/entertainment:"] = "Cinéma/danse/culture/divertissement :"; $a->strings["Love/Romance:"] = "Vie sentimentale/amoureuse :"; $a->strings["Work/employment:"] = "Travail :"; $a->strings["School/education:"] = "Cursus :"; -- cgit v1.2.3 From f077badcb61777810aed21717092a1793bd79b1d Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 6 Nov 2014 23:50:54 -0800 Subject: include self in load_contact_links so you don't get a connect menu entry for yourself --- boot.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/boot.php b/boot.php index 76c09d956..f8c91dfbb 100755 --- a/boot.php +++ b/boot.php @@ -1804,9 +1804,8 @@ function load_contact_links($uid) { // logger('load_contact_links'); - $r = q("SELECT abook_id, abook_flags, abook_my_perms, abook_their_perms, xchan_hash, xchan_photo_m, xchan_name, xchan_url from abook left join xchan on abook_xchan = xchan_hash where abook_channel = %d and not (abook_flags & %d) ", - intval($uid), - intval(ABOOK_FLAG_SELF) + $r = q("SELECT abook_id, abook_flags, abook_my_perms, abook_their_perms, xchan_hash, xchan_photo_m, xchan_name, xchan_url from abook left join xchan on abook_xchan = xchan_hash where abook_channel = %d ", + intval($uid) ); if($r) { foreach($r as $rr){ -- cgit v1.2.3 From 2cfe0f15452c2231314991cdbbab3a9e6926a68b Mon Sep 17 00:00:00 2001 From: marijus Date: Fri, 7 Nov 2014 12:13:38 +0100 Subject: provide lockstate for photo edit --- mod/photos.php | 11 ++++++----- view/tpl/photo_view.tpl | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/mod/photos.php b/mod/photos.php index 0a3d6c704..93e00a4b3 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -840,11 +840,11 @@ function photos_content(&$a) { ); } - // lock - $lock = ( ( (strlen($ph[0]['allow_cid']) || strlen($ph[0]['allow_gid']) + // lockstate + $lockstate = ( ( (strlen($ph[0]['allow_cid']) || strlen($ph[0]['allow_gid']) || strlen($ph[0]['deny_cid']) || strlen($ph[0]['deny_gid'])) ) - ? t('Private Photo') - : Null); + ? array('lock', t('Private Photo')) + : array('unlock', Null)); $a->page['htmlhead'] .= ' + + + + + + + + + + + +
    +
    + + + + + + + +
    +
    The Red Matrix +
    +
    +
    + + + + + + + +
    +
    + +
    +
    +
    + +
    + + + + +
    + +
    + +
    +  + +

    - v -

    +
    +
    + diff --git a/doc/html/globals_vars_0x77.html b/doc/html/globals_vars_0x77.html index c9cdeb78a..042ef4a64 100644 --- a/doc/html/globals_vars_0x77.html +++ b/doc/html/globals_vars_0x77.html @@ -101,6 +101,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
  • s
  • t
  • u
    • +
  • v
  • w
  • x
  • z
    • diff --git a/doc/html/globals_vars_0x78.html b/doc/html/globals_vars_0x78.html index 4278aa8f4..c229b615f 100644 --- a/doc/html/globals_vars_0x78.html +++ b/doc/html/globals_vars_0x78.html @@ -101,6 +101,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
  • s
  • t
  • u
    • +
  • v
  • w
  • x
  • z
    • diff --git a/doc/html/globals_vars_0x7a.html b/doc/html/globals_vars_0x7a.html index 1d8482c2c..2f0197c73 100644 --- a/doc/html/globals_vars_0x7a.html +++ b/doc/html/globals_vars_0x7a.html @@ -101,6 +101,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
  • s
  • t
  • u
    • +
  • v
  • w
  • x
  • z
    • diff --git a/doc/html/html2bbcode_8php.html b/doc/html/html2bbcode_8php.html index b04e5d27a..e1496199b 100644 --- a/doc/html/html2bbcode_8php.html +++ b/doc/html/html2bbcode_8php.html @@ -164,7 +164,7 @@ Functions
    -

    Referenced by api_statuses_mediap(), api_statuses_update(), diaspora2bb(), get_atom_elements(), and rpost_content().

    +

    Referenced by api_statuses_mediap(), api_statuses_update(), diaspora2bb(), get_atom_elements(), refimport_content(), reflect_comment_store(), and rpost_content().

    diff --git a/doc/html/hubloc_8php.html b/doc/html/hubloc_8php.html index cd60f6b6a..66ef98c09 100644 --- a/doc/html/hubloc_8php.html +++ b/doc/html/hubloc_8php.html @@ -228,7 +228,7 @@ Functions
    -

    Referenced by api_red_xchan().

    +

    Referenced by api_red_xchan(), and reflect_comment_store().

    diff --git a/doc/html/identity_8php.html b/doc/html/identity_8php.html index 735aa5b38..fed3e46d6 100644 --- a/doc/html/identity_8php.html +++ b/doc/html/identity_8php.html @@ -176,6 +176,8 @@ Functions    notifications_on ($channel_id, $value)   + get_channel_default_perms ($uid) + 

    Function Documentation

    @@ -290,6 +292,24 @@ Functions

    Referenced by editblock_content(), importelm_post(), wall_attach_post(), and wall_upload_post().

    + + + +
    +
    + + + + + + + + +
    get_channel_default_perms ( $uid)
    +
    + +

    Referenced by connedit_content(), and new_contact().

    +
    @@ -314,7 +334,7 @@ Functions
    Returns
    string
    -

    Referenced by app_render(), app_store(), app_update(), avatar_img(), import_profile_photo(), openid_content(), parse_app_description(), photo_init(), and xchan_store().

    +

    Referenced by app_render(), app_store(), app_update(), avatar_img(), import_profile_photo(), openid_content(), parse_app_description(), photo_init(), reflect_comment_store(), and xchan_store().

    diff --git a/doc/html/identity_8php.js b/doc/html/identity_8php.js index ead11cd4c..92b4f2c38 100644 --- a/doc/html/identity_8php.js +++ b/doc/html/identity_8php.js @@ -6,6 +6,7 @@ var identity_8php = [ "create_sys_channel", "identity_8php.html#a1cf83ac2b645de12868edaa3a5718f05", null ], [ "get_birthdays", "identity_8php.html#ad2c97627a313d53df1a1c7b4215ddb51", null ], [ "get_channel_by_nick", "identity_8php.html#ac73b3e13778c564c877554517a7f51ba", null ], + [ "get_channel_default_perms", "identity_8php.html#a293f416ce9050220b183e08ff5890216", null ], [ "get_default_profile_photo", "identity_8php.html#ab1485a26b032956e1496fc08c58b83ed", null ], [ "get_events", "identity_8php.html#ae381db3d43f8e7c1da8b15d14ecf5312", null ], [ "get_my_address", "identity_8php.html#a490972c02fdb638c52ec0e012a30bfd2", null ], diff --git a/doc/html/include_2config_8php.html b/doc/html/include_2config_8php.html index 0a4937645..6c68d2138 100644 --- a/doc/html/include_2config_8php.html +++ b/doc/html/include_2config_8php.html @@ -340,7 +340,7 @@ Functions
    Returns
    mixed Return value or false on error or if not set
    -

    Referenced by account_service_class_fetch(), 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(), bb2diaspora_itembody(), bbcode(), build_sync_packet(), channel_content(), check_account_admin(), check_account_invite(), check_config(), check_upstream_directory(), cli_startup(), create_account(), create_identity(), create_sys_channel(), RedMatrix\RedDAV\RedDirectory\createFile(), detect_language(), diaspora_comment(), diaspora_conversation(), diaspora_dispatch(), diaspora_dispatch_public(), diaspora_is_blacklisted(), diaspora_like(), diaspora_message(), diaspora_process_outbound(), diaspora_send_followup(), diaspora_send_mail(), diaspora_send_relay(), 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(), filter_insecure(), 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(), get_role_perms(), RedMatrix\RedDAV\RedDirectory\getChild(), RedMatrix\RedDAV\RedDirectory\getChildren(), group_content(), guess_image_type(), home_content(), home_init(), identity_basic_export(), 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_contact(), new_keypair(), notification(), notifier_run(), oembed_bbcode2html(), openid_content(), parse_url_content(), perm_is_allowed(), photo_factory(), 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(), RedMatrix\RedDAV\RedFile\put(), receive_post(), register_content(), register_post(), reload_plugins(), remove_all_xchan_resources(), remove_obsolete_hublocs(), scale_external_images(), search_content(), send_message(), send_reg_approval_email(), send_verification_email(), service_class_allows(), service_class_fetch(), service_limits_content(), set_config(), settings_post(), site_default_perms(), siteinfo_content(), siteinfo_init(), smilies(), start_delivery_chain(), store_diaspora_comment_sig(), 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(), widget_fullprofile(), widget_profile(), z_fetch_url(), z_post_url(), zfinger_init(), zot_fetch(), zot_gethub(), zot_import(), and zotfeed_init().

    +

    Referenced by account_service_class_fetch(), 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(), bb2diaspora_itembody(), bbcode(), build_sync_packet(), channel_content(), check_account_admin(), check_account_invite(), check_config(), check_upstream_directory(), cli_startup(), create_account(), create_identity(), create_sys_channel(), RedMatrix\RedDAV\RedDirectory\createFile(), detect_language(), diaspora_comment(), diaspora_conversation(), diaspora_dispatch(), diaspora_dispatch_public(), diaspora_is_blacklisted(), diaspora_like(), diaspora_message(), diaspora_process_outbound(), diaspora_send_followup(), diaspora_send_mail(), diaspora_send_relay(), 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(), filter_insecure(), 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(), get_role_perms(), RedMatrix\RedDAV\RedDirectory\getChild(), RedMatrix\RedDAV\RedDirectory\getChildren(), group_content(), guess_image_type(), home_content(), home_init(), identity_basic_export(), 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_contact(), new_keypair(), notification(), notifier_run(), oembed_bbcode2html(), openid_content(), parse_url_content(), perm_is_allowed(), photo_factory(), 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(), RedMatrix\RedDAV\RedFile\put(), receive_post(), ref_session_gc(), register_content(), register_post(), reload_plugins(), remove_all_xchan_resources(), remove_obsolete_hublocs(), scale_external_images(), search_content(), send_message(), send_reg_approval_email(), send_verification_email(), service_class_allows(), service_class_fetch(), service_limits_content(), set_config(), settings_post(), site_default_perms(), siteinfo_content(), siteinfo_init(), smilies(), start_delivery_chain(), store_diaspora_comment_sig(), 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(), widget_fullprofile(), widget_profile(), z_fetch_url(), z_post_url(), zfinger_init(), zot_fetch(), zot_gethub(), zot_import(), and zotfeed_init().

    @@ -433,7 +433,7 @@ Functions
    Returns
    mixed Stored value or false if it does not exist
    -

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

    +

    Referenced by Conversation\__construct(), acl_init(), bb2diaspora_itembody(), App\build_pagehead(), change_channel(), channel_content(), connect_content(), connedit_content(), connedit_post(), contact_block(), contact_remove(), conversation(), current_theme(), diaspora_request(), display_content(), editpost_content(), feature_enabled(), findpeople_widget(), fix_attached_file_permissions(), fix_attached_photo_permissions(), Item\get_comment_box(), get_online_status(), Item\get_template_data(), get_theme_uid(), group_content(), home_init(), invite_content(), invite_post(), item_post(), item_store(), item_store_update(), items_fetch(), load_pdl(), FKOAuth1\loginUser(), mail_content(), message_content(), nav(), network_content(), new_contact(), notification(), pdledit_content(), ping_init(), post_post(), profile_activity(), profile_load(), profile_sidebar(), profperm_content(), remove_community_tag(), rpost_content(), search_content(), set_pconfig(), settings_post(), smilies(), tag_deliver(), theme_content(), webpages_content(), widget_archive(), widget_notes(), widget_settings_menu(), and zot_refresh().

    @@ -663,7 +663,7 @@ Functions
    Returns
    mixed Stored $value or false
    -

    Referenced by connect_post(), create_identity(), invite_post(), notes_init(), pdledit_post(), process_channel_sync_delivery(), register_post(), settings_post(), and theme_post().

    +

    Referenced by connect_post(), connedit_post(), create_identity(), invite_post(), notes_init(), pdledit_post(), process_channel_sync_delivery(), register_post(), settings_post(), and theme_post().

    diff --git a/doc/html/include_2network_8php.html b/doc/html/include_2network_8php.html index 9537e68a6..dc050e058 100644 --- a/doc/html/include_2network_8php.html +++ b/doc/html/include_2network_8php.html @@ -747,7 +747,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_url(), discover_by_webbie(), externals_run(), fetch_xrd_links(), get_diaspora_reshare_xml(), 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(), directory_content(), dirprofile_init(), discover_by_url(), discover_by_webbie(), externals_run(), fetch_xrd_links(), get_diaspora_reshare_xml(), 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(), reflect_photo_callback(), 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_2photos_8php.html b/doc/html/include_2photos_8php.html index 2e9d67da2..a61d9ed9c 100644 --- a/doc/html/include_2photos_8php.html +++ b/doc/html/include_2photos_8php.html @@ -162,7 +162,7 @@ Functions

    Determine the album to use

    We create a wall item for every photo, but we don't want to overwhelm the data stream with a hundred newly uploaded photos. So we will make the first photo uploaded to this album in the last several hours visible by default, the rest will become visible over time when and if they acquire comments, likes, dislikes, and/or tags

    -

    Referenced by photos_post(), and wall_upload_post().

    +

    Referenced by photos_post(), reflect_photo_callback(), and wall_upload_post().

    diff --git a/doc/html/items_8php.html b/doc/html/items_8php.html index f8fb60dc3..cfe6a12b6 100644 --- a/doc/html/items_8php.html +++ b/doc/html/items_8php.html @@ -242,8 +242,8 @@ Functions    first_post_date ($uid, $wall=false)   - list_post_dates ($uid, $wall) -  + list_post_dates ($uid, $wall, $mindate) +   posted_dates ($uid, $wall)    fetch_post_tags ($items, $link=false) @@ -311,7 +311,7 @@ Functions

    $item['route'] contains a comma-separated list of xchans that sent the current message, somewhat analogous to the * Received: header line in email. We can use this to perform loop detection and to avoid sending a particular item to any "upstream" sender (they already have a copy because they sent it to us).

    -

    Referenced by process_delivery().

    +

    Referenced by process_delivery().

    @@ -997,7 +997,7 @@ Functions
    -

    Referenced by list_post_dates(), and posted_dates().

    +

    Referenced by list_post_dates(), and posted_dates().

    @@ -1492,7 +1492,7 @@ Functions
    -

    Referenced by consume_feed(), diaspora_asphoto(), diaspora_comment(), diaspora_like(), diaspora_post(), diaspora_reshare(), event_store_item(), impel_init(), import_post(), item_post(), like_content(), mood_init(), photo_upload(), photos_create_item(), post_activity_item(), process_delivery(), profile_activity(), and subthread_content().

    +

    Referenced by consume_feed(), diaspora_asphoto(), diaspora_comment(), diaspora_like(), diaspora_post(), diaspora_reshare(), event_store_item(), impel_init(), import_post(), item_post(), like_content(), mood_init(), photo_upload(), photos_create_item(), post_activity_item(), process_delivery(), profile_activity(), refimport_content(), reflect_comment_store(), and subthread_content().

    @@ -1520,7 +1520,7 @@ Functions
    -

    Referenced by impel_init(), import_post(), item_post(), photos_post(), tagrm_content(), tagrm_post(), and update_imported_item().

    +

    Referenced by impel_init(), import_post(), item_post(), photos_post(), refimport_content(), reflect_comment_store(), tagrm_content(), tagrm_post(), and update_imported_item().

    @@ -1588,7 +1588,7 @@ Functions - +
    @@ -1602,7 +1602,13 @@ Functions - + + + + + + + @@ -2008,7 +2014,7 @@ 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 process_delivery().

    +

    Referenced by process_delivery().

    diff --git a/doc/html/items_8php.js b/doc/html/items_8php.js index 45e633f25..f3ac4dfd0 100644 --- a/doc/html/items_8php.js +++ b/doc/html/items_8php.js @@ -51,7 +51,7 @@ var items_8php = [ "item_store_update", "items_8php.html#acf0bf7c9d21ac84f32effb754f7ad484", null ], [ "items_fetch", "items_8php.html#a756738301f2ed96be50232500677d58a", null ], [ "limit_body_size", "items_8php.html#af94c281016c6c912d06e064113336c5c", null ], - [ "list_post_dates", "items_8php.html#aa2d3caa2f27720762b5c729e07df40fb", null ], + [ "list_post_dates", "items_8php.html#ab33fa9756aaa5f39a6104d57a62baf00", null ], [ "mail_store", "items_8php.html#a77da7ce9a117601d49ac4a67c71b514f", null ], [ "map_scope", "items_8php.html#a8675e62674de6fb7c42e4a408c7116cc", null ], [ "post_activity_item", "items_8php.html#a410f9c743877c125ca06312373346903", null ], diff --git a/doc/html/language_8php.html b/doc/html/language_8php.html index 073080f20..3e1fd3824 100644 --- a/doc/html/language_8php.html +++ b/doc/html/language_8php.html @@ -372,7 +372,7 @@ Functions
    Returns
    translated string if exists, otherwise return $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_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(), bb2diaspora_itembody(), bbcode(), block_content(), blocks_content(), blogtheme_form(), bookmark_add(), bookmarks_content(), bookmarks_init(), categories_widget(), channel_content(), channel_init(), 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(), day_translate(), delegate_content(), design_tools(), diaspora_like(), 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(), foofoo(), format_categories(), format_event_diaspora(), format_event_html(), format_filer(), format_like(), format_notification(), fsuggest_content(), fsuggest_post(), gender_selector(), gender_selector_min(), RedMatrix\RedDAV\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(), RedMatrix\RedDAV\RedBrowser\htmlActionsPanel(), identity_check_service_class(), impel_init(), import_author_rss(), import_author_unknown(), 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(), like_puller(), load_database(), localize_item(), lockview_content(), locs_post(), 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_init(), 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(), role_selector(), rpost_content(), scale_external_images(), search(), search_content(), searchbox(), select_timezone(), send_message(), send_reg_approval_email(), send_verification_email(), service_limits_content(), settings_post(), setup_content(), sexpref_selector(), sexpref_selector_min(), siteinfo_content(), sources_content(), sources_post(), subthread_content(), suggest_content(), sync_locations(), 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(), bb2diaspora_itembody(), bbcode(), block_content(), blocks_content(), blogtheme_form(), bookmark_add(), bookmarks_content(), bookmarks_init(), catblock(), categories_widget(), channel_content(), channel_init(), 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(), day_translate(), delegate_content(), design_tools(), diaspora_like(), 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(), foofoo(), format_categories(), format_event_diaspora(), format_event_html(), format_filer(), format_like(), format_notification(), fsuggest_content(), fsuggest_post(), gender_selector(), gender_selector_min(), RedMatrix\RedDAV\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(), RedMatrix\RedDAV\RedBrowser\htmlActionsPanel(), identity_check_service_class(), impel_init(), import_author_rss(), import_author_unknown(), 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(), like_puller(), load_database(), localize_item(), lockview_content(), locs_content(), locs_post(), 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_init(), 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(), role_selector(), rpost_content(), scale_external_images(), search(), search_content(), searchbox(), select_timezone(), send_message(), send_reg_approval_email(), send_verification_email(), service_limits_content(), settings_post(), setup_content(), sexpref_selector(), sexpref_selector_min(), siteinfo_content(), sources_content(), sources_post(), subthread_content(), suggest_content(), sync_locations(), 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/locs_8php.html b/doc/html/locs_8php.html index 86cc0d2a8..229d5978f 100644 --- a/doc/html/locs_8php.html +++ b/doc/html/locs_8php.html @@ -114,8 +114,26 @@ $(document).ready(function(){initNavTree('locs_8php.html','');}); Functions + +
     $wall $wall,
     $mindate 
     locs_post (&$a)
     
     locs_content (&$a)
     

    Function Documentation

    + +
    +
    + + + + + + + + +
    locs_content (& $a)
    +
    + +
    +
    @@ -129,36 +147,6 @@ Functions
    -

    Placeholder file at present. This is going to involve a bit of work.

    -

    This file will deal with the deletion of channels and management of hublocs.

    -

    We need to provide the following functionality:

    -
      -
    • Delete my account and all channels from the entire network
      • -
    -
      -
    • Delete my account and all channels from this server
      • -
    -
      -
    • Delete a channel from the entire network
      • -
    -
      -
    • Delete a channel from this server
      • -
    -
      -
    • List all hub locations for this channel
      • -
    -
      -
    • Remove this/some hub location from this channel
      • -
    -
      -
    • promote this/some hub location to primary
      • -
    -
      -
    • Remove hub location 'xyz' from this channel, (this should possibly only be allowed if that hub has been down for a period of time)
      • -
    -
      -
    • Some of these actions should probably require email verification
      • -
    diff --git a/doc/html/locs_8php.js b/doc/html/locs_8php.js index 475fc5dd6..6444a590f 100644 --- a/doc/html/locs_8php.js +++ b/doc/html/locs_8php.js @@ -1,4 +1,5 @@ var locs_8php = [ + [ "locs_content", "locs_8php.html#a6c900f53970c0d0e738d2fe06d27ca44", null ], [ "locs_post", "locs_8php.html#a6b43654592919ac863d67a1f787a69b9", null ] ]; \ No newline at end of file diff --git a/doc/html/navtree.js b/doc/html/navtree.js index ad8e7f70e..cc61fa4f9 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#a53e4bdb6f225da55115acb9277f75e53", -"classApp.html#a4ffe529fb14389f7fedf5fdc5f722e7f", -"classTemplate.html#aae9c4d761ea1298e745e8052d7910194", -"diaspora_8php.html#a938c7ee808d38725c0988fa6006805b9", -"globals_vars.html", -"include_2network_8php.html#a316f318167a039c89719afbd129a8f3c", -"namespaceRedMatrix_1_1RedDAV.html", -"session_8php.html#ac95373f4966862a028033dd2f94d4da1", -"view_2theme_2apw_2php_2config_8php.html#ad29461920cf03b9ce1428e21eb1f4ba6" +"boot_8php.html#a50a6707a28c7d05d3f49eaabc7994501", +"classApp.html#a33a8e90b60ec4438f6fbf299d0f6839c", +"classTemplate.html#a317d535946dc065c35dd5cd38380e6c6", +"diaspora_8php.html#a33ae0c4606a7df4d801c05507d87f668", +"globals_func_0x6e.html", +"include_2menu_8php.html#a6a33c6a3db2a7510b16cc656edaec571", +"mod__chanview_8php.html", +"rsd__xml_8php.html#a740cd02fa15e5a53f8547fac73f0ab82", +"tpldebug_8php.html#a5358407d65f2ca826f96356a6642d149" ]; var SYNCONMSG = 'click to disable panel synchronisation'; diff --git a/doc/html/navtreeindex0.js b/doc/html/navtreeindex0.js index bf91f9867..0deb6b75f 100644 --- a/doc/html/navtreeindex0.js +++ b/doc/html/navtreeindex0.js @@ -156,7 +156,7 @@ var NAVTREEINDEX0 = "boot_8php.html#a009e6a0637cb65804ea8094ecc4450b0":[6,0,4,146], "boot_8php.html#a01353c9abebc3544ea080ac161729632":[6,0,4,39], "boot_8php.html#a022cea669f9f13ef7c6268b63884c57f":[6,0,4,160], -"boot_8php.html#a02566ac9d891369a1d3ebb81a15722fc":[6,0,4,265], +"boot_8php.html#a02566ac9d891369a1d3ebb81a15722fc":[6,0,4,266], "boot_8php.html#a028380b2902a86ba32198f6d3b5d10bb":[6,0,4,138], "boot_8php.html#a032bbd6d0321e99e9117332c9ed2b1b8":[6,0,4,58], "boot_8php.html#a03d19251c245587de7ed959300b87bdf":[6,0,4,179], @@ -165,18 +165,19 @@ var NAVTREEINDEX0 = "boot_8php.html#a081307d681d7d04f17b9ced2076e7c85":[6,0,4,1], "boot_8php.html#a09532c3f750ae8c4527e63b2b790cbf3":[6,0,4,222], "boot_8php.html#a0a98dd0110dc6c8e24cefc8ae74d5562":[6,0,4,73], +"boot_8php.html#a0afeb43da443d6ff3526ede5ecdcc3b3":[6,0,4,299], "boot_8php.html#a0b73e2548d6f9beb9c93211f488e336a":[6,0,4,183], -"boot_8php.html#a0c59dde058efebbc66520d136cbd1631":[6,0,4,285], -"boot_8php.html#a0cc8dc76bd10ac0ec81bac08a46f82fe":[6,0,4,281], -"boot_8php.html#a0d877df1e20bae765e1708be50f6b503":[6,0,4,284], +"boot_8php.html#a0c59dde058efebbc66520d136cbd1631":[6,0,4,286], +"boot_8php.html#a0cc8dc76bd10ac0ec81bac08a46f82fe":[6,0,4,282], +"boot_8php.html#a0d877df1e20bae765e1708be50f6b503":[6,0,4,285], "boot_8php.html#a0e4701c9742c3ef88f02ac450a042a84":[6,0,4,22], "boot_8php.html#a0e57f846e6d47a308feced0f7274f178":[6,0,4,65], "boot_8php.html#a0e6db7e365f2b041a828b93786f694bc":[6,0,4,15], "boot_8php.html#a0fb63e51c2a9814941842ae8f2f4dff8":[6,0,4,83], "boot_8php.html#a107d53f96acf5319905a34b1870db09a":[6,0,4,42], -"boot_8php.html#a115faf8797718c3165498abbd6895843":[6,0,4,270], +"boot_8php.html#a115faf8797718c3165498abbd6895843":[6,0,4,271], "boot_8php.html#a11cfe7d99b4dac0454d0de8873989f81":[6,0,4,140], -"boot_8php.html#a1200c1f968ff3d52ef878de5fc5c30c1":[6,0,4,269], +"boot_8php.html#a1200c1f968ff3d52ef878de5fc5c30c1":[6,0,4,270], "boot_8php.html#a12c781cefc20167231e2e3fd5866b1b5":[6,0,4,87], "boot_8php.html#a14ba8f9e162f2559831ee3bf98e0c3bd":[6,0,4,84], "boot_8php.html#a14d44d4a00223dc3db4ea962325db192":[6,0,4,210], @@ -185,9 +186,10 @@ var NAVTREEINDEX0 = "boot_8php.html#a17cf72338b040891781a4bcbdd9a8595":[6,0,4,155], "boot_8php.html#a181c111f4b6c14d091dfd3bf0d0a22cd":[6,0,4,182], "boot_8php.html#a18a400fa45e5632811b33041d8c048bf":[6,0,4,149], -"boot_8php.html#a1af3ed96de14aa0d7891b39cc75b60f2":[6,0,4,293], -"boot_8php.html#a1ba00027b718db732f30fc0e2c3e0abc":[6,0,4,259], -"boot_8php.html#a1c923b99bf77e4203ae94e5684b6ad0f":[6,0,4,295], +"boot_8php.html#a1997c4b7d0253e036bc0fb6b20e4af71":[6,0,4,298], +"boot_8php.html#a1af3ed96de14aa0d7891b39cc75b60f2":[6,0,4,305], +"boot_8php.html#a1ba00027b718db732f30fc0e2c3e0abc":[6,0,4,260], +"boot_8php.html#a1c923b99bf77e4203ae94e5684b6ad0f":[6,0,4,307], "boot_8php.html#a1d6e7f4c08bb68e4a424326a811bdd86":[6,0,4,186], "boot_8php.html#a1da180f961f49a11573cac4ff6c62c05":[6,0,4,82], "boot_8php.html#a1db4f0009c9cb4e107eab0f914a3c8dc":[6,0,4,237], @@ -195,18 +197,18 @@ var NAVTREEINDEX0 = "boot_8php.html#a1fbb93cf030f07391f22cc2948744869":[6,0,4,166], "boot_8php.html#a205d013103997adfa72953d2f20c01e1":[6,0,4,231], "boot_8php.html#a20f0eed431d25870b624b8937a07a59f":[6,0,4,203], -"boot_8php.html#a21cc29e0025943e7c28ff58cb4856ac3":[6,0,4,261], +"boot_8php.html#a21cc29e0025943e7c28ff58cb4856ac3":[6,0,4,262], "boot_8php.html#a222395aa223cfbff6166fab0b4e2e1d5":[6,0,4,43], "boot_8php.html#a24a7a70afedd5d85fe0eadc85afa9f77":[6,0,4,21], "boot_8php.html#a25476eec71fceda237f7dc1d78b0adb8":[6,0,4,106], "boot_8php.html#a27299ecfb9e9a99826f17a1c14c6995f":[6,0,4,98], -"boot_8php.html#a2750985ec445617d7e82ae3098c91e3f":[6,0,4,273], +"boot_8php.html#a2750985ec445617d7e82ae3098c91e3f":[6,0,4,274], "boot_8php.html#a285732e7889fa7f333cbe431111e1029":[6,0,4,206], "boot_8php.html#a29528a2544373cc19a378f350040c6a1":[6,0,4,89], "boot_8php.html#a2958a2bd5422b85329d7c36c06dbc221":[6,0,4,139], "boot_8php.html#a29e921c0c72412cc738e44cca6ca1f62":[6,0,4,235], "boot_8php.html#a2af173e4e9836ee7c90757b4793a2be3":[6,0,4,114], -"boot_8php.html#a2b525996e4426bdddbcec277778bde08":[6,0,4,257], +"boot_8php.html#a2b525996e4426bdddbcec277778bde08":[6,0,4,258], "boot_8php.html#a2c65e925994566a63e6c03c381f1b4a0":[6,0,4,202], "boot_8php.html#a2c8906f1af94a3559a5b4661067bb79d":[6,0,4,135], "boot_8php.html#a2e90096fede6acce16abf0da8cb2febe":[6,0,4,74], @@ -218,11 +220,12 @@ var NAVTREEINDEX0 = "boot_8php.html#a3515ea6bf77495de89b93e9ccd881c49":[6,0,4,128], "boot_8php.html#a35625dacd2158b9f1f1a8e77f9f081fd":[6,0,4,168], "boot_8php.html#a36003bebe4ce860c6652bcc3e09b2214":[6,0,4,218], -"boot_8php.html#a36b31575f992a10b5927b76efba9362e":[6,0,4,299], +"boot_8php.html#a36b31575f992a10b5927b76efba9362e":[6,0,4,311], +"boot_8php.html#a37281c30bd92cecb499878d6778c570f":[6,0,4,297], "boot_8php.html#a38f6c7fe33b5434a24b4314567753dfa":[6,0,4,191], "boot_8php.html#a3ad9cc5d4354be741fa1de12b96e9955":[6,0,4,117], "boot_8php.html#a3b56bfc6a0dd159070e316ddac3b7456":[6,0,4,122], -"boot_8php.html#a3cd42a70c6b3999590e4fd7a1a9096af":[6,0,4,298], +"boot_8php.html#a3cd42a70c6b3999590e4fd7a1a9096af":[6,0,4,310], "boot_8php.html#a3d48dffd9dc73a187263c3002cdf00c0":[6,0,4,188], "boot_8php.html#a3d6d4fc5fafcc9156811669158541caf":[6,0,4,233], "boot_8php.html#a3e0930933fb2c0bf8211cc7ab4e1c3b4":[6,0,4,12], @@ -237,17 +240,14 @@ var NAVTREEINDEX0 = "boot_8php.html#a44ae1542a805ffd7f826fb511db07374":[6,0,4,163], "boot_8php.html#a44d069c8a1cfcc6d2007c506a17ff28f":[6,0,4,77], "boot_8php.html#a458e19af801bc4b0d1f1ce1a6d9e857e":[6,0,4,169], -"boot_8php.html#a45b12aefab9675baffc7a07a09486db8":[6,0,4,282], +"boot_8php.html#a45b12aefab9675baffc7a07a09486db8":[6,0,4,283], "boot_8php.html#a49f2a70b3b43aa904223a8d19e986a47":[6,0,4,189], "boot_8php.html#a4a12ce5de39789b0361e308d89925a20":[6,0,4,112], -"boot_8php.html#a4a49b29838ef2c45ab3556b52baec6a4":[6,0,4,251], +"boot_8php.html#a4a49b29838ef2c45ab3556b52baec6a4":[6,0,4,252], "boot_8php.html#a4bfe22e163657690dfb6d5b1d04cb47e":[6,0,4,187], "boot_8php.html#a4c02d88e66852a01bd5a1feecb7c3ce3":[6,0,4,6], "boot_8php.html#a4edce16cb7f21cdafa1e85bf63d713e6":[6,0,4,224], "boot_8php.html#a4f507a5996dbb3da148add0339a40d5a":[6,0,4,62], "boot_8php.html#a4fefd7486d3b888a05cfd3dc9575f115":[6,0,4,247], -"boot_8php.html#a505410c7edc5f5bb5fa227b98359793e":[6,0,4,213], -"boot_8php.html#a50a6707a28c7d05d3f49eaabc7994501":[6,0,4,30], -"boot_8php.html#a525ca93ff35d3535d1a2b8ba57876afa":[6,0,4,167], -"boot_8php.html#a52b599cd13e152ebc80d7e4413683195":[6,0,4,44] +"boot_8php.html#a505410c7edc5f5bb5fa227b98359793e":[6,0,4,213] }; diff --git a/doc/html/navtreeindex1.js b/doc/html/navtreeindex1.js index 4d7b1bf3e..49933455f 100644 --- a/doc/html/navtreeindex1.js +++ b/doc/html/navtreeindex1.js @@ -1,10 +1,13 @@ var NAVTREEINDEX1 = { +"boot_8php.html#a50a6707a28c7d05d3f49eaabc7994501":[6,0,4,30], +"boot_8php.html#a525ca93ff35d3535d1a2b8ba57876afa":[6,0,4,167], +"boot_8php.html#a52b599cd13e152ebc80d7e4413683195":[6,0,4,44], "boot_8php.html#a53e4bdb6f225da55115acb9277f75e53":[6,0,4,88], "boot_8php.html#a5542c5c2806ab8bca04bad53d47b5209":[6,0,4,36], "boot_8php.html#a56fd673eaa7014150297ce1162502db5":[6,0,4,205], "boot_8php.html#a57eee7352714c004d36c26dda74af73e":[6,0,4,246], -"boot_8php.html#a5a681a672e007cdc22b43345d71f07c6":[6,0,4,296], +"boot_8php.html#a5a681a672e007cdc22b43345d71f07c6":[6,0,4,308], "boot_8php.html#a5ab6181607a090bcdbaa13b15b85aba1":[6,0,4,20], "boot_8php.html#a5ae728ac966ea1d3525a19e7fec59434":[6,0,4,67], "boot_8php.html#a5b043b7fdcfd4e8c9c3747574afc6caa":[6,0,4,195], @@ -17,13 +20,13 @@ var NAVTREEINDEX1 = "boot_8php.html#a6252d8eca67c689d9035ec6da544cf46":[6,0,4,25], "boot_8php.html#a62c832a95e38b1fa23e6cef39521b7d5":[6,0,4,81], "boot_8php.html#a639f079bf28f7bbb2769fee651d76dd8":[6,0,4,110], -"boot_8php.html#a64617d4655804de2a3c86501ab4fdbfd":[6,0,4,278], +"boot_8php.html#a64617d4655804de2a3c86501ab4fdbfd":[6,0,4,279], "boot_8php.html#a6626f383c3d2d459f731ab8b4f237d16":[6,0,4,180], "boot_8php.html#a6788e99021ec8ffb0fa94d651f22a322":[6,0,4,151], "boot_8php.html#a68d1d5bc9c7ccb663dc671b48c66df11":[6,0,4,154], "boot_8php.html#a68eebe493e6f729ffd1aeda7a4b11155":[6,0,4,48], "boot_8php.html#a6969947145a139ec374ce098224d8e81":[6,0,4,157], -"boot_8php.html#a69aac276ed82e010dc382b16ab4d59e1":[6,0,4,263], +"boot_8php.html#a69aac276ed82e010dc382b16ab4d59e1":[6,0,4,264], "boot_8php.html#a6b14a31a8aa9f3452a13383f413bffa2":[6,0,4,250], "boot_8php.html#a6b31dd451bc6c37fe7c9c766ff385aaf":[6,0,4,244], "boot_8php.html#a6b9909db6a7ec80ec6fdd40ba74014dd":[6,0,4,107], @@ -33,25 +36,28 @@ var NAVTREEINDEX1 = "boot_8php.html#a6e57d913634d033b4d5ad72d99fd3e9d":[6,0,4,137], "boot_8php.html#a6ee7a72d558d1851bbb9e3cdde377932":[6,0,4,225], "boot_8php.html#a7037bcbca223395c06bc67f65024de7a":[6,0,4,108], -"boot_8php.html#a7176c0f9f1c98421b97735d892cf6252":[6,0,4,262], +"boot_8php.html#a7176c0f9f1c98421b97735d892cf6252":[6,0,4,263], "boot_8php.html#a718a801b0be6cbaef5e519516da12721":[6,0,4,173], "boot_8php.html#a719c7f3972d5f9268f37a41c76cd4ef6":[6,0,4,29], "boot_8php.html#a7236b2cdcf59f02a42302e893a99013b":[6,0,4,196], "boot_8php.html#a749144d8dd9c1366596a0213c277d050":[6,0,4,144], "boot_8php.html#a74bf27f7564c9a37975e7b37d973dcab":[6,0,4,78], "boot_8php.html#a75a90b0eadd0df510f7e63210733634d":[6,0,4,2], -"boot_8php.html#a75fc600186b13c3b25e661afefb5eac8":[6,0,4,286], +"boot_8php.html#a75fc600186b13c3b25e661afefb5eac8":[6,0,4,287], +"boot_8php.html#a76480b213af379c0c6c7fa4e39019ca9":[6,0,4,296], "boot_8php.html#a768f00b7d66be0daf7ef4eea2e862006":[6,0,4,4], "boot_8php.html#a774f0f792ebfec1e774c5a17bb9d5966":[6,0,4,80], "boot_8php.html#a781916f83fcc8ff1035649afa45f0292":[6,0,4,93], -"boot_8php.html#a78849a1bf8ce8d9804b4cbb502e8f383":[6,0,4,253], +"boot_8php.html#a78849a1bf8ce8d9804b4cbb502e8f383":[6,0,4,254], "boot_8php.html#a7a8ba64d089cc0412c59a2eefc6d655c":[6,0,4,123], "boot_8php.html#a7aa57438db03834aaa0b468bdce773a6":[6,0,4,71], "boot_8php.html#a7af107fab8d62b9a73801713b774ed30":[6,0,4,143], +"boot_8php.html#a7b511bd93202c43405adbe3b5bcebbfe":[6,0,4,294], "boot_8php.html#a7b8f8ad9dbe82711257d23891ef6b133":[6,0,4,175], "boot_8php.html#a7bff2278e68a71e524afd1c7c951e1e3":[6,0,4,75], "boot_8php.html#a7c286add8961fd2d79216314cd4aadd8":[6,0,4,115], "boot_8php.html#a7c2eb822d50e1554bf5c32861f36342b":[6,0,4,63], +"boot_8php.html#a7e5627b5ca4b7464feb0f08663b19ea1":[6,0,4,302], "boot_8php.html#a7ed4581ab66ebcde97f6b3730856b028":[6,0,4,177], "boot_8php.html#a7eeb83e15968f7a6cc5937d493815773":[6,0,4,50], "boot_8php.html#a7f3474fec541e261fc8dff47313c4017":[6,0,4,53], @@ -64,32 +70,35 @@ var NAVTREEINDEX1 = "boot_8php.html#a852d4036a3bed66af1534d014c4ecde2":[6,0,4,228], "boot_8php.html#a8663f32171568489dbb2a01dd00371f8":[6,0,4,133], "boot_8php.html#a87b0f279f8413c7e4d805c5d85f20d34":[6,0,4,125], -"boot_8php.html#a882b666adfe21f035a0f8c02806066d6":[6,0,4,277], -"boot_8php.html#a8892374789fd261eb32a7969d934a14a":[6,0,4,276], +"boot_8php.html#a882b666adfe21f035a0f8c02806066d6":[6,0,4,278], +"boot_8php.html#a8892374789fd261eb32a7969d934a14a":[6,0,4,277], "boot_8php.html#a8905fde0a5b7882bdc083b20d9b34701":[6,0,4,194], "boot_8php.html#a899d24fd074594ceebbf72e1feff335f":[6,0,4,16], "boot_8php.html#a8a60cc38bb567765fd926fef70205f16":[6,0,4,104], "boot_8php.html#a8bb0395933b5e886f086f6a2fb0bfa55":[6,0,4,248], "boot_8php.html#a8c9dce0ef27b35397e29298eb966f7f7":[6,0,4,136], "boot_8php.html#a8da836617174eed9fc2ac8054125354b":[6,0,4,130], -"boot_8php.html#a8df201788c9dd0ca91384e3a14c08bce":[6,0,4,255], -"boot_8php.html#a8fdcc4ffb365a3267bd02ce8a8d466d6":[6,0,4,294], +"boot_8php.html#a8df201788c9dd0ca91384e3a14c08bce":[6,0,4,256], +"boot_8php.html#a8fdcc4ffb365a3267bd02ce8a8d466d6":[6,0,4,306], +"boot_8php.html#a921c55b9fa59a327a5f0e07fa1ccb2e0":[6,0,4,251], "boot_8php.html#a9255af5ae9c887520091ea04763c1a88":[6,0,4,33], "boot_8php.html#a926cad0b3d8b9d9ee5da1898fc063ba3":[6,0,4,11], "boot_8php.html#a93823d15ae07548a4c49de88d325cd26":[6,0,4,158], "boot_8php.html#a939de9a99278f4fd7dcd0ee67f243f08":[6,0,4,134], "boot_8php.html#a949116d9a295b214293006c060ca4848":[6,0,4,132], -"boot_8php.html#a9690d73434125ce594a1f5e7c2a4f7c0":[6,0,4,289], -"boot_8php.html#a96ad56755a21e1361dbd7bf93c9e7ff4":[6,0,4,260], +"boot_8php.html#a9690d73434125ce594a1f5e7c2a4f7c0":[6,0,4,290], +"boot_8php.html#a96ad56755a21e1361dbd7bf93c9e7ff4":[6,0,4,261], "boot_8php.html#a97769915c9f14adc4f8ab1ea2cecfd90":[6,0,4,18], "boot_8php.html#a981d46380f9f23c308bac1f9cb00dc5b":[6,0,4,208], +"boot_8php.html#a997614f25e58f8313641e1eb0109fd10":[6,0,4,300], "boot_8php.html#a99a4a17cb644e7e6826ea07ecaf09777":[6,0,4,249], "boot_8php.html#a9c80420e5a063a4a87ce4831f086134d":[6,0,4,52], "boot_8php.html#a9cbab4ee728e9a8b4ce952bae643044e":[6,0,4,5], "boot_8php.html#a9cc986b4f9dd6558cbb2e25aadbfd964":[6,0,4,240], "boot_8php.html#a9d01ef178b72b145016cca1393415bc4":[6,0,4,209], -"boot_8php.html#a9ea1290e00c6d40684892047f2c778a9":[6,0,4,292], -"boot_8php.html#a9eeb8989272d5ff804a616898bb13659":[6,0,4,279], +"boot_8php.html#a9ea1290e00c6d40684892047f2c778a9":[6,0,4,304], +"boot_8php.html#a9eeb8989272d5ff804a616898bb13659":[6,0,4,280], +"boot_8php.html#a9f8a2938ddd9ee2867e6f8ce77b61b2f":[6,0,4,292], "boot_8php.html#a9ff652e5cb83cd11cbb0350844e7b28f":[6,0,4,239], "boot_8php.html#aa17a4f9c63f5cbc5c06f1066b6aebc42":[6,0,4,197], "boot_8php.html#aa1e828bbbcba170265eb2668d8daf42e":[6,0,4,26], @@ -110,7 +119,7 @@ var NAVTREEINDEX1 = "boot_8php.html#ab2d0e8a9b81ee548ef2ce8e4560da2f6":[6,0,4,229], "boot_8php.html#ab346a2ece14993861f3e4206befa94f0":[6,0,4,35], "boot_8php.html#ab3920c2f3cd64802c0b7ff625c3b2ea8":[6,0,4,223], -"boot_8php.html#ab4bc9c50ecc927b92d519e36562b0df0":[6,0,4,252], +"boot_8php.html#ab4bc9c50ecc927b92d519e36562b0df0":[6,0,4,253], "boot_8php.html#ab4bddb41a0cf407178ec5278b950c393":[6,0,4,193], "boot_8php.html#ab51965fabe54dc031e9a0ce1142ee83e":[6,0,4,234], "boot_8php.html#ab54b24cc302e1a42a67a49d788b6b764":[6,0,4,118], @@ -119,34 +128,35 @@ var NAVTREEINDEX1 = "boot_8php.html#ab724491497ab2618b23a01d5da60aec0":[6,0,4,211], "boot_8php.html#ab79b8b4555cae20d03f8200666d89d63":[6,0,4,7], "boot_8php.html#ab7d65a7e7417825a4db62906bb600729":[6,0,4,103], -"boot_8php.html#ab9dca53455cd157d3c6ba2bdecdbd22d":[6,0,4,288], +"boot_8php.html#ab9dca53455cd157d3c6ba2bdecdbd22d":[6,0,4,289], "boot_8php.html#aba208673515cbb8a55e5fa4a1da99fda":[6,0,4,40], -"boot_8php.html#abbf5ac24eb8aeedb862f618ee0d21e86":[6,0,4,256], +"boot_8php.html#abbf5ac24eb8aeedb862f618ee0d21e86":[6,0,4,257], "boot_8php.html#abc0a90a1a77f5b668aa7e4b57d1776a7":[6,0,4,3], -"boot_8php.html#abd7bb40da9cc073297e49736b338ca07":[6,0,4,283], +"boot_8php.html#abd7bb40da9cc073297e49736b338ca07":[6,0,4,284], "boot_8php.html#abdcdfc873ace4e0902177bad934de0c0":[6,0,4,70], "boot_8php.html#abeb4d86e17cefa8584f1244e2183b0e1":[6,0,4,121], "boot_8php.html#abedd940e664017c61b48c6efa31d0cb8":[6,0,4,102], "boot_8php.html#ac01230c7655e0705b2e99c9bc03c4450":[6,0,4,131], "boot_8php.html#ac17fc8a416ea79e9d5cb4dc9a8ff8c5c":[6,0,4,24], "boot_8php.html#ac195fc9003298923ea81f144388e24b1":[6,0,4,178], -"boot_8php.html#ac43182e0d8bae7576a30b603774974f8":[6,0,4,254], +"boot_8php.html#ac43182e0d8bae7576a30b603774974f8":[6,0,4,255], "boot_8php.html#ac4d1c93dabcace711ffb4931204c336b":[6,0,4,141], "boot_8php.html#ac59a18a4838710d6c2de37aed6b21f03":[6,0,4,100], "boot_8php.html#ac5e74f899f6e98d8e91b14ba1c08bc08":[6,0,4,27], "boot_8php.html#ac608a34f3bc180e7724192e0fd31f9b0":[6,0,4,38], "boot_8php.html#ac8400313df2c831653f9036f71ebd86d":[6,0,4,60], -"boot_8php.html#ac86615ddc0763a00f5311c90e991730c":[6,0,4,290], +"boot_8php.html#ac86615ddc0763a00f5311c90e991730c":[6,0,4,291], "boot_8php.html#ac890557fedc5b5a3b1d996249b1e1a20":[6,0,4,127], +"boot_8php.html#ac89396b9144391acd08d6d0f9b332220":[6,0,4,293], "boot_8php.html#ac99fc4d040764eac1736bec6973556fe":[6,0,4,129], "boot_8php.html#aca08bc4f1554ba877500f6abcc99e1e8":[6,0,4,207], "boot_8php.html#aca47505b8732177f52bb2d647eb2741c":[6,0,4,37], "boot_8php.html#aca5e42678e178c6b9034610d66666fd7":[6,0,4,13], "boot_8php.html#acc4e0c910af066148b810e5fde55fff1":[6,0,4,8], "boot_8php.html#acca19aae62e1a6951a856b945de20d67":[6,0,4,181], -"boot_8php.html#accd6f36cc9f40225cbd720e4d12a7c6e":[6,0,4,291], +"boot_8php.html#accd6f36cc9f40225cbd720e4d12a7c6e":[6,0,4,303], "boot_8php.html#acd877c405b06b348b37b6f7e62a211e9":[6,0,4,241], -"boot_8php.html#ace6d70ac290397ddd40e561fd0831858":[6,0,4,275], +"boot_8php.html#ace6d70ac290397ddd40e561fd0831858":[6,0,4,276], "boot_8php.html#ace83842dbeb84f7ed9ac59a9f57a7c32":[6,0,4,215], "boot_8php.html#aced60c7285192e80b7c4757e45a7f1e3":[6,0,4,69], "boot_8php.html#ad0876e837cf3fad8a26417e315f6e2c8":[6,0,4,161], @@ -156,25 +166,27 @@ var NAVTREEINDEX1 = "boot_8php.html#ad34c1547020a305915bcc39707744690":[6,0,4,91], "boot_8php.html#ad4c9dc2c8a82e8f52b7404c1655eab44":[6,0,4,31], "boot_8php.html#ad789aef3cb95fc1eb36be7c4283d0137":[6,0,4,236], -"boot_8php.html#ad8887b49bbb02dd30b4eb9f6c7773c63":[6,0,4,264], -"boot_8php.html#ad88a70ec62e08d590123d3697dfe64d5":[6,0,4,258], +"boot_8php.html#ad8887b49bbb02dd30b4eb9f6c7773c63":[6,0,4,265], +"boot_8php.html#ad88a70ec62e08d590123d3697dfe64d5":[6,0,4,259], +"boot_8php.html#ad94aca4c260b8a892397786201dc4664":[6,0,4,295], "boot_8php.html#ada72d88ae39a7e3b45baea201cb49a29":[6,0,4,97], "boot_8php.html#adaeb4f590c56326b2dca3b19f31b6272":[6,0,4,145], -"boot_8php.html#adca48aee78465ae3064ca4432c0d87b5":[6,0,4,267], +"boot_8php.html#adca48aee78465ae3064ca4432c0d87b5":[6,0,4,268], "boot_8php.html#add517a0958ac684792c62142a3877f81":[6,0,4,41], "boot_8php.html#adfb2fc7be5a4226c0a8e24131da9d498":[6,0,4,23], +"boot_8php.html#ae09767b94688657978ff9366ec63684b":[6,0,4,301], "boot_8php.html#ae0d9527117cd87dcba11986047ae336e":[6,0,4,45], "boot_8php.html#ae0da3ca0f54d75d22c71e007331f8d06":[6,0,4,109], -"boot_8php.html#ae37444eaa42705185080ccf3e670cbc2":[6,0,4,274], +"boot_8php.html#ae37444eaa42705185080ccf3e670cbc2":[6,0,4,275], "boot_8php.html#ae3cef7b63e25e7bafea3fcf6b99fad0e":[6,0,4,190], "boot_8php.html#ae4861de36017fe399c1839f778bad9f5":[6,0,4,164], "boot_8php.html#ae94f7c7c0909629a75aed1c41f10bc95":[6,0,4,198], -"boot_8php.html#aea392cb26ed617f3a8cde648385b5df0":[6,0,4,287], +"boot_8php.html#aea392cb26ed617f3a8cde648385b5df0":[6,0,4,288], "boot_8php.html#aea7fc57a4d8e9dcb42f2601b0b9b761c":[6,0,4,28], -"boot_8php.html#aead84fa27d7516b855220fe004964a45":[6,0,4,280], +"boot_8php.html#aead84fa27d7516b855220fe004964a45":[6,0,4,281], "boot_8php.html#aeb1039302affcbe7e8872c01c08c88f8":[6,0,4,54], "boot_8php.html#aec36f8fcd4cb14a52934590b3d6666b4":[6,0,4,238], -"boot_8php.html#aecaa1b6945b317ba8f1daf4af2aed8e6":[6,0,4,268], +"boot_8php.html#aecaa1b6945b317ba8f1daf4af2aed8e6":[6,0,4,269], "boot_8php.html#aed0dfb35f7dd00dc9e4f868ea7f7ff53":[6,0,4,172], "boot_8php.html#aedfb9501ed408278667995524e0d15cf":[6,0,4,105], "boot_8php.html#aee324eca9de4e0fedf01ab5f92e27c67":[6,0,4,184], @@ -182,7 +194,7 @@ var NAVTREEINDEX1 = "boot_8php.html#aefba06f1c0842036329033e7567ecf6d":[6,0,4,147], "boot_8php.html#aefe573c3c7b0d37fbff264bbae79d673":[6,0,4,116], "boot_8php.html#aefecf8599036df7f1b95d6820e0e2fa4":[6,0,4,32], -"boot_8php.html#af33d1b2e98a1e21af672005525d46dfe":[6,0,4,271], +"boot_8php.html#af33d1b2e98a1e21af672005525d46dfe":[6,0,4,272], "boot_8php.html#af3905ea8f8568d0236db13fca40514e3":[6,0,4,192], "boot_8php.html#af3a4271630aabd8be592213f925d6a36":[6,0,4,64], "boot_8php.html#af3bdfc20979c16f15bb9c60446a480f9":[6,0,4,55], @@ -191,16 +203,16 @@ var NAVTREEINDEX1 = "boot_8php.html#af6937db5f581d006bf4a5c3d9c7e0461":[6,0,4,212], "boot_8php.html#af6b3de425e5849c73370a484c44607a3":[6,0,4,170], "boot_8php.html#af6f6f6f40139f12fc09ec47373b30919":[6,0,4,94], -"boot_8php.html#af86c651547aa8f9e549ee40a09455549":[6,0,4,266], +"boot_8php.html#af86c651547aa8f9e549ee40a09455549":[6,0,4,267], "boot_8php.html#af8c0cb0744c9a6b5d6d3baafb1f1e71d":[6,0,4,204], "boot_8php.html#afaf93b7026f784b113b4f8921745891e":[6,0,4,185], -"boot_8php.html#afb97615e985a013799839b68b99018d7":[6,0,4,272], +"boot_8php.html#afb97615e985a013799839b68b99018d7":[6,0,4,273], "boot_8php.html#afbb1fe1b2c8c730ec8e08da93b6512c4":[6,0,4,51], "boot_8php.html#afbb21ecccac9819aa65397e816868a5f":[6,0,4,221], "boot_8php.html#afe084c30a1810c10442edb4fbcbc0086":[6,0,4,86], "boot_8php.html#afe63ae69ba55299f813766e54df06ede":[6,0,4,156], "boot_8php.html#afe88b920aa285982edb817a0dd44eb37":[6,0,4,14], -"boot_8php.html#afef254290febac854c85fc698d9483a6":[6,0,4,297], +"boot_8php.html#afef254290febac854c85fc698d9483a6":[6,0,4,309], "boot_8php.html#aff210e8403dd72368522b17fb6e5d4e7":[6,0,4,232], "boxy_8php.html":[6,0,3,1,4,1,0], "cache_8php.html":[6,0,0,15], @@ -237,17 +249,5 @@ var NAVTREEINDEX1 = "classApp.html#a256360c9184fed6d7556e0bc0a835d7f":[5,0,7,48], "classApp.html#a2e82da4aecfc2017a8d1d332ca501f9f":[5,0,7,76], "classApp.html#a2eb832a8577dee7d40b93abdf6d1d35a":[5,0,7,12], -"classApp.html#a330410a288f3393d53772f5e98f857ea":[5,0,7,51], -"classApp.html#a33a8e90b60ec4438f6fbf299d0f6839c":[5,0,7,66], -"classApp.html#a344d2b7dc2f276648d521aee4da1731c":[5,0,7,23], -"classApp.html#a3694aa1907aa103a2adbc71f926f0fa0":[5,0,7,55], -"classApp.html#a3d84af5e42082098672531cd1a618853":[5,0,7,22], -"classApp.html#a4659785d13e4bac0bed50dbb1b0d4299":[5,0,7,6], -"classApp.html#a4776d9322edea17fae56afa5d01a323e":[5,0,7,24], -"classApp.html#a4833bee2eae4ad1691a04fa19e11a766":[5,0,7,90], -"classApp.html#a487332f8de40414ca1a54a4265570b70":[5,0,7,85], -"classApp.html#a495ec082c2719314e536070ca1ce073d":[5,0,7,42], -"classApp.html#a4b67935096f66d1f14b657399a8461ac":[5,0,7,68], -"classApp.html#a4bdd7bfed62f50515fce652127bf481b":[5,0,7,25], -"classApp.html#a4c7cfc62d39508086cf300dc2e39c4df":[5,0,7,59] +"classApp.html#a330410a288f3393d53772f5e98f857ea":[5,0,7,51] }; diff --git a/doc/html/navtreeindex2.js b/doc/html/navtreeindex2.js index 6e61d8759..6f46ad030 100644 --- a/doc/html/navtreeindex2.js +++ b/doc/html/navtreeindex2.js @@ -1,5 +1,17 @@ var NAVTREEINDEX2 = { +"classApp.html#a33a8e90b60ec4438f6fbf299d0f6839c":[5,0,7,66], +"classApp.html#a344d2b7dc2f276648d521aee4da1731c":[5,0,7,23], +"classApp.html#a3694aa1907aa103a2adbc71f926f0fa0":[5,0,7,55], +"classApp.html#a3d84af5e42082098672531cd1a618853":[5,0,7,22], +"classApp.html#a4659785d13e4bac0bed50dbb1b0d4299":[5,0,7,6], +"classApp.html#a4776d9322edea17fae56afa5d01a323e":[5,0,7,24], +"classApp.html#a4833bee2eae4ad1691a04fa19e11a766":[5,0,7,90], +"classApp.html#a487332f8de40414ca1a54a4265570b70":[5,0,7,85], +"classApp.html#a495ec082c2719314e536070ca1ce073d":[5,0,7,42], +"classApp.html#a4b67935096f66d1f14b657399a8461ac":[5,0,7,68], +"classApp.html#a4bdd7bfed62f50515fce652127bf481b":[5,0,7,25], +"classApp.html#a4c7cfc62d39508086cf300dc2e39c4df":[5,0,7,59], "classApp.html#a4ffe529fb14389f7fedf5fdc5f722e7f":[5,0,7,67], "classApp.html#a5293a8543ba338dcf38cd4ff3bc5d4be":[5,0,7,9], "classApp.html#a557d7b779d8259027f4724ebf7b248dc":[5,0,7,28], @@ -237,17 +249,5 @@ var NAVTREEINDEX2 = "classRedmatrix_1_1Import_1_1Import.html#afd251e6e5a18516bac4d1a40435602f1":[5,0,4,0,0,11], "classTemplate.html":[5,0,25], "classTemplate.html#a07737733f6949bdedea1e3d301b2ab7b":[5,0,25,13], -"classTemplate.html#a285b5b2007dbbf733476273df3fed4ef":[5,0,25,12], -"classTemplate.html#a317d535946dc065c35dd5cd38380e6c6":[5,0,25,22], -"classTemplate.html#a35d599c9b53a02e2fe2232e5b7ed5da7":[5,0,25,2], -"classTemplate.html#a37c15f6d1ade500943629f27a62808b7":[5,0,25,3], -"classTemplate.html#a4b933954086d9e01a1804b0b1c6ee93e":[5,0,25,6], -"classTemplate.html#a4e86b566c3f728e95ce5db1b33665c10":[5,0,25,21], -"classTemplate.html#a6f0efc256688c36110180b501067ff11":[5,0,25,23], -"classTemplate.html#a8469ab2988b6be2681516dc4b4e07d38":[5,0,25,15], -"classTemplate.html#a86e8fd27955ef10cadfd86f3fca70677":[5,0,25,9], -"classTemplate.html#a8f4d17e49f42b876a97364c13fb572d1":[5,0,25,19], -"classTemplate.html#aa6a087e0b7b887dd1c98c9e0ecbd3b29":[5,0,25,4], -"classTemplate.html#aa6f9bd7a8f7512efcf90e8d376fe05ee":[5,0,25,10], -"classTemplate.html#aac9a4638f11271e1b1dcc9f247242718":[5,0,25,20] +"classTemplate.html#a285b5b2007dbbf733476273df3fed4ef":[5,0,25,12] }; diff --git a/doc/html/navtreeindex3.js b/doc/html/navtreeindex3.js index ca92c7407..a855bf2c7 100644 --- a/doc/html/navtreeindex3.js +++ b/doc/html/navtreeindex3.js @@ -1,5 +1,17 @@ var NAVTREEINDEX3 = { +"classTemplate.html#a317d535946dc065c35dd5cd38380e6c6":[5,0,25,22], +"classTemplate.html#a35d599c9b53a02e2fe2232e5b7ed5da7":[5,0,25,2], +"classTemplate.html#a37c15f6d1ade500943629f27a62808b7":[5,0,25,3], +"classTemplate.html#a4b933954086d9e01a1804b0b1c6ee93e":[5,0,25,6], +"classTemplate.html#a4e86b566c3f728e95ce5db1b33665c10":[5,0,25,21], +"classTemplate.html#a6f0efc256688c36110180b501067ff11":[5,0,25,23], +"classTemplate.html#a8469ab2988b6be2681516dc4b4e07d38":[5,0,25,15], +"classTemplate.html#a86e8fd27955ef10cadfd86f3fca70677":[5,0,25,9], +"classTemplate.html#a8f4d17e49f42b876a97364c13fb572d1":[5,0,25,19], +"classTemplate.html#aa6a087e0b7b887dd1c98c9e0ecbd3b29":[5,0,25,4], +"classTemplate.html#aa6f9bd7a8f7512efcf90e8d376fe05ee":[5,0,25,10], +"classTemplate.html#aac9a4638f11271e1b1dcc9f247242718":[5,0,25,20], "classTemplate.html#aae9c4d761ea1298e745e8052d7910194":[5,0,25,1], "classTemplate.html#abbc484016ddf5d818f55b823cae6feb0":[5,0,25,14], "classTemplate.html#abda4c8d049f70553338eae7c905e9d5c":[5,0,25,17], @@ -237,17 +249,5 @@ var NAVTREEINDEX3 = "diaspora_8php.html#a131abd521b218d6ae6f7d2917d8b2605":[6,0,0,31,15], "diaspora_8php.html#a1704748aa2384c73e43f10e71defd31a":[6,0,0,31,25], "diaspora_8php.html#a20b968d64ef26afe5cb0cc75a7570a31":[6,0,0,31,14], -"diaspora_8php.html#a2bf43f6b5890897f425ef4325d34b007":[6,0,0,31,19], -"diaspora_8php.html#a33ae0c4606a7df4d801c05507d87f668":[6,0,0,31,26], -"diaspora_8php.html#a4901762cba5cd8dcdc57bdf285eefb1b":[6,0,0,31,12], -"diaspora_8php.html#a586d5a3ba92d35cee14f879f290072aa":[6,0,0,31,17], -"diaspora_8php.html#a5d57518545baa31cf8a85a937a267681":[6,0,0,31,10], -"diaspora_8php.html#a5ed66b910d7b0284f9b3ee04e72306ff":[6,0,0,31,7], -"diaspora_8php.html#a69f250b078a46e405647428ec3399a16":[6,0,0,31,27], -"diaspora_8php.html#a6f0a67b6b17503c125af32763be931b7":[6,0,0,31,4], -"diaspora_8php.html#a71fe9bb66626b4197ae018a230778bb2":[6,0,0,31,13], -"diaspora_8php.html#a7cff2f8f11044c1b3a360f20e1bbee46":[6,0,0,31,11], -"diaspora_8php.html#a849754ec369e1a60fadae5c14584ca36":[6,0,0,31,3], -"diaspora_8php.html#a858f70153c384f8778082cf7843a19da":[6,0,0,31,8], -"diaspora_8php.html#a900abf51398b2ef26cd2cd31c52f1b0f":[6,0,0,31,16] +"diaspora_8php.html#a2bf43f6b5890897f425ef4325d34b007":[6,0,0,31,19] }; diff --git a/doc/html/navtreeindex4.js b/doc/html/navtreeindex4.js index f5f4028bc..f296d3fe2 100644 --- a/doc/html/navtreeindex4.js +++ b/doc/html/navtreeindex4.js @@ -1,5 +1,17 @@ var NAVTREEINDEX4 = { +"diaspora_8php.html#a33ae0c4606a7df4d801c05507d87f668":[6,0,0,31,26], +"diaspora_8php.html#a4901762cba5cd8dcdc57bdf285eefb1b":[6,0,0,31,12], +"diaspora_8php.html#a586d5a3ba92d35cee14f879f290072aa":[6,0,0,31,17], +"diaspora_8php.html#a5d57518545baa31cf8a85a937a267681":[6,0,0,31,10], +"diaspora_8php.html#a5ed66b910d7b0284f9b3ee04e72306ff":[6,0,0,31,7], +"diaspora_8php.html#a69f250b078a46e405647428ec3399a16":[6,0,0,31,27], +"diaspora_8php.html#a6f0a67b6b17503c125af32763be931b7":[6,0,0,31,4], +"diaspora_8php.html#a71fe9bb66626b4197ae018a230778bb2":[6,0,0,31,13], +"diaspora_8php.html#a7cff2f8f11044c1b3a360f20e1bbee46":[6,0,0,31,11], +"diaspora_8php.html#a849754ec369e1a60fadae5c14584ca36":[6,0,0,31,3], +"diaspora_8php.html#a858f70153c384f8778082cf7843a19da":[6,0,0,31,8], +"diaspora_8php.html#a900abf51398b2ef26cd2cd31c52f1b0f":[6,0,0,31,16], "diaspora_8php.html#a938c7ee808d38725c0988fa6006805b9":[6,0,0,31,20], "diaspora_8php.html#a9bf7ef4094e0e14f6e2b7fe76ab7ad2e":[6,0,0,31,32], "diaspora_8php.html#aa34d2748bb97e9e193cacd572f335055":[6,0,0,31,28], @@ -237,17 +249,5 @@ var NAVTREEINDEX4 = "globals_func_0x6a.html":[6,1,1,10], "globals_func_0x6b.html":[6,1,1,11], "globals_func_0x6c.html":[6,1,1,12], -"globals_func_0x6d.html":[6,1,1,13], -"globals_func_0x6e.html":[6,1,1,14], -"globals_func_0x6f.html":[6,1,1,15], -"globals_func_0x70.html":[6,1,1,16], -"globals_func_0x71.html":[6,1,1,17], -"globals_func_0x72.html":[6,1,1,18], -"globals_func_0x73.html":[6,1,1,19], -"globals_func_0x74.html":[6,1,1,20], -"globals_func_0x75.html":[6,1,1,21], -"globals_func_0x76.html":[6,1,1,22], -"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_func_0x6d.html":[6,1,1,13] }; diff --git a/doc/html/navtreeindex5.js b/doc/html/navtreeindex5.js index 088466692..ed6a6c92d 100644 --- a/doc/html/navtreeindex5.js +++ b/doc/html/navtreeindex5.js @@ -1,7 +1,19 @@ var NAVTREEINDEX5 = { -"globals_vars.html":[6,1,2], +"globals_func_0x6e.html":[6,1,1,14], +"globals_func_0x6f.html":[6,1,1,15], +"globals_func_0x70.html":[6,1,1,16], +"globals_func_0x71.html":[6,1,1,17], +"globals_func_0x72.html":[6,1,1,18], +"globals_func_0x73.html":[6,1,1,19], +"globals_func_0x74.html":[6,1,1,20], +"globals_func_0x75.html":[6,1,1,21], +"globals_func_0x76.html":[6,1,1,22], +"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_0x61.html":[6,1,2,1], "globals_vars_0x63.html":[6,1,2,2], "globals_vars_0x64.html":[6,1,2,3], @@ -20,9 +32,10 @@ var NAVTREEINDEX5 = "globals_vars_0x73.html":[6,1,2,16], "globals_vars_0x74.html":[6,1,2,17], "globals_vars_0x75.html":[6,1,2,18], -"globals_vars_0x77.html":[6,1,2,19], -"globals_vars_0x78.html":[6,1,2,20], -"globals_vars_0x7a.html":[6,1,2,21], +"globals_vars_0x76.html":[6,1,2,19], +"globals_vars_0x77.html":[6,1,2,20], +"globals_vars_0x78.html":[6,1,2,21], +"globals_vars_0x7a.html":[6,1,2,22], "gprobe_8php.html":[6,0,0,41], "gprobe_8php.html#adf72cb0a70b5b9d99fdec1cc60e18ed1":[6,0,0,41,0], "greenthumbnails_8php.html":[6,0,3,1,0,2,3], @@ -60,37 +73,38 @@ var NAVTREEINDEX5 = "hubloc_8php.html#af1b476c936f96a93282b1d058e3d05ea":[6,0,0,45,4], "identity_8php.html":[6,0,0,46], "identity_8php.html#a1cf83ac2b645de12868edaa3a5718f05":[6,0,0,46,3], -"identity_8php.html#a224710dfb7465b706c91134247c20afa":[6,0,0,46,11], -"identity_8php.html#a2ab5172eabd375869060c9ad68323f5c":[6,0,0,46,17], -"identity_8php.html#a2e6a1cc35887937823ec7fbb90472afe":[6,0,0,46,22], -"identity_8php.html#a332df795f684788002f5a6424abacfd7":[6,0,0,46,10], +"identity_8php.html#a224710dfb7465b706c91134247c20afa":[6,0,0,46,12], +"identity_8php.html#a293f416ce9050220b183e08ff5890216":[6,0,0,46,6], +"identity_8php.html#a2ab5172eabd375869060c9ad68323f5c":[6,0,0,46,18], +"identity_8php.html#a2e6a1cc35887937823ec7fbb90472afe":[6,0,0,46,23], +"identity_8php.html#a332df795f684788002f5a6424abacfd7":[6,0,0,46,11], "identity_8php.html#a345f4c943d84de502ec6e72d2c813945":[6,0,0,46,2], -"identity_8php.html#a432259b2cf5b6f59be53e71db9f2c7dc":[6,0,0,46,26], -"identity_8php.html#a4751b522ea913d0e7ed43e03d22e9e68":[6,0,0,46,25], -"identity_8php.html#a47d6f53216f23a3484061793bef29854":[6,0,0,46,27], -"identity_8php.html#a490972c02fdb638c52ec0e012a30bfd2":[6,0,0,46,8], -"identity_8php.html#a4e996e44b50330098a04b467367a559f":[6,0,0,46,20], -"identity_8php.html#a4ff59df0f0a668a06a8411f87496aa21":[6,0,0,46,12], -"identity_8php.html#a5650319c799de09d1b6d1076b6f839a4":[6,0,0,46,23], -"identity_8php.html#a5b815330f3d177ab383af37a6c12e532":[6,0,0,46,30], -"identity_8php.html#a680fbafc2db023c5b1309e0180e81315":[6,0,0,46,31], +"identity_8php.html#a432259b2cf5b6f59be53e71db9f2c7dc":[6,0,0,46,27], +"identity_8php.html#a4751b522ea913d0e7ed43e03d22e9e68":[6,0,0,46,26], +"identity_8php.html#a47d6f53216f23a3484061793bef29854":[6,0,0,46,28], +"identity_8php.html#a490972c02fdb638c52ec0e012a30bfd2":[6,0,0,46,9], +"identity_8php.html#a4e996e44b50330098a04b467367a559f":[6,0,0,46,21], +"identity_8php.html#a4ff59df0f0a668a06a8411f87496aa21":[6,0,0,46,13], +"identity_8php.html#a5650319c799de09d1b6d1076b6f839a4":[6,0,0,46,24], +"identity_8php.html#a5b815330f3d177ab383af37a6c12e532":[6,0,0,46,31], +"identity_8php.html#a680fbafc2db023c5b1309e0180e81315":[6,0,0,46,32], "identity_8php.html#a77d2237f1846964634b1c99089c27c7d":[6,0,0,46,1], -"identity_8php.html#a78151baf4407a8482d2681a91a9c486b":[6,0,0,46,28], -"identity_8php.html#a9637c557e13d9671f3eeb124ab98212a":[6,0,0,46,19], -"identity_8php.html#aa46321e1cd6a3b8dfde8bf9510112fec":[6,0,0,46,9], -"identity_8php.html#aa4bd4abfcba883f43919e89ec6419025":[6,0,0,46,21], +"identity_8php.html#a78151baf4407a8482d2681a91a9c486b":[6,0,0,46,29], +"identity_8php.html#a9637c557e13d9671f3eeb124ab98212a":[6,0,0,46,20], +"identity_8php.html#aa46321e1cd6a3b8dfde8bf9510112fec":[6,0,0,46,10], +"identity_8php.html#aa4bd4abfcba883f43919e89ec6419025":[6,0,0,46,22], "identity_8php.html#aa870d2c1f558cfd52bef05bc124e8fa4":[6,0,0,46,0], -"identity_8php.html#aaeb666872995e3ab8da8f7bc5f3b2bd3":[6,0,0,46,14], -"identity_8php.html#aaff86ee3b5984821e7a256c2da5f1a51":[6,0,0,46,13], -"identity_8php.html#ab1485a26b032956e1496fc08c58b83ed":[6,0,0,46,6], +"identity_8php.html#aaeb666872995e3ab8da8f7bc5f3b2bd3":[6,0,0,46,15], +"identity_8php.html#aaff86ee3b5984821e7a256c2da5f1a51":[6,0,0,46,14], +"identity_8php.html#ab1485a26b032956e1496fc08c58b83ed":[6,0,0,46,7], "identity_8php.html#ac73b3e13778c564c877554517a7f51ba":[6,0,0,46,5], -"identity_8php.html#ac9fcd5c4c371998790b5c55c3d0f4633":[6,0,0,46,16], +"identity_8php.html#ac9fcd5c4c371998790b5c55c3d0f4633":[6,0,0,46,17], "identity_8php.html#ad2c97627a313d53df1a1c7b4215ddb51":[6,0,0,46,4], -"identity_8php.html#ad4a2c8caca8f6ae93633ebeca0ed6620":[6,0,0,46,24], -"identity_8php.html#ae2b140df652a55ca11bb6a99005fce35":[6,0,0,46,18], -"identity_8php.html#ae381db3d43f8e7c1da8b15d14ecf5312":[6,0,0,46,7], -"identity_8php.html#af2802bc13a00a17b867bba7978ba8f58":[6,0,0,46,29], -"identity_8php.html#afaedbc8e2d2a70ec8b006162baac5249":[6,0,0,46,15], +"identity_8php.html#ad4a2c8caca8f6ae93633ebeca0ed6620":[6,0,0,46,25], +"identity_8php.html#ae2b140df652a55ca11bb6a99005fce35":[6,0,0,46,19], +"identity_8php.html#ae381db3d43f8e7c1da8b15d14ecf5312":[6,0,0,46,8], +"identity_8php.html#af2802bc13a00a17b867bba7978ba8f58":[6,0,0,46,30], +"identity_8php.html#afaedbc8e2d2a70ec8b006162baac5249":[6,0,0,46,16], "impel_8php.html":[6,0,1,43], "impel_8php.html#ab7db6fca43b42ea4332cb3e841b3cf7b":[6,0,1,43,0], "import_8php.html":[6,0,1,44], @@ -235,19 +249,5 @@ var NAVTREEINDEX5 = "include_2menu_8php.html#a32701c4245e78ba9106eef52c08bf33d":[6,0,0,51,9], "include_2menu_8php.html#a3884bda4d85d84ec99447db9403a68d8":[6,0,0,51,3], "include_2menu_8php.html#a47447c01ba8ea04cd74af1d4c5b68fc7":[6,0,0,51,8], -"include_2menu_8php.html#a68ebbf492470c930f652013656f9071d":[6,0,0,51,7], -"include_2menu_8php.html#a6a33c6a3db2a7510b16cc656edaec571":[6,0,0,51,5], -"include_2menu_8php.html#a9aa8e0052dd47c1a93f53a983bd4620a":[6,0,0,51,2], -"include_2menu_8php.html#acb66f80ca895a6ccd562b3d9ae7b41aa":[6,0,0,51,6], -"include_2menu_8php.html#ad87f51ce85172bcc3f931aa0cd96a804":[6,0,0,51,4], -"include_2menu_8php.html#add35fae5e9695031b3d46e30ac409eb8":[6,0,0,51,0], -"include_2message_8php.html":[6,0,0,52], -"include_2message_8php.html#a254a756031e4d5e94f85e2939bdb5091":[6,0,0,52,2], -"include_2message_8php.html#a5f8de9847e203329e317ac38dc646898":[6,0,0,52,1], -"include_2message_8php.html#a652973ce47a262f2d238c2fd6233d97e":[6,0,0,52,3], -"include_2message_8php.html#a751ffd6635022b2190f56154ee745752":[6,0,0,52,4], -"include_2message_8php.html#aed272d77c06a309e2836ac79e75613f1":[6,0,0,52,0], -"include_2network_8php.html":[6,0,0,54], -"include_2network_8php.html#a1ff07d9fad93b713b93da0ab77aab7f0":[6,0,0,54,7], -"include_2network_8php.html#a27a951b59d8d622c0b3e7b0673ba74c6":[6,0,0,54,14] +"include_2menu_8php.html#a68ebbf492470c930f652013656f9071d":[6,0,0,51,7] }; diff --git a/doc/html/navtreeindex6.js b/doc/html/navtreeindex6.js index 1bd667200..4976e91e3 100644 --- a/doc/html/navtreeindex6.js +++ b/doc/html/navtreeindex6.js @@ -1,5 +1,19 @@ var NAVTREEINDEX6 = { +"include_2menu_8php.html#a6a33c6a3db2a7510b16cc656edaec571":[6,0,0,51,5], +"include_2menu_8php.html#a9aa8e0052dd47c1a93f53a983bd4620a":[6,0,0,51,2], +"include_2menu_8php.html#acb66f80ca895a6ccd562b3d9ae7b41aa":[6,0,0,51,6], +"include_2menu_8php.html#ad87f51ce85172bcc3f931aa0cd96a804":[6,0,0,51,4], +"include_2menu_8php.html#add35fae5e9695031b3d46e30ac409eb8":[6,0,0,51,0], +"include_2message_8php.html":[6,0,0,52], +"include_2message_8php.html#a254a756031e4d5e94f85e2939bdb5091":[6,0,0,52,2], +"include_2message_8php.html#a5f8de9847e203329e317ac38dc646898":[6,0,0,52,1], +"include_2message_8php.html#a652973ce47a262f2d238c2fd6233d97e":[6,0,0,52,3], +"include_2message_8php.html#a751ffd6635022b2190f56154ee745752":[6,0,0,52,4], +"include_2message_8php.html#aed272d77c06a309e2836ac79e75613f1":[6,0,0,52,0], +"include_2network_8php.html":[6,0,0,54], +"include_2network_8php.html#a1ff07d9fad93b713b93da0ab77aab7f0":[6,0,0,54,7], +"include_2network_8php.html#a27a951b59d8d622c0b3e7b0673ba74c6":[6,0,0,54,14], "include_2network_8php.html#a316f318167a039c89719afbd129a8f3c":[6,0,0,54,16], "include_2network_8php.html#a3e6c751a51de33ad3563f0938296e78a":[6,0,0,54,20], "include_2network_8php.html#a469b9bd700269cd07d954f1a16c5899b":[6,0,0,54,6], @@ -117,7 +131,6 @@ var NAVTREEINDEX6 = "items_8php.html#a8f3c85c584ccd2b98c3ca440e45b40f8":[6,0,0,49,12], "items_8php.html#a94ddb1d6c8fa21dd7433677e85168037":[6,0,0,49,33], "items_8php.html#a9b449eeae50003414b8b30ca927af434":[6,0,0,49,70], -"items_8php.html#aa2d3caa2f27720762b5c729e07df40fb":[6,0,0,49,51], "items_8php.html#aa371905f0a211b307cb3f7188c6cba04":[6,0,0,49,68], "items_8php.html#aa579bc4445d60098b1410961ca8e96b7":[6,0,0,49,11], "items_8php.html#aa723c0571e314a1853a24c5854b4f54f":[6,0,0,49,23], @@ -127,6 +140,7 @@ var NAVTREEINDEX6 = "items_8php.html#aabfaa193b83154c2a81e91284e5d5e59":[6,0,0,49,69], "items_8php.html#aac8c9eb4338e2a996c43914392c6cfdb":[6,0,0,49,15], "items_8php.html#ab1bce4261bcf75ad62753b498a144d17":[6,0,0,49,65], +"items_8php.html#ab33fa9756aaa5f39a6104d57a62baf00":[6,0,0,49,51], "items_8php.html#aba98fcbbcd7044a7e9ea34edabc14c87":[6,0,0,49,28], "items_8php.html#abeb7886cde44d9a83dbaf2bc4ab18723":[6,0,0,49,8], "items_8php.html#abf7a1b73eb352d79acd36309b0dababd":[6,0,0,49,2], @@ -162,7 +176,8 @@ var NAVTREEINDEX6 = "lockview_8php.html":[6,0,1,51], "lockview_8php.html#a851e26ab9a1008df5c5ebebea31e9b44":[6,0,1,51,0], "locs_8php.html":[6,0,1,52], -"locs_8php.html#a6b43654592919ac863d67a1f787a69b9":[6,0,1,52,0], +"locs_8php.html#a6b43654592919ac863d67a1f787a69b9":[6,0,1,52,1], +"locs_8php.html#a6c900f53970c0d0e738d2fe06d27ca44":[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], @@ -234,20 +249,5 @@ var NAVTREEINDEX6 = "mod_2photos_8php.html#aa87382611a66ec5effdb2d78f13f5812":[6,0,1,80,0], "mod_2photos_8php.html#ab950295cd77626f5fe65331a87693014":[6,0,1,80,1], "mod_2probe_8php.html":[6,0,1,88], -"mod_2probe_8php.html#a1f1db3fa6038e451e737964c94bf5e99":[6,0,1,88,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], -"mytheme_2php_2style_8php.html":[6,0,3,1,3,0,1], -"mytheme_2php_2theme_8php.html":[6,0,3,1,3,0,2], -"mytheme_2php_2theme_8php.html#a6ce5df8ece6acc09c1fddaccbeb244e8":[6,0,3,1,3,0,2,0], -"namespaceFriendica.html":[4,0,1], -"namespaceFriendica.html":[5,0,1], -"namespaceRedMatrix.html":[4,0,3], -"namespaceRedMatrix.html":[5,0,3] +"mod_2probe_8php.html#a1f1db3fa6038e451e737964c94bf5e99":[6,0,1,88,0] }; diff --git a/doc/html/navtreeindex7.js b/doc/html/navtreeindex7.js index 8a1528c2d..750d36362 100644 --- a/doc/html/navtreeindex7.js +++ b/doc/html/navtreeindex7.js @@ -1,11 +1,26 @@ var NAVTREEINDEX7 = { +"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], +"mytheme_2php_2style_8php.html":[6,0,3,1,3,0,1], +"mytheme_2php_2theme_8php.html":[6,0,3,1,3,0,2], +"mytheme_2php_2theme_8php.html#a6ce5df8ece6acc09c1fddaccbeb244e8":[6,0,3,1,3,0,2,0], +"namespaceFriendica.html":[4,0,1], +"namespaceFriendica.html":[5,0,1], +"namespaceRedMatrix.html":[4,0,3], +"namespaceRedMatrix.html":[5,0,3], "namespaceRedMatrix_1_1RedDAV.html":[4,0,3,0], "namespaceRedMatrix_1_1RedDAV.html":[5,0,3,0], "namespaceRedmatrix.html":[5,0,4], "namespaceRedmatrix.html":[4,0,4], -"namespaceRedmatrix_1_1Import.html":[4,0,4,0], "namespaceRedmatrix_1_1Import.html":[5,0,4,0], +"namespaceRedmatrix_1_1Import.html":[4,0,4,0], "namespaceacl__selectors.html":[4,0,0], "namespaceacl__selectors.html":[5,0,0], "namespacefriendica-to-smarty-tpl.html":[4,0,2], @@ -14,8 +29,8 @@ var NAVTREEINDEX7 = "namespacemembers_func.html":[4,1,1], "namespacemembers_vars.html":[4,1,2], "namespaces.html":[4,0], -"namespaceupdatetpl.html":[5,0,5], "namespaceupdatetpl.html":[4,0,5], +"namespaceupdatetpl.html":[5,0,5], "namespaceutil.html":[4,0,6], "namespaceutil.html":[5,0,6], "nav_8php.html":[6,0,0,53], @@ -200,6 +215,20 @@ var NAVTREEINDEX7 = "reddav_8php.html#a5df0d09893f2e65dc5cf6bbab6cfb266":[6,0,0,71,1], "reddav_8php.html#a9f531641dfb4e43cd88ac1a9ae7e2088":[6,0,0,71,2], "reddav_8php.html#ae92ea0df1993f6a7bcd1b6efa6c1fb66":[6,0,0,71,0], +"refimport_8php.html":[6,0,0,1,1], +"refimport_8php.html#a01a29630fa5e1ce6cd5e1fd75280747c":[6,0,0,1,1,2], +"refimport_8php.html#a53434bc19e6264db89e18d92ddc09860":[6,0,0,1,1,1], +"refimport_8php.html#a54003135d7c8994a76e831fb6faa2fe6":[6,0,0,1,1,6], +"refimport_8php.html#a684a44d2401abf75f441591bcb41d10d":[6,0,0,1,1,12], +"refimport_8php.html#a6c3e0475fde9fe72ff2492a5e3e5259c":[6,0,0,1,1,4], +"refimport_8php.html#a8459983ebf013ed5737f7ed317bfae1f":[6,0,0,1,1,8], +"refimport_8php.html#a9c1f681f1f303400a9818696a9f96d6f":[6,0,0,1,1,10], +"refimport_8php.html#aa98de7d112e3a5b4b6956f108d04a41d":[6,0,0,1,1,3], +"refimport_8php.html#ac43699d8ae86175e049aa4e87853caac":[6,0,0,1,1,7], +"refimport_8php.html#ad297afe0730c9119dd94d3cf0521b025":[6,0,0,1,1,9], +"refimport_8php.html#ad97ebb5feda0230a4834e0b3637a0d29":[6,0,0,1,1,0], +"refimport_8php.html#ae9c56f779d1e0ac7bcb2a460129e7ae5":[6,0,0,1,1,5], +"refimport_8php.html#aeec793cefa260f788b7d005adcb35796":[6,0,0,1,1,11], "register_8php.html":[6,0,1,97], "register_8php.html#a0e91f57f111407ea8d3223a05022bb2a":[6,0,1,97,0], "register_8php.html#a51731dcc1917c58a790eb1c0f6132271":[6,0,1,97,2], @@ -220,34 +249,5 @@ var NAVTREEINDEX7 = "rmagic_8php.html#a95455edd43f1bff39446a57388cdde16":[6,0,1,102,1], "rpost_8php.html":[6,0,1,103], "rpost_8php.html#a8190354d789000806d9879aea276728f":[6,0,1,103,0], -"rsd__xml_8php.html":[6,0,1,104], -"rsd__xml_8php.html#a740cd02fa15e5a53f8547fac73f0ab82":[6,0,1,104,0], -"search_8php.html":[6,0,1,105], -"search_8php.html#ab2568591359edde5b483a6cd9a24b2cc":[6,0,1,105,0], -"search_8php.html#acf19fd30f07f495781ca0d7a0a08b435":[6,0,1,105,1], -"search__ac_8php.html":[6,0,1,106], -"search__ac_8php.html#a14f90c83a3f2be095e9e2992a8d66138":[6,0,1,106,0], -"security_8php.html":[6,0,0,72], -"security_8php.html#a20f8b9851f23ee8894b8925584ef6821":[6,0,0,72,2], -"security_8php.html#a3ef2be6a7e4928e39d50059d6feb457c":[6,0,0,72,11], -"security_8php.html#a444ac867dfa8c37cf0a7a226412bee28":[6,0,0,72,4], -"security_8php.html#a6126c77a1267e046ac59cf864613f011":[6,0,0,72,10], -"security_8php.html#a77ba0d1889a39cf32434c5ce96fe1433":[6,0,0,72,5], -"security_8php.html#a8d23d2597aae380a3341872fe9513380":[6,0,0,72,1], -"security_8php.html#a9355488460ab11d6058656ff919e5cf9":[6,0,0,72,7], -"security_8php.html#a9c6180e82150a5a9af91a1255d096b5c":[6,0,0,72,3], -"security_8php.html#ab3bdd30dc60d9ee72370b866aa4a2d01":[6,0,0,72,9], -"security_8php.html#acd06ef411116115c2f0a92633700db8a":[6,0,0,72,6], -"security_8php.html#adc7bf51e3b8d67bd80e9348f9ab03733":[6,0,0,72,0], -"security_8php.html#afa683bc025a1d2fe9065e2f6cd71a22f":[6,0,0,72,8], -"service__limits_8php.html":[6,0,1,107], -"service__limits_8php.html#a653424aac63c5cd05ba70c3c77bf7f8a":[6,0,1,107,0], -"session_8php.html":[6,0,0,73], -"session_8php.html#a26fa1042356d555023cbf15ddd4f8507":[6,0,0,73,4], -"session_8php.html#a4c0ead624f95483e386bc80abf570a8f":[6,0,0,73,0], -"session_8php.html#a5e1c616e02b863d5450317d101366bb7":[6,0,0,73,1], -"session_8php.html#a62e4a6cb26b4bb1b8ddd8277b26090eb":[6,0,0,73,8], -"session_8php.html#a7f0f50576360d9ba52d29364e0b83a8e":[6,0,0,73,5], -"session_8php.html#a96b09cc763572f45280786a7b33feb7e":[6,0,0,73,7], -"session_8php.html#ac4461c1984543d3553e73dba2771568f":[6,0,0,73,6] +"rsd__xml_8php.html":[6,0,1,104] }; diff --git a/doc/html/navtreeindex8.js b/doc/html/navtreeindex8.js index 99d331cf6..75e8fbe66 100644 --- a/doc/html/navtreeindex8.js +++ b/doc/html/navtreeindex8.js @@ -1,5 +1,34 @@ var NAVTREEINDEX8 = { +"rsd__xml_8php.html#a740cd02fa15e5a53f8547fac73f0ab82":[6,0,1,104,0], +"search_8php.html":[6,0,1,105], +"search_8php.html#ab2568591359edde5b483a6cd9a24b2cc":[6,0,1,105,0], +"search_8php.html#acf19fd30f07f495781ca0d7a0a08b435":[6,0,1,105,1], +"search__ac_8php.html":[6,0,1,106], +"search__ac_8php.html#a14f90c83a3f2be095e9e2992a8d66138":[6,0,1,106,0], +"security_8php.html":[6,0,0,72], +"security_8php.html#a20f8b9851f23ee8894b8925584ef6821":[6,0,0,72,2], +"security_8php.html#a3ef2be6a7e4928e39d50059d6feb457c":[6,0,0,72,11], +"security_8php.html#a444ac867dfa8c37cf0a7a226412bee28":[6,0,0,72,4], +"security_8php.html#a6126c77a1267e046ac59cf864613f011":[6,0,0,72,10], +"security_8php.html#a77ba0d1889a39cf32434c5ce96fe1433":[6,0,0,72,5], +"security_8php.html#a8d23d2597aae380a3341872fe9513380":[6,0,0,72,1], +"security_8php.html#a9355488460ab11d6058656ff919e5cf9":[6,0,0,72,7], +"security_8php.html#a9c6180e82150a5a9af91a1255d096b5c":[6,0,0,72,3], +"security_8php.html#ab3bdd30dc60d9ee72370b866aa4a2d01":[6,0,0,72,9], +"security_8php.html#acd06ef411116115c2f0a92633700db8a":[6,0,0,72,6], +"security_8php.html#adc7bf51e3b8d67bd80e9348f9ab03733":[6,0,0,72,0], +"security_8php.html#afa683bc025a1d2fe9065e2f6cd71a22f":[6,0,0,72,8], +"service__limits_8php.html":[6,0,1,107], +"service__limits_8php.html#a653424aac63c5cd05ba70c3c77bf7f8a":[6,0,1,107,0], +"session_8php.html":[6,0,0,73], +"session_8php.html#a26fa1042356d555023cbf15ddd4f8507":[6,0,0,73,4], +"session_8php.html#a4c0ead624f95483e386bc80abf570a8f":[6,0,0,73,0], +"session_8php.html#a5e1c616e02b863d5450317d101366bb7":[6,0,0,73,1], +"session_8php.html#a62e4a6cb26b4bb1b8ddd8277b26090eb":[6,0,0,73,8], +"session_8php.html#a7f0f50576360d9ba52d29364e0b83a8e":[6,0,0,73,5], +"session_8php.html#a96b09cc763572f45280786a7b33feb7e":[6,0,0,73,7], +"session_8php.html#ac4461c1984543d3553e73dba2771568f":[6,0,0,73,6], "session_8php.html#ac95373f4966862a028033dd2f94d4da1":[6,0,0,73,3], "session_8php.html#af0100a2642a5268594bbd5742a03d885":[6,0,0,73,9], "session_8php.html#af230b86bfff7db66c3bdd7e0bbc24052":[6,0,0,73,2], @@ -82,21 +111,22 @@ var NAVTREEINDEX8 = "tagrm_8php.html#a1702f40aa53a2fa93deade1f609abe78":[6,0,1,120,1], "tagrm_8php.html#adfd4ea5b4d7fc6d9c9e042af5cd7d49a":[6,0,1,120,0], "taxonomy_8php.html":[6,0,0,79], -"taxonomy_8php.html#a03f55ee46c5f496e42f3d29db8d09cce":[6,0,0,79,9], -"taxonomy_8php.html#a088371f4bc19155b2291508f5cd63332":[6,0,0,79,0], -"taxonomy_8php.html#a08df5164926d2b31b8e9fcfe919de2b6":[6,0,0,79,2], -"taxonomy_8php.html#a0fb8cf0ac7bcbc8b27d856fe9bf69cd1":[6,0,0,79,6], -"taxonomy_8php.html#a163b5131f388080b0fc82398d3a32fe1":[6,0,0,79,4], -"taxonomy_8php.html#a3299482ac20e9d79453048dd52881d37":[6,0,0,79,3], -"taxonomy_8php.html#a4ba1339b2a7054971178ce194e4440fd":[6,0,0,79,10], -"taxonomy_8php.html#a599ee71dd3194c8127b00dabec77abc1":[6,0,0,79,1], -"taxonomy_8php.html#a7747fa859ac56fbffd4f9782d85505de":[6,0,0,79,7], -"taxonomy_8php.html#a7a913d19c77610da689be48fbbf6734c":[6,0,0,79,14], -"taxonomy_8php.html#aaeded36bcc983b35d9205fe5b6c18c43":[6,0,0,79,13], -"taxonomy_8php.html#aaf90ba8b839d6459065f39a4f1109b8a":[6,0,0,79,11], -"taxonomy_8php.html#ac21d1dff16d569e7d110167aea4e63c2":[6,0,0,79,12], -"taxonomy_8php.html#adfead45e3b8a3dfb2b4a4b9281d0dbe1":[6,0,0,79,5], -"taxonomy_8php.html#af387463d42ffdf7d2ab3d5b22e40a0c7":[6,0,0,79,8], +"taxonomy_8php.html#a03f55ee46c5f496e42f3d29db8d09cce":[6,0,0,79,10], +"taxonomy_8php.html#a088371f4bc19155b2291508f5cd63332":[6,0,0,79,1], +"taxonomy_8php.html#a08df5164926d2b31b8e9fcfe919de2b6":[6,0,0,79,3], +"taxonomy_8php.html#a0fb8cf0ac7bcbc8b27d856fe9bf69cd1":[6,0,0,79,7], +"taxonomy_8php.html#a163b5131f388080b0fc82398d3a32fe1":[6,0,0,79,5], +"taxonomy_8php.html#a3299482ac20e9d79453048dd52881d37":[6,0,0,79,4], +"taxonomy_8php.html#a4ba1339b2a7054971178ce194e4440fd":[6,0,0,79,11], +"taxonomy_8php.html#a599ee71dd3194c8127b00dabec77abc1":[6,0,0,79,2], +"taxonomy_8php.html#a7747fa859ac56fbffd4f9782d85505de":[6,0,0,79,8], +"taxonomy_8php.html#a7a913d19c77610da689be48fbbf6734c":[6,0,0,79,15], +"taxonomy_8php.html#aa8f8a1ff85daef046298e93c83e7a1b4":[6,0,0,79,0], +"taxonomy_8php.html#aaeded36bcc983b35d9205fe5b6c18c43":[6,0,0,79,14], +"taxonomy_8php.html#aaf90ba8b839d6459065f39a4f1109b8a":[6,0,0,79,12], +"taxonomy_8php.html#ac21d1dff16d569e7d110167aea4e63c2":[6,0,0,79,13], +"taxonomy_8php.html#adfead45e3b8a3dfb2b4a4b9281d0dbe1":[6,0,0,79,6], +"taxonomy_8php.html#af387463d42ffdf7d2ab3d5b22e40a0c7":[6,0,0,79,9], "template__processor_8php.html":[6,0,0,80], "template__processor_8php.html#a797745996c7839a93b2ab1af456631ab":[6,0,0,80,3], "template__processor_8php.html#ab2bcd8738f20f293636a6ae8e1099db5":[6,0,0,80,1], @@ -219,35 +249,5 @@ var NAVTREEINDEX8 = "toggle__safesearch_8php.html":[6,0,1,123], "toggle__safesearch_8php.html#a23d5cfb2727a266e44993ffbf5595a79":[6,0,1,123,0], "tpldebug_8php.html":[6,0,2,7], -"tpldebug_8php.html#a44778457a6c02554812fbfad19d32ba3":[6,0,2,7,0], -"tpldebug_8php.html#a5358407d65f2ca826f96356a6642d149":[6,0,2,7,1], -"tpldebug_8php.html#afbc7aadb3f7ff1edf0aaaa326a42179c":[6,0,2,7,2], -"typo_8php.html":[6,0,2,8], -"typo_8php.html#a1b709c1d79631ebc8320b41bda028b54":[6,0,2,8,1], -"typo_8php.html#a329c9c12217d2c8660c47bbc7c8df4c5":[6,0,2,8,4], -"typo_8php.html#a3ecd17ac846be1b35f3662f5c12ab6bd":[6,0,2,8,3], -"typo_8php.html#a9590b15215a21e9b42eb546aeef79704":[6,0,2,8,2], -"typo_8php.html#acebf83966ef6d7e5645a6b62ba368f9f":[6,0,2,8,0], -"typohelper_8php.html":[6,0,2,9], -"typohelper_8php.html#a7542d95618011800c61773127fa625cf":[6,0,2,9,0], -"typohelper_8php.html#ab6fd357fb5b2a3ba8aab9e8b98c6a805":[6,0,2,9,1], -"uexport_8php.html":[6,0,1,124], -"uexport_8php.html#a118920137dedebe0581623a2e57e7b0d":[6,0,1,124,0], -"update__channel_8php.html":[6,0,1,125], -"update__channel_8php.html#aca52a9da500f0db2f0a8666af5bc06ba":[6,0,1,125,0], -"update__display_8php.html":[6,0,1,126], -"update__display_8php.html#aa36ac524059e209d5d75a03c16206246":[6,0,1,126,0], -"update__network_8php.html":[6,0,1,127], -"update__network_8php.html#a8abf5b9f65af6a27ee2f9d7207ed1b41":[6,0,1,127,0], -"update__search_8php.html":[6,0,1,128], -"update__search_8php.html#ace4c3a23fa7d6922399e27c297a6ba52":[6,0,1,128,0], -"updatetpl_8py.html":[6,0,2,10], -"updatetpl_8py.html#a52a85ffa6b6d63d840b185a133478c12":[6,0,2,10,5], -"updatetpl_8py.html#a79c20eb62d568c999b56eb08530355d3":[6,0,2,10,2], -"updatetpl_8py.html#a988d937ed5d5c2b592b763036af5cf94":[6,0,2,10,1], -"updatetpl_8py.html#ab42dd79af65ee82201fd6f04715f62f6":[6,0,2,10,3], -"updatetpl_8py.html#ac9d11279fed403a329a719298feafc4f":[6,0,2,10,0], -"updatetpl_8py.html#ae694f5e1f25f8a92a945eb90c432dfe6":[6,0,2,10,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] +"tpldebug_8php.html#a44778457a6c02554812fbfad19d32ba3":[6,0,2,7,0] }; diff --git a/doc/html/navtreeindex9.js b/doc/html/navtreeindex9.js index 5631fe626..431de1608 100644 --- a/doc/html/navtreeindex9.js +++ b/doc/html/navtreeindex9.js @@ -1,5 +1,35 @@ var NAVTREEINDEX9 = { +"tpldebug_8php.html#a5358407d65f2ca826f96356a6642d149":[6,0,2,7,1], +"tpldebug_8php.html#afbc7aadb3f7ff1edf0aaaa326a42179c":[6,0,2,7,2], +"typo_8php.html":[6,0,2,8], +"typo_8php.html#a1b709c1d79631ebc8320b41bda028b54":[6,0,2,8,1], +"typo_8php.html#a329c9c12217d2c8660c47bbc7c8df4c5":[6,0,2,8,4], +"typo_8php.html#a3ecd17ac846be1b35f3662f5c12ab6bd":[6,0,2,8,3], +"typo_8php.html#a9590b15215a21e9b42eb546aeef79704":[6,0,2,8,2], +"typo_8php.html#acebf83966ef6d7e5645a6b62ba368f9f":[6,0,2,8,0], +"typohelper_8php.html":[6,0,2,9], +"typohelper_8php.html#a7542d95618011800c61773127fa625cf":[6,0,2,9,0], +"typohelper_8php.html#ab6fd357fb5b2a3ba8aab9e8b98c6a805":[6,0,2,9,1], +"uexport_8php.html":[6,0,1,124], +"uexport_8php.html#a118920137dedebe0581623a2e57e7b0d":[6,0,1,124,0], +"update__channel_8php.html":[6,0,1,125], +"update__channel_8php.html#aca52a9da500f0db2f0a8666af5bc06ba":[6,0,1,125,0], +"update__display_8php.html":[6,0,1,126], +"update__display_8php.html#aa36ac524059e209d5d75a03c16206246":[6,0,1,126,0], +"update__network_8php.html":[6,0,1,127], +"update__network_8php.html#a8abf5b9f65af6a27ee2f9d7207ed1b41":[6,0,1,127,0], +"update__search_8php.html":[6,0,1,128], +"update__search_8php.html#ace4c3a23fa7d6922399e27c297a6ba52":[6,0,1,128,0], +"updatetpl_8py.html":[6,0,2,10], +"updatetpl_8py.html#a52a85ffa6b6d63d840b185a133478c12":[6,0,2,10,5], +"updatetpl_8py.html#a79c20eb62d568c999b56eb08530355d3":[6,0,2,10,2], +"updatetpl_8py.html#a988d937ed5d5c2b592b763036af5cf94":[6,0,2,10,1], +"updatetpl_8py.html#ab42dd79af65ee82201fd6f04715f62f6":[6,0,2,10,3], +"updatetpl_8py.html#ac9d11279fed403a329a719298feafc4f":[6,0,2,10,0], +"updatetpl_8py.html#ae694f5e1f25f8a92a945eb90c432dfe6":[6,0,2,10,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], "view_2theme_2apw_2php_2config_8php.html#ad59fc09da66b66267f9753c8b2dd68d0":[6,0,3,1,0,1,0,0], "view_2theme_2blogga_2php_2config_8php.html":[6,0,3,1,1,0,0], @@ -41,36 +71,37 @@ var NAVTREEINDEX9 = "wfinger_8php.html#ae21e50c8d0a5f3c9be9f43a4e519acd3":[6,0,1,137,0], "widedarkness_8php.html":[6,0,3,1,0,2,10], "widgets_8php.html":[6,0,0,82], -"widgets_8php.html#a08035db02ff6a23260146b4c64153422":[6,0,0,82,11], -"widgets_8php.html#a0d404276fedc59f5038cf5c085028326":[6,0,0,82,26], +"widgets_8php.html#a08035db02ff6a23260146b4c64153422":[6,0,0,82,12], +"widgets_8php.html#a0d404276fedc59f5038cf5c085028326":[6,0,0,82,27], "widgets_8php.html#a0e2f5179ed1a73b282dfda7270fcabb3":[6,0,0,82,3], -"widgets_8php.html#a145ff35319cfa47a9cc07f9425bd674b":[6,0,0,82,8], -"widgets_8php.html#a268b01ce1ab8fe2cb346cb769b9d1091":[6,0,0,82,9], -"widgets_8php.html#a313a8d10ab81c71357c12e67e4d7efd5":[6,0,0,82,16], -"widgets_8php.html#a3bdfb81bf9a8ddf219924fa7eaf22013":[6,0,0,82,18], -"widgets_8php.html#a45ea061dabe9a8372e4ca3b9e5714256":[6,0,0,82,19], -"widgets_8php.html#a47c72aac42058ea086c9ef8651c259da":[6,0,0,82,5], -"widgets_8php.html#a50b1410238100c8a94c06b0aa63ee3b8":[6,0,0,82,25], -"widgets_8php.html#a5ab3b64496e02cab56429978ad55f1c0":[6,0,0,82,12], -"widgets_8php.html#a6dbc227aac750774284ee39c45f0a200":[6,0,0,82,27], -"widgets_8php.html#a702e2fc0adc9b615999eca18b7311b5e":[6,0,0,82,21], -"widgets_8php.html#a70442dfa079312d9d5e5ee01be51a165":[6,0,0,82,15], +"widgets_8php.html#a145ff35319cfa47a9cc07f9425bd674b":[6,0,0,82,9], +"widgets_8php.html#a268b01ce1ab8fe2cb346cb769b9d1091":[6,0,0,82,10], +"widgets_8php.html#a313a8d10ab81c71357c12e67e4d7efd5":[6,0,0,82,17], +"widgets_8php.html#a3bdfb81bf9a8ddf219924fa7eaf22013":[6,0,0,82,19], +"widgets_8php.html#a45ea061dabe9a8372e4ca3b9e5714256":[6,0,0,82,20], +"widgets_8php.html#a47c72aac42058ea086c9ef8651c259da":[6,0,0,82,6], +"widgets_8php.html#a50b1410238100c8a94c06b0aa63ee3b8":[6,0,0,82,26], +"widgets_8php.html#a5ab3b64496e02cab56429978ad55f1c0":[6,0,0,82,13], +"widgets_8php.html#a6dbc227aac750774284ee39c45f0a200":[6,0,0,82,28], +"widgets_8php.html#a702e2fc0adc9b615999eca18b7311b5e":[6,0,0,82,22], +"widgets_8php.html#a70442dfa079312d9d5e5ee01be51a165":[6,0,0,82,16], "widgets_8php.html#a7b1e357b5a2027718470b77ec921fc65":[6,0,0,82,2], -"widgets_8php.html#a94203eb9bcd63cbdecbbcb15163598d8":[6,0,0,82,23], -"widgets_8php.html#a95c06bc9be133e89768746302d2ac395":[6,0,0,82,10], -"widgets_8php.html#a999ba893cac7600d3d3b4e7e14cf8c20":[6,0,0,82,20], -"widgets_8php.html#a9d60539db68042e63c0015abd69a6f7a":[6,0,0,82,6], -"widgets_8php.html#aa189a07241246d97efbee29f1c6a6f7f":[6,0,0,82,7], -"widgets_8php.html#aaa73bcf1702eaadd9dcd253502f55e01":[6,0,0,82,24], -"widgets_8php.html#abd2e508a2a0b911c4a838e3cb7599923":[6,0,0,82,22], -"widgets_8php.html#abe03366fd22fd27d683518fa0765da50":[6,0,0,82,29], +"widgets_8php.html#a94203eb9bcd63cbdecbbcb15163598d8":[6,0,0,82,24], +"widgets_8php.html#a95c06bc9be133e89768746302d2ac395":[6,0,0,82,11], +"widgets_8php.html#a999ba893cac7600d3d3b4e7e14cf8c20":[6,0,0,82,21], +"widgets_8php.html#a9d60539db68042e63c0015abd69a6f7a":[6,0,0,82,7], +"widgets_8php.html#aa189a07241246d97efbee29f1c6a6f7f":[6,0,0,82,8], +"widgets_8php.html#aaa73bcf1702eaadd9dcd253502f55e01":[6,0,0,82,25], +"widgets_8php.html#abd2e508a2a0b911c4a838e3cb7599923":[6,0,0,82,23], +"widgets_8php.html#abe03366fd22fd27d683518fa0765da50":[6,0,0,82,30], "widgets_8php.html#aced5cb177f630b30799c5eab873ee75c":[6,0,0,82,1], -"widgets_8php.html#ad1bf7aa69e8d100d95faba17c7bc91cd":[6,0,0,82,14], +"widgets_8php.html#ad1bf7aa69e8d100d95faba17c7bc91cd":[6,0,0,82,15], "widgets_8php.html#add9b24d3304e529a7975e96122315554":[6,0,0,82,0], -"widgets_8php.html#ade630b19fb4c622b7b2f6f8ef89eefa2":[6,0,0,82,13], -"widgets_8php.html#ae4ced69d83dbdd9e6b51660d9eba8653":[6,0,0,82,28], -"widgets_8php.html#af37fdad3b2e861d860a4a8c4d8a76c0b":[6,0,0,82,4], -"widgets_8php.html#afa2e55a78f95667a6da082efac7fec74":[6,0,0,82,17], +"widgets_8php.html#ade630b19fb4c622b7b2f6f8ef89eefa2":[6,0,0,82,14], +"widgets_8php.html#ae4ced69d83dbdd9e6b51660d9eba8653":[6,0,0,82,29], +"widgets_8php.html#af37fdad3b2e861d860a4a8c4d8a76c0b":[6,0,0,82,5], +"widgets_8php.html#af919de8e7e2ba8192a65fadc72a2c8b5":[6,0,0,82,4], +"widgets_8php.html#afa2e55a78f95667a6da082efac7fec74":[6,0,0,82,18], "xchan_8php.html":[6,0,1,138], "xchan_8php.html#a9853348bf1a35c644460221ba75edc2d":[6,0,1,138,0], "xrd_8php.html":[6,0,1,139], @@ -82,13 +113,13 @@ var NAVTREEINDEX9 = "zot_8php.html":[6,0,0,83], "zot_8php.html#a083aec6c900d244e1bfc1406f9461465":[6,0,0,83,15], "zot_8php.html#a084c581d534e7e3b759488b46602288f":[6,0,0,83,20], +"zot_8php.html#a0e3006e7a456b2175a9badc96bc5176d":[6,0,0,83,11], "zot_8php.html#a0fc2211c5309d9f925ecc4115e3fdb75":[6,0,0,83,9], "zot_8php.html#a20750dd2c36961013fd382fb34e1366c":[6,0,0,83,6], "zot_8php.html#a2657e141d62d5f67ad3c87651b585299":[6,0,0,83,7], "zot_8php.html#a31aad56acf8ff8f2353e6ff8595544df":[6,0,0,83,18], "zot_8php.html#a3920afe14fc1d82020161b4b86bcd9ac":[6,0,0,83,28], "zot_8php.html#a3bf11286c2619b4ca28e49d5b5ab374a":[6,0,0,83,5], -"zot_8php.html#a4d9e6ca295e443b740d9960c304b3474":[6,0,0,83,11], "zot_8php.html#a528e97ca5d69c3b7f35c5d954afde315":[6,0,0,83,8], "zot_8php.html#a55056e863a7860bc0cf922e78fcce073":[6,0,0,83,25], "zot_8php.html#a5bcdfef419b16075a0eca990956223dc":[6,0,0,83,31], diff --git a/doc/html/permissions_8php.html b/doc/html/permissions_8php.html index 96d65b44b..bd92a66d0 100644 --- a/doc/html/permissions_8php.html +++ b/doc/html/permissions_8php.html @@ -243,7 +243,7 @@ Functions -

    Referenced by connedit_content(), create_identity(), foofoo(), new_contact(), and settings_post().

    +

    Referenced by connedit_content(), create_identity(), diaspora_request(), foofoo(), new_contact(), settings_post(), and zot_refresh().

    @@ -277,7 +277,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(), RedMatrix\RedDAV\RedDirectory\createDirectory(), RedMatrix\RedDAV\RedDirectory\createFile(), RedMatrix\RedDAV\RedFile\delete(), diaspora_asphoto(), diaspora_comment(), diaspora_conversation(), diaspora_like(), diaspora_photo(), diaspora_post(), diaspora_reshare(), display_content(), editblock_content(), get_feed_for(), RedMatrix\RedDAV\RedDirectory\getChild(), RedMatrix\RedDAV\RedDirectory\getChildren(), item_post(), like_content(), local_dir_update(), p_init(), 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(), RedMatrix\RedDAV\RedBrowser\set_writeable(), RedMatrix\RedDAV\RedFile\setName(), RedMatrix\RedDAV\RedDirectory\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(), RedMatrix\RedDAV\RedDirectory\createDirectory(), RedMatrix\RedDAV\RedDirectory\createFile(), RedMatrix\RedDAV\RedFile\delete(), diaspora_asphoto(), diaspora_comment(), diaspora_conversation(), diaspora_like(), diaspora_photo(), diaspora_post(), diaspora_reshare(), display_content(), editblock_content(), get_feed_for(), RedMatrix\RedDAV\RedDirectory\getChild(), RedMatrix\RedDAV\RedDirectory\getChildren(), item_post(), like_content(), local_dir_update(), p_init(), 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(), RedMatrix\RedDAV\RedBrowser\set_writeable(), RedMatrix\RedDAV\RedFile\setName(), RedMatrix\RedDAV\RedDirectory\setName(), subthread_content(), tag_deliver(), tgroup_check(), update_birthdays(), viewconnections_content(), widget_archive(), widget_catcloud_wall(), widget_categories(), widget_item(), widget_photo_albums(), widget_tagcloud_wall(), z_readdir(), and zot_feed().

    diff --git a/doc/html/php_2theme__init_8php.html b/doc/html/php_2theme__init_8php.html index e8c0dd6e2..11b70b2bb 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(), 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(), impel_init(), import_post(), importelm_post(), invite_content(), is_public_profile(), item_photo_menu(), item_post(), item_store(), item_store_update(), items_fetch(), layouts_content(), locs_post(), 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(), 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(), store_diaspora_comment_sig(), 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_encode_locations(), 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(), diaspora_request(), 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(), impel_init(), import_post(), importelm_post(), invite_content(), is_public_profile(), item_photo_menu(), item_post(), item_store(), item_store_update(), items_fetch(), layouts_content(), locs_content(), locs_post(), 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(), 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(), refimport_content(), reflect_comment_store(), reflect_photo_callback(), rpost_content(), send_message(), settings_post(), sources_post(), start_delivery_chain(), store_diaspora_comment_sig(), 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_encode_locations(), zot_finger(), and zot_refresh().

    diff --git a/doc/html/plugin_8php.html b/doc/html/plugin_8php.html index c71c22f19..1557daf08 100644 --- a/doc/html/plugin_8php.html +++ b/doc/html/plugin_8php.html @@ -206,7 +206,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(), 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().

    +

    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().

    @@ -298,7 +298,7 @@ Functions
    -

    Referenced by achievements_content(), 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(), RedMatrix\RedDAV\RedBrowser\generateDirectoryIndex(), get_birthdays(), Item\get_comment_box(), get_events(), get_feed_for(), group_content(), group_side(), help_content(), hostxrd_init(), RedMatrix\RedDAV\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(), p_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(), search_content(), searchbox(), 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 achievements_content(), 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(), RedMatrix\RedDAV\RedBrowser\generateDirectoryIndex(), get_birthdays(), Item\get_comment_box(), get_events(), get_feed_for(), group_content(), group_side(), help_content(), hostxrd_init(), RedMatrix\RedDAV\RedBrowser\htmlActionsPanel(), identity_selector(), import_content(), invite_content(), lang_selector(), layouts_content(), locs_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(), p_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(), search_content(), searchbox(), 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/refimport_8php.html b/doc/html/refimport_8php.html new file mode 100644 index 000000000..26dc98a08 --- /dev/null +++ b/doc/html/refimport_8php.html @@ -0,0 +1,381 @@ + + + + + + +The Red Matrix: include/Import/refimport.php File Reference + + + + + + + + + + + + + +
    +
    + + + + + + + +
    +
    The Red Matrix +
    +
    +
    + + + + + +
    +
    + +
    +
    +
    + +
    + + + + +
    + +
    + +
    +
    +Functions | +Variables
    +
    +
    refimport.php File Reference
    +
    +
    + + + + + + + + + + + + + + +

    +Functions

     reflect_get_channel ()
     
     refimport_content (&$a)
     
     reflect_article_callback ($matches)
     
     reflect_photo_callback ($matches)
     
     reflect_find_user ($users, $name)
     
     reflect_comment_store ($channel, $post, $comment, $user)
     
    + + + + + + + + + + + + + + + +

    +Variables

    const REDMATRIX_IMPORTCHANNEL 'mike'
     
    const REFLECT_EXPORTUSERNAME 'mike'
     
    const REFLECT_BLOGNAME 'Diary and Other Rantings'
     
    const REFLECT_BASEURL 'http://example.com/'
     
    const REFLECT_USERFILE 'user.json'
     
    const REFLECT_OVERWRITE false
     
    const REFLECT_MAXPERRUN 30
     
    +

    Function Documentation

    + +
    +
    + + + + + + + + +
    refimport_content (& $a)
    +
    + +
    +
    + +
    +
    + + + + + + + + +
    reflect_article_callback ( $matches)
    +
    + +
    +
    + +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    reflect_comment_store ( $channel,
     $post,
     $comment,
     $user 
    )
    +
    + +

    Referenced by refimport_content().

    + +
    +
    + +
    +
    + + + + + + + + + + + + + + + + + + +
    reflect_find_user ( $users,
     $name 
    )
    +
    + +

    Referenced by refimport_content().

    + +
    +
    + +
    +
    + + + + + + + +
    reflect_get_channel ()
    +
    + +

    Referenced by refimport_content(), and reflect_photo_callback().

    + +
    +
    + +
    +
    + + + + + + + + +
    reflect_photo_callback ( $matches)
    +
    + +
    +
    +

    Variable Documentation

    + +
    +
    + + + + +
    const REDMATRIX_IMPORTCHANNEL 'mike'
    +
    + +

    Referenced by reflect_get_channel().

    + +
    +
    + +
    +
    + + + + +
    const REFLECT_BASEURL 'http://example.com/'
    +
    + +

    Referenced by reflect_comment_store(), and reflect_photo_callback().

    + +
    +
    + +
    +
    + + + + +
    const REFLECT_BLOGNAME 'Diary and Other Rantings'
    +
    + +

    Referenced by refimport_content().

    + +
    +
    + +
    +
    + + + + +
    const REFLECT_EXPORTUSERNAME 'mike'
    +
    + +

    Referenced by reflect_comment_store().

    + +
    +
    + +
    +
    + + + + +
    const REFLECT_MAXPERRUN 30
    +
    + +

    Referenced by refimport_content().

    + +
    +
    + +
    +
    + + + + +
    const REFLECT_OVERWRITE false
    +
    + +

    Referenced by refimport_content(), and reflect_comment_store().

    + +
    +
    + +
    +
    + + + + +
    const REFLECT_USERFILE 'user.json'
    +
    + +

    Referenced by refimport_content().

    + +
    +
    +
    +
    + diff --git a/doc/html/refimport_8php.js b/doc/html/refimport_8php.js new file mode 100644 index 000000000..f0b97cbee --- /dev/null +++ b/doc/html/refimport_8php.js @@ -0,0 +1,16 @@ +var refimport_8php = +[ + [ "refimport_content", "refimport_8php.html#ad97ebb5feda0230a4834e0b3637a0d29", null ], + [ "reflect_article_callback", "refimport_8php.html#a53434bc19e6264db89e18d92ddc09860", null ], + [ "reflect_comment_store", "refimport_8php.html#a01a29630fa5e1ce6cd5e1fd75280747c", null ], + [ "reflect_find_user", "refimport_8php.html#aa98de7d112e3a5b4b6956f108d04a41d", null ], + [ "reflect_get_channel", "refimport_8php.html#a6c3e0475fde9fe72ff2492a5e3e5259c", null ], + [ "reflect_photo_callback", "refimport_8php.html#ae9c56f779d1e0ac7bcb2a460129e7ae5", null ], + [ "REDMATRIX_IMPORTCHANNEL", "refimport_8php.html#a54003135d7c8994a76e831fb6faa2fe6", null ], + [ "REFLECT_BASEURL", "refimport_8php.html#ac43699d8ae86175e049aa4e87853caac", null ], + [ "REFLECT_BLOGNAME", "refimport_8php.html#a8459983ebf013ed5737f7ed317bfae1f", null ], + [ "REFLECT_EXPORTUSERNAME", "refimport_8php.html#ad297afe0730c9119dd94d3cf0521b025", null ], + [ "REFLECT_MAXPERRUN", "refimport_8php.html#a9c1f681f1f303400a9818696a9f96d6f", null ], + [ "REFLECT_OVERWRITE", "refimport_8php.html#aeec793cefa260f788b7d005adcb35796", null ], + [ "REFLECT_USERFILE", "refimport_8php.html#a684a44d2401abf75f441591bcb41d10d", null ] +]; \ No newline at end of file diff --git a/doc/html/search/all_63.js b/doc/html/search/all_63.js index 3be68534d..04912f004 100644 --- a/doc/html/search/all_63.js +++ b/doc/html/search/all_63.js @@ -5,6 +5,7 @@ var searchData= ['cal',['cal',['../datetime_8php.html#aea356409ba69f9de412298c998595dd2',1,'datetime.php']]], ['call_5fhooks',['call_hooks',['../plugin_8php.html#a7f05de16c0a32602853b09b99dd85e7c',1,'plugin.php']]], ['can_5fcomment_5fon_5fpost',['can_comment_on_post',['../items_8php.html#a1e75047cf175aaee8dd16aa761913ff9',1,'items.php']]], + ['catblock',['catblock',['../taxonomy_8php.html#aa8f8a1ff85daef046298e93c83e7a1b4',1,'taxonomy.php']]], ['categories_5fwidget',['categories_widget',['../contact__widgets_8php.html#a165eb021e61c4dcab2a552f28628d353',1,'contact_widgets.php']]], ['change_5fchannel',['change_channel',['../security_8php.html#a8d23d2597aae380a3341872fe9513380',1,'security.php']]], ['change_5fpermissions',['change_permissions',['../classProtoDriver.html#a34b97ca5ef2165f2e16eb2fe59ff6c67',1,'ProtoDriver\change_permissions()'],['../classZotDriver.html#a6776935156accb0f170e2e24577133db',1,'ZotDriver\change_permissions()']]], diff --git a/doc/html/search/all_67.js b/doc/html/search/all_67.js index 86bc1f755..40d52a6c9 100644 --- a/doc/html/search/all_67.js +++ b/doc/html/search/all_67.js @@ -20,6 +20,7 @@ var searchData= ['get_5fcapath',['get_capath',['../include_2network_8php.html#a78e89557b2fbd344ad790846d761b0c7',1,'network.php']]], ['get_5fchannel',['get_channel',['../classApp.html#a084e03c77686d8c13390fef3f7428a2b',1,'App']]], ['get_5fchannel_5fby_5fnick',['get_channel_by_nick',['../identity_8php.html#ac73b3e13778c564c877554517a7f51ba',1,'identity.php']]], + ['get_5fchannel_5fdefault_5fperms',['get_channel_default_perms',['../identity_8php.html#a293f416ce9050220b183e08ff5890216',1,'identity.php']]], ['get_5fchild',['get_child',['../classItem.html#a632185dd25c5caf277067c76230a4320',1,'Item']]], ['get_5fchildren',['get_children',['../classRedmatrix_1_1Import_1_1Import.html#a832a4cc0d33d0eea29cb450004054580',1,'Redmatrix\Import\Import\get_children()'],['../classItem.html#aa0ee775ec94abccec6c798428835d001',1,'Item\get_children()']]], ['get_5fcipher',['get_cipher',['../classConversation.html#a4aab60bb39fa6761b6cacdc8d9da2901',1,'Conversation']]], @@ -130,8 +131,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',['../mod_2group_8php.html',1,'']]], ['group_2ephp',['group.php',['../include_2group_8php.html',1,'']]], + ['group_2ephp',['group.php',['../mod_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_6c.js b/doc/html/search/all_6c.js index 765d4c768..3c3de04df 100644 --- a/doc/html/search/all_6c.js +++ b/doc/html/search/all_6c.js @@ -17,7 +17,7 @@ var searchData= ['limit_5fbody_5fsize',['limit_body_size',['../items_8php.html#af94c281016c6c912d06e064113336c5c',1,'items.php']]], ['link_5fcompare',['link_compare',['../text_8php.html#a47c1e4a5f3f53027daacd8a9db24f285',1,'text.php']]], ['linkify',['linkify',['../text_8php.html#a11255c8c4e5245b6c24f97684826aa54',1,'text.php']]], - ['list_5fpost_5fdates',['list_post_dates',['../items_8php.html#aa2d3caa2f27720762b5c729e07df40fb',1,'items.php']]], + ['list_5fpost_5fdates',['list_post_dates',['../items_8php.html#ab33fa9756aaa5f39a6104d57a62baf00',1,'items.php']]], ['list_5fpublic_5fsites',['list_public_sites',['../dirsearch_8php.html#a985d410a170549429857af6ff2673149',1,'dirsearch.php']]], ['load',['load',['../classphoto__driver.html#a19e1af2b6af4c63aa6230abe69f83712',1,'photo_driver\load()'],['../classphoto__gd.html#a33092b889875b68bfb1c97ff123012d9',1,'photo_gd\load()'],['../classphoto__imagick.html#a2c9168f110ccd6c264095d766615dfa8',1,'photo_imagick\load()']]], ['load_5fconfig',['load_config',['../include_2config_8php.html#a27559f388c9b9af81c94e48d6889d1d1',1,'config.php']]], @@ -36,6 +36,7 @@ var searchData= ['lockview_2ephp',['lockview.php',['../lockview_8php.html',1,'']]], ['lockview_5fcontent',['lockview_content',['../lockview_8php.html#a851e26ab9a1008df5c5ebebea31e9b44',1,'lockview.php']]], ['locs_2ephp',['locs.php',['../locs_8php.html',1,'']]], + ['locs_5fcontent',['locs_content',['../locs_8php.html#a6c900f53970c0d0e738d2fe06d27ca44',1,'locs.php']]], ['locs_5fpost',['locs_post',['../locs_8php.html#a6b43654592919ac863d67a1f787a69b9',1,'locs.php']]], ['log',['log',['../classRedMatrix_1_1RedDAV_1_1RedBasicAuth.html#abf6fe89b0a8239ed93c3b07e1fbce75b',1,'RedMatrix\RedDAV\RedBasicAuth\log()'],['../classRedMatrix_1_1RedDAV_1_1RedDirectory.html#af90a1a74cfd643a5c56b9a17ea250d59',1,'RedMatrix\RedDAV\RedDirectory\log()']]], ['logger',['logger',['../text_8php.html#a030fa5ecc64168af0c4f44897a9bce63',1,'text.php']]], diff --git a/doc/html/search/all_70.js b/doc/html/search/all_70.js index e1f5ce70b..df9d49a93 100644 --- a/doc/html/search/all_70.js +++ b/doc/html/search/all_70.js @@ -66,6 +66,7 @@ var searchData= ['perms_5fw_5ftagwall',['PERMS_W_TAGWALL',['../boot_8php.html#a99a4a17cb644e7e6826ea07ecaf09777',1,'boot.php']]], ['perms_5fw_5fwall',['PERMS_W_WALL',['../boot_8php.html#a6b14a31a8aa9f3452a13383f413bffa2',1,'boot.php']]], ['photo_2ephp',['photo.php',['../photo_8php.html',1,'']]], + ['photo_5fadult',['PHOTO_ADULT',['../boot_8php.html#a921c55b9fa59a327a5f0e07fa1ccb2e0',1,'boot.php']]], ['photo_5fdriver',['photo_driver',['../classphoto__driver.html',1,'']]], ['photo_5fdriver_2ephp',['photo_driver.php',['../photo__driver_8php.html',1,'']]], ['photo_5ffactory',['photo_factory',['../photo__driver_8php.html#a32e2817faa25d7f11f60a8abff565035',1,'photo_driver.php']]], @@ -160,7 +161,7 @@ var searchData= ['probe_5fzot',['probe_zot',['../include_2probe_8php.html#a3c02c7a23e8335a79c3c0f5331d11a85',1,'probe.php']]], ['proc_5frun',['proc_run',['../boot_8php.html#ab346a2ece14993861f3e4206befa94f0',1,'boot.php']]], ['process_5fchannel_5fsync_5fdelivery',['process_channel_sync_delivery',['../zot_8php.html#ac301c67864917c35922257950ae0f95c',1,'zot.php']]], - ['process_5fdelivery',['process_delivery',['../zot_8php.html#a4d9e6ca295e443b740d9960c304b3474',1,'zot.php']]], + ['process_5fdelivery',['process_delivery',['../zot_8php.html#a0e3006e7a456b2175a9badc96bc5176d',1,'zot.php']]], ['process_5flocation_5fdelivery',['process_location_delivery',['../zot_8php.html#a8eeefdb0dad4c436bea9d1c06c0a7988',1,'zot.php']]], ['process_5fmail_5fdelivery',['process_mail_delivery',['../zot_8php.html#aa6ae96db8cbbdbb10e6876d206bbf7cc',1,'zot.php']]], ['process_5fprofile_5fdelivery',['process_profile_delivery',['../zot_8php.html#a9a57b40669351c9791126b925cb7ef3b',1,'zot.php']]], diff --git a/doc/html/search/all_72.js b/doc/html/search/all_72.js index 93882734e..5dc27105f 100644 --- a/doc/html/search/all_72.js +++ b/doc/html/search/all_72.js @@ -43,6 +43,7 @@ var searchData= ['redfile_2ephp',['RedFile.php',['../RedFile_8php.html',1,'']]], ['redfiledata',['RedFileData',['../reddav_8php.html#a9f531641dfb4e43cd88ac1a9ae7e2088',1,'reddav.php']]], ['redmatrix',['RedMatrix',['../namespaceRedMatrix.html',1,'RedMatrix'],['../namespaceRedmatrix.html',1,'Redmatrix']]], + ['redmatrix_5fimportchannel',['REDMATRIX_IMPORTCHANNEL',['../refimport_8php.html#a54003135d7c8994a76e831fb6faa2fe6',1,'refimport.php']]], ['reduce',['reduce',['../docblox__errorchecker_8php.html#ae9562cf60aa693114603d27b55d2185f',1,'docblox_errorchecker.php']]], ['ref_5fsession_5fclose',['ref_session_close',['../session_8php.html#a5e1c616e02b863d5450317d101366bb7',1,'session.php']]], ['ref_5fsession_5fdestroy',['ref_session_destroy',['../session_8php.html#af230b86bfff7db66c3bdd7e0bbc24052',1,'session.php']]], @@ -50,6 +51,19 @@ var searchData= ['ref_5fsession_5fopen',['ref_session_open',['../session_8php.html#a26fa1042356d555023cbf15ddd4f8507',1,'session.php']]], ['ref_5fsession_5fread',['ref_session_read',['../session_8php.html#a7f0f50576360d9ba52d29364e0b83a8e',1,'session.php']]], ['ref_5fsession_5fwrite',['ref_session_write',['../session_8php.html#ac4461c1984543d3553e73dba2771568f',1,'session.php']]], + ['refimport_2ephp',['refimport.php',['../refimport_8php.html',1,'']]], + ['refimport_5fcontent',['refimport_content',['../refimport_8php.html#ad97ebb5feda0230a4834e0b3637a0d29',1,'refimport.php']]], + ['reflect_5farticle_5fcallback',['reflect_article_callback',['../refimport_8php.html#a53434bc19e6264db89e18d92ddc09860',1,'refimport.php']]], + ['reflect_5fbaseurl',['REFLECT_BASEURL',['../refimport_8php.html#ac43699d8ae86175e049aa4e87853caac',1,'refimport.php']]], + ['reflect_5fblogname',['REFLECT_BLOGNAME',['../refimport_8php.html#a8459983ebf013ed5737f7ed317bfae1f',1,'refimport.php']]], + ['reflect_5fcomment_5fstore',['reflect_comment_store',['../refimport_8php.html#a01a29630fa5e1ce6cd5e1fd75280747c',1,'refimport.php']]], + ['reflect_5fexportusername',['REFLECT_EXPORTUSERNAME',['../refimport_8php.html#ad297afe0730c9119dd94d3cf0521b025',1,'refimport.php']]], + ['reflect_5ffind_5fuser',['reflect_find_user',['../refimport_8php.html#aa98de7d112e3a5b4b6956f108d04a41d',1,'refimport.php']]], + ['reflect_5fget_5fchannel',['reflect_get_channel',['../refimport_8php.html#a6c3e0475fde9fe72ff2492a5e3e5259c',1,'refimport.php']]], + ['reflect_5fmaxperrun',['REFLECT_MAXPERRUN',['../refimport_8php.html#a9c1f681f1f303400a9818696a9f96d6f',1,'refimport.php']]], + ['reflect_5foverwrite',['REFLECT_OVERWRITE',['../refimport_8php.html#aeec793cefa260f788b7d005adcb35796',1,'refimport.php']]], + ['reflect_5fphoto_5fcallback',['reflect_photo_callback',['../refimport_8php.html#ae9c56f779d1e0ac7bcb2a460129e7ae5',1,'refimport.php']]], + ['reflect_5fuserfile',['REFLECT_USERFILE',['../refimport_8php.html#a684a44d2401abf75f441591bcb41d10d',1,'refimport.php']]], ['register_2ephp',['register.php',['../register_8php.html',1,'']]], ['register_5fapprove',['REGISTER_APPROVE',['../boot_8php.html#a7176c0f9f1c98421b97735d892cf6252',1,'boot.php']]], ['register_5fclosed',['REGISTER_CLOSED',['../boot_8php.html#a69aac276ed82e010dc382b16ab4d59e1',1,'boot.php']]], diff --git a/doc/html/search/all_76.js b/doc/html/search/all_76.js index 37f7c54b7..ec35b57e4 100644 --- a/doc/html/search/all_76.js +++ b/doc/html/search/all_76.js @@ -16,6 +16,17 @@ var searchData= ['viewsrc_2ephp',['viewsrc.php',['../viewsrc_8php.html',1,'']]], ['viewsrc_5fcontent',['viewsrc_content',['../viewsrc_8php.html#a6eff3d0c1d7d14b335c4edb785cd60a4',1,'viewsrc.php']]], ['visible_5factivity',['visible_activity',['../conversation_8php.html#a7eeaaf44506815576f3bd80053ef52c3',1,'conversation.php']]], + ['vnotify_5falert',['VNOTIFY_ALERT',['../boot_8php.html#a9f8a2938ddd9ee2867e6f8ce77b61b2f',1,'boot.php']]], + ['vnotify_5fbirthday',['VNOTIFY_BIRTHDAY',['../boot_8php.html#ac89396b9144391acd08d6d0f9b332220',1,'boot.php']]], + ['vnotify_5fchannel',['VNOTIFY_CHANNEL',['../boot_8php.html#a7b511bd93202c43405adbe3b5bcebbfe',1,'boot.php']]], + ['vnotify_5fevent',['VNOTIFY_EVENT',['../boot_8php.html#ad94aca4c260b8a892397786201dc4664',1,'boot.php']]], + ['vnotify_5feventtoday',['VNOTIFY_EVENTTODAY',['../boot_8php.html#a76480b213af379c0c6c7fa4e39019ca9',1,'boot.php']]], + ['vnotify_5finfo',['VNOTIFY_INFO',['../boot_8php.html#a37281c30bd92cecb499878d6778c570f',1,'boot.php']]], + ['vnotify_5fintro',['VNOTIFY_INTRO',['../boot_8php.html#a1997c4b7d0253e036bc0fb6b20e4af71',1,'boot.php']]], + ['vnotify_5fmail',['VNOTIFY_MAIL',['../boot_8php.html#a0afeb43da443d6ff3526ede5ecdcc3b3',1,'boot.php']]], + ['vnotify_5fnetwork',['VNOTIFY_NETWORK',['../boot_8php.html#a997614f25e58f8313641e1eb0109fd10',1,'boot.php']]], + ['vnotify_5fregister',['VNOTIFY_REGISTER',['../boot_8php.html#ae09767b94688657978ff9366ec63684b',1,'boot.php']]], + ['vnotify_5fsystem',['VNOTIFY_SYSTEM',['../boot_8php.html#a7e5627b5ca4b7464feb0f08663b19ea1',1,'boot.php']]], ['vote_2ephp',['vote.php',['../vote_8php.html',1,'']]], ['vote_5fcontent',['vote_content',['../vote_8php.html#a6aa67489bf458ca5e3206e46dac68596',1,'vote.php']]], ['vote_5finit',['vote_init',['../vote_8php.html#ae0c6610f40afbbc1f4fe6494c51fbab2',1,'vote.php']]], diff --git a/doc/html/search/all_77.js b/doc/html/search/all_77.js index b3a5a4947..621b0aed7 100644 --- a/doc/html/search/all_77.js +++ b/doc/html/search/all_77.js @@ -18,6 +18,7 @@ var searchData= ['widget_5fappselect',['widget_appselect',['../widgets_8php.html#aced5cb177f630b30799c5eab873ee75c',1,'widgets.php']]], ['widget_5farchive',['widget_archive',['../widgets_8php.html#a7b1e357b5a2027718470b77ec921fc65',1,'widgets.php']]], ['widget_5fbookmarkedchats',['widget_bookmarkedchats',['../widgets_8php.html#a0e2f5179ed1a73b282dfda7270fcabb3',1,'widgets.php']]], + ['widget_5fcatcloud_5fwall',['widget_catcloud_wall',['../widgets_8php.html#af919de8e7e2ba8192a65fadc72a2c8b5',1,'widgets.php']]], ['widget_5fcategories',['widget_categories',['../widgets_8php.html#af37fdad3b2e861d860a4a8c4d8a76c0b',1,'widgets.php']]], ['widget_5fchatroom_5flist',['widget_chatroom_list',['../widgets_8php.html#a47c72aac42058ea086c9ef8651c259da',1,'widgets.php']]], ['widget_5fclock',['widget_clock',['../widgets_8php.html#a9d60539db68042e63c0015abd69a6f7a',1,'widgets.php']]], diff --git a/doc/html/search/files_72.js b/doc/html/search/files_72.js index 0bab1f0eb..73bd22015 100644 --- a/doc/html/search/files_72.js +++ b/doc/html/search/files_72.js @@ -12,6 +12,7 @@ var searchData= ['reddav_2ephp',['reddav.php',['../reddav_8php.html',1,'']]], ['reddirectory_2ephp',['RedDirectory.php',['../RedDirectory_8php.html',1,'']]], ['redfile_2ephp',['RedFile.php',['../RedFile_8php.html',1,'']]], + ['refimport_2ephp',['refimport.php',['../refimport_8php.html',1,'']]], ['register_2ephp',['register.php',['../register_8php.html',1,'']]], ['regmod_2ephp',['regmod.php',['../regmod_8php.html',1,'']]], ['regver_2ephp',['regver.php',['../regver_8php.html',1,'']]], diff --git a/doc/html/search/functions_63.js b/doc/html/search/functions_63.js index 26de38b25..7b5abcc2f 100644 --- a/doc/html/search/functions_63.js +++ b/doc/html/search/functions_63.js @@ -3,6 +3,7 @@ var searchData= ['cal',['cal',['../datetime_8php.html#aea356409ba69f9de412298c998595dd2',1,'datetime.php']]], ['call_5fhooks',['call_hooks',['../plugin_8php.html#a7f05de16c0a32602853b09b99dd85e7c',1,'plugin.php']]], ['can_5fcomment_5fon_5fpost',['can_comment_on_post',['../items_8php.html#a1e75047cf175aaee8dd16aa761913ff9',1,'items.php']]], + ['catblock',['catblock',['../taxonomy_8php.html#aa8f8a1ff85daef046298e93c83e7a1b4',1,'taxonomy.php']]], ['categories_5fwidget',['categories_widget',['../contact__widgets_8php.html#a165eb021e61c4dcab2a552f28628d353',1,'contact_widgets.php']]], ['change_5fchannel',['change_channel',['../security_8php.html#a8d23d2597aae380a3341872fe9513380',1,'security.php']]], ['change_5fpermissions',['change_permissions',['../classProtoDriver.html#a34b97ca5ef2165f2e16eb2fe59ff6c67',1,'ProtoDriver\change_permissions()'],['../classZotDriver.html#a6776935156accb0f170e2e24577133db',1,'ZotDriver\change_permissions()']]], diff --git a/doc/html/search/functions_67.js b/doc/html/search/functions_67.js index 992225335..835416938 100644 --- a/doc/html/search/functions_67.js +++ b/doc/html/search/functions_67.js @@ -20,6 +20,7 @@ var searchData= ['get_5fcapath',['get_capath',['../include_2network_8php.html#a78e89557b2fbd344ad790846d761b0c7',1,'network.php']]], ['get_5fchannel',['get_channel',['../classApp.html#a084e03c77686d8c13390fef3f7428a2b',1,'App']]], ['get_5fchannel_5fby_5fnick',['get_channel_by_nick',['../identity_8php.html#ac73b3e13778c564c877554517a7f51ba',1,'identity.php']]], + ['get_5fchannel_5fdefault_5fperms',['get_channel_default_perms',['../identity_8php.html#a293f416ce9050220b183e08ff5890216',1,'identity.php']]], ['get_5fchild',['get_child',['../classItem.html#a632185dd25c5caf277067c76230a4320',1,'Item']]], ['get_5fchildren',['get_children',['../classRedmatrix_1_1Import_1_1Import.html#a832a4cc0d33d0eea29cb450004054580',1,'Redmatrix\Import\Import\get_children()'],['../classItem.html#aa0ee775ec94abccec6c798428835d001',1,'Item\get_children()']]], ['get_5fcipher',['get_cipher',['../classConversation.html#a4aab60bb39fa6761b6cacdc8d9da2901',1,'Conversation']]], diff --git a/doc/html/search/functions_6c.js b/doc/html/search/functions_6c.js index 171acad1d..bae096081 100644 --- a/doc/html/search/functions_6c.js +++ b/doc/html/search/functions_6c.js @@ -10,7 +10,7 @@ var searchData= ['limit_5fbody_5fsize',['limit_body_size',['../items_8php.html#af94c281016c6c912d06e064113336c5c',1,'items.php']]], ['link_5fcompare',['link_compare',['../text_8php.html#a47c1e4a5f3f53027daacd8a9db24f285',1,'text.php']]], ['linkify',['linkify',['../text_8php.html#a11255c8c4e5245b6c24f97684826aa54',1,'text.php']]], - ['list_5fpost_5fdates',['list_post_dates',['../items_8php.html#aa2d3caa2f27720762b5c729e07df40fb',1,'items.php']]], + ['list_5fpost_5fdates',['list_post_dates',['../items_8php.html#ab33fa9756aaa5f39a6104d57a62baf00',1,'items.php']]], ['list_5fpublic_5fsites',['list_public_sites',['../dirsearch_8php.html#a985d410a170549429857af6ff2673149',1,'dirsearch.php']]], ['load',['load',['../classphoto__driver.html#a19e1af2b6af4c63aa6230abe69f83712',1,'photo_driver\load()'],['../classphoto__gd.html#a33092b889875b68bfb1c97ff123012d9',1,'photo_gd\load()'],['../classphoto__imagick.html#a2c9168f110ccd6c264095d766615dfa8',1,'photo_imagick\load()']]], ['load_5fconfig',['load_config',['../include_2config_8php.html#a27559f388c9b9af81c94e48d6889d1d1',1,'config.php']]], @@ -27,6 +27,7 @@ var searchData= ['local_5fuser',['local_user',['../boot_8php.html#ad4c9dc2c8a82e8f52b7404c1655eab44',1,'boot.php']]], ['localize_5fitem',['localize_item',['../conversation_8php.html#a9bd7f9fb6678736c581bcba3b17f471c',1,'conversation.php']]], ['lockview_5fcontent',['lockview_content',['../lockview_8php.html#a851e26ab9a1008df5c5ebebea31e9b44',1,'lockview.php']]], + ['locs_5fcontent',['locs_content',['../locs_8php.html#a6c900f53970c0d0e738d2fe06d27ca44',1,'locs.php']]], ['locs_5fpost',['locs_post',['../locs_8php.html#a6b43654592919ac863d67a1f787a69b9',1,'locs.php']]], ['log',['log',['../classRedMatrix_1_1RedDAV_1_1RedBasicAuth.html#abf6fe89b0a8239ed93c3b07e1fbce75b',1,'RedMatrix\RedDAV\RedBasicAuth\log()'],['../classRedMatrix_1_1RedDAV_1_1RedDirectory.html#af90a1a74cfd643a5c56b9a17ea250d59',1,'RedMatrix\RedDAV\RedDirectory\log()']]], ['logger',['logger',['../text_8php.html#a030fa5ecc64168af0c4f44897a9bce63',1,'text.php']]], diff --git a/doc/html/search/functions_70.js b/doc/html/search/functions_70.js index 7ef2743de..dc785aa57 100644 --- a/doc/html/search/functions_70.js +++ b/doc/html/search/functions_70.js @@ -81,7 +81,7 @@ var searchData= ['probe_5fzot',['probe_zot',['../include_2probe_8php.html#a3c02c7a23e8335a79c3c0f5331d11a85',1,'probe.php']]], ['proc_5frun',['proc_run',['../boot_8php.html#ab346a2ece14993861f3e4206befa94f0',1,'boot.php']]], ['process_5fchannel_5fsync_5fdelivery',['process_channel_sync_delivery',['../zot_8php.html#ac301c67864917c35922257950ae0f95c',1,'zot.php']]], - ['process_5fdelivery',['process_delivery',['../zot_8php.html#a4d9e6ca295e443b740d9960c304b3474',1,'zot.php']]], + ['process_5fdelivery',['process_delivery',['../zot_8php.html#a0e3006e7a456b2175a9badc96bc5176d',1,'zot.php']]], ['process_5flocation_5fdelivery',['process_location_delivery',['../zot_8php.html#a8eeefdb0dad4c436bea9d1c06c0a7988',1,'zot.php']]], ['process_5fmail_5fdelivery',['process_mail_delivery',['../zot_8php.html#aa6ae96db8cbbdbb10e6876d206bbf7cc',1,'zot.php']]], ['process_5fprofile_5fdelivery',['process_profile_delivery',['../zot_8php.html#a9a57b40669351c9791126b925cb7ef3b',1,'zot.php']]], diff --git a/doc/html/search/functions_72.js b/doc/html/search/functions_72.js index ce802ed6b..472ad4bd5 100644 --- a/doc/html/search/functions_72.js +++ b/doc/html/search/functions_72.js @@ -26,6 +26,12 @@ var searchData= ['ref_5fsession_5fopen',['ref_session_open',['../session_8php.html#a26fa1042356d555023cbf15ddd4f8507',1,'session.php']]], ['ref_5fsession_5fread',['ref_session_read',['../session_8php.html#a7f0f50576360d9ba52d29364e0b83a8e',1,'session.php']]], ['ref_5fsession_5fwrite',['ref_session_write',['../session_8php.html#ac4461c1984543d3553e73dba2771568f',1,'session.php']]], + ['refimport_5fcontent',['refimport_content',['../refimport_8php.html#ad97ebb5feda0230a4834e0b3637a0d29',1,'refimport.php']]], + ['reflect_5farticle_5fcallback',['reflect_article_callback',['../refimport_8php.html#a53434bc19e6264db89e18d92ddc09860',1,'refimport.php']]], + ['reflect_5fcomment_5fstore',['reflect_comment_store',['../refimport_8php.html#a01a29630fa5e1ce6cd5e1fd75280747c',1,'refimport.php']]], + ['reflect_5ffind_5fuser',['reflect_find_user',['../refimport_8php.html#aa98de7d112e3a5b4b6956f108d04a41d',1,'refimport.php']]], + ['reflect_5fget_5fchannel',['reflect_get_channel',['../refimport_8php.html#a6c3e0475fde9fe72ff2492a5e3e5259c',1,'refimport.php']]], + ['reflect_5fphoto_5fcallback',['reflect_photo_callback',['../refimport_8php.html#ae9c56f779d1e0ac7bcb2a460129e7ae5',1,'refimport.php']]], ['register_5fcontent',['register_content',['../register_8php.html#a0e91f57f111407ea8d3223a05022bb2a',1,'register.php']]], ['register_5fhook',['register_hook',['../plugin_8php.html#a425472c5f3afc137268b2ad45652b209',1,'plugin.php']]], ['register_5finit',['register_init',['../register_8php.html#ae20c0cd40f738d6295de58b9202c83d5',1,'register.php']]], diff --git a/doc/html/search/functions_77.js b/doc/html/search/functions_77.js index 8cfb46c63..23a414c07 100644 --- a/doc/html/search/functions_77.js +++ b/doc/html/search/functions_77.js @@ -11,6 +11,7 @@ var searchData= ['widget_5fappselect',['widget_appselect',['../widgets_8php.html#aced5cb177f630b30799c5eab873ee75c',1,'widgets.php']]], ['widget_5farchive',['widget_archive',['../widgets_8php.html#a7b1e357b5a2027718470b77ec921fc65',1,'widgets.php']]], ['widget_5fbookmarkedchats',['widget_bookmarkedchats',['../widgets_8php.html#a0e2f5179ed1a73b282dfda7270fcabb3',1,'widgets.php']]], + ['widget_5fcatcloud_5fwall',['widget_catcloud_wall',['../widgets_8php.html#af919de8e7e2ba8192a65fadc72a2c8b5',1,'widgets.php']]], ['widget_5fcategories',['widget_categories',['../widgets_8php.html#af37fdad3b2e861d860a4a8c4d8a76c0b',1,'widgets.php']]], ['widget_5fchatroom_5flist',['widget_chatroom_list',['../widgets_8php.html#a47c72aac42058ea086c9ef8651c259da',1,'widgets.php']]], ['widget_5fclock',['widget_clock',['../widgets_8php.html#a9d60539db68042e63c0015abd69a6f7a',1,'widgets.php']]], diff --git a/doc/html/search/search.js b/doc/html/search/search.js index fe24f105b..4477a1d6c 100644 --- a/doc/html/search/search.js +++ b/doc/html/search/search.js @@ -12,7 +12,7 @@ var indexSectionsWithContent = 2: "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100001000000000001001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", 3: "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010111111111001111111111111010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", 4: "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010111111111111111111111111010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", - 5: "0000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000101111111111111101111011010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + 5: "0000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000101111111111111101111111010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", 6: "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101001000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000" }; diff --git a/doc/html/search/variables_70.js b/doc/html/search/variables_70.js index 4042ed660..e9954a9de 100644 --- a/doc/html/search/variables_70.js +++ b/doc/html/search/variables_70.js @@ -38,6 +38,7 @@ var searchData= ['perms_5fw_5fstream',['PERMS_W_STREAM',['../boot_8php.html#a8bb0395933b5e886f086f6a2fb0bfa55',1,'boot.php']]], ['perms_5fw_5ftagwall',['PERMS_W_TAGWALL',['../boot_8php.html#a99a4a17cb644e7e6826ea07ecaf09777',1,'boot.php']]], ['perms_5fw_5fwall',['PERMS_W_WALL',['../boot_8php.html#a6b14a31a8aa9f3452a13383f413bffa2',1,'boot.php']]], + ['photo_5fadult',['PHOTO_ADULT',['../boot_8php.html#a921c55b9fa59a327a5f0e07fa1ccb2e0',1,'boot.php']]], ['photo_5fnormal',['PHOTO_NORMAL',['../boot_8php.html#a4a49b29838ef2c45ab3556b52baec6a4',1,'boot.php']]], ['photo_5fprofile',['PHOTO_PROFILE',['../boot_8php.html#ab4bc9c50ecc927b92d519e36562b0df0',1,'boot.php']]], ['photo_5fthing',['PHOTO_THING',['../boot_8php.html#a78849a1bf8ce8d9804b4cbb502e8f383',1,'boot.php']]], diff --git a/doc/html/search/variables_72.js b/doc/html/search/variables_72.js index be2927ed5..885c50398 100644 --- a/doc/html/search/variables_72.js +++ b/doc/html/search/variables_72.js @@ -5,6 +5,13 @@ var searchData= ['rdelim',['rdelim',['../namespacefriendica-to-smarty-tpl.html#a8540514fb7c4aa18ad2dffa2a975036b',1,'friendica-to-smarty-tpl']]], ['red_5fplatform',['RED_PLATFORM',['../boot_8php.html#a96ad56755a21e1361dbd7bf93c9e7ff4',1,'boot.php']]], ['red_5fversion',['RED_VERSION',['../boot_8php.html#a21cc29e0025943e7c28ff58cb4856ac3',1,'boot.php']]], + ['redmatrix_5fimportchannel',['REDMATRIX_IMPORTCHANNEL',['../refimport_8php.html#a54003135d7c8994a76e831fb6faa2fe6',1,'refimport.php']]], + ['reflect_5fbaseurl',['REFLECT_BASEURL',['../refimport_8php.html#ac43699d8ae86175e049aa4e87853caac',1,'refimport.php']]], + ['reflect_5fblogname',['REFLECT_BLOGNAME',['../refimport_8php.html#a8459983ebf013ed5737f7ed317bfae1f',1,'refimport.php']]], + ['reflect_5fexportusername',['REFLECT_EXPORTUSERNAME',['../refimport_8php.html#ad297afe0730c9119dd94d3cf0521b025',1,'refimport.php']]], + ['reflect_5fmaxperrun',['REFLECT_MAXPERRUN',['../refimport_8php.html#a9c1f681f1f303400a9818696a9f96d6f',1,'refimport.php']]], + ['reflect_5foverwrite',['REFLECT_OVERWRITE',['../refimport_8php.html#aeec793cefa260f788b7d005adcb35796',1,'refimport.php']]], + ['reflect_5fuserfile',['REFLECT_USERFILE',['../refimport_8php.html#a684a44d2401abf75f441591bcb41d10d',1,'refimport.php']]], ['register_5fapprove',['REGISTER_APPROVE',['../boot_8php.html#a7176c0f9f1c98421b97735d892cf6252',1,'boot.php']]], ['register_5fclosed',['REGISTER_CLOSED',['../boot_8php.html#a69aac276ed82e010dc382b16ab4d59e1',1,'boot.php']]], ['register_5fopen',['REGISTER_OPEN',['../boot_8php.html#ad8887b49bbb02dd30b4eb9f6c7773c63',1,'boot.php']]], diff --git a/doc/html/search/variables_76.html b/doc/html/search/variables_76.html new file mode 100644 index 000000000..8af237461 --- /dev/null +++ b/doc/html/search/variables_76.html @@ -0,0 +1,26 @@ + + + + + + + + + +
    +
    Loading...
    +
    + +
    Searching...
    +
    No Matches
    + +
    + + diff --git a/doc/html/search/variables_76.js b/doc/html/search/variables_76.js new file mode 100644 index 000000000..f046273ce --- /dev/null +++ b/doc/html/search/variables_76.js @@ -0,0 +1,14 @@ +var searchData= +[ + ['vnotify_5falert',['VNOTIFY_ALERT',['../boot_8php.html#a9f8a2938ddd9ee2867e6f8ce77b61b2f',1,'boot.php']]], + ['vnotify_5fbirthday',['VNOTIFY_BIRTHDAY',['../boot_8php.html#ac89396b9144391acd08d6d0f9b332220',1,'boot.php']]], + ['vnotify_5fchannel',['VNOTIFY_CHANNEL',['../boot_8php.html#a7b511bd93202c43405adbe3b5bcebbfe',1,'boot.php']]], + ['vnotify_5fevent',['VNOTIFY_EVENT',['../boot_8php.html#ad94aca4c260b8a892397786201dc4664',1,'boot.php']]], + ['vnotify_5feventtoday',['VNOTIFY_EVENTTODAY',['../boot_8php.html#a76480b213af379c0c6c7fa4e39019ca9',1,'boot.php']]], + ['vnotify_5finfo',['VNOTIFY_INFO',['../boot_8php.html#a37281c30bd92cecb499878d6778c570f',1,'boot.php']]], + ['vnotify_5fintro',['VNOTIFY_INTRO',['../boot_8php.html#a1997c4b7d0253e036bc0fb6b20e4af71',1,'boot.php']]], + ['vnotify_5fmail',['VNOTIFY_MAIL',['../boot_8php.html#a0afeb43da443d6ff3526ede5ecdcc3b3',1,'boot.php']]], + ['vnotify_5fnetwork',['VNOTIFY_NETWORK',['../boot_8php.html#a997614f25e58f8313641e1eb0109fd10',1,'boot.php']]], + ['vnotify_5fregister',['VNOTIFY_REGISTER',['../boot_8php.html#ae09767b94688657978ff9366ec63684b',1,'boot.php']]], + ['vnotify_5fsystem',['VNOTIFY_SYSTEM',['../boot_8php.html#a7e5627b5ca4b7464feb0f08663b19ea1',1,'boot.php']]] +]; diff --git a/doc/html/taxonomy_8php.html b/doc/html/taxonomy_8php.html index 552ef36bc..3f16dad15 100644 --- a/doc/html/taxonomy_8php.html +++ b/doc/html/taxonomy_8php.html @@ -134,6 +134,8 @@ Functions    tagblock ($link, $uid, $count=0, $authors= '', $flags=0, $restrict=0, $type=TERM_HASHTAG)   + catblock ($uid, $count=0, $authors= '', $flags=0, $restrict=0, $type=TERM_CATEGORY) +   dir_tagblock ($link, $r)    obj_verbs () @@ -144,6 +146,58 @@ Functions  

    Function Documentation

    + +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    catblock ( $uid,
     $count = 0,
     $authors = '',
     $flags = 0,
     $restrict = 0,
     $type = TERM_CATEGORY 
    )
    +
    + +

    Referenced by widget_catcloud_wall().

    + +
    +
    @@ -464,7 +518,7 @@ Functions
    -

    Referenced by tagblock(), and widget_tagcloud().

    +

    Referenced by catblock(), tagblock(), and widget_tagcloud().

    diff --git a/doc/html/taxonomy_8php.js b/doc/html/taxonomy_8php.js index 24b5fb426..903cd8534 100644 --- a/doc/html/taxonomy_8php.js +++ b/doc/html/taxonomy_8php.js @@ -1,5 +1,6 @@ var taxonomy_8php = [ + [ "catblock", "taxonomy_8php.html#aa8f8a1ff85daef046298e93c83e7a1b4", null ], [ "dir_tagadelic", "taxonomy_8php.html#a088371f4bc19155b2291508f5cd63332", null ], [ "dir_tagblock", "taxonomy_8php.html#a599ee71dd3194c8127b00dabec77abc1", null ], [ "file_tag_decode", "taxonomy_8php.html#a08df5164926d2b31b8e9fcfe919de2b6", null ], diff --git a/doc/html/text_8php.html b/doc/html/text_8php.html index e0a5ec96b..25a8ad3d5 100644 --- a/doc/html/text_8php.html +++ b/doc/html/text_8php.html @@ -631,7 +631,7 @@ Variables
    -

    Referenced by advanced_profile(), cal(), events_content(), format_event_diaspora(), format_event_html(), get_birthdays(), get_events(), list_post_dates(), ping_init(), and posted_dates().

    +

    Referenced by advanced_profile(), cal(), events_content(), format_event_diaspora(), format_event_html(), get_birthdays(), get_events(), list_post_dates(), ping_init(), and posted_dates().

    @@ -1339,7 +1339,7 @@ Variables
    -

    Referenced by 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(), bb2diaspora_itembody(), bb2diaspora_itemwallwall(), 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(), cloud_init(), connedit_post(), consume_feed(), conversation(), create_account(), create_identity(), RedMatrix\RedDAV\RedDirectory\createDirectory(), RedMatrix\RedDAV\RedDirectory\createFile(), cronhooks_run(), datetime_convert(), RedMatrix\RedDAV\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_url(), 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(), RedMatrix\RedDAV\RedFile\get(), get_atom_elements(), get_diaspora_key(), get_diaspora_reshare_xml(), get_item_elements(), get_language_name(), Conversation\get_template_data(), RedMatrix\RedDAV\RedDirectory\getChild(), RedMatrix\RedDAV\RedDirectory\getDir(), group_content(), guess_image_type(), http_status_exit(), hubloc_change_primary(), impel_init(), import_author_rss(), import_author_unknown(), 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(), RedMatrix\RedDAV\RedDirectory\log(), RedMatrix\RedDAV\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(), process_channel_sync_delivery(), process_delivery(), process_location_delivery(), process_mail_delivery(), process_profile_delivery(), profile_load(), profile_photo_set_profile_perms(), profile_sidebar(), profiles_content(), prune_hub_reinstalls(), public_recips(), RedMatrix\RedDAV\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_obsolete_hublocs(), remove_queue_item(), scale_external_images(), scrape_feed(), scrape_vcard(), search_ac_init(), enotify\send(), send_reg_approval_email(), Conversation\set_mode(), RedMatrix\RedDAV\RedFile\setName(), RedMatrix\RedDAV\RedDirectory\setName(), settings_post(), start_delivery_chain(), store_diaspora_comment_sig(), stream_perms_api_uids(), stream_perms_xchans(), subthread_content(), sync_directories(), sync_locations(), tag_deliver(), tagger_content(), tgroup_check(), uninstall_plugin(), unload_plugin(), update_directory_entry(), update_feed_item(), update_imported_item(), update_queue_time(), RedMatrix\RedDAV\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_message_request(), zot_process_response(), zot_refresh(), zot_register_hub(), and zotfeed_init().

    +

    Referenced by 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(), bb2diaspora_itembody(), bb2diaspora_itemwallwall(), 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(), cloud_init(), connedit_post(), consume_feed(), conversation(), create_account(), create_identity(), RedMatrix\RedDAV\RedDirectory\createDirectory(), RedMatrix\RedDAV\RedDirectory\createFile(), cronhooks_run(), datetime_convert(), RedMatrix\RedDAV\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_url(), 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(), RedMatrix\RedDAV\RedFile\get(), get_atom_elements(), get_diaspora_key(), get_diaspora_reshare_xml(), get_item_elements(), get_language_name(), Conversation\get_template_data(), RedMatrix\RedDAV\RedDirectory\getChild(), RedMatrix\RedDAV\RedDirectory\getDir(), group_content(), guess_image_type(), http_status_exit(), hubloc_change_primary(), impel_init(), import_author_rss(), import_author_unknown(), 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(), RedMatrix\RedDAV\RedDirectory\log(), RedMatrix\RedDAV\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(), process_channel_sync_delivery(), process_delivery(), process_location_delivery(), process_mail_delivery(), process_profile_delivery(), profile_load(), profile_photo_set_profile_perms(), profile_sidebar(), profiles_content(), prune_hub_reinstalls(), public_recips(), RedMatrix\RedDAV\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_obsolete_hublocs(), remove_queue_item(), scale_external_images(), scrape_feed(), scrape_vcard(), search_ac_init(), enotify\send(), send_reg_approval_email(), Conversation\set_mode(), RedMatrix\RedDAV\RedFile\setName(), RedMatrix\RedDAV\RedDirectory\setName(), settings_post(), start_delivery_chain(), store_diaspora_comment_sig(), stream_perms_api_uids(), stream_perms_xchans(), subthread_content(), sync_directories(), sync_locations(), tag_deliver(), tagger_content(), tgroup_check(), uninstall_plugin(), unload_plugin(), update_directory_entry(), update_feed_item(), update_imported_item(), update_queue_time(), RedMatrix\RedDAV\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_message_request(), zot_process_response(), zot_refresh(), zot_register_hub(), and zotfeed_init().

    @@ -1761,7 +1761,7 @@ Variables
    -

    Referenced by aes_encapsulate(), app_store(), attach_mkdir(), attach_store(), bb_parse_crypt(), bbcode(), build_sync_packet(), create_account(), create_identity(), RedMatrix\RedDAV\RedDirectory\createFile(), diaspora_msg_build(), diaspora_transmit(), directory_run(), event_store_event(), fsuggest_post(), group_add(), import_directory_profile(), import_xchan(), item_message_id(), item_store(), local_dir_update(), lostpass_content(), lostpass_post(), magic_init(), mail_store(), notification(), notifier_run(), prepare_body(), process_location_delivery(), profiles_init(), removeaccount_content(), removeme_content(), send_message(), send_reg_approval_email(), settings_post(), setup_post(), thing_init(), verify_email_address(), and zot_process_message_request().

    +

    Referenced by aes_encapsulate(), app_store(), attach_mkdir(), attach_store(), bb_parse_crypt(), bbcode(), build_sync_packet(), create_account(), create_identity(), RedMatrix\RedDAV\RedDirectory\createFile(), diaspora_msg_build(), diaspora_transmit(), directory_run(), event_store_event(), fsuggest_post(), group_add(), import_directory_profile(), import_xchan(), item_message_id(), item_store(), local_dir_update(), lostpass_content(), lostpass_post(), magic_init(), mail_store(), notification(), notifier_run(), prepare_body(), process_location_delivery(), profiles_init(), reflect_comment_store(), removeaccount_content(), removeme_content(), send_message(), send_reg_approval_email(), settings_post(), setup_post(), thing_init(), verify_email_address(), and zot_process_message_request().

    @@ -1826,7 +1826,7 @@ Variables
    Returns
    string substituted string
    -

    Referenced by achievements_content(), 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(), RedMatrix\RedDAV\RedBrowser\generateDirectoryIndex(), get_birthdays(), Item\get_comment_box(), get_events(), get_feed_for(), group_content(), group_side(), help_content(), hostxrd_init(), RedMatrix\RedDAV\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(), p_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(), search_content(), searchbox(), 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 achievements_content(), 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(), RedMatrix\RedDAV\RedBrowser\generateDirectoryIndex(), get_birthdays(), Item\get_comment_box(), get_events(), get_feed_for(), group_content(), group_side(), help_content(), hostxrd_init(), RedMatrix\RedDAV\RedBrowser\htmlActionsPanel(), identity_selector(), import_content(), invite_content(), lang_selector(), layouts_content(), locs_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(), p_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(), search_content(), searchbox(), 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().

    diff --git a/doc/html/typo_8php.html b/doc/html/typo_8php.html index deafea102..3d285d710 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(), hivenet_init(), home_content(), home_init(), hostxrd_init(), impel_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_pdl(), load_translation_table(), load_xconfig(), locs_post(), 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(), oexchange_content(), oexchange_init(), onedirsync_run(), onepoll_run(), openid_content(), opensearch_init(), p_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(), send_message(), service_class_allows(), service_class_fetch(), service_limits_content(), 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(), stumble_init(), subthread_content(), suckerberg_init(), 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(), hivenet_init(), home_content(), home_init(), hostxrd_init(), impel_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_pdl(), load_translation_table(), load_xconfig(), locs_content(), locs_post(), 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(), oexchange_content(), oexchange_init(), onedirsync_run(), onepoll_run(), openid_content(), opensearch_init(), p_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(), send_message(), service_class_allows(), service_class_fetch(), service_limits_content(), 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(), stumble_init(), subthread_content(), suckerberg_init(), 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_catcloud_wall(), 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 6ebcfa512..8ff068709 100644 --- a/doc/html/typohelper_8php.html +++ b/doc/html/typohelper_8php.html @@ -130,7 +130,7 @@ Variables Initial value:
    = <<< EOT
    error_reporting(E_ERROR | E_WARNING | E_PARSE )
    -

    Referenced by api_date(), check_php(), check_webbie(), dbesc(), dba_mysql\escape(), dba_mysqli\escape(), filter_insecure(), head_get_css(), head_get_js(), head_get_main_js(), item_store_update(), list_post_dates(), load_database(), photos_album_get_db_idstr(), photos_post(), posted_dates(), relative_date(), stream_perms_api_uids(), stream_perms_xchans(), thing_init(), and xmlify().

    +

    Referenced by api_date(), check_php(), check_webbie(), dbesc(), dba_mysql\escape(), dba_mysqli\escape(), filter_insecure(), head_get_css(), head_get_js(), head_get_main_js(), item_store_update(), list_post_dates(), load_database(), photos_album_get_db_idstr(), photos_post(), posted_dates(), relative_date(), stream_perms_api_uids(), stream_perms_xchans(), thing_init(), and xmlify().

    diff --git a/doc/html/widgets_8php.html b/doc/html/widgets_8php.html index 0d3e55b22..2701a39a7 100644 --- a/doc/html/widgets_8php.html +++ b/doc/html/widgets_8php.html @@ -138,6 +138,8 @@ Functions    widget_tagcloud_wall ($arr)   + widget_catcloud_wall ($arr) +   widget_affinity ($arr)    widget_settings_menu ($arr) @@ -236,6 +238,22 @@ Functions
    +
    + + +
    +
    + + + + + + + + +
    widget_catcloud_wall ( $arr)
    +
    +
    diff --git a/doc/html/widgets_8php.js b/doc/html/widgets_8php.js index 69c9d267d..005294da8 100644 --- a/doc/html/widgets_8php.js +++ b/doc/html/widgets_8php.js @@ -4,6 +4,7 @@ var widgets_8php = [ "widget_appselect", "widgets_8php.html#aced5cb177f630b30799c5eab873ee75c", null ], [ "widget_archive", "widgets_8php.html#a7b1e357b5a2027718470b77ec921fc65", null ], [ "widget_bookmarkedchats", "widgets_8php.html#a0e2f5179ed1a73b282dfda7270fcabb3", null ], + [ "widget_catcloud_wall", "widgets_8php.html#af919de8e7e2ba8192a65fadc72a2c8b5", null ], [ "widget_categories", "widgets_8php.html#af37fdad3b2e861d860a4a8c4d8a76c0b", null ], [ "widget_chatroom_list", "widgets_8php.html#a47c72aac42058ea086c9ef8651c259da", null ], [ "widget_clock", "widgets_8php.html#a9d60539db68042e63c0015abd69a6f7a", null ], diff --git a/doc/html/zot_8php.html b/doc/html/zot_8php.html index 273defd29..d570d5a79 100644 --- a/doc/html/zot_8php.html +++ b/doc/html/zot_8php.html @@ -142,8 +142,8 @@ Functions    allowed_public_recips ($msg)   - process_delivery ($sender, $arr, $deliveries, $relay, $public=false) -  + process_delivery ($sender, $arr, $deliveries, $relay, $public=false, $request=false) +   remove_community_tag ($sender, $arr, $uid)    update_imported_item ($sender, $item, $uid) @@ -263,7 +263,7 @@ Functions
    -

    Referenced by process_delivery().

    +

    Referenced by process_delivery().

    @@ -513,7 +513,7 @@ Functions - +
    @@ -545,7 +545,13 @@ Functions - + + + + + + + @@ -709,7 +715,7 @@ Functions
     $public = false $public = false,
     $request = false 
    -

    Referenced by process_delivery().

    +

    Referenced by process_delivery().

    @@ -777,7 +783,7 @@ Functions
    -

    Referenced by process_delivery().

    +

    Referenced by process_delivery().

    @@ -1112,6 +1118,9 @@ which will be processed and delivered before this function ultimately returns.
    +

    zot_process_message_request($data) If a site receives a comment to a post but finds they have no parent to attach it with, they may send a 'request' packet containing the message_id of the missing parent. This is the handler for that packet. We will create a message_list array of the entire conversation starting with the missing parent and invoke delivery to the sender of the packet.

    +

    include/deliver.php (for local delivery) and mod/post.php (for web delivery) detect the existence of this 'message_list' at the destination and split it into individual messages which are processed/delivered in order.

    +

    Called from mod/post.php

    Referenced by post_post().

    diff --git a/doc/html/zot_8php.js b/doc/html/zot_8php.js index 1596257c4..521de64be 100644 --- a/doc/html/zot_8php.js +++ b/doc/html/zot_8php.js @@ -11,7 +11,7 @@ var zot_8php = [ "import_xchan", "zot_8php.html#a528e97ca5d69c3b7f35c5d954afde315", null ], [ "make_xchan_hash", "zot_8php.html#a0fc2211c5309d9f925ecc4115e3fdb75", null ], [ "process_channel_sync_delivery", "zot_8php.html#ac301c67864917c35922257950ae0f95c", null ], - [ "process_delivery", "zot_8php.html#a4d9e6ca295e443b740d9960c304b3474", null ], + [ "process_delivery", "zot_8php.html#a0e3006e7a456b2175a9badc96bc5176d", null ], [ "process_location_delivery", "zot_8php.html#a8eeefdb0dad4c436bea9d1c06c0a7988", null ], [ "process_mail_delivery", "zot_8php.html#aa6ae96db8cbbdbb10e6876d206bbf7cc", null ], [ "process_profile_delivery", "zot_8php.html#a9a57b40669351c9791126b925cb7ef3b", null ], -- cgit v1.2.3 From 26343b8856d6145b6c1fd62ff648e34b376eddc5 Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 7 Nov 2014 05:15:28 -0800 Subject: rev update --- util/messages.po | 1129 +++++++++++++++++++++++++++++------------------------- version.inc | 2 +- 2 files changed, 609 insertions(+), 522 deletions(-) diff --git a/util/messages.po b/util/messages.po index 21cc95b0d..892817b74 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 2014-10-31.845\n" +"Project-Id-Version: 2014-11-07.852\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-31 00:03-0700\n" +"POT-Creation-Date: 2014-11-07 00:04-0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -23,7 +23,7 @@ msgid "Cannot locate DNS info for database server '%s'" msgstr "" #: ../../include/photo/photo_driver.php:680 ../../include/photos.php:51 -#: ../../mod/photos.php:91 ../../mod/photos.php:645 +#: ../../mod/photos.php:91 ../../mod/photos.php:652 #: ../../mod/profile_photo.php:142 ../../mod/profile_photo.php:301 #: ../../mod/profile_photo.php:423 msgid "Profile Photos" @@ -42,7 +42,7 @@ msgstr "" msgid "Address Book" msgstr "" -#: ../../include/apps.php:129 ../../include/nav.php:125 ../../boot.php:1496 +#: ../../include/apps.php:129 ../../include/nav.php:125 ../../boot.php:1513 msgid "Login" msgstr "" @@ -55,7 +55,7 @@ msgstr "" msgid "Matrix" msgstr "" -#: ../../include/apps.php:132 ../../include/widgets.php:524 +#: ../../include/apps.php:132 ../../include/widgets.php:548 #: ../../include/nav.php:218 ../../mod/admin.php:953 ../../mod/admin.php:1158 msgid "Settings" msgstr "" @@ -75,8 +75,8 @@ msgstr "" msgid "Channel Home" msgstr "" -#: ../../include/apps.php:136 ../../include/identity.php:1115 -#: ../../include/identity.php:1233 ../../mod/profperm.php:112 +#: ../../include/apps.php:136 ../../include/identity.php:1120 +#: ../../include/identity.php:1238 ../../mod/profperm.php:112 msgid "Profile" msgstr "" @@ -155,7 +155,7 @@ msgid "Profile Photo" msgstr "" #: ../../include/apps.php:242 ../../mod/settings.php:81 -#: ../../mod/settings.php:544 +#: ../../mod/settings.php:575 msgid "Update" msgstr "" @@ -170,7 +170,7 @@ msgstr "" #: ../../include/apps.php:249 ../../include/page_widgets.php:8 #: ../../include/page_widgets.php:36 ../../include/RedDAV/RedBrowser.php:250 #: ../../include/menu.php:42 ../../include/ItemObject.php:100 -#: ../../mod/settings.php:580 ../../mod/blocks.php:99 +#: ../../mod/settings.php:611 ../../mod/blocks.php:99 #: ../../mod/connections.php:381 ../../mod/connections.php:394 #: ../../mod/connections.php:413 ../../mod/webpages.php:131 #: ../../mod/editblock.php:111 ../../mod/editlayout.php:106 @@ -181,16 +181,16 @@ msgstr "" #: ../../include/apps.php:250 ../../include/conversation.php:638 #: ../../include/RedDAV/RedBrowser.php:251 ../../include/ItemObject.php:120 -#: ../../mod/photos.php:1062 ../../mod/settings.php:581 -#: ../../mod/connedit.php:468 ../../mod/group.php:176 ../../mod/admin.php:732 +#: ../../mod/photos.php:1066 ../../mod/settings.php:612 +#: ../../mod/connedit.php:476 ../../mod/group.php:176 ../../mod/admin.php:732 #: ../../mod/admin.php:863 ../../mod/thing.php:234 msgid "Delete" msgstr "" #: ../../include/apps.php:331 ../../include/apps.php:382 #: ../../include/conversation.php:1003 ../../include/RedDAV/RedBrowser.php:163 -#: ../../mod/photos.php:703 ../../mod/photos.php:1124 -#: ../../mod/connedit.php:504 +#: ../../mod/photos.php:711 ../../mod/photos.php:1128 +#: ../../mod/connedit.php:512 msgid "Unknown" msgstr "" @@ -200,18 +200,18 @@ msgstr "" #: ../../include/attach.php:318 ../../include/attach.php:511 #: ../../include/attach.php:584 ../../include/chat.php:116 #: ../../include/items.php:4005 ../../include/photos.php:15 -#: ../../mod/mood.php:112 ../../mod/photos.php:68 ../../mod/photos.php:533 -#: ../../mod/mitem.php:73 ../../mod/achievements.php:30 -#: ../../mod/settings.php:495 ../../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/blocks.php:29 ../../mod/blocks.php:44 ../../mod/profiles.php:179 +#: ../../mod/mood.php:112 ../../mod/photos.php:68 ../../mod/mitem.php:73 +#: ../../mod/achievements.php:30 ../../mod/settings.php:526 +#: ../../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/blocks.php:29 +#: ../../mod/blocks.php:44 ../../mod/profiles.php:179 #: ../../mod/profiles.php:532 ../../mod/events.php:195 #: ../../mod/channel.php:89 ../../mod/channel.php:193 #: ../../mod/channel.php:236 ../../mod/chat.php:90 ../../mod/chat.php:95 #: ../../mod/register.php:70 ../../mod/regmod.php:17 ../../mod/common.php:35 #: ../../mod/network.php:12 ../../mod/connections.php:169 -#: ../../mod/connedit.php:254 ../../mod/delegate.php:6 +#: ../../mod/connedit.php:266 ../../mod/delegate.php:6 #: ../../mod/webpages.php:40 ../../mod/bookmarks.php:46 #: ../../mod/setup.php:203 ../../mod/editblock.php:34 ../../mod/pdledit.php:21 #: ../../mod/editlayout.php:48 ../../mod/editpost.php:13 @@ -222,15 +222,15 @@ msgstr "" #: ../../mod/filestorage.php:109 ../../mod/fsuggest.php:78 #: ../../mod/suggest.php:26 ../../mod/group.php:9 ../../mod/like.php:154 #: ../../mod/thing.php:247 ../../mod/thing.php:264 ../../mod/thing.php:299 -#: ../../mod/invite.php:13 ../../mod/invite.php:104 ../../mod/item.php:182 -#: ../../mod/item.php:190 ../../mod/item.php:961 ../../mod/layouts.php:27 -#: ../../mod/layouts.php:39 ../../mod/viewconnections.php:22 -#: ../../mod/viewconnections.php:27 ../../mod/viewsrc.php:14 -#: ../../mod/mail.php:111 ../../mod/manage.php:6 ../../mod/menu.php:44 -#: ../../mod/message.php:16 ../../mod/new_channel.php:68 +#: ../../mod/invite.php:13 ../../mod/invite.php:104 ../../mod/item.php:184 +#: ../../mod/item.php:192 ../../mod/item.php:964 ../../mod/layouts.php:27 +#: ../../mod/layouts.php:39 ../../mod/locs.php:71 +#: ../../mod/viewconnections.php:22 ../../mod/viewconnections.php:27 +#: ../../mod/viewsrc.php:14 ../../mod/mail.php:111 ../../mod/manage.php:6 +#: ../../mod/menu.php:44 ../../mod/message.php:16 ../../mod/new_channel.php:68 #: ../../mod/new_channel.php:99 ../../mod/notifications.php:66 #: ../../mod/page.php:28 ../../mod/page.php:78 ../../mod/appman.php:66 -#: ../../mod/service_limits.php:7 ../../index.php:190 ../../index.php:401 +#: ../../mod/service_limits.php:7 ../../index.php:190 ../../index.php:390 msgid "Permission denied." msgstr "" @@ -293,7 +293,7 @@ msgid "database storage failed." msgstr "" #: ../../include/conversation.php:120 ../../include/text.php:1743 -#: ../../include/diaspora.php:1924 ../../mod/subthread.php:72 +#: ../../include/diaspora.php:1923 ../../mod/subthread.php:72 #: ../../mod/subthread.php:174 ../../mod/tagger.php:45 ../../mod/like.php:298 msgid "photo" msgstr "" @@ -308,7 +308,7 @@ msgid "channel" msgstr "" #: ../../include/conversation.php:148 ../../include/text.php:1749 -#: ../../include/diaspora.php:1924 ../../mod/subthread.php:72 +#: ../../include/diaspora.php:1923 ../../mod/subthread.php:72 #: ../../mod/subthread.php:174 ../../mod/tagger.php:53 ../../mod/like.php:298 msgid "status" msgstr "" @@ -318,7 +318,7 @@ msgstr "" msgid "comment" msgstr "" -#: ../../include/conversation.php:164 ../../include/diaspora.php:1953 +#: ../../include/conversation.php:164 ../../include/diaspora.php:1952 #: ../../mod/like.php:344 #, php-format msgid "%1$s likes %2$s's %3$s" @@ -398,7 +398,7 @@ msgid "View in context" msgstr "" #: ../../include/conversation.php:719 ../../include/conversation.php:1153 -#: ../../include/ItemObject.php:310 ../../mod/photos.php:970 +#: ../../include/ItemObject.php:310 ../../mod/photos.php:974 #: ../../mod/editblock.php:120 ../../mod/editlayout.php:115 #: ../../mod/editpost.php:121 ../../mod/editwebpage.php:152 #: ../../mod/mail.php:234 ../../mod/mail.php:349 @@ -430,7 +430,7 @@ msgid "View Status" msgstr "" #: ../../include/conversation.php:945 ../../include/nav.php:99 -#: ../../mod/connedit.php:421 ../../mod/connedit.php:535 +#: ../../mod/connedit.php:429 ../../mod/connedit.php:544 msgid "View Profile" msgstr "" @@ -442,7 +442,7 @@ msgstr "" msgid "Matrix Activity" msgstr "" -#: ../../include/conversation.php:948 ../../include/identity.php:835 +#: ../../include/conversation.php:948 ../../include/identity.php:840 #: ../../include/widgets.php:135 ../../include/widgets.php:175 #: ../../include/Contact.php:107 ../../mod/directory.php:183 #: ../../mod/dirprofile.php:164 ../../mod/suggest.php:51 @@ -538,14 +538,14 @@ msgid "Expires YYYY-MM-DD HH:MM" msgstr "" #: ../../include/conversation.php:1114 ../../include/page_widgets.php:40 -#: ../../include/ItemObject.php:608 ../../mod/photos.php:990 +#: ../../include/ItemObject.php:608 ../../mod/photos.php:994 #: ../../mod/webpages.php:135 ../../mod/editblock.php:141 #: ../../mod/editlayout.php:135 ../../mod/editpost.php:140 #: ../../mod/editwebpage.php:174 msgid "Preview" msgstr "" -#: ../../include/conversation.php:1128 ../../mod/photos.php:969 +#: ../../include/conversation.php:1128 ../../mod/photos.php:973 #: ../../mod/editblock.php:168 ../../mod/editlayout.php:161 #: ../../mod/editwebpage.php:201 ../../mod/layouts.php:122 msgid "Share" @@ -675,8 +675,8 @@ msgstr "" msgid "OK" msgstr "" -#: ../../include/conversation.php:1182 ../../mod/settings.php:519 -#: ../../mod/settings.php:545 ../../mod/events.php:568 +#: ../../include/conversation.php:1182 ../../mod/settings.php:550 +#: ../../mod/settings.php:576 ../../mod/events.php:568 #: ../../mod/editpost.php:151 ../../mod/fbrowser.php:82 #: ../../mod/fbrowser.php:117 ../../mod/tagrm.php:11 ../../mod/tagrm.php:134 msgid "Cancel" @@ -832,7 +832,7 @@ msgid "Finishes:" msgstr "" #: ../../include/event.php:40 ../../include/bb2diaspora.php:485 -#: ../../include/identity.php:886 ../../mod/events.php:579 +#: ../../include/identity.php:891 ../../mod/events.php:579 #: ../../mod/directory.php:156 ../../mod/dirprofile.php:105 msgid "Location:" msgstr "" @@ -1009,10 +1009,110 @@ msgstr "" msgid "%1$s has an updated %2$s, changing %3$s." msgstr "" +#: ../../include/datetime.php:43 ../../include/datetime.php:45 +msgid "Miscellaneous" +msgstr "" + +#: ../../include/datetime.php:241 +msgid "never" +msgstr "" + +#: ../../include/datetime.php:247 +msgid "less than a second ago" +msgstr "" + +#: ../../include/datetime.php:250 +msgid "year" +msgstr "" + +#: ../../include/datetime.php:250 +msgid "years" +msgstr "" + +#: ../../include/datetime.php:251 +msgid "month" +msgstr "" + +#: ../../include/datetime.php:251 +msgid "months" +msgstr "" + +#: ../../include/datetime.php:252 +msgid "week" +msgstr "" + +#: ../../include/datetime.php:252 +msgid "weeks" +msgstr "" + +#: ../../include/datetime.php:253 +msgid "day" +msgstr "" + +#: ../../include/datetime.php:253 +msgid "days" +msgstr "" + +#: ../../include/datetime.php:254 +msgid "hour" +msgstr "" + +#: ../../include/datetime.php:254 +msgid "hours" +msgstr "" + +#: ../../include/datetime.php:255 +msgid "minute" +msgstr "" + +#: ../../include/datetime.php:255 +msgid "minutes" +msgstr "" + +#: ../../include/datetime.php:256 +msgid "second" +msgstr "" + +#: ../../include/datetime.php:256 +msgid "seconds" +msgstr "" + +#: ../../include/datetime.php:265 +#, php-format +msgid "%1$d %2$s ago" +msgstr "" + +#: ../../include/datetime.php:470 +#, php-format +msgid "%1$s's birthday" +msgstr "" + +#: ../../include/datetime.php:471 +#, php-format +msgid "Happy Birthday %1$s" +msgstr "" + #: ../../include/bb2diaspora.php:384 msgid "Attachments:" msgstr "" +#: ../../include/bb2diaspora.php:465 +msgid "Redmatrix event notification:" +msgstr "" + +#: ../../include/zot.php:661 +msgid "Invalid data packet" +msgstr "" + +#: ../../include/zot.php:677 +msgid "Unable to verify channel signature" +msgstr "" + +#: ../../include/zot.php:1791 +#, php-format +msgid "Unable to verify site signature for %s" +msgstr "" + #: ../../include/auth.php:116 msgid "Logged out." msgstr "" @@ -1064,8 +1164,8 @@ msgstr "" msgid "%1$s used of %2$s (%3$s%)" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:245 ../../mod/settings.php:520 -#: ../../mod/settings.php:546 ../../mod/admin.php:868 +#: ../../include/RedDAV/RedBrowser.php:245 ../../mod/settings.php:551 +#: ../../mod/settings.php:577 ../../mod/admin.php:868 msgid "Name" msgstr "" @@ -1098,8 +1198,8 @@ msgstr "" msgid "Upload file" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:308 ../../mod/photos.php:728 -#: ../../mod/photos.php:1237 ../../mod/profile_photo.php:361 +#: ../../include/RedDAV/RedBrowser.php:308 ../../mod/photos.php:736 +#: ../../mod/photos.php:1241 ../../mod/profile_photo.php:361 msgid "Upload" msgstr "" @@ -1149,7 +1249,7 @@ msgid "RSS/Atom" msgstr "" #: ../../include/contact_selectors.php:79 ../../mod/admin.php:728 -#: ../../mod/admin.php:737 ../../boot.php:1498 +#: ../../mod/admin.php:737 ../../boot.php:1515 msgid "Email" msgstr "" @@ -1239,7 +1339,8 @@ msgstr "" msgid "Everything" msgstr "" -#: ../../include/contact_widgets.php:93 ../../include/widgets.php:29 +#: ../../include/contact_widgets.php:93 ../../include/taxonomy.php:230 +#: ../../include/widgets.php:29 msgid "Categories" msgstr "" @@ -1402,44 +1503,44 @@ msgstr "" msgid "Tags" msgstr "" -#: ../../include/taxonomy.php:227 +#: ../../include/taxonomy.php:249 msgid "Keywords" msgstr "" -#: ../../include/taxonomy.php:252 +#: ../../include/taxonomy.php:274 msgid "have" msgstr "" -#: ../../include/taxonomy.php:252 +#: ../../include/taxonomy.php:274 msgid "has" msgstr "" -#: ../../include/taxonomy.php:253 +#: ../../include/taxonomy.php:275 msgid "want" msgstr "" -#: ../../include/taxonomy.php:253 +#: ../../include/taxonomy.php:275 msgid "wants" msgstr "" -#: ../../include/taxonomy.php:254 ../../include/ItemObject.php:221 +#: ../../include/taxonomy.php:276 ../../include/ItemObject.php:221 msgid "like" msgstr "" -#: ../../include/taxonomy.php:254 +#: ../../include/taxonomy.php:276 msgid "likes" msgstr "" -#: ../../include/taxonomy.php:255 ../../include/ItemObject.php:222 +#: ../../include/taxonomy.php:277 ../../include/ItemObject.php:222 msgid "dislike" msgstr "" -#: ../../include/taxonomy.php:255 +#: ../../include/taxonomy.php:277 msgid "dislikes" msgstr "" -#: ../../include/taxonomy.php:338 ../../include/identity.php:1141 -#: ../../include/ItemObject.php:146 ../../mod/photos.php:1019 +#: ../../include/taxonomy.php:360 ../../include/identity.php:1146 +#: ../../include/ItemObject.php:146 ../../mod/photos.php:1023 msgctxt "noun" msgid "Like" msgid_plural "Likes" @@ -1663,7 +1764,7 @@ msgstr "" #: ../../include/items.php:377 ../../mod/profperm.php:23 #: ../../mod/subthread.php:49 ../../mod/group.php:68 ../../mod/like.php:246 -#: ../../index.php:400 +#: ../../index.php:389 msgid "Permission denied" msgstr "" @@ -1711,25 +1812,25 @@ msgstr "" msgid "Item not found." msgstr "" -#: ../../include/items.php:4391 ../../mod/group.php:38 ../../mod/group.php:140 +#: ../../include/items.php:4394 ../../mod/group.php:38 ../../mod/group.php:140 msgid "Collection not found." msgstr "" -#: ../../include/items.php:4406 +#: ../../include/items.php:4409 msgid "Collection is empty." msgstr "" -#: ../../include/items.php:4413 +#: ../../include/items.php:4416 #, php-format msgid "Collection: %s" msgstr "" -#: ../../include/items.php:4424 +#: ../../include/items.php:4427 #, php-format msgid "Connection: %s" msgstr "" -#: ../../include/items.php:4427 +#: ../../include/items.php:4430 msgid "Connection not found." msgstr "" @@ -2155,7 +2256,7 @@ msgstr "" msgid "Allow previewing posts and comments before publishing them" msgstr "" -#: ../../include/features.php:49 ../../include/widgets.php:513 +#: ../../include/features.php:49 ../../include/widgets.php:537 #: ../../mod/sources.php:88 msgid "Channel Sources" msgstr "" @@ -2297,27 +2398,27 @@ msgstr "" msgid "Channel location missing." msgstr "" -#: ../../include/follow.php:86 +#: ../../include/follow.php:82 msgid "Response from remote channel was incomplete." msgstr "" -#: ../../include/follow.php:103 +#: ../../include/follow.php:99 msgid "Channel was deleted and no longer exists." msgstr "" -#: ../../include/follow.php:139 ../../include/follow.php:208 +#: ../../include/follow.php:135 ../../include/follow.php:202 msgid "Protocol disabled." msgstr "" -#: ../../include/follow.php:182 +#: ../../include/follow.php:176 msgid "Channel discovery failed." msgstr "" -#: ../../include/follow.php:198 +#: ../../include/follow.php:192 msgid "local account not found." msgstr "" -#: ../../include/follow.php:225 +#: ../../include/follow.php:220 msgid "Cannot connect to yourself." msgstr "" @@ -2360,7 +2461,7 @@ msgstr "" msgid "add" msgstr "" -#: ../../include/identity.php:31 ../../mod/item.php:1358 +#: ../../include/identity.php:31 ../../mod/item.php:1361 msgid "Unable to obtain identity information from database" msgstr "" @@ -2397,214 +2498,214 @@ msgstr "" msgid "Default Profile" msgstr "" -#: ../../include/identity.php:382 ../../include/identity.php:383 -#: ../../include/identity.php:390 ../../include/widgets.php:407 +#: ../../include/identity.php:387 ../../include/identity.php:388 +#: ../../include/identity.php:395 ../../include/widgets.php:431 #: ../../include/profile_selectors.php:80 ../../mod/settings.php:304 #: ../../mod/settings.php:308 ../../mod/settings.php:309 #: ../../mod/settings.php:312 ../../mod/settings.php:323 -#: ../../mod/connedit.php:501 +#: ../../mod/connedit.php:509 msgid "Friends" msgstr "" -#: ../../include/identity.php:638 +#: ../../include/identity.php:643 msgid "Requested channel is not available." msgstr "" -#: ../../include/identity.php:686 ../../mod/achievements.php:11 +#: ../../include/identity.php:691 ../../mod/achievements.php:11 #: ../../mod/profile.php:16 ../../mod/blocks.php:10 ../../mod/connect.php:13 #: ../../mod/webpages.php:8 ../../mod/filestorage.php:48 #: ../../mod/layouts.php:8 ../../mod/hcard.php:8 msgid "Requested profile is not available." msgstr "" -#: ../../include/identity.php:849 ../../mod/profiles.php:722 +#: ../../include/identity.php:854 ../../mod/profiles.php:722 msgid "Change profile photo" msgstr "" -#: ../../include/identity.php:855 +#: ../../include/identity.php:860 msgid "Profiles" msgstr "" -#: ../../include/identity.php:855 +#: ../../include/identity.php:860 msgid "Manage/edit profiles" msgstr "" -#: ../../include/identity.php:856 ../../mod/profiles.php:723 +#: ../../include/identity.php:861 ../../mod/profiles.php:723 msgid "Create New Profile" msgstr "" -#: ../../include/identity.php:859 ../../include/nav.php:103 +#: ../../include/identity.php:864 ../../include/nav.php:103 msgid "Edit Profile" msgstr "" -#: ../../include/identity.php:870 ../../mod/profiles.php:734 +#: ../../include/identity.php:875 ../../mod/profiles.php:734 msgid "Profile Image" msgstr "" -#: ../../include/identity.php:873 +#: ../../include/identity.php:878 msgid "visible to everybody" msgstr "" -#: ../../include/identity.php:874 ../../mod/profiles.php:617 +#: ../../include/identity.php:879 ../../mod/profiles.php:617 #: ../../mod/profiles.php:738 msgid "Edit visibility" msgstr "" -#: ../../include/identity.php:888 ../../include/identity.php:1125 +#: ../../include/identity.php:893 ../../include/identity.php:1130 #: ../../mod/directory.php:158 msgid "Gender:" msgstr "" -#: ../../include/identity.php:889 ../../include/identity.php:1169 +#: ../../include/identity.php:894 ../../include/identity.php:1174 #: ../../mod/directory.php:160 msgid "Status:" msgstr "" -#: ../../include/identity.php:890 ../../include/identity.php:1180 +#: ../../include/identity.php:895 ../../include/identity.php:1185 #: ../../mod/directory.php:162 msgid "Homepage:" msgstr "" -#: ../../include/identity.php:891 ../../mod/dirprofile.php:151 +#: ../../include/identity.php:896 ../../mod/dirprofile.php:151 msgid "Online Now" msgstr "" -#: ../../include/identity.php:969 ../../include/identity.php:1049 -#: ../../mod/ping.php:298 +#: ../../include/identity.php:974 ../../include/identity.php:1054 +#: ../../mod/ping.php:316 msgid "g A l F d" msgstr "" -#: ../../include/identity.php:970 ../../include/identity.php:1050 +#: ../../include/identity.php:975 ../../include/identity.php:1055 msgid "F d" msgstr "" -#: ../../include/identity.php:1015 ../../include/identity.php:1090 -#: ../../mod/ping.php:320 +#: ../../include/identity.php:1020 ../../include/identity.php:1095 +#: ../../mod/ping.php:338 msgid "[today]" msgstr "" -#: ../../include/identity.php:1027 +#: ../../include/identity.php:1032 msgid "Birthday Reminders" msgstr "" -#: ../../include/identity.php:1028 +#: ../../include/identity.php:1033 msgid "Birthdays this week:" msgstr "" -#: ../../include/identity.php:1083 +#: ../../include/identity.php:1088 msgid "[No description]" msgstr "" -#: ../../include/identity.php:1101 +#: ../../include/identity.php:1106 msgid "Event Reminders" msgstr "" -#: ../../include/identity.php:1102 +#: ../../include/identity.php:1107 msgid "Events this week:" msgstr "" -#: ../../include/identity.php:1123 ../../mod/settings.php:947 +#: ../../include/identity.php:1128 ../../mod/settings.php:984 msgid "Full Name:" msgstr "" -#: ../../include/identity.php:1130 +#: ../../include/identity.php:1135 msgid "Like this channel" msgstr "" -#: ../../include/identity.php:1154 +#: ../../include/identity.php:1159 msgid "j F, Y" msgstr "" -#: ../../include/identity.php:1155 +#: ../../include/identity.php:1160 msgid "j F" msgstr "" -#: ../../include/identity.php:1162 +#: ../../include/identity.php:1167 msgid "Birthday:" msgstr "" -#: ../../include/identity.php:1166 +#: ../../include/identity.php:1171 msgid "Age:" msgstr "" -#: ../../include/identity.php:1175 +#: ../../include/identity.php:1180 #, php-format msgid "for %1$d %2$s" msgstr "" -#: ../../include/identity.php:1178 ../../mod/profiles.php:639 +#: ../../include/identity.php:1183 ../../mod/profiles.php:639 msgid "Sexual Preference:" msgstr "" -#: ../../include/identity.php:1182 ../../mod/profiles.php:641 +#: ../../include/identity.php:1187 ../../mod/profiles.php:641 msgid "Hometown:" msgstr "" -#: ../../include/identity.php:1184 +#: ../../include/identity.php:1189 msgid "Tags:" msgstr "" -#: ../../include/identity.php:1186 ../../mod/profiles.php:642 +#: ../../include/identity.php:1191 ../../mod/profiles.php:642 msgid "Political Views:" msgstr "" -#: ../../include/identity.php:1188 +#: ../../include/identity.php:1193 msgid "Religion:" msgstr "" -#: ../../include/identity.php:1190 ../../mod/directory.php:164 +#: ../../include/identity.php:1195 ../../mod/directory.php:164 msgid "About:" msgstr "" -#: ../../include/identity.php:1192 +#: ../../include/identity.php:1197 msgid "Hobbies/Interests:" msgstr "" -#: ../../include/identity.php:1194 ../../mod/profiles.php:645 +#: ../../include/identity.php:1199 ../../mod/profiles.php:645 msgid "Likes:" msgstr "" -#: ../../include/identity.php:1196 ../../mod/profiles.php:646 +#: ../../include/identity.php:1201 ../../mod/profiles.php:646 msgid "Dislikes:" msgstr "" -#: ../../include/identity.php:1199 +#: ../../include/identity.php:1204 msgid "Contact information and Social Networks:" msgstr "" -#: ../../include/identity.php:1201 +#: ../../include/identity.php:1206 msgid "My other channels:" msgstr "" -#: ../../include/identity.php:1203 +#: ../../include/identity.php:1208 msgid "Musical interests:" msgstr "" -#: ../../include/identity.php:1205 +#: ../../include/identity.php:1210 msgid "Books, literature:" msgstr "" -#: ../../include/identity.php:1207 +#: ../../include/identity.php:1212 msgid "Television:" msgstr "" -#: ../../include/identity.php:1209 +#: ../../include/identity.php:1214 msgid "Film/dance/culture/entertainment:" msgstr "" -#: ../../include/identity.php:1211 +#: ../../include/identity.php:1216 msgid "Love/Romance:" msgstr "" -#: ../../include/identity.php:1213 +#: ../../include/identity.php:1218 msgid "Work/employment:" msgstr "" -#: ../../include/identity.php:1215 +#: ../../include/identity.php:1220 msgid "School/education:" msgstr "" -#: ../../include/identity.php:1235 +#: ../../include/identity.php:1240 msgid "Like this thing" msgstr "" @@ -2662,100 +2763,100 @@ msgstr "" msgid "Remove term" msgstr "" -#: ../../include/widgets.php:342 +#: ../../include/widgets.php:352 msgid "Archives" msgstr "" -#: ../../include/widgets.php:404 +#: ../../include/widgets.php:428 msgid "Refresh" msgstr "" -#: ../../include/widgets.php:405 ../../mod/connedit.php:498 +#: ../../include/widgets.php:429 ../../mod/connedit.php:506 msgid "Me" msgstr "" -#: ../../include/widgets.php:406 ../../mod/connedit.php:500 +#: ../../include/widgets.php:430 ../../mod/connedit.php:508 msgid "Best Friends" msgstr "" -#: ../../include/widgets.php:408 +#: ../../include/widgets.php:432 msgid "Co-workers" msgstr "" -#: ../../include/widgets.php:409 ../../mod/connedit.php:502 +#: ../../include/widgets.php:433 ../../mod/connedit.php:510 msgid "Former Friends" msgstr "" -#: ../../include/widgets.php:410 ../../mod/connedit.php:503 +#: ../../include/widgets.php:434 ../../mod/connedit.php:511 msgid "Acquaintances" msgstr "" -#: ../../include/widgets.php:411 +#: ../../include/widgets.php:435 msgid "Everybody" msgstr "" -#: ../../include/widgets.php:445 +#: ../../include/widgets.php:469 msgid "Account settings" msgstr "" -#: ../../include/widgets.php:451 +#: ../../include/widgets.php:475 msgid "Channel settings" msgstr "" -#: ../../include/widgets.php:457 +#: ../../include/widgets.php:481 msgid "Additional features" msgstr "" -#: ../../include/widgets.php:463 +#: ../../include/widgets.php:487 msgid "Feature settings" msgstr "" -#: ../../include/widgets.php:469 +#: ../../include/widgets.php:493 msgid "Display settings" msgstr "" -#: ../../include/widgets.php:475 +#: ../../include/widgets.php:499 msgid "Connected apps" msgstr "" -#: ../../include/widgets.php:481 +#: ../../include/widgets.php:505 msgid "Export channel" msgstr "" -#: ../../include/widgets.php:487 +#: ../../include/widgets.php:511 msgid "Export content" msgstr "" -#: ../../include/widgets.php:496 -msgid "Automatic Permissions (Advanced)" +#: ../../include/widgets.php:520 ../../mod/connedit.php:538 +msgid "Connection Default Permissions" msgstr "" -#: ../../include/widgets.php:504 +#: ../../include/widgets.php:528 msgid "Premium Channel Settings" msgstr "" -#: ../../include/widgets.php:538 ../../mod/mail.php:124 +#: ../../include/widgets.php:562 ../../mod/mail.php:124 #: ../../mod/message.php:31 msgid "Messages" msgstr "" -#: ../../include/widgets.php:543 +#: ../../include/widgets.php:567 msgid "Check Mail" msgstr "" -#: ../../include/widgets.php:548 ../../include/nav.php:209 +#: ../../include/widgets.php:572 ../../include/nav.php:209 msgid "New Message" msgstr "" -#: ../../include/widgets.php:624 +#: ../../include/widgets.php:648 msgid "Chat Rooms" msgstr "" -#: ../../include/widgets.php:642 +#: ../../include/widgets.php:666 msgid "Bookmarked Chatrooms" msgstr "" -#: ../../include/widgets.php:660 +#: ../../include/widgets.php:684 msgid "Suggested Chatrooms" msgstr "" @@ -2772,89 +2873,6 @@ msgstr "" msgid "User '%s' deleted" msgstr "" -#: ../../include/datetime.php:43 ../../include/datetime.php:45 -msgid "Miscellaneous" -msgstr "" - -#: ../../include/datetime.php:238 -msgid "never" -msgstr "" - -#: ../../include/datetime.php:244 -msgid "less than a second ago" -msgstr "" - -#: ../../include/datetime.php:247 -msgid "year" -msgstr "" - -#: ../../include/datetime.php:247 -msgid "years" -msgstr "" - -#: ../../include/datetime.php:248 -msgid "month" -msgstr "" - -#: ../../include/datetime.php:248 -msgid "months" -msgstr "" - -#: ../../include/datetime.php:249 -msgid "week" -msgstr "" - -#: ../../include/datetime.php:249 -msgid "weeks" -msgstr "" - -#: ../../include/datetime.php:250 -msgid "day" -msgstr "" - -#: ../../include/datetime.php:250 -msgid "days" -msgstr "" - -#: ../../include/datetime.php:251 -msgid "hour" -msgstr "" - -#: ../../include/datetime.php:251 -msgid "hours" -msgstr "" - -#: ../../include/datetime.php:252 -msgid "minute" -msgstr "" - -#: ../../include/datetime.php:252 -msgid "minutes" -msgstr "" - -#: ../../include/datetime.php:253 -msgid "second" -msgstr "" - -#: ../../include/datetime.php:253 -msgid "seconds" -msgstr "" - -#: ../../include/datetime.php:262 -#, php-format -msgid "%1$d %2$s ago" -msgstr "" - -#: ../../include/datetime.php:467 -#, php-format -msgid "%1$s's birthday" -msgstr "" - -#: ../../include/datetime.php:468 -#, php-format -msgid "Happy Birthday %1$s" -msgstr "" - #: ../../include/message.php:18 msgid "No recipient provided." msgstr "" @@ -2871,7 +2889,7 @@ msgstr "" msgid "Stored post could not be verified." msgstr "" -#: ../../include/nav.php:95 ../../include/nav.php:128 ../../boot.php:1495 +#: ../../include/nav.php:95 ../../include/nav.php:128 ../../boot.php:1512 msgid "Logout" msgstr "" @@ -2944,7 +2962,7 @@ msgstr "" msgid "Home Page" msgstr "" -#: ../../include/nav.php:163 ../../mod/register.php:220 ../../boot.php:1472 +#: ../../include/nav.php:163 ../../mod/register.php:220 ../../boot.php:1489 msgid "Register" msgstr "" @@ -3060,19 +3078,6 @@ msgstr "" msgid "view full size" msgstr "" -#: ../../include/zot.php:661 -msgid "Invalid data packet" -msgstr "" - -#: ../../include/zot.php:677 -msgid "Unable to verify channel signature" -msgstr "" - -#: ../../include/zot.php:1776 -#, php-format -msgid "Unable to verify site signature for %s" -msgstr "" - #: ../../include/acl_selectors.php:240 msgid "Visible to your default audience" msgstr "" @@ -3085,14 +3090,14 @@ msgstr "" msgid "Don't show" msgstr "" -#: ../../include/acl_selectors.php:248 ../../mod/photos.php:591 -#: ../../mod/photos.php:945 ../../mod/events.php:585 ../../mod/chat.php:209 +#: ../../include/acl_selectors.php:248 ../../mod/photos.php:589 +#: ../../mod/photos.php:948 ../../mod/events.php:585 ../../mod/chat.php:209 #: ../../mod/filestorage.php:137 msgid "Permissions" msgstr "" #: ../../include/acl_selectors.php:249 ../../include/ItemObject.php:305 -#: ../../mod/photos.php:1141 +#: ../../mod/photos.php:1145 msgid "Close" msgstr "" @@ -3126,7 +3131,7 @@ msgid "Delete this item?" msgstr "" #: ../../include/js_strings.php:6 ../../include/ItemObject.php:598 -#: ../../mod/photos.php:988 ../../mod/photos.php:1098 +#: ../../mod/photos.php:992 ../../mod/photos.php:1102 msgid "Comment" msgstr "" @@ -3492,11 +3497,11 @@ msgid "Save to Folder" msgstr "" #: ../../include/ItemObject.php:142 ../../include/ItemObject.php:154 -#: ../../mod/photos.php:1015 ../../mod/photos.php:1027 +#: ../../mod/photos.php:1019 ../../mod/photos.php:1031 msgid "View all" msgstr "" -#: ../../include/ItemObject.php:151 ../../mod/photos.php:1024 +#: ../../include/ItemObject.php:151 ../../mod/photos.php:1028 msgctxt "noun" msgid "Dislike" msgid_plural "Dislikes" @@ -3523,11 +3528,11 @@ msgstr "" msgid "Add Tag" msgstr "" -#: ../../include/ItemObject.php:221 ../../mod/photos.php:967 +#: ../../include/ItemObject.php:221 ../../mod/photos.php:971 msgid "I like this (toggle)" msgstr "" -#: ../../include/ItemObject.php:222 ../../mod/photos.php:968 +#: ../../include/ItemObject.php:222 ../../mod/photos.php:972 msgid "I don't like this (toggle)" msgstr "" @@ -3568,12 +3573,12 @@ msgstr "" msgid "Add to Calendar" msgstr "" -#: ../../include/ItemObject.php:299 ../../mod/photos.php:1135 +#: ../../include/ItemObject.php:299 ../../mod/photos.php:1139 msgctxt "noun" msgid "Likes" msgstr "" -#: ../../include/ItemObject.php:300 ../../mod/photos.php:1136 +#: ../../include/ItemObject.php:300 ../../mod/photos.php:1140 msgctxt "noun" msgid "Dislikes" msgstr "" @@ -3585,28 +3590,28 @@ msgid_plural "%d comments" msgstr[0] "" msgstr[1] "" -#: ../../include/ItemObject.php:596 ../../mod/photos.php:986 -#: ../../mod/photos.php:1096 +#: ../../include/ItemObject.php:596 ../../mod/photos.php:990 +#: ../../mod/photos.php:1100 msgid "This is you" msgstr "" #: ../../include/ItemObject.php:599 ../../mod/mood.php:135 -#: ../../mod/photos.php:547 ../../mod/photos.php:661 ../../mod/photos.php:949 -#: ../../mod/photos.php:989 ../../mod/photos.php:1099 -#: ../../mod/settings.php:518 ../../mod/settings.php:630 -#: ../../mod/settings.php:659 ../../mod/settings.php:683 -#: ../../mod/settings.php:759 ../../mod/settings.php:939 +#: ../../mod/photos.php:595 ../../mod/photos.php:669 ../../mod/photos.php:953 +#: ../../mod/photos.php:993 ../../mod/photos.php:1103 +#: ../../mod/settings.php:549 ../../mod/settings.php:661 +#: ../../mod/settings.php:690 ../../mod/settings.php:714 +#: ../../mod/settings.php:790 ../../mod/settings.php:976 #: ../../mod/poke.php:166 ../../mod/profiles.php:615 ../../mod/events.php:587 #: ../../mod/chat.php:177 ../../mod/chat.php:211 ../../mod/connect.php:92 -#: ../../mod/connedit.php:546 ../../mod/setup.php:307 ../../mod/setup.php:350 +#: ../../mod/connedit.php:555 ../../mod/setup.php:307 ../../mod/setup.php:350 #: ../../mod/pdledit.php:58 ../../mod/sources.php:104 #: ../../mod/sources.php:138 ../../mod/filestorage.php:146 #: ../../mod/fsuggest.php:108 ../../mod/group.php:81 ../../mod/admin.php:414 #: ../../mod/admin.php:725 ../../mod/admin.php:861 ../../mod/admin.php:994 #: ../../mod/admin.php:1193 ../../mod/admin.php:1280 ../../mod/thing.php:284 #: ../../mod/thing.php:327 ../../mod/import.php:480 ../../mod/invite.php:142 -#: ../../mod/mail.php:348 ../../mod/appman.php:99 ../../mod/poll.php:68 -#: ../../view/theme/apw/php/config.php:256 +#: ../../mod/locs.php:99 ../../mod/mail.php:348 ../../mod/appman.php:99 +#: ../../mod/poll.php:68 ../../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 @@ -3657,84 +3662,84 @@ msgstr "" msgid "Album not found." msgstr "" -#: ../../mod/photos.php:119 ../../mod/photos.php:662 +#: ../../mod/photos.php:119 ../../mod/photos.php:670 msgid "Delete Album" msgstr "" -#: ../../mod/photos.php:159 ../../mod/photos.php:950 +#: ../../mod/photos.php:159 ../../mod/photos.php:954 msgid "Delete Photo" msgstr "" -#: ../../mod/photos.php:451 ../../mod/search.php:13 ../../mod/directory.php:15 +#: ../../mod/photos.php:459 ../../mod/search.php:13 ../../mod/directory.php:15 #: ../../mod/dirprofile.php:9 ../../mod/display.php:9 #: ../../mod/viewconnections.php:17 msgid "Public access denied." msgstr "" -#: ../../mod/photos.php:461 +#: ../../mod/photos.php:470 msgid "No photos selected" msgstr "" -#: ../../mod/photos.php:507 +#: ../../mod/photos.php:514 msgid "Access to this item is restricted." msgstr "" -#: ../../mod/photos.php:558 +#: ../../mod/photos.php:553 #, php-format msgid "%1$.2f MB of %2$.2f MB photo storage used." msgstr "" -#: ../../mod/photos.php:561 +#: ../../mod/photos.php:556 #, php-format msgid "%1$.2f MB photo storage used." msgstr "" -#: ../../mod/photos.php:583 +#: ../../mod/photos.php:580 msgid "Upload Photos" msgstr "" -#: ../../mod/photos.php:587 -msgid "Enter a new album name or select an existing one:" +#: ../../mod/photos.php:584 ../../mod/photos.php:663 ../../mod/photos.php:941 +msgid "Enter a new album name" +msgstr "" + +#: ../../mod/photos.php:585 ../../mod/photos.php:664 ../../mod/photos.php:942 +msgid "or select an existing one (doubleclick)" msgstr "" -#: ../../mod/photos.php:588 +#: ../../mod/photos.php:586 msgid "Do not show a status post for this upload" msgstr "" -#: ../../mod/photos.php:609 +#: ../../mod/photos.php:614 msgid "Album name could not be decoded" msgstr "" -#: ../../mod/photos.php:645 ../../mod/photos.php:1159 -#: ../../mod/photos.php:1174 +#: ../../mod/photos.php:652 ../../mod/photos.php:1163 +#: ../../mod/photos.php:1178 msgid "Contact Photos" msgstr "" -#: ../../mod/photos.php:656 -msgid "New album name: " -msgstr "" - -#: ../../mod/photos.php:668 +#: ../../mod/photos.php:676 msgid "Show Newest First" msgstr "" -#: ../../mod/photos.php:670 +#: ../../mod/photos.php:678 msgid "Show Oldest First" msgstr "" -#: ../../mod/photos.php:697 ../../mod/photos.php:1206 +#: ../../mod/photos.php:705 ../../mod/photos.php:1210 msgid "View Photo" msgstr "" -#: ../../mod/photos.php:726 +#: ../../mod/photos.php:734 msgid "Edit Album" msgstr "" -#: ../../mod/photos.php:777 +#: ../../mod/photos.php:779 msgid "Permission denied. Access to this item may be restricted." msgstr "" -#: ../../mod/photos.php:779 +#: ../../mod/photos.php:781 msgid "Photo not available" msgstr "" @@ -3762,43 +3767,43 @@ msgstr "" msgid "Remove" msgstr "" -#: ../../mod/photos.php:933 +#: ../../mod/photos.php:935 msgid "Edit photo" msgstr "" -#: ../../mod/photos.php:935 +#: ../../mod/photos.php:937 msgid "Rotate CW (right)" msgstr "" -#: ../../mod/photos.php:936 +#: ../../mod/photos.php:938 msgid "Rotate CCW (left)" msgstr "" -#: ../../mod/photos.php:939 -msgid "New album name" -msgstr "" - -#: ../../mod/photos.php:942 +#: ../../mod/photos.php:945 msgid "Caption" msgstr "" -#: ../../mod/photos.php:944 +#: ../../mod/photos.php:947 msgid "Add a Tag" msgstr "" -#: ../../mod/photos.php:947 +#: ../../mod/photos.php:950 msgid "Example: @bob, @Barbara_Jensen, @jim@example.com" msgstr "" -#: ../../mod/photos.php:1125 +#: ../../mod/photos.php:952 +msgid "Flag as adult in album view" +msgstr "" + +#: ../../mod/photos.php:1129 msgid "In This Photo:" msgstr "" -#: ../../mod/photos.php:1212 +#: ../../mod/photos.php:1216 msgid "View Album" msgstr "" -#: ../../mod/photos.php:1235 +#: ../../mod/photos.php:1239 msgid "Recent Photos" msgstr "" @@ -3871,7 +3876,7 @@ msgstr "" msgid "Menu Item Permissions" msgstr "" -#: ../../mod/mitem.php:134 ../../mod/mitem.php:177 ../../mod/settings.php:974 +#: ../../mod/mitem.php:134 ../../mod/mitem.php:177 ../../mod/settings.php:1011 msgid "(click to open/close)" msgstr "" @@ -3923,15 +3928,15 @@ msgstr "" msgid "Some blurb about what to do when you're new here" msgstr "" -#: ../../mod/ping.php:237 +#: ../../mod/ping.php:255 msgid "sent you a private message" msgstr "" -#: ../../mod/ping.php:288 +#: ../../mod/ping.php:306 msgid "added your channel" msgstr "" -#: ../../mod/ping.php:329 +#: ../../mod/ping.php:347 msgid "posted an event" msgstr "" @@ -3975,438 +3980,503 @@ msgstr "" msgid "System failure storing new email. Please try again." msgstr "" -#: ../../mod/settings.php:448 +#: ../../mod/settings.php:479 msgid "Settings updated." msgstr "" -#: ../../mod/settings.php:517 ../../mod/settings.php:543 -#: ../../mod/settings.php:579 +#: ../../mod/settings.php:548 ../../mod/settings.php:574 +#: ../../mod/settings.php:610 msgid "Add application" msgstr "" -#: ../../mod/settings.php:520 +#: ../../mod/settings.php:551 msgid "Name of application" msgstr "" -#: ../../mod/settings.php:521 ../../mod/settings.php:547 +#: ../../mod/settings.php:552 ../../mod/settings.php:578 msgid "Consumer Key" msgstr "" -#: ../../mod/settings.php:521 ../../mod/settings.php:522 +#: ../../mod/settings.php:552 ../../mod/settings.php:553 msgid "Automatically generated - change if desired. Max length 20" msgstr "" -#: ../../mod/settings.php:522 ../../mod/settings.php:548 +#: ../../mod/settings.php:553 ../../mod/settings.php:579 msgid "Consumer Secret" msgstr "" -#: ../../mod/settings.php:523 ../../mod/settings.php:549 +#: ../../mod/settings.php:554 ../../mod/settings.php:580 msgid "Redirect" msgstr "" -#: ../../mod/settings.php:523 +#: ../../mod/settings.php:554 msgid "" "Redirect URI - leave blank unless your application specifically requires this" msgstr "" -#: ../../mod/settings.php:524 ../../mod/settings.php:550 +#: ../../mod/settings.php:555 ../../mod/settings.php:581 msgid "Icon url" msgstr "" -#: ../../mod/settings.php:524 +#: ../../mod/settings.php:555 msgid "Optional" msgstr "" -#: ../../mod/settings.php:535 +#: ../../mod/settings.php:566 msgid "You can't edit this application." msgstr "" -#: ../../mod/settings.php:578 +#: ../../mod/settings.php:609 msgid "Connected Apps" msgstr "" -#: ../../mod/settings.php:582 +#: ../../mod/settings.php:613 msgid "Client key starts with" msgstr "" -#: ../../mod/settings.php:583 +#: ../../mod/settings.php:614 msgid "No name" msgstr "" -#: ../../mod/settings.php:584 +#: ../../mod/settings.php:615 msgid "Remove authorization" msgstr "" -#: ../../mod/settings.php:595 +#: ../../mod/settings.php:626 msgid "No feature settings configured" msgstr "" -#: ../../mod/settings.php:603 +#: ../../mod/settings.php:634 msgid "Feature Settings" msgstr "" -#: ../../mod/settings.php:626 +#: ../../mod/settings.php:657 msgid "Account Settings" msgstr "" -#: ../../mod/settings.php:627 +#: ../../mod/settings.php:658 msgid "Password Settings" msgstr "" -#: ../../mod/settings.php:628 +#: ../../mod/settings.php:659 msgid "New Password:" msgstr "" -#: ../../mod/settings.php:629 +#: ../../mod/settings.php:660 msgid "Confirm:" msgstr "" -#: ../../mod/settings.php:629 +#: ../../mod/settings.php:660 msgid "Leave password fields blank unless changing" msgstr "" -#: ../../mod/settings.php:631 ../../mod/settings.php:948 +#: ../../mod/settings.php:662 ../../mod/settings.php:985 msgid "Email Address:" msgstr "" -#: ../../mod/settings.php:632 ../../mod/removeaccount.php:61 +#: ../../mod/settings.php:663 ../../mod/removeaccount.php:61 msgid "Remove Account" msgstr "" -#: ../../mod/settings.php:633 +#: ../../mod/settings.php:664 msgid "Remove this account from this server including all its channels" msgstr "" -#: ../../mod/settings.php:634 ../../mod/settings.php:1014 +#: ../../mod/settings.php:665 ../../mod/settings.php:1067 msgid "Warning: This action is permanent and cannot be reversed." msgstr "" -#: ../../mod/settings.php:650 +#: ../../mod/settings.php:681 msgid "Off" msgstr "" -#: ../../mod/settings.php:650 +#: ../../mod/settings.php:681 msgid "On" msgstr "" -#: ../../mod/settings.php:657 +#: ../../mod/settings.php:688 msgid "Additional Features" msgstr "" -#: ../../mod/settings.php:682 +#: ../../mod/settings.php:713 msgid "Connector Settings" msgstr "" -#: ../../mod/settings.php:712 ../../mod/admin.php:362 +#: ../../mod/settings.php:743 ../../mod/admin.php:362 msgid "No special theme for mobile devices" msgstr "" -#: ../../mod/settings.php:721 +#: ../../mod/settings.php:752 #, php-format msgid "%s - (Experimental)" msgstr "" -#: ../../mod/settings.php:757 +#: ../../mod/settings.php:788 msgid "Display Settings" msgstr "" -#: ../../mod/settings.php:763 +#: ../../mod/settings.php:794 msgid "Display Theme:" msgstr "" -#: ../../mod/settings.php:764 +#: ../../mod/settings.php:795 msgid "Mobile Theme:" msgstr "" -#: ../../mod/settings.php:765 +#: ../../mod/settings.php:796 msgid "Enable user zoom on mobile devices" msgstr "" -#: ../../mod/settings.php:766 +#: ../../mod/settings.php:797 msgid "Update browser every xx seconds" msgstr "" -#: ../../mod/settings.php:766 +#: ../../mod/settings.php:797 msgid "Minimum of 10 seconds, no maximum" msgstr "" -#: ../../mod/settings.php:767 +#: ../../mod/settings.php:798 msgid "Maximum number of conversations to load at any time:" msgstr "" -#: ../../mod/settings.php:767 +#: ../../mod/settings.php:798 msgid "Maximum of 100 items" msgstr "" -#: ../../mod/settings.php:768 +#: ../../mod/settings.php:799 msgid "Don't show emoticons" msgstr "" -#: ../../mod/settings.php:769 +#: ../../mod/settings.php:800 msgid "Link post titles to source" msgstr "" -#: ../../mod/settings.php:770 +#: ../../mod/settings.php:801 msgid "System Page Layout Editor - (advanced)" msgstr "" -#: ../../mod/settings.php:804 +#: ../../mod/settings.php:835 msgid "Nobody except yourself" msgstr "" -#: ../../mod/settings.php:805 +#: ../../mod/settings.php:836 msgid "Only those you specifically allow" msgstr "" -#: ../../mod/settings.php:806 +#: ../../mod/settings.php:837 msgid "Approved connections" msgstr "" -#: ../../mod/settings.php:807 +#: ../../mod/settings.php:838 msgid "Any connections" msgstr "" -#: ../../mod/settings.php:808 +#: ../../mod/settings.php:839 msgid "Anybody on this website" msgstr "" -#: ../../mod/settings.php:809 +#: ../../mod/settings.php:840 msgid "Anybody in this network" msgstr "" -#: ../../mod/settings.php:810 +#: ../../mod/settings.php:841 msgid "Anybody authenticated" msgstr "" -#: ../../mod/settings.php:811 +#: ../../mod/settings.php:842 msgid "Anybody on the internet" msgstr "" -#: ../../mod/settings.php:885 +#: ../../mod/settings.php:916 msgid "Publish your default profile in the network directory" msgstr "" -#: ../../mod/settings.php:885 ../../mod/settings.php:890 -#: ../../mod/settings.php:967 ../../mod/api.php:106 ../../mod/profiles.php:574 -#: ../../mod/admin.php:392 +#: ../../mod/settings.php:916 ../../mod/settings.php:921 +#: ../../mod/settings.php:1004 ../../mod/api.php:106 +#: ../../mod/profiles.php:574 ../../mod/admin.php:392 msgid "No" msgstr "" -#: ../../mod/settings.php:885 ../../mod/settings.php:890 -#: ../../mod/settings.php:967 ../../mod/api.php:105 ../../mod/profiles.php:573 -#: ../../mod/admin.php:394 +#: ../../mod/settings.php:916 ../../mod/settings.php:921 +#: ../../mod/settings.php:1004 ../../mod/api.php:105 +#: ../../mod/profiles.php:573 ../../mod/admin.php:394 msgid "Yes" msgstr "" -#: ../../mod/settings.php:890 +#: ../../mod/settings.php:921 msgid "Allow us to suggest you as a potential friend to new members?" msgstr "" -#: ../../mod/settings.php:894 ../../mod/profile_photo.php:365 +#: ../../mod/settings.php:925 ../../mod/profile_photo.php:365 msgid "or" msgstr "" -#: ../../mod/settings.php:899 +#: ../../mod/settings.php:930 msgid "Your channel address is" msgstr "" -#: ../../mod/settings.php:937 +#: ../../mod/settings.php:974 msgid "Channel Settings" msgstr "" -#: ../../mod/settings.php:946 +#: ../../mod/settings.php:983 msgid "Basic Settings" msgstr "" -#: ../../mod/settings.php:949 +#: ../../mod/settings.php:986 msgid "Your Timezone:" msgstr "" -#: ../../mod/settings.php:950 +#: ../../mod/settings.php:987 msgid "Default Post Location:" msgstr "" -#: ../../mod/settings.php:950 +#: ../../mod/settings.php:987 msgid "Geographical location to display on your posts" msgstr "" -#: ../../mod/settings.php:951 +#: ../../mod/settings.php:988 msgid "Use Browser Location:" msgstr "" -#: ../../mod/settings.php:953 +#: ../../mod/settings.php:990 msgid "Adult Content" msgstr "" -#: ../../mod/settings.php:953 +#: ../../mod/settings.php:990 msgid "" "This channel frequently or regularly publishes adult content. (Please tag " "any adult material and/or nudity with #NSFW)" msgstr "" -#: ../../mod/settings.php:955 +#: ../../mod/settings.php:992 msgid "Security and Privacy Settings" msgstr "" -#: ../../mod/settings.php:957 +#: ../../mod/settings.php:994 msgid "Your permissions are already configured. Click to view/adjust" msgstr "" -#: ../../mod/settings.php:959 +#: ../../mod/settings.php:996 msgid "Hide my online presence" msgstr "" -#: ../../mod/settings.php:959 +#: ../../mod/settings.php:996 msgid "Prevents displaying in your profile that you are online" msgstr "" -#: ../../mod/settings.php:961 +#: ../../mod/settings.php:998 msgid "Simple Privacy Settings:" msgstr "" -#: ../../mod/settings.php:962 +#: ../../mod/settings.php:999 msgid "" "Very Public - extremely permissive (should be used with caution)" msgstr "" -#: ../../mod/settings.php:963 +#: ../../mod/settings.php:1000 msgid "" "Typical - default public, privacy when desired (similar to social " "network permissions but with improved privacy)" msgstr "" -#: ../../mod/settings.php:964 +#: ../../mod/settings.php:1001 msgid "Private - default private, never open or public" msgstr "" -#: ../../mod/settings.php:965 +#: ../../mod/settings.php:1002 msgid "Blocked - default blocked to/from everybody" msgstr "" -#: ../../mod/settings.php:967 +#: ../../mod/settings.php:1004 msgid "Allow others to tag your posts" msgstr "" -#: ../../mod/settings.php:967 +#: ../../mod/settings.php:1004 msgid "" "Often used by the community to retro-actively flag inappropriate content" msgstr "" -#: ../../mod/settings.php:969 +#: ../../mod/settings.php:1006 msgid "Advanced Privacy Settings" msgstr "" -#: ../../mod/settings.php:971 +#: ../../mod/settings.php:1008 msgid "Expire other channel content after this many days" msgstr "" -#: ../../mod/settings.php:971 +#: ../../mod/settings.php:1008 msgid "0 or blank prevents expiration" msgstr "" -#: ../../mod/settings.php:972 +#: ../../mod/settings.php:1009 msgid "Maximum Friend Requests/Day:" msgstr "" -#: ../../mod/settings.php:972 +#: ../../mod/settings.php:1009 msgid "May reduce spam activity" msgstr "" -#: ../../mod/settings.php:973 +#: ../../mod/settings.php:1010 msgid "Default Post Permissions" msgstr "" -#: ../../mod/settings.php:978 +#: ../../mod/settings.php:1015 msgid "Channel permissions category:" msgstr "" -#: ../../mod/settings.php:986 +#: ../../mod/settings.php:1023 msgid "Maximum private messages per day from unknown people:" msgstr "" -#: ../../mod/settings.php:986 +#: ../../mod/settings.php:1023 msgid "Useful to reduce spamming" msgstr "" -#: ../../mod/settings.php:989 +#: ../../mod/settings.php:1026 msgid "Notification Settings" msgstr "" -#: ../../mod/settings.php:990 +#: ../../mod/settings.php:1027 msgid "By default post a status message when:" msgstr "" -#: ../../mod/settings.php:991 +#: ../../mod/settings.php:1028 msgid "accepting a friend request" msgstr "" -#: ../../mod/settings.php:992 +#: ../../mod/settings.php:1029 msgid "joining a forum/community" msgstr "" -#: ../../mod/settings.php:993 +#: ../../mod/settings.php:1030 msgid "making an interesting profile change" msgstr "" -#: ../../mod/settings.php:994 +#: ../../mod/settings.php:1031 msgid "Send a notification email when:" msgstr "" -#: ../../mod/settings.php:995 +#: ../../mod/settings.php:1032 msgid "You receive a connection request" msgstr "" -#: ../../mod/settings.php:996 +#: ../../mod/settings.php:1033 msgid "Your connections are confirmed" msgstr "" -#: ../../mod/settings.php:997 +#: ../../mod/settings.php:1034 msgid "Someone writes on your profile wall" msgstr "" -#: ../../mod/settings.php:998 +#: ../../mod/settings.php:1035 msgid "Someone writes a followup comment" msgstr "" -#: ../../mod/settings.php:999 +#: ../../mod/settings.php:1036 msgid "You receive a private message" msgstr "" -#: ../../mod/settings.php:1000 +#: ../../mod/settings.php:1037 msgid "You receive a friend suggestion" msgstr "" -#: ../../mod/settings.php:1001 +#: ../../mod/settings.php:1038 msgid "You are tagged in a post" msgstr "" -#: ../../mod/settings.php:1002 +#: ../../mod/settings.php:1039 msgid "You are poked/prodded/etc. in a post" msgstr "" -#: ../../mod/settings.php:1005 +#: ../../mod/settings.php:1042 +msgid "Show visual notifications including:" +msgstr "" + +#: ../../mod/settings.php:1044 +msgid "Unseen matrix activity" +msgstr "" + +#: ../../mod/settings.php:1045 +msgid "Unseen channel activity" +msgstr "" + +#: ../../mod/settings.php:1046 +msgid "Unseen private messages" +msgstr "" + +#: ../../mod/settings.php:1046 ../../mod/settings.php:1051 +#: ../../mod/settings.php:1052 ../../mod/settings.php:1053 +msgid "Recommended" +msgstr "" + +#: ../../mod/settings.php:1047 +msgid "Upcoming events" +msgstr "" + +#: ../../mod/settings.php:1048 +msgid "Events today" +msgstr "" + +#: ../../mod/settings.php:1049 +msgid "Upcoming birthdays" +msgstr "" + +#: ../../mod/settings.php:1049 +msgid "Not available in all themes" +msgstr "" + +#: ../../mod/settings.php:1050 +msgid "System (personal) notifications" +msgstr "" + +#: ../../mod/settings.php:1051 +msgid "System info messages" +msgstr "" + +#: ../../mod/settings.php:1052 +msgid "System critical alerts" +msgstr "" + +#: ../../mod/settings.php:1053 +msgid "New connections" +msgstr "" + +#: ../../mod/settings.php:1054 +msgid "System Registrations" +msgstr "" + +#: ../../mod/settings.php:1056 +msgid "Notify me of events this many days in advance" +msgstr "" + +#: ../../mod/settings.php:1056 +msgid "Must be greater than 0" +msgstr "" + +#: ../../mod/settings.php:1058 msgid "Advanced Account/Page Type Settings" msgstr "" -#: ../../mod/settings.php:1006 +#: ../../mod/settings.php:1059 msgid "Change the behaviour of this account for special situations" msgstr "" -#: ../../mod/settings.php:1009 +#: ../../mod/settings.php:1062 msgid "" "Please enable expert mode (in Settings > " "Additional features) to adjust!" msgstr "" -#: ../../mod/settings.php:1010 +#: ../../mod/settings.php:1063 msgid "Miscellaneous Settings" msgstr "" -#: ../../mod/settings.php:1012 +#: ../../mod/settings.php:1065 msgid "Personal menu to display in your channel pages" msgstr "" -#: ../../mod/settings.php:1013 +#: ../../mod/settings.php:1066 msgid "Remove this channel" msgstr "" @@ -4477,7 +4547,7 @@ msgid "Channel not found." msgstr "" #: ../../mod/block.php:75 ../../mod/display.php:102 ../../mod/help.php:70 -#: ../../mod/page.php:81 ../../index.php:252 +#: ../../mod/page.php:81 ../../index.php:241 msgid "Page not found." msgstr "" @@ -5201,15 +5271,15 @@ msgstr "" msgid "Could not access contact record." msgstr "" -#: ../../mod/connections.php:51 ../../mod/connedit.php:78 +#: ../../mod/connections.php:51 ../../mod/connedit.php:86 msgid "Could not locate selected profile." msgstr "" -#: ../../mod/connections.php:94 ../../mod/connedit.php:132 +#: ../../mod/connections.php:94 ../../mod/connedit.php:140 msgid "Connection updated." msgstr "" -#: ../../mod/connections.php:96 ../../mod/connedit.php:134 +#: ../../mod/connections.php:96 ../../mod/connedit.php:142 msgid "Failed to update connection record." msgstr "" @@ -5294,314 +5364,311 @@ msgstr "" msgid "Edit post" msgstr "" -#: ../../mod/connedit.php:181 +#: ../../mod/connedit.php:189 msgid "is now connected to" msgstr "" -#: ../../mod/connedit.php:302 +#: ../../mod/connedit.php:310 msgid "Could not access address book record." msgstr "" -#: ../../mod/connedit.php:316 +#: ../../mod/connedit.php:324 msgid "Refresh failed - channel is currently unavailable." msgstr "" -#: ../../mod/connedit.php:323 +#: ../../mod/connedit.php:331 msgid "Channel has been unblocked" msgstr "" -#: ../../mod/connedit.php:324 +#: ../../mod/connedit.php:332 msgid "Channel has been blocked" msgstr "" -#: ../../mod/connedit.php:328 ../../mod/connedit.php:340 -#: ../../mod/connedit.php:352 ../../mod/connedit.php:364 -#: ../../mod/connedit.php:380 +#: ../../mod/connedit.php:336 ../../mod/connedit.php:348 +#: ../../mod/connedit.php:360 ../../mod/connedit.php:372 +#: ../../mod/connedit.php:388 msgid "Unable to set address book parameters." msgstr "" -#: ../../mod/connedit.php:335 +#: ../../mod/connedit.php:343 msgid "Channel has been unignored" msgstr "" -#: ../../mod/connedit.php:336 +#: ../../mod/connedit.php:344 msgid "Channel has been ignored" msgstr "" -#: ../../mod/connedit.php:347 +#: ../../mod/connedit.php:355 msgid "Channel has been unarchived" msgstr "" -#: ../../mod/connedit.php:348 +#: ../../mod/connedit.php:356 msgid "Channel has been archived" msgstr "" -#: ../../mod/connedit.php:359 +#: ../../mod/connedit.php:367 msgid "Channel has been unhidden" msgstr "" -#: ../../mod/connedit.php:360 +#: ../../mod/connedit.php:368 msgid "Channel has been hidden" msgstr "" -#: ../../mod/connedit.php:375 +#: ../../mod/connedit.php:383 msgid "Channel has been approved" msgstr "" -#: ../../mod/connedit.php:376 +#: ../../mod/connedit.php:384 msgid "Channel has been unapproved" msgstr "" -#: ../../mod/connedit.php:404 +#: ../../mod/connedit.php:412 msgid "Connection has been removed." msgstr "" -#: ../../mod/connedit.php:424 +#: ../../mod/connedit.php:432 #, php-format msgid "View %s's profile" msgstr "" -#: ../../mod/connedit.php:428 +#: ../../mod/connedit.php:436 msgid "Refresh Permissions" msgstr "" -#: ../../mod/connedit.php:431 +#: ../../mod/connedit.php:439 msgid "Fetch updated permissions" msgstr "" -#: ../../mod/connedit.php:435 +#: ../../mod/connedit.php:443 msgid "Recent Activity" msgstr "" -#: ../../mod/connedit.php:438 +#: ../../mod/connedit.php:446 msgid "View recent posts and comments" msgstr "" -#: ../../mod/connedit.php:442 ../../mod/connedit.php:585 +#: ../../mod/connedit.php:450 ../../mod/connedit.php:594 #: ../../mod/admin.php:734 msgid "Unblock" msgstr "" -#: ../../mod/connedit.php:442 ../../mod/connedit.php:585 +#: ../../mod/connedit.php:450 ../../mod/connedit.php:594 #: ../../mod/admin.php:733 msgid "Block" msgstr "" -#: ../../mod/connedit.php:445 +#: ../../mod/connedit.php:453 msgid "Block or Unblock this connection" msgstr "" -#: ../../mod/connedit.php:449 ../../mod/connedit.php:586 +#: ../../mod/connedit.php:457 ../../mod/connedit.php:595 msgid "Unignore" msgstr "" -#: ../../mod/connedit.php:449 ../../mod/connedit.php:586 +#: ../../mod/connedit.php:457 ../../mod/connedit.php:595 #: ../../mod/notifications.php:51 msgid "Ignore" msgstr "" -#: ../../mod/connedit.php:452 +#: ../../mod/connedit.php:460 msgid "Ignore or Unignore this connection" msgstr "" -#: ../../mod/connedit.php:455 +#: ../../mod/connedit.php:463 msgid "Unarchive" msgstr "" -#: ../../mod/connedit.php:455 +#: ../../mod/connedit.php:463 msgid "Archive" msgstr "" -#: ../../mod/connedit.php:458 +#: ../../mod/connedit.php:466 msgid "Archive or Unarchive this connection" msgstr "" -#: ../../mod/connedit.php:461 +#: ../../mod/connedit.php:469 msgid "Unhide" msgstr "" -#: ../../mod/connedit.php:461 +#: ../../mod/connedit.php:469 msgid "Hide" msgstr "" -#: ../../mod/connedit.php:464 +#: ../../mod/connedit.php:472 msgid "Hide or Unhide this connection" msgstr "" -#: ../../mod/connedit.php:471 +#: ../../mod/connedit.php:479 msgid "Delete this connection" msgstr "" -#: ../../mod/connedit.php:514 ../../mod/connedit.php:543 +#: ../../mod/connedit.php:522 ../../mod/connedit.php:552 msgid "Approve this connection" msgstr "" -#: ../../mod/connedit.php:514 +#: ../../mod/connedit.php:522 msgid "Accept connection to allow communication" msgstr "" -#: ../../mod/connedit.php:530 -msgid "Automatic Permissions Settings" -msgstr "" - -#: ../../mod/connedit.php:530 +#: ../../mod/connedit.php:538 #, php-format msgid "Connections: settings for %s" msgstr "" -#: ../../mod/connedit.php:534 -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." +#: ../../mod/connedit.php:539 +msgid "Apply these permissions automatically" +msgstr "" + +#: ../../mod/connedit.php:543 +msgid "Apply the permissions indicated on this page to all new connections." msgstr "" -#: ../../mod/connedit.php:536 +#: ../../mod/connedit.php:545 msgid "Slide to adjust your degree of friendship" msgstr "" -#: ../../mod/connedit.php:542 +#: ../../mod/connedit.php:551 msgid "inherited" msgstr "" -#: ../../mod/connedit.php:544 +#: ../../mod/connedit.php:553 msgid "Connection has no individual permissions!" msgstr "" -#: ../../mod/connedit.php:545 +#: ../../mod/connedit.php:554 msgid "" "This may be appropriate based on your privacy settings, though you may wish to review the \"Advanced Permissions\"." msgstr "" -#: ../../mod/connedit.php:547 +#: ../../mod/connedit.php:556 msgid "Profile Visibility" msgstr "" -#: ../../mod/connedit.php:548 +#: ../../mod/connedit.php:557 #, php-format msgid "" "Please choose the profile you would like to display to %s when viewing your " "profile securely." msgstr "" -#: ../../mod/connedit.php:549 +#: ../../mod/connedit.php:558 msgid "Contact Information / Notes" msgstr "" -#: ../../mod/connedit.php:550 +#: ../../mod/connedit.php:559 msgid "Edit contact notes" msgstr "" -#: ../../mod/connedit.php:552 +#: ../../mod/connedit.php:561 msgid "Their Settings" msgstr "" -#: ../../mod/connedit.php:553 +#: ../../mod/connedit.php:562 msgid "My Settings" msgstr "" -#: ../../mod/connedit.php:555 +#: ../../mod/connedit.php:564 msgid "Clear/Disable Automatic Permissions" msgstr "" -#: ../../mod/connedit.php:556 +#: ../../mod/connedit.php:565 msgid "Forum Members" msgstr "" -#: ../../mod/connedit.php:557 +#: ../../mod/connedit.php:566 msgid "Soapbox" msgstr "" -#: ../../mod/connedit.php:558 +#: ../../mod/connedit.php:567 msgid "Full Sharing (typical social network permissions)" msgstr "" -#: ../../mod/connedit.php:559 +#: ../../mod/connedit.php:568 msgid "Cautious Sharing " msgstr "" -#: ../../mod/connedit.php:560 +#: ../../mod/connedit.php:569 msgid "Follow Only" msgstr "" -#: ../../mod/connedit.php:561 +#: ../../mod/connedit.php:570 msgid "Individual Permissions" msgstr "" -#: ../../mod/connedit.php:562 +#: ../../mod/connedit.php:571 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 "" -#: ../../mod/connedit.php:563 +#: ../../mod/connedit.php:572 msgid "Advanced Permissions" msgstr "" -#: ../../mod/connedit.php:564 +#: ../../mod/connedit.php:573 msgid "Simple Permissions (select one and submit)" msgstr "" -#: ../../mod/connedit.php:568 +#: ../../mod/connedit.php:577 #, php-format msgid "Visit %s's profile - %s" msgstr "" -#: ../../mod/connedit.php:569 +#: ../../mod/connedit.php:578 msgid "Block/Unblock contact" msgstr "" -#: ../../mod/connedit.php:570 +#: ../../mod/connedit.php:579 msgid "Ignore contact" msgstr "" -#: ../../mod/connedit.php:571 +#: ../../mod/connedit.php:580 msgid "Repair URL settings" msgstr "" -#: ../../mod/connedit.php:572 +#: ../../mod/connedit.php:581 msgid "View conversations" msgstr "" -#: ../../mod/connedit.php:574 +#: ../../mod/connedit.php:583 msgid "Delete contact" msgstr "" -#: ../../mod/connedit.php:577 +#: ../../mod/connedit.php:586 msgid "Last update:" msgstr "" -#: ../../mod/connedit.php:579 +#: ../../mod/connedit.php:588 msgid "Update public posts" msgstr "" -#: ../../mod/connedit.php:581 +#: ../../mod/connedit.php:590 msgid "Update now" msgstr "" -#: ../../mod/connedit.php:587 +#: ../../mod/connedit.php:596 msgid "Currently blocked" msgstr "" -#: ../../mod/connedit.php:588 +#: ../../mod/connedit.php:597 msgid "Currently ignored" msgstr "" -#: ../../mod/connedit.php:589 +#: ../../mod/connedit.php:598 msgid "Currently archived" msgstr "" -#: ../../mod/connedit.php:590 +#: ../../mod/connedit.php:599 msgid "Currently pending" msgstr "" -#: ../../mod/connedit.php:591 +#: ../../mod/connedit.php:600 msgid "Hide this contact from others" msgstr "" -#: ../../mod/connedit.php:591 +#: ../../mod/connedit.php:600 msgid "" "Replies/likes to your public posts may still be visible" msgstr "" @@ -6359,7 +6426,7 @@ msgstr "" msgid "Help:" msgstr "" -#: ../../mod/help.php:67 ../../index.php:249 +#: ../../mod/help.php:67 ../../index.php:238 msgid "Not Found" msgstr "" @@ -7354,28 +7421,28 @@ msgstr "" msgid "3. Click [Connect]" msgstr "" -#: ../../mod/item.php:150 +#: ../../mod/item.php:151 msgid "Unable to locate original post." msgstr "" -#: ../../mod/item.php:409 +#: ../../mod/item.php:411 msgid "Empty post discarded." msgstr "" -#: ../../mod/item.php:451 +#: ../../mod/item.php:453 msgid "Executable content type not permitted to this channel." msgstr "" -#: ../../mod/item.php:888 +#: ../../mod/item.php:891 msgid "System error. Post not saved." msgstr "" -#: ../../mod/item.php:1363 +#: ../../mod/item.php:1366 #, php-format msgid "You have reached your limit of %1$.0f top level posts." msgstr "" -#: ../../mod/item.php:1369 +#: ../../mod/item.php:1372 #, php-format msgid "You have reached your limit of %1$.0f webpages." msgstr "" @@ -7393,14 +7460,34 @@ msgstr "" msgid "Layout Name" msgstr "" -#: ../../mod/locs.php:47 ../../mod/locs.php:74 +#: ../../mod/locs.php:19 ../../mod/locs.php:46 msgid "Location not found." msgstr "" -#: ../../mod/locs.php:78 +#: ../../mod/locs.php:50 msgid "Primary location cannot be removed." msgstr "" +#: ../../mod/locs.php:82 +msgid "No locations found." +msgstr "" + +#: ../../mod/locs.php:95 +msgid "Manage Channel Locations" +msgstr "" + +#: ../../mod/locs.php:96 +msgid "Location (address)" +msgstr "" + +#: ../../mod/locs.php:97 +msgid "Primary Location" +msgstr "" + +#: ../../mod/locs.php:98 +msgid "Drop location" +msgstr "" + #: ../../mod/lockview.php:31 msgid "Remote privacy information not available." msgstr "" @@ -7446,7 +7533,7 @@ msgid "" "Password reset failed." msgstr "" -#: ../../mod/lostpass.php:85 ../../boot.php:1506 +#: ../../mod/lostpass.php:85 ../../boot.php:1523 msgid "Password Reset" msgstr "" @@ -8179,41 +8266,41 @@ msgstr "" msgid "Are you a clean desk or a messy desk person?" msgstr "" -#: ../../boot.php:1294 +#: ../../boot.php:1311 #, php-format msgid "Update %s failed. See error logs." msgstr "" -#: ../../boot.php:1297 +#: ../../boot.php:1314 #, php-format msgid "Update Error at %s" msgstr "" -#: ../../boot.php:1471 +#: ../../boot.php:1488 msgid "" "Create an account to access services and applications within the Red Matrix" msgstr "" -#: ../../boot.php:1499 +#: ../../boot.php:1516 msgid "Password" msgstr "" -#: ../../boot.php:1500 +#: ../../boot.php:1517 msgid "Remember me" msgstr "" -#: ../../boot.php:1505 +#: ../../boot.php:1522 msgid "Forgot your password?" msgstr "" -#: ../../boot.php:1570 +#: ../../boot.php:1587 msgid "permission denied" msgstr "" -#: ../../boot.php:1571 +#: ../../boot.php:1588 msgid "Got Zot?" msgstr "" -#: ../../boot.php:2005 +#: ../../boot.php:2021 msgid "toggle mobile" msgstr "" diff --git a/version.inc b/version.inc index 01d6c72d9..b0f79cf5f 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2014-11-06.851 +2014-11-07.852 -- cgit v1.2.3 From 1cc1bc8e811ccee8dedd340dcaa156c7c1a3fed1 Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 7 Nov 2014 05:15:39 -0800 Subject: fix broken photo edits when adult flag is changed --- mod/photos.php | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/mod/photos.php b/mod/photos.php index 0a3d6c704..9d8e68134 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -274,11 +274,9 @@ function photos_post(&$a) { } } - $p = q("SELECT * FROM `photo` WHERE `resource_id` = '%s' AND `uid` = %d and ((photo_flags = %d) or (photo_flags & %d )) ORDER BY `scale` DESC", + $p = q("SELECT * FROM `photo` WHERE `resource_id` = '%s' AND `uid` = %d ORDER BY `scale` DESC", dbesc($resource_id), - intval($page_owner_uid), - intval(PHOTO_NORMAL), - intval(PHOTO_PROFILE) + intval($page_owner_uid) ); if($p) { $ext = $phototypes[$p[0]['type']]; @@ -322,10 +320,11 @@ function photos_post(&$a) { intval($item_id), intval($page_owner_uid) ); - } - if($r) { - $old_tag = $r[0]['tag']; - $old_inform = $r[0]['inform']; + + if($r) { + $old_tag = $r[0]['tag']; + $old_inform = $r[0]['inform']; + } } -- cgit v1.2.3 From 961049f5faf04edcf3dc5485e76d81460b929efb Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 7 Nov 2014 12:16:13 -0800 Subject: revert that bit --- include/poller.php | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/include/poller.php b/include/poller.php index 1734af7d9..026d84c62 100644 --- a/include/poller.php +++ b/include/poller.php @@ -263,7 +263,7 @@ function poller_run($argv, $argc){ ); - $contacts = q("SELECT abook_id, abook_flags, abook_network, abook_updated, abook_connected, abook_closeness, abook_xchan, abook_channel + $contacts = q("SELECT abook_id, abook_flags, abook_updated, abook_connected, abook_closeness, abook_xchan, abook_channel FROM abook LEFT JOIN account on abook_account = account_id where 1 $sql_extra AND (( abook_flags & %d ) OR ( abook_flags = %d )) @@ -357,12 +357,6 @@ function poller_run($argv, $argc){ if((! $update) && (! $force)) continue; - // we handled feed contacts earlier - now filter out anything else that - // doesn't require polling to keep the process count down. - - if($contact['abook_network'] !== 'zot') - continue; - proc_run('php','include/onepoll.php',$contact['abook_id']); if($interval) @time_sleep_until(microtime(true) + (float) $interval); -- cgit v1.2.3 From 55f64c37364a1e4ac3e57a6af2953df196589c49 Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 7 Nov 2014 13:06:56 -0800 Subject: tgroup_check - decrypt if obscured before checking body text for reshares --- include/items.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/include/items.php b/include/items.php index 325947341..7e2bb4f18 100755 --- a/include/items.php +++ b/include/items.php @@ -2974,7 +2974,15 @@ function tgroup_check($uid,$item) { // At this point we've determined that the person receiving this post was mentioned in it. // Now let's check if this mention was inside a reshare so we don't spam a forum - $body = preg_replace('/\[share(.*?)\[\/share\]/','',$item['body']); + + $body = $item['body']; + + if(array_key_exists('item_flags',$item) && ($item['item_flags'] & ITEM_OBSCURED) && $body) { + $key = get_config('system','prvkey'); + $body = crypto_unencapsulate(json_decode($body,true),$key); + } + + $body = preg_replace('/\[share(.*?)\[\/share\]/','',$body); $pattern = '/@\!?\[zrl\=' . preg_quote($term['url'],'/') . '\]' . preg_quote($term['term'] . '+','/') . '\[\/zrl\]/'; -- cgit v1.2.3 From a22ba7629b809f9855c190480ebb250452dfeb16 Mon Sep 17 00:00:00 2001 From: zottel Date: Fri, 7 Nov 2014 22:19:17 +0100 Subject: update to German strings --- view/de/messages.po | 12011 +++++++++++++++++++++++++------------------------- view/de/strings.php | 2764 ++++++------ 2 files changed, 7500 insertions(+), 7275 deletions(-) diff --git a/view/de/messages.po b/view/de/messages.po index ae568d05d..9c2a40648 100644 --- a/view/de/messages.po +++ b/view/de/messages.po @@ -24,8 +24,8 @@ msgid "" msgstr "" "Project-Id-Version: Red Matrix\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-17 14:18+0000\n" -"PO-Revision-Date: 2014-10-23 11:52+0000\n" +"POT-Creation-Date: 2014-10-31 00:03-0700\n" +"PO-Revision-Date: 2014-11-07 21:07+0000\n" "Last-Translator: zottel \n" "Language-Team: German (http://www.transifex.com/projects/p/red-matrix/language/de/)\n" "MIME-Version: 1.0\n" @@ -34,2629 +34,2865 @@ msgstr "" "Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../../view/theme/redbasic/php/config.php:84 -msgid "Light (Red Matrix default)" -msgstr "Hell (RedMatrix-Voreinstellung)" +#: ../../include/dba/dba_driver.php:50 +#, php-format +msgid "Cannot locate DNS info for database server '%s'" +msgstr "Kann die DNS-Informationen für den Datenbank-Server '%s' nicht finden" -#: ../../view/theme/redbasic/php/config.php:99 -#: ../../include/ItemObject.php:599 ../../mod/settings.php:519 -#: ../../mod/settings.php:631 ../../mod/settings.php:660 -#: ../../mod/settings.php:684 ../../mod/settings.php:760 -#: ../../mod/settings.php:945 ../../mod/filestorage.php:146 -#: ../../mod/admin.php:414 ../../mod/admin.php:725 ../../mod/admin.php:861 -#: ../../mod/admin.php:994 ../../mod/admin.php:1193 ../../mod/admin.php:1280 -#: ../../mod/photos.php:563 ../../mod/photos.php:672 ../../mod/photos.php:974 -#: ../../mod/photos.php:1014 ../../mod/photos.php:1101 ../../mod/mood.php:135 -#: ../../mod/pdledit.php:58 ../../mod/connedit.php:540 ../../mod/setup.php:307 -#: ../../mod/setup.php:350 ../../mod/invite.php:142 ../../mod/thing.php:284 -#: ../../mod/thing.php:327 ../../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:480 ../../mod/mail.php:348 ../../mod/profiles.php:643 -#: ../../mod/chat.php:177 ../../mod/chat.php:211 ../../mod/events.php:587 -msgid "Submit" -msgstr "Bestätigen" +#: ../../include/photo/photo_driver.php:680 ../../include/photos.php:51 +#: ../../mod/photos.php:91 ../../mod/photos.php:645 +#: ../../mod/profile_photo.php:142 ../../mod/profile_photo.php:301 +#: ../../mod/profile_photo.php:423 +msgid "Profile Photos" +msgstr "Profilfotos" -#: ../../view/theme/redbasic/php/config.php:102 -msgid "Theme settings" -msgstr "Theme-Einstellungen" +#: ../../include/apps.php:126 +msgid "Site Admin" +msgstr "Hub-Administration" -#: ../../view/theme/redbasic/php/config.php:103 -msgid "Set scheme" -msgstr "Schema" +#: ../../include/apps.php:127 ../../include/conversation.php:1572 +#: ../../include/nav.php:117 +msgid "Bookmarks" +msgstr "Lesezeichen" -#: ../../view/theme/redbasic/php/config.php:104 -msgid "Narrow navbar" -msgstr "Schmale Navigationsleiste" +#: ../../include/apps.php:128 +msgid "Address Book" +msgstr "Adressbuch" -#: ../../view/theme/redbasic/php/config.php:105 -msgid "Navigation bar background color" -msgstr "Hintergrundfarbe der Navigationsleiste" +#: ../../include/apps.php:129 ../../include/nav.php:125 ../../boot.php:1496 +msgid "Login" +msgstr "Anmelden" -#: ../../view/theme/redbasic/php/config.php:106 -msgid "Navigation bar gradient top color" -msgstr "Farbverlauf der Navigationsleiste: Farbe oben" +#: ../../include/apps.php:130 ../../include/nav.php:216 +#: ../../mod/manage.php:148 +msgid "Channel Manager" +msgstr "Kanal-Manager" -#: ../../view/theme/redbasic/php/config.php:107 -msgid "Navigation bar gradient bottom color" -msgstr "Farbverlauf der Navigationsleiste: Farbe unten" +#: ../../include/apps.php:131 ../../include/nav.php:190 +msgid "Matrix" +msgstr "Matrix" -#: ../../view/theme/redbasic/php/config.php:108 -msgid "Navigation active button gradient top color" -msgstr "Navigations-Button aktiv: Farbe für Farbverlauf oben" +#: ../../include/apps.php:132 ../../include/widgets.php:524 +#: ../../include/nav.php:218 ../../mod/admin.php:953 ../../mod/admin.php:1158 +msgid "Settings" +msgstr "Einstellungen" -#: ../../view/theme/redbasic/php/config.php:109 -msgid "Navigation active button gradient bottom color" -msgstr "Navigations-Button aktiv: Farbe für Farbverlauf unten" +#: ../../include/apps.php:133 ../../include/conversation.php:1546 +#: ../../include/RedDAV/RedBrowser.php:241 ../../include/nav.php:106 +#: ../../mod/fbrowser.php:114 +msgid "Files" +msgstr "Dateien" -#: ../../view/theme/redbasic/php/config.php:110 -msgid "Navigation bar border color " -msgstr "Farbe für den Rand der Navigationsleiste" +#: ../../include/apps.php:134 ../../include/conversation.php:1583 +#: ../../include/nav.php:121 ../../mod/webpages.php:129 +msgid "Webpages" +msgstr "Webseiten" -#: ../../view/theme/redbasic/php/config.php:111 -msgid "Navigation bar icon color " -msgstr "Farbe für die Icons der Navigationsleiste" +#: ../../include/apps.php:135 ../../include/nav.php:193 +msgid "Channel Home" +msgstr "Mein Kanal" -#: ../../view/theme/redbasic/php/config.php:112 -msgid "Navigation bar active icon color " -msgstr "Farbe für aktive Icons der Navigationsleiste" +#: ../../include/apps.php:136 ../../include/identity.php:1115 +#: ../../include/identity.php:1233 ../../mod/profperm.php:112 +msgid "Profile" +msgstr "Profil" -#: ../../view/theme/redbasic/php/config.php:113 -msgid "link color" -msgstr "Farbe für Links" +#: ../../include/apps.php:137 ../../include/conversation.php:1537 +#: ../../include/nav.php:105 ../../mod/fbrowser.php:25 +msgid "Photos" +msgstr "Fotos" -#: ../../view/theme/redbasic/php/config.php:114 -msgid "Set font-color for banner" -msgstr "Farbe der Schrift des Banners" +#: ../../include/apps.php:138 ../../include/nav.php:212 +#: ../../mod/events.php:431 +msgid "Events" +msgstr "Veranstaltungen" -#: ../../view/theme/redbasic/php/config.php:115 -msgid "Set the background color" -msgstr "Hintergrundfarbe" +#: ../../include/apps.php:139 ../../include/nav.php:176 +#: ../../mod/directory.php:226 +msgid "Directory" +msgstr "Verzeichnis" -#: ../../view/theme/redbasic/php/config.php:116 -msgid "Set the background image" -msgstr "Hintergrundbild" +#: ../../include/apps.php:140 ../../include/nav.php:168 ../../mod/help.php:58 +#: ../../mod/help.php:63 +msgid "Help" +msgstr "Hilfe" -#: ../../view/theme/redbasic/php/config.php:117 -msgid "Set the background color of items" -msgstr "Hintergrundfarbe für Beiträge" +#: ../../include/apps.php:141 ../../include/nav.php:204 +msgid "Mail" +msgstr "Mail" -#: ../../view/theme/redbasic/php/config.php:118 -msgid "Set the background color of comments" -msgstr "Hintergrundfarbe für Kommentare" +#: ../../include/apps.php:142 ../../mod/mood.php:131 +msgid "Mood" +msgstr "Laune" -#: ../../view/theme/redbasic/php/config.php:119 -msgid "Set the border color of comments" -msgstr "Farbe des Randes von Kommentaren" +#: ../../include/apps.php:143 ../../include/conversation.php:951 +msgid "Poke" +msgstr "Anstupsen" -#: ../../view/theme/redbasic/php/config.php:120 -msgid "Set the indent for comments" -msgstr "Einzug für Kommentare" +#: ../../include/apps.php:144 ../../include/nav.php:111 +msgid "Chat" +msgstr "Chat" -#: ../../view/theme/redbasic/php/config.php:121 -msgid "Set the basic color for item icons" -msgstr "Grundfarbe für Beitrags-Icons" +#: ../../include/apps.php:145 ../../include/text.php:822 +#: ../../include/text.php:834 ../../include/nav.php:173 +#: ../../mod/search.php:30 +msgid "Search" +msgstr "Suche" -#: ../../view/theme/redbasic/php/config.php:122 -msgid "Set the hover color for item icons" -msgstr "Farbe für Beitrags-Icons unter dem Mauszeiger" +#: ../../include/apps.php:146 +msgid "Probe" +msgstr "Testen" -#: ../../view/theme/redbasic/php/config.php:123 -msgid "Set font-size for the entire application" -msgstr "Schriftgröße für die ganze Applikation" +#: ../../include/apps.php:147 +msgid "Suggest" +msgstr "Empfehlungen" -#: ../../view/theme/redbasic/php/config.php:124 -msgid "Set font-size for posts and comments" -msgstr "Schriftgröße für Beiträge und Kommentare" +#: ../../include/apps.php:148 +msgid "Random Channel" +msgstr "Zufälliger Kanal" -#: ../../view/theme/redbasic/php/config.php:125 -msgid "Set font-color for posts and comments" -msgstr "Schriftfarbe für Posts und Kommentare" +#: ../../include/apps.php:149 +msgid "Invite" +msgstr "Einladen" -#: ../../view/theme/redbasic/php/config.php:126 -msgid "Set radius of corners" -msgstr "Ecken-Radius" +#: ../../include/apps.php:150 +msgid "Features" +msgstr "Funktionen" -#: ../../view/theme/redbasic/php/config.php:127 -msgid "Set shadow depth of photos" -msgstr "Schattentiefe von Fotos" +#: ../../include/apps.php:151 +msgid "Language" +msgstr "Sprache" -#: ../../view/theme/redbasic/php/config.php:128 -msgid "Set maximum width of conversation regions" -msgstr "Maximalbreite der Unterhaltungsbereiche" +#: ../../include/apps.php:152 +msgid "Post" +msgstr "Beitrag" -#: ../../view/theme/redbasic/php/config.php:129 -msgid "Center conversation regions" -msgstr "Konversationsbereich zentrieren" +#: ../../include/apps.php:153 +msgid "Profile Photo" +msgstr "Profilfoto" -#: ../../view/theme/redbasic/php/config.php:130 -msgid "Set minimum opacity of nav bar - to hide it" -msgstr "Mindest-Deckkraft der Navigationsleiste ( - versteckt sie)" +#: ../../include/apps.php:242 ../../mod/settings.php:81 +#: ../../mod/settings.php:544 +msgid "Update" +msgstr "Aktualisieren" -#: ../../view/theme/redbasic/php/config.php:131 -msgid "Set size of conversation author photo" -msgstr "Größe der Avatare von Themenstartern" +#: ../../include/apps.php:242 +msgid "Install" +msgstr "Installieren" -#: ../../view/theme/redbasic/php/config.php:132 -msgid "Set size of followup author photos" -msgstr "Größe der Avatare von Kommentatoren" +#: ../../include/apps.php:247 +msgid "Purchase" +msgstr "Kaufen" -#: ../../view/theme/redbasic/php/config.php:133 -msgid "Sloppy photo albums" -msgstr "Schräge Fotoalben" +#: ../../include/apps.php:249 ../../include/page_widgets.php:8 +#: ../../include/page_widgets.php:36 ../../include/RedDAV/RedBrowser.php:250 +#: ../../include/menu.php:42 ../../include/ItemObject.php:100 +#: ../../mod/settings.php:580 ../../mod/blocks.php:99 +#: ../../mod/connections.php:381 ../../mod/connections.php:394 +#: ../../mod/connections.php:413 ../../mod/webpages.php:131 +#: ../../mod/editblock.php:111 ../../mod/editlayout.php:106 +#: ../../mod/editpost.php:112 ../../mod/editwebpage.php:143 +#: ../../mod/thing.php:233 ../../mod/layouts.php:121 ../../mod/menu.php:59 +msgid "Edit" +msgstr "Bearbeiten" -#: ../../view/theme/redbasic/php/config.php:133 -msgid "Are you a clean desk or a messy desk person?" -msgstr "Bist Du jemand, der einen aufgeräumten Schreibtisch hat, oder eher einen chaotischen?" +#: ../../include/apps.php:250 ../../include/conversation.php:638 +#: ../../include/RedDAV/RedBrowser.php:251 ../../include/ItemObject.php:120 +#: ../../mod/photos.php:1062 ../../mod/settings.php:581 +#: ../../mod/connedit.php:468 ../../mod/group.php:176 ../../mod/admin.php:732 +#: ../../mod/admin.php:863 ../../mod/thing.php:234 +msgid "Delete" +msgstr "Löschen" -#: ../../boot.php:1294 -#, php-format -msgid "Update %s failed. See error logs." -msgstr "Aktualisierung %s fehlgeschlagen. Details in den Fehlerprotokollen." +#: ../../include/apps.php:331 ../../include/apps.php:382 +#: ../../include/conversation.php:1003 ../../include/RedDAV/RedBrowser.php:163 +#: ../../mod/photos.php:703 ../../mod/photos.php:1124 +#: ../../mod/connedit.php:504 +msgid "Unknown" +msgstr "Unbekannt" -#: ../../boot.php:1297 -#, php-format -msgid "Update Error at %s" -msgstr "Aktualisierungsfehler auf %s" +#: ../../include/attach.php:116 ../../include/attach.php:163 +#: ../../include/attach.php:226 ../../include/attach.php:240 +#: ../../include/attach.php:280 ../../include/attach.php:294 +#: ../../include/attach.php:318 ../../include/attach.php:511 +#: ../../include/attach.php:584 ../../include/chat.php:116 +#: ../../include/items.php:4005 ../../include/photos.php:15 +#: ../../mod/mood.php:112 ../../mod/photos.php:68 ../../mod/photos.php:533 +#: ../../mod/mitem.php:73 ../../mod/achievements.php:30 +#: ../../mod/settings.php:495 ../../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/blocks.php:29 ../../mod/blocks.php:44 ../../mod/profiles.php:179 +#: ../../mod/profiles.php:532 ../../mod/events.php:195 +#: ../../mod/channel.php:89 ../../mod/channel.php:193 +#: ../../mod/channel.php:236 ../../mod/chat.php:90 ../../mod/chat.php:95 +#: ../../mod/register.php:70 ../../mod/regmod.php:17 ../../mod/common.php:35 +#: ../../mod/network.php:12 ../../mod/connections.php:169 +#: ../../mod/connedit.php:254 ../../mod/delegate.php:6 +#: ../../mod/webpages.php:40 ../../mod/bookmarks.php:46 +#: ../../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/profile_photo.php:263 ../../mod/profile_photo.php:276 +#: ../../mod/sources.php:66 ../../mod/filestorage.php:18 +#: ../../mod/filestorage.php:67 ../../mod/filestorage.php:82 +#: ../../mod/filestorage.php:109 ../../mod/fsuggest.php:78 +#: ../../mod/suggest.php:26 ../../mod/group.php:9 ../../mod/like.php:154 +#: ../../mod/thing.php:247 ../../mod/thing.php:264 ../../mod/thing.php:299 +#: ../../mod/invite.php:13 ../../mod/invite.php:104 ../../mod/item.php:182 +#: ../../mod/item.php:190 ../../mod/item.php:961 ../../mod/layouts.php:27 +#: ../../mod/layouts.php:39 ../../mod/viewconnections.php:22 +#: ../../mod/viewconnections.php:27 ../../mod/viewsrc.php:14 +#: ../../mod/mail.php:111 ../../mod/manage.php:6 ../../mod/menu.php:44 +#: ../../mod/message.php:16 ../../mod/new_channel.php:68 +#: ../../mod/new_channel.php:99 ../../mod/notifications.php:66 +#: ../../mod/page.php:28 ../../mod/page.php:78 ../../mod/appman.php:66 +#: ../../mod/service_limits.php:7 ../../index.php:190 ../../index.php:401 +msgid "Permission denied." +msgstr "Zugang verweigert" -#: ../../boot.php:1471 -msgid "" -"Create an account to access services and applications within the Red Matrix" -msgstr "Erstelle einen Account, um Anwendungen und Dienste innerhalb der Red-Matrix verwenden zu können." +#: ../../include/attach.php:221 ../../include/attach.php:275 +msgid "Item was not found." +msgstr "Beitrag wurde nicht gefunden." -#: ../../boot.php:1472 ../../include/nav.php:163 ../../mod/register.php:220 -msgid "Register" -msgstr "Registrieren" +#: ../../include/attach.php:331 +msgid "No source file." +msgstr "Keine Quelldatei." -#: ../../boot.php:1495 ../../include/nav.php:95 ../../include/nav.php:128 -msgid "Logout" -msgstr "Abmelden" +#: ../../include/attach.php:348 +msgid "Cannot locate file to replace" +msgstr "Kann Datei zum Ersetzen nicht finden" -#: ../../boot.php:1496 ../../include/nav.php:125 ../../include/apps.php:129 -msgid "Login" -msgstr "Anmelden" +#: ../../include/attach.php:366 +msgid "Cannot locate file to revise/update" +msgstr "Kann Datei zum Prüfen/Aktualisieren nicht finden" -#: ../../boot.php:1498 ../../include/contact_selectors.php:79 -#: ../../mod/admin.php:728 ../../mod/admin.php:737 -msgid "Email" -msgstr "E-Mail" +#: ../../include/attach.php:377 +#, php-format +msgid "File exceeds size limit of %d" +msgstr "Datei überschreitet das Größen-Limit von %d" -#: ../../boot.php:1499 -msgid "Password" -msgstr "Kennwort" +#: ../../include/attach.php:389 +#, php-format +msgid "You have reached your limit of %1$.0f Mbytes attachment storage." +msgstr "Die Größe Deiner Datei-Anhänge hat das Maximum von %1$.0f MByte erreicht." -#: ../../boot.php:1500 -msgid "Remember me" -msgstr "Angaben speichern" +#: ../../include/attach.php:472 +msgid "File upload failed. Possible system limit or action terminated." +msgstr "Datei-Upload fehlgeschlagen. Mögliche Systembegrenzung oder abgebrochener Prozess." -#: ../../boot.php:1505 -msgid "Forgot your password?" -msgstr "Passwort vergessen?" +#: ../../include/attach.php:484 +msgid "Stored file could not be verified. Upload failed." +msgstr "Gespeichert Datei konnte nicht verifiziert werden. Upload abgebrochen." -#: ../../boot.php:1506 ../../mod/lostpass.php:85 -msgid "Password Reset" -msgstr "Zurücksetzen des Kennworts" +#: ../../include/attach.php:526 ../../include/attach.php:543 +msgid "Path not available." +msgstr "Pfad nicht verfügbar." -#: ../../boot.php:1570 -msgid "permission denied" -msgstr "Zugriff verweigert" +#: ../../include/attach.php:589 +msgid "Empty pathname" +msgstr "Leere Pfadangabe" -#: ../../boot.php:1571 -msgid "Got Zot?" -msgstr "Haste schon Zot?" +#: ../../include/attach.php:605 +msgid "duplicate filename or path" +msgstr "doppelter Dateiname oder Pfad" -#: ../../boot.php:2001 -msgid "toggle mobile" -msgstr "auf/von mobile Ansicht wechseln" +#: ../../include/attach.php:629 +msgid "Path not found." +msgstr "Pfad nicht gefunden." -#: ../../include/auth.php:116 -msgid "Logged out." -msgstr "Ausgeloggt." +#: ../../include/attach.php:680 +msgid "mkdir failed." +msgstr "mkdir fehlgeschlagen." -#: ../../include/auth.php:257 -msgid "Failed authentication" -msgstr "Authentifizierung fehlgeschlagen" +#: ../../include/attach.php:684 +msgid "database storage failed." +msgstr "Speichern in der Datenbank fehlgeschlagen." -#: ../../include/auth.php:271 ../../mod/openid.php:190 -msgid "Login failed." -msgstr "Login fehlgeschlagen." +#: ../../include/conversation.php:120 ../../include/text.php:1743 +#: ../../include/diaspora.php:1924 ../../mod/subthread.php:72 +#: ../../mod/subthread.php:174 ../../mod/tagger.php:45 ../../mod/like.php:298 +msgid "photo" +msgstr "Foto" -#: ../../include/comanche.php:35 -msgid "Default" -msgstr "Standard" +#: ../../include/conversation.php:123 ../../include/text.php:1746 +#: ../../mod/tagger.php:49 +msgid "event" +msgstr "Ereignis" -#: ../../include/RedDAV/RedBrowser.php:106 -#: ../../include/RedDAV/RedBrowser.php:249 -msgid "parent" -msgstr "Übergeordnetes Verzeichnis" +#: ../../include/conversation.php:126 ../../mod/like.php:89 +msgid "channel" +msgstr "Kanal" -#: ../../include/RedDAV/RedBrowser.php:130 -msgid "Collection" -msgstr "Sammlung" +#: ../../include/conversation.php:148 ../../include/text.php:1749 +#: ../../include/diaspora.php:1924 ../../mod/subthread.php:72 +#: ../../mod/subthread.php:174 ../../mod/tagger.php:53 ../../mod/like.php:298 +msgid "status" +msgstr "Status" -#: ../../include/RedDAV/RedBrowser.php:133 -msgid "Principal" -msgstr "Prinzipal" +#: ../../include/conversation.php:150 ../../include/text.php:1751 +#: ../../mod/tagger.php:55 +msgid "comment" +msgstr "Kommentar" -#: ../../include/RedDAV/RedBrowser.php:136 -msgid "Addressbook" -msgstr "Adressbuch" +#: ../../include/conversation.php:164 ../../include/diaspora.php:1953 +#: ../../mod/like.php:344 +#, php-format +msgid "%1$s likes %2$s's %3$s" +msgstr "%1$s gefällt %2$ss %3$s" -#: ../../include/RedDAV/RedBrowser.php:139 -msgid "Calendar" -msgstr "Kalender" +#: ../../include/conversation.php:167 ../../mod/like.php:346 +#, php-format +msgid "%1$s doesn't like %2$s's %3$s" +msgstr "%1$s gefällt %2$ss %3$s nicht" -#: ../../include/RedDAV/RedBrowser.php:142 -msgid "Schedule Inbox" -msgstr "Posteingang für überwachte Kalender" +#: ../../include/conversation.php:204 +#, php-format +msgid "%1$s is now connected with %2$s" +msgstr "%1$s ist jetzt mit %2$s verbunden" -#: ../../include/RedDAV/RedBrowser.php:145 -msgid "Schedule Outbox" -msgstr "Postausgang für überwachte Kalender" +#: ../../include/conversation.php:239 +#, php-format +msgid "%1$s poked %2$s" +msgstr "%1$s stupste %2$s an" -#: ../../include/RedDAV/RedBrowser.php:163 ../../include/apps.php:331 -#: ../../include/apps.php:382 ../../include/conversation.php:1003 -#: ../../mod/connedit.php:498 -msgid "Unknown" -msgstr "Unbekannt" +#: ../../include/conversation.php:243 ../../include/text.php:901 +msgid "poked" +msgstr "stupste" -#: ../../include/RedDAV/RedBrowser.php:223 +#: ../../include/conversation.php:261 ../../mod/mood.php:63 #, php-format -msgid "%1$s used" -msgstr "%1$s verwendet" +msgctxt "mood" +msgid "%1$s is %2$s" +msgstr "%1$s ist %2$s" -#: ../../include/RedDAV/RedBrowser.php:228 -#, php-format -msgid "%1$s used of %2$s (%3$s%)" -msgstr "%1$s von %2$s verwendet (%3$s%)" +#: ../../include/conversation.php:637 ../../include/ItemObject.php:126 +msgid "Select" +msgstr "Auswählen" -#: ../../include/RedDAV/RedBrowser.php:241 ../../include/nav.php:106 -#: ../../include/apps.php:133 ../../include/conversation.php:1546 -#: ../../mod/fbrowser.php:114 -msgid "Files" -msgstr "Dateien" +#: ../../include/conversation.php:645 ../../include/ItemObject.php:89 +msgid "Private Message" +msgstr "Private Nachricht" -#: ../../include/RedDAV/RedBrowser.php:245 ../../mod/settings.php:521 -#: ../../mod/settings.php:547 ../../mod/admin.php:868 -msgid "Name" -msgstr "Name" +#: ../../include/conversation.php:652 ../../include/ItemObject.php:194 +msgid "Message signature validated" +msgstr "Signatur überprüft" -#: ../../include/RedDAV/RedBrowser.php:246 -msgid "Type" -msgstr "Typ" +#: ../../include/conversation.php:653 ../../include/ItemObject.php:195 +msgid "Message signature incorrect" +msgstr "Signatur nicht korrekt" -#: ../../include/RedDAV/RedBrowser.php:247 -msgid "Size" -msgstr "Größe" +#: ../../include/conversation.php:674 +#, php-format +msgid "View %s's profile @ %s" +msgstr "%ss Profil auf %s ansehen" -#: ../../include/RedDAV/RedBrowser.php:248 -msgid "Last Modified" -msgstr "Zuletzt geändert" +#: ../../include/conversation.php:689 +msgid "Categories:" +msgstr "Kategorien:" -#: ../../include/RedDAV/RedBrowser.php:250 ../../include/page_widgets.php:8 -#: ../../include/page_widgets.php:36 ../../include/menu.php:42 -#: ../../include/ItemObject.php:100 ../../include/apps.php:249 -#: ../../mod/settings.php:581 ../../mod/webpages.php:131 -#: ../../mod/connections.php:381 ../../mod/connections.php:394 -#: ../../mod/connections.php:413 ../../mod/menu.php:59 ../../mod/thing.php:233 -#: ../../mod/editpost.php:112 ../../mod/editwebpage.php:143 -#: ../../mod/blocks.php:99 ../../mod/layouts.php:121 -#: ../../mod/editblock.php:111 ../../mod/editlayout.php:106 -msgid "Edit" -msgstr "Bearbeiten" +#: ../../include/conversation.php:690 +msgid "Filed under:" +msgstr "Gespeichert unter:" -#: ../../include/RedDAV/RedBrowser.php:251 ../../include/ItemObject.php:120 -#: ../../include/apps.php:250 ../../include/conversation.php:638 -#: ../../mod/settings.php:582 ../../mod/admin.php:732 ../../mod/admin.php:863 -#: ../../mod/photos.php:1064 ../../mod/connedit.php:462 -#: ../../mod/thing.php:234 ../../mod/group.php:176 -msgid "Delete" -msgstr "Löschen" +#: ../../include/conversation.php:698 ../../include/ItemObject.php:265 +#, php-format +msgid " from %s" +msgstr "von %s" -#: ../../include/RedDAV/RedBrowser.php:252 -msgid "Total" -msgstr "Summe" +#: ../../include/conversation.php:701 ../../include/ItemObject.php:268 +#, php-format +msgid "last edited: %s" +msgstr "zuletzt bearbeitet: %s" -#: ../../include/RedDAV/RedBrowser.php:304 -msgid "Create new folder" -msgstr "Neuen Ordner anlegen" +#: ../../include/conversation.php:702 ../../include/ItemObject.php:269 +#, php-format +msgid "Expires: %s" +msgstr "Verfällt: %s" -#: ../../include/RedDAV/RedBrowser.php:305 ../../mod/new_channel.php:122 -#: ../../mod/mitem.php:142 ../../mod/menu.php:84 -msgid "Create" -msgstr "Erstelle" +#: ../../include/conversation.php:717 +msgid "View in context" +msgstr "Im Zusammenhang anschauen" -#: ../../include/RedDAV/RedBrowser.php:306 -msgid "Upload file" -msgstr "Datei hochladen" +#: ../../include/conversation.php:719 ../../include/conversation.php:1153 +#: ../../include/ItemObject.php:310 ../../mod/photos.php:970 +#: ../../mod/editblock.php:120 ../../mod/editlayout.php:115 +#: ../../mod/editpost.php:121 ../../mod/editwebpage.php:152 +#: ../../mod/mail.php:234 ../../mod/mail.php:349 +msgid "Please wait" +msgstr "Bitte warten" -#: ../../include/RedDAV/RedBrowser.php:307 ../../mod/photos.php:745 -#: ../../mod/photos.php:1226 ../../mod/profile_photo.php:361 -msgid "Upload" -msgstr "Hochladen" +#: ../../include/conversation.php:843 +msgid "remove" +msgstr "lösche" -#: ../../include/photos.php:15 ../../include/items.php:3994 -#: ../../include/attach.php:116 ../../include/attach.php:163 -#: ../../include/attach.php:226 ../../include/attach.php:240 -#: ../../include/attach.php:280 ../../include/attach.php:294 -#: ../../include/attach.php:318 ../../include/attach.php:511 -#: ../../include/attach.php:584 ../../include/chat.php:116 -#: ../../mod/settings.php:496 ../../mod/filestorage.php:18 -#: ../../mod/filestorage.php:67 ../../mod/filestorage.php:82 -#: ../../mod/filestorage.php:109 ../../mod/webpages.php:40 -#: ../../mod/authtest.php:13 ../../mod/new_channel.php:68 -#: ../../mod/new_channel.php:99 ../../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:17 -#: ../../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:247 ../../mod/thing.php:264 -#: ../../mod/thing.php:299 ../../mod/viewconnections.php:22 -#: ../../mod/viewconnections.php:27 ../../mod/register.php:70 -#: ../../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/service_limits.php:7 ../../mod/item.php:182 -#: ../../mod/item.php:190 ../../mod/item.php:929 ../../mod/appman.php:66 -#: ../../mod/sources.php:66 ../../mod/page.php:30 ../../mod/page.php:80 -#: ../../mod/mail.php:111 ../../mod/channel.php:89 ../../mod/channel.php:193 -#: ../../mod/channel.php:236 ../../mod/profiles.php:179 -#: ../../mod/profiles.php:560 ../../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:200 ../../mod/notifications.php:66 -#: ../../mod/layouts.php:27 ../../mod/layouts.php:39 -#: ../../mod/editblock.php:34 ../../mod/viewsrc.php:14 -#: ../../mod/achievements.php:30 ../../mod/editlayout.php:48 -#: ../../index.php:190 ../../index.php:365 -msgid "Permission denied." -msgstr "Zugang verweigert" +#: ../../include/conversation.php:847 ../../include/nav.php:257 +msgid "Loading..." +msgstr "Lädt ..." -#: ../../include/photos.php:51 ../../include/photo/photo_driver.php:680 -#: ../../mod/photos.php:91 ../../mod/photos.php:657 ../../mod/photos.php:679 -#: ../../mod/profile_photo.php:142 ../../mod/profile_photo.php:301 -#: ../../mod/profile_photo.php:423 -msgid "Profile Photos" -msgstr "Profilfotos" +#: ../../include/conversation.php:848 +msgid "Delete Selected Items" +msgstr "Lösche die ausgewählten Elemente" -#: ../../include/photos.php:104 -#, php-format -msgid "Image exceeds website size limit of %lu bytes" -msgstr "Bild überschreitet das Limit der Webseite von %lu bytes" +#: ../../include/conversation.php:942 +msgid "View Source" +msgstr "Quelle anzeigen" -#: ../../include/photos.php:111 -msgid "Image file is empty." -msgstr "Bilddatei ist leer." +#: ../../include/conversation.php:943 +msgid "Follow Thread" +msgstr "Unterhaltung folgen" -#: ../../include/photos.php:140 ../../mod/profile_photo.php:216 -msgid "Unable to process image" -msgstr "Kann Bild nicht verarbeiten" +#: ../../include/conversation.php:944 +msgid "View Status" +msgstr "Status ansehen" -#: ../../include/photos.php:212 -msgid "Photo storage failed." -msgstr "Foto speichern schlug fehl" +#: ../../include/conversation.php:945 ../../include/nav.php:99 +#: ../../mod/connedit.php:421 ../../mod/connedit.php:535 +msgid "View Profile" +msgstr "Profil ansehen" -#: ../../include/photos.php:340 ../../include/conversation.php:1540 -msgid "Photo Albums" -msgstr "Fotoalben" +#: ../../include/conversation.php:946 +msgid "View Photos" +msgstr "Fotos ansehen" -#: ../../include/photos.php:344 -msgid "Upload New Photos" -msgstr "Lade neue Fotos hoch" +#: ../../include/conversation.php:947 +msgid "Matrix Activity" +msgstr "Matrix-Aktivität" -#: ../../include/contact_widgets.php:14 -#, php-format -msgid "%d invitation available" -msgid_plural "%d invitations available" -msgstr[0] "%d Einladung verfügbar" -msgstr[1] "%d Einladungen verfügbar" +#: ../../include/conversation.php:948 ../../include/identity.php:835 +#: ../../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/contact_widgets.php:19 ../../mod/admin.php:418 -msgid "Advanced" -msgstr "Fortgeschritten" - -#: ../../include/contact_widgets.php:22 -msgid "Find Channels" -msgstr "Finde Kanäle" - -#: ../../include/contact_widgets.php:23 -msgid "Enter name or interest" -msgstr "Name oder Interessen eingeben" - -#: ../../include/contact_widgets.php:24 -msgid "Connect/Follow" -msgstr "Verbinden/Folgen" - -#: ../../include/contact_widgets.php:25 -msgid "Examples: Robert Morgenstein, Fishing" -msgstr "Beispiele: Robert Morgenstein, Angeln" - -#: ../../include/contact_widgets.php:26 ../../mod/connections.php:412 -#: ../../mod/directory.php:222 ../../mod/directory.php:227 -msgid "Find" -msgstr "Finde" - -#: ../../include/contact_widgets.php:27 ../../mod/suggest.php:59 -msgid "Channel Suggestions" -msgstr "Kanal-Vorschläge" - -#: ../../include/contact_widgets.php:29 -msgid "Random Profile" -msgstr "Zufallsprofil" - -#: ../../include/contact_widgets.php:30 -msgid "Invite Friends" -msgstr "Lade Freunde ein" - -#: ../../include/contact_widgets.php:32 -msgid "Exammple: name=fred and country=iceland" -msgstr "Beispiel: name=fred and country=deutschland" - -#: ../../include/contact_widgets.php:33 -msgid "Advanced Find" -msgstr "Erweiterte Suche" +#: ../../include/conversation.php:949 +msgid "Edit Contact" +msgstr "Kontakt bearbeiten" -#: ../../include/contact_widgets.php:58 ../../include/features.php:72 -#: ../../include/widgets.php:303 -msgid "Saved Folders" -msgstr "Gespeicherte Ordner" +#: ../../include/conversation.php:950 +msgid "Send PM" +msgstr "Sende PN" -#: ../../include/contact_widgets.php:61 ../../include/contact_widgets.php:96 -#: ../../include/widgets.php:306 -msgid "Everything" -msgstr "Alles" +#: ../../include/conversation.php:1024 +#, php-format +msgid "%s likes this." +msgstr "%s gefällt das." -#: ../../include/contact_widgets.php:93 ../../include/widgets.php:29 -msgid "Categories" -msgstr "Kategorien" +#: ../../include/conversation.php:1024 +#, php-format +msgid "%s doesn't like this." +msgstr "%s gefällt das nicht." -#: ../../include/contact_widgets.php:126 +#: ../../include/conversation.php:1028 #, php-format -msgid "%d connection in common" -msgid_plural "%d connections in common" -msgstr[0] "%d gemeinsame Verbindung" -msgstr[1] "%d gemeinsame Verbindungen" +msgid "%2$d people like this." +msgid_plural "%2$d people like this." +msgstr[0] "%2$d Person gefällt das." +msgstr[1] "%2$d Leuten gefällt das." -#: ../../include/contact_widgets.php:131 -msgid "show more" -msgstr "mehr zeigen" +#: ../../include/conversation.php:1030 +#, php-format +msgid "%2$d people don't like this." +msgid_plural "%2$d people don't like this." +msgstr[0] "%2$d Person gefällt das nicht." +msgstr[1] "%2$d Leuten gefällt das nicht." -#: ../../include/activities.php:39 -msgid " and " +#: ../../include/conversation.php:1036 +msgid "and" msgstr "und" -#: ../../include/activities.php:47 -msgid "public profile" -msgstr "öffentliches Profil" - -#: ../../include/activities.php:52 +#: ../../include/conversation.php:1039 #, php-format -msgid "%1$s changed %2$s to “%3$s”" -msgstr "%1$s hat %2$s auf “%3$s” geändert" +msgid ", and %d other people" +msgid_plural ", and %d other people" +msgstr[0] "" +msgstr[1] ", und %d andere" -#: ../../include/activities.php:53 +#: ../../include/conversation.php:1040 #, php-format -msgid "Visit %1$s's %2$s" -msgstr "Besuche %1$s's %2$s" +msgid "%s like this." +msgstr "%s gefällt das." -#: ../../include/activities.php:56 +#: ../../include/conversation.php:1040 #, php-format -msgid "%1$s has an updated %2$s, changing %3$s." -msgstr "%1$s hat ein aktualisiertes %2$s, %3$s wurde verändert." +msgid "%s don't like this." +msgstr "%s gefällt das nicht." -#: ../../include/items.php:375 ../../mod/subthread.php:49 -#: ../../mod/profperm.php:23 ../../mod/group.php:68 ../../mod/like.php:242 -#: ../../index.php:364 -msgid "Permission denied" -msgstr "Keine Berechtigung" +#: ../../include/conversation.php:1097 +msgid "Visible to everybody" +msgstr "Sichtbar für jeden" -#: ../../include/items.php:962 ../../include/items.php:1007 -msgid "(Unknown)" -msgstr "(Unbekannt)" +#: ../../include/conversation.php:1098 ../../mod/mail.php:170 +#: ../../mod/mail.php:282 +msgid "Please enter a link URL:" +msgstr "Gib eine URL ein:" -#: ../../include/items.php:1163 -msgid "Visible to anybody on the internet." -msgstr "Für jeden im Internet sichtbar." +#: ../../include/conversation.php:1099 +msgid "Please enter a video link/URL:" +msgstr "Gib einen Video-Link/URL ein:" -#: ../../include/items.php:1165 -msgid "Visible to you only." -msgstr "Nur für Dich sichtbar." +#: ../../include/conversation.php:1100 +msgid "Please enter an audio link/URL:" +msgstr "Gib einen Audio-Link/URL ein:" -#: ../../include/items.php:1167 -msgid "Visible to anybody in this network." -msgstr "Für jedes Mitglied der RedMatrix sichtbar." +#: ../../include/conversation.php:1101 +msgid "Tag term:" +msgstr "Schlagwort:" -#: ../../include/items.php:1169 -msgid "Visible to anybody authenticated." -msgstr "Für jeden sichtbar, der angemeldet ist." +#: ../../include/conversation.php:1102 ../../mod/filer.php:49 +msgid "Save to Folder:" +msgstr "Speichern in Ordner:" -#: ../../include/items.php:1171 -#, php-format -msgid "Visible to anybody on %s." -msgstr "Für jeden auf %s sichtbar." +#: ../../include/conversation.php:1103 +msgid "Where are you right now?" +msgstr "Wo bist Du jetzt grade?" -#: ../../include/items.php:1173 -msgid "Visible to all connections." -msgstr "Für alle Verbindungen sichtbar." +#: ../../include/conversation.php:1104 ../../mod/editpost.php:52 +#: ../../mod/mail.php:171 ../../mod/mail.php:283 +msgid "Expires YYYY-MM-DD HH:MM" +msgstr "Verfällt YYYY-MM-DD HH;MM" -#: ../../include/items.php:1175 -msgid "Visible to approved connections." -msgstr "Nur für akzeptierte Verbindungen sichtbar." +#: ../../include/conversation.php:1114 ../../include/page_widgets.php:40 +#: ../../include/ItemObject.php:608 ../../mod/photos.php:990 +#: ../../mod/webpages.php:135 ../../mod/editblock.php:141 +#: ../../mod/editlayout.php:135 ../../mod/editpost.php:140 +#: ../../mod/editwebpage.php:174 +msgid "Preview" +msgstr "Vorschau" -#: ../../include/items.php:1177 -msgid "Visible to specific connections." -msgstr "Sichtbar für bestimmte Verbindungen." +#: ../../include/conversation.php:1128 ../../mod/photos.php:969 +#: ../../mod/editblock.php:168 ../../mod/editlayout.php:161 +#: ../../mod/editwebpage.php:201 ../../mod/layouts.php:122 +msgid "Share" +msgstr "Teilen" -#: ../../include/items.php:3927 ../../mod/filestorage.php:26 -#: ../../mod/admin.php:168 ../../mod/admin.php:898 ../../mod/admin.php:1101 -#: ../../mod/thing.php:76 ../../mod/display.php:32 ../../mod/viewsrc.php:20 -msgid "Item not found." -msgstr "Element nicht gefunden." +#: ../../include/conversation.php:1130 ../../mod/editwebpage.php:139 +msgid "Page link title" +msgstr "Seitentitel-Link" -#: ../../include/items.php:4365 ../../mod/group.php:38 ../../mod/group.php:140 -msgid "Collection not found." -msgstr "Sammlung nicht gefunden" +#: ../../include/conversation.php:1133 +msgid "Post as" +msgstr "Posten als" -#: ../../include/items.php:4380 -msgid "Collection is empty." -msgstr "Sammlung ist leer." +#: ../../include/conversation.php:1134 ../../mod/editblock.php:112 +#: ../../mod/editlayout.php:107 ../../mod/editpost.php:113 +#: ../../mod/editwebpage.php:144 ../../mod/mail.php:231 ../../mod/mail.php:345 +msgid "Upload photo" +msgstr "Foto hochladen" -#: ../../include/items.php:4387 -#, php-format -msgid "Collection: %s" -msgstr "Sammlung: %s" +#: ../../include/conversation.php:1135 +msgid "upload photo" +msgstr "Foto hochladen" -#: ../../include/items.php:4398 -#, php-format -msgid "Connection: %s" -msgstr "Verbindung: %s" +#: ../../include/conversation.php:1136 ../../mod/editblock.php:113 +#: ../../mod/editlayout.php:108 ../../mod/editpost.php:114 +#: ../../mod/editwebpage.php:145 ../../mod/mail.php:232 ../../mod/mail.php:346 +msgid "Attach file" +msgstr "Datei anhängen" -#: ../../include/items.php:4401 -msgid "Connection not found." -msgstr "Die Verbindung wurde nicht gefunden." +#: ../../include/conversation.php:1137 +msgid "attach file" +msgstr "Datei anfügen" -#: ../../include/Contact.php:107 ../../include/identity.php:832 -#: ../../include/conversation.php:948 ../../include/widgets.php:135 -#: ../../include/widgets.php:175 ../../mod/dirprofile.php:164 -#: ../../mod/suggest.php:51 ../../mod/directory.php:183 ../../mod/match.php:62 -msgid "Connect" -msgstr "Verbinden" +#: ../../include/conversation.php:1138 ../../mod/editblock.php:114 +#: ../../mod/editlayout.php:109 ../../mod/editpost.php:115 +#: ../../mod/editwebpage.php:146 ../../mod/mail.php:233 ../../mod/mail.php:347 +msgid "Insert web link" +msgstr "Link einfügen" -#: ../../include/Contact.php:123 -msgid "New window" -msgstr "Neues Fenster" +#: ../../include/conversation.php:1139 +msgid "web link" +msgstr "Web-Link" -#: ../../include/Contact.php:124 -msgid "Open the selected location in a different window or browser tab" -msgstr "Öffne die markierte Adresse in einem neuen Browser Fenster oder Tab" +#: ../../include/conversation.php:1140 +msgid "Insert video link" +msgstr "Video-Link einfügen" -#: ../../include/Contact.php:211 ../../mod/admin.php:649 -#, php-format -msgid "User '%s' deleted" -msgstr "Benutzer '%s' gelöscht" +#: ../../include/conversation.php:1141 +msgid "video link" +msgstr "Video-Link" -#: ../../include/datetime.php:43 ../../include/datetime.php:45 -msgid "Miscellaneous" -msgstr "Verschiedenes" +#: ../../include/conversation.php:1142 +msgid "Insert audio link" +msgstr "Audio-Link einfügen" -#: ../../include/datetime.php:152 ../../include/datetime.php:284 -msgid "year" -msgstr "Jahr" +#: ../../include/conversation.php:1143 +msgid "audio link" +msgstr "Audio-Link" -#: ../../include/datetime.php:157 ../../include/datetime.php:285 -msgid "month" -msgstr "Monat" +#: ../../include/conversation.php:1144 ../../mod/editblock.php:118 +#: ../../mod/editlayout.php:113 ../../mod/editpost.php:119 +#: ../../mod/editwebpage.php:150 +msgid "Set your location" +msgstr "Standort" -#: ../../include/datetime.php:162 ../../include/datetime.php:287 -msgid "day" -msgstr "Tag" +#: ../../include/conversation.php:1145 +msgid "set location" +msgstr "Standort" -#: ../../include/datetime.php:275 -msgid "never" -msgstr "Nie" +#: ../../include/conversation.php:1146 ../../mod/editblock.php:119 +#: ../../mod/editlayout.php:114 ../../mod/editpost.php:120 +#: ../../mod/editwebpage.php:151 +msgid "Clear browser location" +msgstr "Browser-Standort löschen" -#: ../../include/datetime.php:281 -msgid "less than a second ago" -msgstr "Vor weniger als einer Sekunde" +#: ../../include/conversation.php:1147 +msgid "clear location" +msgstr "Standort löschen" -#: ../../include/datetime.php:284 -msgid "years" -msgstr "Jahre" +#: ../../include/conversation.php:1149 ../../mod/editblock.php:132 +#: ../../mod/editlayout.php:126 ../../mod/editpost.php:132 +#: ../../mod/editwebpage.php:167 +msgid "Set title" +msgstr "Titel" -#: ../../include/datetime.php:285 -msgid "months" -msgstr "Monate" +#: ../../include/conversation.php:1152 ../../mod/events.php:563 +#: ../../mod/editblock.php:135 ../../mod/editlayout.php:129 +#: ../../mod/editpost.php:134 ../../mod/editwebpage.php:169 +msgid "Categories (comma-separated list)" +msgstr "Kategorien (Kommagetrennte Liste)" -#: ../../include/datetime.php:286 -msgid "week" -msgstr "Woche" +#: ../../include/conversation.php:1154 ../../mod/editblock.php:121 +#: ../../mod/editlayout.php:116 ../../mod/editpost.php:122 +#: ../../mod/editwebpage.php:153 +msgid "Permission settings" +msgstr "Berechtigungs-Einstellungen" -#: ../../include/datetime.php:286 -msgid "weeks" -msgstr "Wochen" +#: ../../include/conversation.php:1155 +msgid "permissions" +msgstr "Berechtigungen" -#: ../../include/datetime.php:287 -msgid "days" -msgstr "Tage" +#: ../../include/conversation.php:1162 ../../mod/editblock.php:129 +#: ../../mod/editlayout.php:123 ../../mod/editpost.php:129 +#: ../../mod/editwebpage.php:162 +msgid "Public post" +msgstr "Öffentlicher Beitrag" -#: ../../include/datetime.php:288 -msgid "hour" -msgstr "Stunde" +#: ../../include/conversation.php:1164 ../../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 "Beispiel: bob@example.com, mary@example.com" -#: ../../include/datetime.php:288 -msgid "hours" -msgstr "Stunden" +#: ../../include/conversation.php:1177 ../../mod/editblock.php:146 +#: ../../mod/editlayout.php:140 ../../mod/editpost.php:146 +#: ../../mod/editwebpage.php:179 ../../mod/mail.php:238 ../../mod/mail.php:352 +msgid "Set expiration date" +msgstr "Verfallsdatum" -#: ../../include/datetime.php:289 -msgid "minute" -msgstr "Minute" +#: ../../include/conversation.php:1179 ../../include/ItemObject.php:611 +#: ../../mod/editpost.php:148 ../../mod/mail.php:240 ../../mod/mail.php:354 +msgid "Encrypt text" +msgstr "Text verschlüsseln" -#: ../../include/datetime.php:289 -msgid "minutes" -msgstr "Minuten" +#: ../../include/conversation.php:1181 ../../mod/events.php:569 +#: ../../mod/editpost.php:150 +msgid "OK" +msgstr "Ok" -#: ../../include/datetime.php:290 -msgid "second" -msgstr "Sekunde" +#: ../../include/conversation.php:1182 ../../mod/settings.php:519 +#: ../../mod/settings.php:545 ../../mod/events.php:568 +#: ../../mod/editpost.php:151 ../../mod/fbrowser.php:82 +#: ../../mod/fbrowser.php:117 ../../mod/tagrm.php:11 ../../mod/tagrm.php:134 +msgid "Cancel" +msgstr "Abbrechen" -#: ../../include/datetime.php:290 -msgid "seconds" -msgstr "Sekunden" +#: ../../include/conversation.php:1426 +msgid "Discover" +msgstr "Entdecken" -#: ../../include/datetime.php:299 -#, php-format -msgid "%1$d %2$s ago" -msgstr "vor %1$d %2$s" +#: ../../include/conversation.php:1429 +msgid "Imported public streams" +msgstr "Importierte öffentliche Beiträge" -#: ../../include/datetime.php:504 -#, php-format -msgid "%1$s's birthday" -msgstr "%1$ss Geburtstag" +#: ../../include/conversation.php:1434 +msgid "Commented Order" +msgstr "Neueste Kommentare" -#: ../../include/datetime.php:505 -#, php-format -msgid "Happy Birthday %1$s" -msgstr "Alles Gute zum Geburtstag, %1$s" +#: ../../include/conversation.php:1437 +msgid "Sort by Comment Date" +msgstr "Nach Kommentardatum sortiert" -#: ../../include/identity.php:31 ../../mod/item.php:1319 -msgid "Unable to obtain identity information from database" -msgstr "Kann keine Identitäts-Informationen aus Datenbank beziehen" +#: ../../include/conversation.php:1441 +msgid "Posted Order" +msgstr "Neueste Beiträge" -#: ../../include/identity.php:66 -msgid "Empty name" -msgstr "Namensfeld leer" +#: ../../include/conversation.php:1444 +msgid "Sort by Post Date" +msgstr "Nach Beitragsdatum sortiert" -#: ../../include/identity.php:68 -msgid "Name too long" -msgstr "Name ist zu lang" +#: ../../include/conversation.php:1449 ../../include/widgets.php:89 +msgid "Personal" +msgstr "Persönlich" -#: ../../include/identity.php:169 -msgid "No account identifier" -msgstr "Keine Account-Kennung" +#: ../../include/conversation.php:1452 +msgid "Posts that mention or involve you" +msgstr "Beiträge mit Beteiligung Deinerseits" -#: ../../include/identity.php:181 -msgid "Nickname is required." -msgstr "Spitzname ist erforderlich." +#: ../../include/conversation.php:1458 ../../mod/connections.php:211 +#: ../../mod/connections.php:224 ../../mod/menu.php:61 +msgid "New" +msgstr "Neu" -#: ../../include/identity.php:195 -msgid "Reserved nickname. Please choose another." -msgstr "Reservierter Kurzname. Bitte wähle einen anderen." +#: ../../include/conversation.php:1461 +msgid "Activity Stream - by date" +msgstr "Activity Stream – nach Datum sortiert" -#: ../../include/identity.php:200 -msgid "" -"Nickname has unsupported characters or is already being used on this site." -msgstr "Der Spitzname enthält nicht-unterstütze Zeichen oder wird bereits auf dieser Seite genutzt." +#: ../../include/conversation.php:1467 +msgid "Starred" +msgstr "Markiert" -#: ../../include/identity.php:282 -msgid "Unable to retrieve created identity" -msgstr "Kann die erstellte Identität nicht empfangen" +#: ../../include/conversation.php:1470 +msgid "Favourite Posts" +msgstr "Markierte Beiträge" -#: ../../include/identity.php:342 -msgid "Default Profile" -msgstr "Standard-Profil" +#: ../../include/conversation.php:1477 +msgid "Spam" +msgstr "Spam" -#: ../../include/identity.php:381 ../../include/identity.php:382 -#: ../../include/identity.php:389 ../../include/profile_selectors.php:80 -#: ../../include/widgets.php:407 ../../mod/connedit.php:495 -msgid "Friends" -msgstr "Freunde" +#: ../../include/conversation.php:1480 +msgid "Posts flagged as SPAM" +msgstr "Nachrichten, die als SPAM markiert wurden" -#: ../../include/identity.php:635 -msgid "Requested channel is not available." -msgstr "Angeforderte Kanal nicht verfügbar." +#: ../../include/conversation.php:1516 ../../mod/admin.php:867 +msgid "Channel" +msgstr "Kanal" -#: ../../include/identity.php:683 ../../mod/filestorage.php:48 -#: ../../mod/webpages.php:8 ../../mod/profile.php:16 ../../mod/hcard.php:8 -#: ../../mod/connect.php:13 ../../mod/blocks.php:10 ../../mod/layouts.php:8 -#: ../../mod/achievements.php:11 -msgid "Requested profile is not available." -msgstr "Erwünschte Profil ist nicht verfügbar." +#: ../../include/conversation.php:1519 +msgid "Status Messages and Posts" +msgstr "Statusnachrichten und Beiträge" -#: ../../include/identity.php:846 ../../mod/profiles.php:750 -msgid "Change profile photo" -msgstr "Profilfoto ändern" +#: ../../include/conversation.php:1528 +msgid "About" +msgstr "Über" -#: ../../include/identity.php:852 -msgid "Profiles" -msgstr "Profile" +#: ../../include/conversation.php:1531 +msgid "Profile Details" +msgstr "Profil-Details" -#: ../../include/identity.php:852 -msgid "Manage/edit profiles" -msgstr "Profile verwalten/bearbeiten" +#: ../../include/conversation.php:1540 ../../include/photos.php:340 +msgid "Photo Albums" +msgstr "Fotoalben" -#: ../../include/identity.php:853 ../../mod/profiles.php:751 -msgid "Create New Profile" -msgstr "Neues Profil erstellen" +#: ../../include/conversation.php:1549 +msgid "Files and Storage" +msgstr "Dateien und Speicher" -#: ../../include/identity.php:856 ../../include/nav.php:103 -msgid "Edit Profile" -msgstr "Profile bearbeiten" +#: ../../include/conversation.php:1559 ../../include/conversation.php:1562 +msgid "Chatrooms" +msgstr "Chaträume" -#: ../../include/identity.php:867 ../../mod/profiles.php:762 -msgid "Profile Image" -msgstr "Profilfoto:" +#: ../../include/conversation.php:1575 +msgid "Saved Bookmarks" +msgstr "Gespeicherte Lesezeichen" -#: ../../include/identity.php:870 -msgid "visible to everybody" -msgstr "sichtbar für jeden" +#: ../../include/conversation.php:1586 +msgid "Manage Webpages" +msgstr "Webseiten verwalten" -#: ../../include/identity.php:871 ../../mod/profiles.php:645 -#: ../../mod/profiles.php:766 -msgid "Edit visibility" -msgstr "Sichtbarkeit bearbeiten" +#: ../../include/notify.php:23 +msgid "created a new post" +msgstr "Neuer Beitrag wurde erzeugt" -#: ../../include/identity.php:883 ../../include/event.php:40 -#: ../../include/bb2diaspora.php:461 ../../mod/dirprofile.php:105 -#: ../../mod/directory.php:156 ../../mod/events.php:579 -msgid "Location:" -msgstr "Ort:" +#: ../../include/notify.php:24 +#, php-format +msgid "commented on %s's post" +msgstr "hat %s's Beitrag kommentiert" -#: ../../include/identity.php:885 ../../include/identity.php:1122 -#: ../../mod/directory.php:158 -msgid "Gender:" -msgstr "Geschlecht:" +#: ../../include/page_widgets.php:6 +msgid "New Page" +msgstr "Neue Seite" -#: ../../include/identity.php:886 ../../include/identity.php:1166 -#: ../../mod/directory.php:160 -msgid "Status:" -msgstr "Status:" +#: ../../include/page_widgets.php:39 ../../mod/blocks.php:102 +#: ../../mod/webpages.php:134 ../../mod/layouts.php:125 +msgid "View" +msgstr "Ansicht" -#: ../../include/identity.php:887 ../../include/identity.php:1177 -#: ../../mod/directory.php:162 -msgid "Homepage:" -msgstr "Homepage:" +#: ../../include/page_widgets.php:41 ../../mod/webpages.php:136 +msgid "Actions" +msgstr "Aktionen" -#: ../../include/identity.php:888 ../../mod/dirprofile.php:151 -msgid "Online Now" -msgstr "gerade online" +#: ../../include/page_widgets.php:42 ../../mod/webpages.php:137 +msgid "Page Link" +msgstr "Seiten-Link" -#: ../../include/identity.php:966 ../../include/identity.php:1046 -#: ../../mod/ping.php:298 -msgid "g A l F d" -msgstr "l, d. F G \\\\U\\\\h\\\\r" +#: ../../include/page_widgets.php:43 ../../mod/webpages.php:138 +msgid "Title" +msgstr "Titel" -#: ../../include/identity.php:967 ../../include/identity.php:1047 -msgid "F d" -msgstr "d. F" +#: ../../include/page_widgets.php:44 ../../mod/webpages.php:139 +msgid "Created" +msgstr "Erstellt" -#: ../../include/identity.php:1012 ../../include/identity.php:1087 -#: ../../mod/ping.php:320 -msgid "[today]" -msgstr "[Heute]" +#: ../../include/page_widgets.php:45 ../../mod/webpages.php:140 +msgid "Edited" +msgstr "Geändert" -#: ../../include/identity.php:1024 -msgid "Birthday Reminders" -msgstr "Geburtstags Erinnerungen" +#: ../../include/security.php:320 +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 "Das Security-Token des Formulars war nicht korrekt. Das ist wahrscheinlich passiert, weil das Formular zu lange (>3 Stunden) offen war, bevor es abgeschickt wurde." -#: ../../include/identity.php:1025 -msgid "Birthdays this week:" -msgstr "Geburtstage in dieser Woche:" +#: ../../include/event.php:11 ../../include/bb2diaspora.php:463 +msgid "l F d, Y \\@ g:i A" +msgstr "l, d. F Y\\\\, H:i" -#: ../../include/identity.php:1080 -msgid "[No description]" -msgstr "[Keine Beschreibung]" +#: ../../include/event.php:20 ../../include/bb2diaspora.php:469 +msgid "Starts:" +msgstr "Beginnt:" -#: ../../include/identity.php:1098 -msgid "Event Reminders" -msgstr "Veranstaltungs- Erinnerungen" +#: ../../include/event.php:30 ../../include/bb2diaspora.php:477 +msgid "Finishes:" +msgstr "Endet:" -#: ../../include/identity.php:1099 -msgid "Events this week:" -msgstr "Veranstaltungen in dieser Woche:" +#: ../../include/event.php:40 ../../include/bb2diaspora.php:485 +#: ../../include/identity.php:886 ../../mod/events.php:579 +#: ../../mod/directory.php:156 ../../mod/dirprofile.php:105 +msgid "Location:" +msgstr "Ort:" -#: ../../include/identity.php:1112 ../../include/identity.php:1230 -#: ../../include/apps.php:136 ../../mod/profperm.php:112 -msgid "Profile" -msgstr "Profil" +#: ../../include/event.php:326 +msgid "This event has been added to your calendar." +msgstr "Dieses Ereignis wurde zu Deinem Kalender hinzugefügt" -#: ../../include/identity.php:1120 ../../mod/settings.php:953 -msgid "Full Name:" -msgstr "Voller Name:" +#: ../../include/oembed.php:171 +msgid "Embedded content" +msgstr "Eingebetteter Inhalt" -#: ../../include/identity.php:1127 -msgid "Like this channel" -msgstr "Dieser Kanal gefällt mir" +#: ../../include/oembed.php:180 +msgid "Embedding disabled" +msgstr "Einbetten ausgeschaltet" -#: ../../include/identity.php:1138 ../../include/taxonomy.php:338 -#: ../../include/ItemObject.php:146 -msgctxt "noun" -msgid "Like" -msgid_plural "Likes" -msgstr[0] "Gefällt mir" -msgstr[1] "Gefällt mir" +#: ../../include/permissions.php:13 +msgid "Can view my normal stream and posts" +msgstr "Kann meine normalen Beiträge sehen" -#: ../../include/identity.php:1151 -msgid "j F, Y" -msgstr "j. F Y" +#: ../../include/permissions.php:14 +msgid "Can view my default channel profile" +msgstr "Kann mein Standardprofil sehen" -#: ../../include/identity.php:1152 -msgid "j F" -msgstr "j. F" +#: ../../include/permissions.php:15 +msgid "Can view my photo albums" +msgstr "Kann meine Fotoalben betrachten" -#: ../../include/identity.php:1159 -msgid "Birthday:" -msgstr "Geburtstag:" +#: ../../include/permissions.php:16 +msgid "Can view my connections" +msgstr "Kann meine Verbindungen sehen" -#: ../../include/identity.php:1163 -msgid "Age:" -msgstr "Alter:" +#: ../../include/permissions.php:17 +msgid "Can view my file storage" +msgstr "Kann meine Dateiordner lesen" -#: ../../include/identity.php:1172 -#, php-format -msgid "for %1$d %2$s" -msgstr "seit %1$d %2$s" +#: ../../include/permissions.php:18 +msgid "Can view my webpages" +msgstr "Kann meine Webseiten sehen" -#: ../../include/identity.php:1175 ../../mod/profiles.php:667 -msgid "Sexual Preference:" -msgstr "Sexuelle Orientierung:" +#: ../../include/permissions.php:21 +msgid "Can send me their channel stream and posts" +msgstr "Kann mir die Beiträge aus seinem/ihrem Kanal schicken" -#: ../../include/identity.php:1179 ../../mod/profiles.php:669 -msgid "Hometown:" -msgstr "Heimatstadt:" +#: ../../include/permissions.php:22 +msgid "Can post on my channel page (\"wall\")" +msgstr "Kann auf meiner Kanal-Seite (\"wall\") Beiträge veröffentlichen" -#: ../../include/identity.php:1181 -msgid "Tags:" -msgstr "Schlagworte:" +#: ../../include/permissions.php:23 +msgid "Can comment on or like my posts" +msgstr "Darf meine Beiträge kommentieren und mögen/nicht mögen" -#: ../../include/identity.php:1183 ../../mod/profiles.php:670 -msgid "Political Views:" -msgstr "Politische Ansichten:" +#: ../../include/permissions.php:24 +msgid "Can send me private mail messages" +msgstr "Kann mir private Nachrichten schicken" -#: ../../include/identity.php:1185 -msgid "Religion:" -msgstr "Religion:" +#: ../../include/permissions.php:25 +msgid "Can post photos to my photo albums" +msgstr "Kann Fotos in meinen Fotoalben veröffentlichen" -#: ../../include/identity.php:1187 ../../mod/directory.php:164 -msgid "About:" -msgstr "Über:" +#: ../../include/permissions.php:26 +msgid "Can like/dislike stuff" +msgstr "Kann andere Elemente mögen/nicht mögen" -#: ../../include/identity.php:1189 -msgid "Hobbies/Interests:" -msgstr "Hobbys/Interessen:" +#: ../../include/permissions.php:26 +msgid "Profiles and things other than posts/comments" +msgstr "Profile und alles außer Beiträge und Kommentare" -#: ../../include/identity.php:1191 ../../mod/profiles.php:673 -msgid "Likes:" -msgstr "Gefällt:" +#: ../../include/permissions.php:28 +msgid "Can forward to all my channel contacts via post @mentions" +msgstr "Kann an alle meine Kontakte via @-Erwähnung Nachrichten weiterleiten" -#: ../../include/identity.php:1193 ../../mod/profiles.php:674 -msgid "Dislikes:" -msgstr "Gefällt nicht:" +#: ../../include/permissions.php:28 +msgid "Advanced - useful for creating group forum channels" +msgstr "Fortgeschritten - sinnvoll, um Gruppen-Kanäle/-Foren zu erstellen" -#: ../../include/identity.php:1196 -msgid "Contact information and Social Networks:" -msgstr "Kontaktinformation und soziale Netzwerke:" +#: ../../include/permissions.php:29 +msgid "Can chat with me (when available)" +msgstr "Kann mit mir chatten (wenn verfügbar)" -#: ../../include/identity.php:1198 -msgid "My other channels:" -msgstr "Meine anderen Kanäle:" +#: ../../include/permissions.php:30 +msgid "Can write to my file storage" +msgstr "Kann in meine Dateiordner schreiben" -#: ../../include/identity.php:1200 -msgid "Musical interests:" -msgstr "Musikalische Interessen:" +#: ../../include/permissions.php:31 +msgid "Can edit my webpages" +msgstr "Kann meine Webseiten bearbeiten" -#: ../../include/identity.php:1202 -msgid "Books, literature:" -msgstr "Bücher, Literatur:" +#: ../../include/permissions.php:33 +msgid "Can source my public posts in derived channels" +msgstr "Kann meine öffentlichen Beiträge als Quellen für Kanäle verwenden" -#: ../../include/identity.php:1204 -msgid "Television:" -msgstr "Fernsehen:" +#: ../../include/permissions.php:33 +msgid "Somewhat advanced - very useful in open communities" +msgstr "Etwas fortgeschritten – sehr nützlich in offenen Gemeinschaften" -#: ../../include/identity.php:1206 -msgid "Film/dance/culture/entertainment:" -msgstr "Film/Tanz/Kultur/Unterhaltung:" +#: ../../include/permissions.php:35 +msgid "Can administer my channel resources" +msgstr "Kann meine Kanäle administrieren" -#: ../../include/identity.php:1208 -msgid "Love/Romance:" -msgstr "Liebe/Romantik:" +#: ../../include/permissions.php:35 +msgid "" +"Extremely advanced. Leave this alone unless you know what you are doing" +msgstr "Sehr fortgeschritten. Bearbeite das nur, wenn Du genau weißt, was Du tust" -#: ../../include/identity.php:1210 -msgid "Work/employment:" -msgstr "Arbeit/Anstellung:" +#: ../../include/permissions.php:785 +msgid "Social Networking" +msgstr "Soziales Netzwerk" -#: ../../include/identity.php:1212 -msgid "School/education:" -msgstr "Schule/Ausbildung:" +#: ../../include/permissions.php:786 ../../include/permissions.php:788 +#: ../../include/permissions.php:790 +msgid "Mostly Public" +msgstr "Weitgehend öffentlich" -#: ../../include/identity.php:1232 -msgid "Like this thing" -msgstr "Gefällt mir" +#: ../../include/permissions.php:786 ../../include/permissions.php:788 +#: ../../include/permissions.php:790 +msgid "Restricted" +msgstr "Beschränkt" -#: ../../include/page_widgets.php:6 -msgid "New Page" -msgstr "Neue Seite" +#: ../../include/permissions.php:786 ../../include/permissions.php:788 +msgid "Private" +msgstr "Privat" -#: ../../include/page_widgets.php:39 ../../mod/webpages.php:134 -#: ../../mod/blocks.php:102 ../../mod/layouts.php:125 -msgid "View" -msgstr "Ansicht" +#: ../../include/permissions.php:787 +msgid "Community Forum" +msgstr "Forum" -#: ../../include/page_widgets.php:40 ../../include/ItemObject.php:608 -#: ../../include/conversation.php:1114 ../../mod/webpages.php:135 -#: ../../mod/photos.php:1015 ../../mod/editpost.php:140 -#: ../../mod/editwebpage.php:174 ../../mod/editblock.php:141 -#: ../../mod/editlayout.php:135 -msgid "Preview" -msgstr "Vorschau" +#: ../../include/permissions.php:789 +msgid "Feed Republish" +msgstr "Teilen von Feeds" -#: ../../include/page_widgets.php:41 ../../mod/webpages.php:136 -msgid "Actions" -msgstr "Aktionen" +#: ../../include/permissions.php:791 +msgid "Special Purpose" +msgstr "Für besondere Zwecke" -#: ../../include/page_widgets.php:42 ../../mod/webpages.php:137 -msgid "Page Link" -msgstr "Seiten-Link" +#: ../../include/permissions.php:792 +msgid "Celebrity/Soapbox" +msgstr "Mitteilungs-Kanal (keine Kommentare)" -#: ../../include/page_widgets.php:43 ../../mod/webpages.php:138 -msgid "Title" -msgstr "Titel" +#: ../../include/permissions.php:792 +msgid "Group Repository" +msgstr "Gruppenarchiv" -#: ../../include/page_widgets.php:44 ../../mod/webpages.php:139 -msgid "Created" -msgstr "Erstellt" +#: ../../include/permissions.php:793 ../../include/profile_selectors.php:6 +#: ../../include/profile_selectors.php:23 +#: ../../include/profile_selectors.php:61 +#: ../../include/profile_selectors.php:97 +msgid "Other" +msgstr "Andere" -#: ../../include/page_widgets.php:45 ../../mod/webpages.php:140 -msgid "Edited" -msgstr "Geändert" +#: ../../include/permissions.php:794 +msgid "Custom/Expert Mode" +msgstr "Benutzerdefiniert/Expertenmodus" -#: ../../include/message.php:18 -msgid "No recipient provided." -msgstr "Kein Empfänger angegeben" +#: ../../include/activities.php:39 +msgid " and " +msgstr "und" -#: ../../include/message.php:23 -msgid "[no subject]" -msgstr "[no subject]" +#: ../../include/activities.php:47 +msgid "public profile" +msgstr "öffentliches Profil" -#: ../../include/message.php:45 -msgid "Unable to determine sender." -msgstr "Kann Absender nicht bestimmen." +#: ../../include/activities.php:52 +#, php-format +msgid "%1$s changed %2$s to “%3$s”" +msgstr "%1$s hat %2$s auf “%3$s” geändert" -#: ../../include/message.php:200 -msgid "Stored post could not be verified." -msgstr "Gespeicherter Beitrag konnten nicht überprüft werden." +#: ../../include/activities.php:53 +#, php-format +msgid "Visit %1$s's %2$s" +msgstr "Besuche %1$s's %2$s" -#: ../../include/taxonomy.php:210 -msgid "Tags" -msgstr "Schlagwörter" +#: ../../include/activities.php:56 +#, php-format +msgid "%1$s has an updated %2$s, changing %3$s." +msgstr "%1$s hat ein aktualisiertes %2$s, %3$s wurde verändert." -#: ../../include/taxonomy.php:227 -msgid "Keywords" -msgstr "Schlüsselwörter" +#: ../../include/bb2diaspora.php:384 +msgid "Attachments:" +msgstr "Anhänge:" -#: ../../include/taxonomy.php:252 -msgid "have" -msgstr "habe" +#: ../../include/auth.php:116 +msgid "Logged out." +msgstr "Ausgeloggt." -#: ../../include/taxonomy.php:252 -msgid "has" -msgstr "hat" +#: ../../include/auth.php:257 +msgid "Failed authentication" +msgstr "Authentifizierung fehlgeschlagen" -#: ../../include/taxonomy.php:253 -msgid "want" -msgstr "will" +#: ../../include/auth.php:271 ../../mod/openid.php:190 +msgid "Login failed." +msgstr "Login fehlgeschlagen." -#: ../../include/taxonomy.php:253 -msgid "wants" -msgstr "will" +#: ../../include/RedDAV/RedBrowser.php:106 +#: ../../include/RedDAV/RedBrowser.php:249 +msgid "parent" +msgstr "Übergeordnetes Verzeichnis" -#: ../../include/taxonomy.php:254 ../../include/ItemObject.php:221 -msgid "like" -msgstr "mag" +#: ../../include/RedDAV/RedBrowser.php:130 +msgid "Collection" +msgstr "Ordner" -#: ../../include/taxonomy.php:254 -msgid "likes" -msgstr "gefällt" +#: ../../include/RedDAV/RedBrowser.php:133 +msgid "Principal" +msgstr "Prinzipal" -#: ../../include/taxonomy.php:255 ../../include/ItemObject.php:222 -msgid "dislike" -msgstr "verurteile" +#: ../../include/RedDAV/RedBrowser.php:136 +msgid "Addressbook" +msgstr "Adressbuch" -#: ../../include/taxonomy.php:255 -msgid "dislikes" -msgstr "missfällt" +#: ../../include/RedDAV/RedBrowser.php:139 +msgid "Calendar" +msgstr "Kalender" -#: ../../include/js_strings.php:5 -msgid "Delete this item?" -msgstr "Dieses Element löschen?" +#: ../../include/RedDAV/RedBrowser.php:142 +msgid "Schedule Inbox" +msgstr "Posteingang für überwachte Kalender" -#: ../../include/js_strings.php:6 ../../include/ItemObject.php:598 -#: ../../mod/photos.php:1013 ../../mod/photos.php:1100 -msgid "Comment" -msgstr "Kommentar" +#: ../../include/RedDAV/RedBrowser.php:145 +msgid "Schedule Outbox" +msgstr "Postausgang für überwachte Kalender" -#: ../../include/js_strings.php:7 ../../include/ItemObject.php:332 -msgid "[+] show all" -msgstr "[+] Zeige alle" +#: ../../include/RedDAV/RedBrowser.php:223 +#, php-format +msgid "%1$s used" +msgstr "%1$s verwendet" -#: ../../include/js_strings.php:8 -msgid "[-] show less" -msgstr "[-] zeige weniger" +#: ../../include/RedDAV/RedBrowser.php:228 +#, php-format +msgid "%1$s used of %2$s (%3$s%)" +msgstr "%1$s von %2$s verwendet (%3$s%)" -#: ../../include/js_strings.php:9 -msgid "[+] expand" -msgstr "[+] aufklappen" +#: ../../include/RedDAV/RedBrowser.php:245 ../../mod/settings.php:520 +#: ../../mod/settings.php:546 ../../mod/admin.php:868 +msgid "Name" +msgstr "Name" -#: ../../include/js_strings.php:10 -msgid "[-] collapse" -msgstr "[-] einklappen" +#: ../../include/RedDAV/RedBrowser.php:246 +msgid "Type" +msgstr "Typ" -#: ../../include/js_strings.php:11 -msgid "Password too short" -msgstr "Kennwort zu kurz" +#: ../../include/RedDAV/RedBrowser.php:247 +msgid "Size" +msgstr "Größe" -#: ../../include/js_strings.php:12 -msgid "Passwords do not match" -msgstr "Kennwörter stimmen nicht überein" +#: ../../include/RedDAV/RedBrowser.php:248 +msgid "Last Modified" +msgstr "Zuletzt geändert" -#: ../../include/js_strings.php:13 ../../mod/photos.php:39 -msgid "everybody" -msgstr "alle" +#: ../../include/RedDAV/RedBrowser.php:252 +msgid "Total" +msgstr "Summe" -#: ../../include/js_strings.php:14 -msgid "Secret Passphrase" -msgstr "geheime Passphrase" +#: ../../include/RedDAV/RedBrowser.php:305 +msgid "Create new folder" +msgstr "Neuen Ordner anlegen" -#: ../../include/js_strings.php:15 -msgid "Passphrase hint" -msgstr "Hinweis zur Passphrase" +#: ../../include/RedDAV/RedBrowser.php:306 ../../mod/mitem.php:142 +#: ../../mod/menu.php:84 ../../mod/new_channel.php:122 +msgid "Create" +msgstr "Erstelle" -#: ../../include/js_strings.php:16 -msgid "Notice: Permissions have changed but have not yet been submitted." -msgstr "Achtung: Berechtigungen wurden verändert, aber noch nicht gespeichert." +#: ../../include/RedDAV/RedBrowser.php:307 +msgid "Upload file" +msgstr "Datei hochladen" -#: ../../include/js_strings.php:17 -msgid "close all" -msgstr "Alle schließen" +#: ../../include/RedDAV/RedBrowser.php:308 ../../mod/photos.php:728 +#: ../../mod/photos.php:1237 ../../mod/profile_photo.php:361 +msgid "Upload" +msgstr "Hochladen" -#: ../../include/js_strings.php:18 -msgid "Nothing new here" -msgstr "Nichts Neues hier" +#: ../../include/bookmarks.php:35 +#, php-format +msgid "%1$s's bookmarks" +msgstr "%1$ss Lesezeichen" -#: ../../include/js_strings.php:20 -msgid "timeago.prefixAgo" -msgstr "timeago.prefixAgo" +#: ../../include/comanche.php:35 ../../view/theme/apw/php/config.php:185 +msgid "Default" +msgstr "Standard" -#: ../../include/js_strings.php:21 -msgid "timeago.prefixFromNow" -msgstr " " +#: ../../include/contact_selectors.php:56 +msgid "Frequently" +msgstr "Häufig" -#: ../../include/js_strings.php:22 -msgid "ago" -msgstr "her" +#: ../../include/contact_selectors.php:57 +msgid "Hourly" +msgstr "Stündlich" -#: ../../include/js_strings.php:23 -msgid "from now" -msgstr "von jetzt" +#: ../../include/contact_selectors.php:58 +msgid "Twice daily" +msgstr "Zwei Mal am Tag" -#: ../../include/js_strings.php:24 -msgid "less than a minute" -msgstr "weniger als eine Minute" +#: ../../include/contact_selectors.php:59 +msgid "Daily" +msgstr "Täglich" -#: ../../include/js_strings.php:25 -msgid "about a minute" -msgstr "ungefähr eine Minute" +#: ../../include/contact_selectors.php:60 +msgid "Weekly" +msgstr "Wöchentlich" -#: ../../include/js_strings.php:26 -#, php-format -msgid "%d minutes" -msgstr "%d Minuten" +#: ../../include/contact_selectors.php:61 +msgid "Monthly" +msgstr "Monatlich" -#: ../../include/js_strings.php:27 -msgid "about an hour" -msgstr "ungefähr eine Stunde" +#: ../../include/contact_selectors.php:76 +msgid "Friendica" +msgstr "Friendica" -#: ../../include/js_strings.php:28 -#, php-format -msgid "about %d hours" -msgstr "ungefähr %d Stunden" +#: ../../include/contact_selectors.php:77 +msgid "OStatus" +msgstr "OStatus" -#: ../../include/js_strings.php:29 -msgid "a day" -msgstr "ein Tag" +#: ../../include/contact_selectors.php:78 +msgid "RSS/Atom" +msgstr "RSS/Atom" -#: ../../include/js_strings.php:30 -#, php-format -msgid "%d days" -msgstr "%d Tage" +#: ../../include/contact_selectors.php:79 ../../mod/admin.php:728 +#: ../../mod/admin.php:737 ../../boot.php:1498 +msgid "Email" +msgstr "E-Mail" -#: ../../include/js_strings.php:31 -msgid "about a month" -msgstr "ungefähr ein Monat" +#: ../../include/contact_selectors.php:80 +msgid "Diaspora" +msgstr "Diaspora" -#: ../../include/js_strings.php:32 -#, php-format -msgid "%d months" -msgstr "%d Monate" +#: ../../include/contact_selectors.php:81 +msgid "Facebook" +msgstr "Facebook" -#: ../../include/js_strings.php:33 -msgid "about a year" -msgstr "ungefähr ein Jahr" +#: ../../include/contact_selectors.php:82 +msgid "Zot!" +msgstr "Zot!" -#: ../../include/js_strings.php:34 -#, php-format -msgid "%d years" -msgstr "%d Jahre" +#: ../../include/contact_selectors.php:83 +msgid "LinkedIn" +msgstr "LinkedIn" -#: ../../include/js_strings.php:35 -msgid " " -msgstr " " +#: ../../include/contact_selectors.php:84 +msgid "XMPP/IM" +msgstr "XMPP/IM" -#: ../../include/js_strings.php:36 -msgid "timeago.numbers" -msgstr "timeago.numbers" +#: ../../include/contact_selectors.php:85 +msgid "MySpace" +msgstr "MySpace" -#: ../../include/permissions.php:13 -msgid "Can view my normal stream and posts" -msgstr "Kann meine normalen Beiträge sehen" +#: ../../include/contact_widgets.php:14 +#, php-format +msgid "%d invitation available" +msgid_plural "%d invitations available" +msgstr[0] "%d Einladung verfügbar" +msgstr[1] "%d Einladungen verfügbar" -#: ../../include/permissions.php:14 -msgid "Can view my default channel profile" -msgstr "Kann mein Standardprofil sehen" +#: ../../include/contact_widgets.php:19 ../../mod/admin.php:418 +msgid "Advanced" +msgstr "Fortgeschritten" -#: ../../include/permissions.php:15 -msgid "Can view my photo albums" -msgstr "Kann meine Fotoalben betrachten" +#: ../../include/contact_widgets.php:22 +msgid "Find Channels" +msgstr "Finde Kanäle" -#: ../../include/permissions.php:16 -msgid "Can view my connections" -msgstr "Kann meine Verbindungen sehen" +#: ../../include/contact_widgets.php:23 +msgid "Enter name or interest" +msgstr "Name oder Interessen eingeben" -#: ../../include/permissions.php:17 -msgid "Can view my file storage" -msgstr "Kann meine Dateiordner lesen" +#: ../../include/contact_widgets.php:24 +msgid "Connect/Follow" +msgstr "Verbinden/Folgen" -#: ../../include/permissions.php:18 -msgid "Can view my webpages" -msgstr "Kann meine Webseiten sehen" +#: ../../include/contact_widgets.php:25 +msgid "Examples: Robert Morgenstein, Fishing" +msgstr "Beispiele: Robert Morgenstein, Angeln" -#: ../../include/permissions.php:21 -msgid "Can send me their channel stream and posts" -msgstr "Kann mir die Beiträge aus seinem/ihrem Kanal schicken" +#: ../../include/contact_widgets.php:26 ../../mod/connections.php:412 +#: ../../mod/directory.php:222 ../../mod/directory.php:227 +msgid "Find" +msgstr "Finde" -#: ../../include/permissions.php:22 -msgid "Can post on my channel page (\"wall\")" -msgstr "Kann auf meiner Kanal-Seite (\"wall\") Beiträge veröffentlichen" +#: ../../include/contact_widgets.php:27 ../../mod/suggest.php:59 +msgid "Channel Suggestions" +msgstr "Kanal-Vorschläge" -#: ../../include/permissions.php:23 -msgid "Can comment on or like my posts" -msgstr "Darf meine Beiträge kommentieren und mögen/nicht mögen" +#: ../../include/contact_widgets.php:29 +msgid "Random Profile" +msgstr "Zufallsprofil" -#: ../../include/permissions.php:24 -msgid "Can send me private mail messages" -msgstr "Kann mir private Nachrichten schicken" +#: ../../include/contact_widgets.php:30 +msgid "Invite Friends" +msgstr "Lade Freunde ein" -#: ../../include/permissions.php:25 -msgid "Can post photos to my photo albums" -msgstr "Kann Fotos in meinen Fotoalben veröffentlichen" +#: ../../include/contact_widgets.php:32 +msgid "Exammple: name=fred and country=iceland" +msgstr "Beispiel: name=fred and country=deutschland" -#: ../../include/permissions.php:26 -msgid "Can like/dislike stuff" -msgstr "Kann andere Elemente mögen/nicht mögen" +#: ../../include/contact_widgets.php:33 +msgid "Advanced Find" +msgstr "Erweiterte Suche" -#: ../../include/permissions.php:26 -msgid "Profiles and things other than posts/comments" -msgstr "Profile und alles außer Beiträge und Kommentare" +#: ../../include/contact_widgets.php:58 ../../include/features.php:72 +#: ../../include/widgets.php:303 +msgid "Saved Folders" +msgstr "Gespeicherte Ordner" -#: ../../include/permissions.php:28 -msgid "Can forward to all my channel contacts via post @mentions" -msgstr "Kann an alle meine Kontakte via @-Erwähnung Nachrichten weiterleiten" +#: ../../include/contact_widgets.php:61 ../../include/contact_widgets.php:96 +#: ../../include/widgets.php:306 +msgid "Everything" +msgstr "Alles" -#: ../../include/permissions.php:28 -msgid "Advanced - useful for creating group forum channels" -msgstr "Fortgeschritten - sinnvoll, um Gruppen-Kanäle/-Foren zu erstellen" +#: ../../include/contact_widgets.php:93 ../../include/widgets.php:29 +msgid "Categories" +msgstr "Kategorien" -#: ../../include/permissions.php:29 -msgid "Can chat with me (when available)" -msgstr "Kann mit mir chatten (wenn verfügbar)" +#: ../../include/contact_widgets.php:126 +#, php-format +msgid "%d connection in common" +msgid_plural "%d connections in common" +msgstr[0] "%d gemeinsame Verbindung" +msgstr[1] "%d gemeinsame Verbindungen" -#: ../../include/permissions.php:30 -msgid "Can write to my file storage" -msgstr "Kann in meine Dateiordner schreiben" +#: ../../include/contact_widgets.php:131 +msgid "show more" +msgstr "mehr zeigen" -#: ../../include/permissions.php:31 -msgid "Can edit my webpages" -msgstr "Kann meine Webseiten bearbeiten" +#: ../../include/account.php:23 +msgid "Not a valid email address" +msgstr "Ungültige E-Mail-Adresse" -#: ../../include/permissions.php:33 -msgid "Can source my public posts in derived channels" -msgstr "Kann meine öffentlichen Beiträge als Quellen für Kanäle verwenden" +#: ../../include/account.php:25 +msgid "Your email domain is not among those allowed on this site" +msgstr "Deine E-Mail-Adresse ist dieser Seite nicht erlaubt" -#: ../../include/permissions.php:33 -msgid "Somewhat advanced - very useful in open communities" -msgstr "Etwas fortgeschritten – sehr nützlich in offenen Gemeinschaften" +#: ../../include/account.php:31 +msgid "Your email address is already registered at this site." +msgstr "Deine E-Mail-Adresse ist auf dieser Seite bereits registriert." -#: ../../include/permissions.php:35 -msgid "Can administer my channel resources" -msgstr "Kann meine Kanäle administrieren" +#: ../../include/account.php:64 +msgid "An invitation is required." +msgstr "Eine Einladung wird benötigt" -#: ../../include/permissions.php:35 -msgid "" -"Extremely advanced. Leave this alone unless you know what you are doing" -msgstr "Sehr fortgeschritten. Bearbeite das nur, wenn Du genau weißt, was Du tust" +#: ../../include/account.php:68 +msgid "Invitation could not be verified." +msgstr "Die Einladung konnte nicht bestätigt werden" -#: ../../include/permissions.php:738 -msgid "Social Networking" -msgstr "Soziales Netzwerk" +#: ../../include/account.php:119 +msgid "Please enter the required information." +msgstr "Bitte gib die benötigten Informationen ein." -#: ../../include/permissions.php:739 ../../include/permissions.php:741 -#: ../../include/permissions.php:743 ../../include/permissions.php:745 -msgid "Mostly Public" -msgstr "Weitgehend öffentlich" +#: ../../include/account.php:187 +msgid "Failed to store account information." +msgstr "Speichern der Account-Informationen fehlgeschlagen" -#: ../../include/permissions.php:739 ../../include/permissions.php:741 -#: ../../include/permissions.php:743 -msgid "Restricted" -msgstr "Beschränkt" +#: ../../include/account.php:245 +#, php-format +msgid "Registration confirmation for %s" +msgstr "Registrierungsbestätigung für %s" -#: ../../include/permissions.php:739 ../../include/permissions.php:741 -msgid "Private" -msgstr "Privat" +#: ../../include/account.php:313 +#, php-format +msgid "Registration request at %s" +msgstr "Registrierungsanfrage auf %s" -#: ../../include/permissions.php:740 -msgid "Community Forum" -msgstr "Forum" +#: ../../include/account.php:315 ../../include/account.php:342 +#: ../../include/account.php:399 +msgid "Administrator" +msgstr "Administrator" -#: ../../include/permissions.php:742 -msgid "Feed Republish" -msgstr "Teilen von Feeds" +#: ../../include/account.php:337 +msgid "your registration password" +msgstr "Dein Registrierungspasswort" -#: ../../include/permissions.php:744 -msgid "Celebrity/Soapbox" -msgstr "Mitteilungs-Kanal (keine Kommentare)" +#: ../../include/account.php:340 ../../include/account.php:397 +#, php-format +msgid "Registration details for %s" +msgstr "Registrierungsdetails für %s" -#: ../../include/permissions.php:746 ../../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/account.php:406 +msgid "Account approved." +msgstr "Account bestätigt." -#: ../../include/permissions.php:747 -msgid "Custom/Expert Mode" -msgstr "Benutzerdefiniert/Expertenmodus" +#: ../../include/account.php:440 +#, php-format +msgid "Registration revoked for %s" +msgstr "Registrierung für %s widerrufen" -#: ../../include/contact_selectors.php:56 -msgid "Frequently" -msgstr "Häufig" +#: ../../include/account.php:486 +msgid "Account verified. Please login." +msgstr "Konto geprüft. Bitte melde Dich an!" -#: ../../include/contact_selectors.php:57 -msgid "Hourly" -msgstr "Stündlich" +#: ../../include/account.php:647 ../../include/account.php:649 +msgid "Click here to upgrade." +msgstr "Klicke hier, um das Upgrade durchzuführen." -#: ../../include/contact_selectors.php:58 -msgid "Twice daily" -msgstr "Zwei Mal am Tag" +#: ../../include/account.php:655 +msgid "This action exceeds the limits set by your subscription plan." +msgstr "Diese Aktion überschreitet die Grenzen Ihres Abonnements." -#: ../../include/contact_selectors.php:59 -msgid "Daily" -msgstr "Täglich" +#: ../../include/account.php:660 +msgid "This action is not available under your subscription plan." +msgstr "Diese Aktion ist in Ihrem Abonnement nicht verfügbar." -#: ../../include/contact_selectors.php:60 -msgid "Weekly" -msgstr "Wöchentlich" +#: ../../include/bbcode.php:112 ../../include/bbcode.php:653 +#: ../../include/bbcode.php:656 ../../include/bbcode.php:661 +#: ../../include/bbcode.php:664 ../../include/bbcode.php:667 +#: ../../include/bbcode.php:670 ../../include/bbcode.php:675 +#: ../../include/bbcode.php:678 ../../include/bbcode.php:683 +#: ../../include/bbcode.php:686 ../../include/bbcode.php:689 +#: ../../include/bbcode.php:692 +msgid "Image/photo" +msgstr "Bild/Foto" -#: ../../include/contact_selectors.php:61 -msgid "Monthly" -msgstr "Monatlich" +#: ../../include/bbcode.php:147 ../../include/bbcode.php:703 +msgid "Encrypted content" +msgstr "Verschlüsselter Inhalt" -#: ../../include/contact_selectors.php:76 -msgid "Friendica" -msgstr "Friendica" +#: ../../include/bbcode.php:165 +msgid "Install design element: " +msgstr "Design-Element installieren:" -#: ../../include/contact_selectors.php:77 -msgid "OStatus" -msgstr "OStatus" +#: ../../include/bbcode.php:171 +msgid "QR code" +msgstr "QR-Code" -#: ../../include/contact_selectors.php:78 -msgid "RSS/Atom" -msgstr "RSS/Atom" +#: ../../include/bbcode.php:220 +#, php-format +msgid "%1$s wrote the following %2$s %3$s" +msgstr "%1$s schrieb den folgenden %2$s %3$s" -#: ../../include/contact_selectors.php:80 -msgid "Diaspora" -msgstr "Diaspora" +#: ../../include/bbcode.php:222 +msgid "post" +msgstr "Beitrag" -#: ../../include/contact_selectors.php:81 -msgid "Facebook" -msgstr "Facebook" +#: ../../include/bbcode.php:621 +msgid "$1 spoiler" +msgstr "$1 Spoiler" -#: ../../include/contact_selectors.php:82 -msgid "Zot!" -msgstr "Zot!" +#: ../../include/bbcode.php:641 +msgid "$1 wrote:" +msgstr "$1 schrieb:" -#: ../../include/contact_selectors.php:83 -msgid "LinkedIn" -msgstr "LinkedIn" +#: ../../include/dir_fns.php:56 +msgid "Sort Options" +msgstr "Sortieroptionen" -#: ../../include/contact_selectors.php:84 -msgid "XMPP/IM" -msgstr "XMPP/IM" +#: ../../include/dir_fns.php:57 +msgid "Alphabetic" +msgstr "alphabetisch" -#: ../../include/contact_selectors.php:85 -msgid "MySpace" -msgstr "MySpace" +#: ../../include/dir_fns.php:58 +msgid "Reverse Alphabetic" +msgstr "Entgegengesetzt alphabetisch" -#: ../../include/event.php:11 ../../include/bb2diaspora.php:439 -msgid "l F d, Y \\@ g:i A" -msgstr "l, d. F Y\\\\, H:i" +#: ../../include/dir_fns.php:59 +msgid "Newest to Oldest" +msgstr "Neueste zuerst" -#: ../../include/event.php:20 ../../include/bb2diaspora.php:445 -msgid "Starts:" -msgstr "Beginnt:" +#: ../../include/dir_fns.php:71 +msgid "Enable Safe Search" +msgstr "Sichere Suche einschalten" -#: ../../include/event.php:30 ../../include/bb2diaspora.php:453 -msgid "Finishes:" -msgstr "Endet:" +#: ../../include/dir_fns.php:73 +msgid "Disable Safe Search" +msgstr "Sichere Suche ausschalten" -#: ../../include/event.php:326 -msgid "This event has been added to your calendar." -msgstr "Dieses Ereignis wurde zu Deinem Kalender hinzugefügt" +#: ../../include/dir_fns.php:75 +msgid "Safe Mode" +msgstr "Sicherer Modus" -#: ../../include/profile_selectors.php:6 -#: ../../include/profile_selectors.php:23 -msgid "Male" -msgstr "Männlich" +#: ../../include/taxonomy.php:210 +msgid "Tags" +msgstr "Schlagwörter" -#: ../../include/profile_selectors.php:6 -#: ../../include/profile_selectors.php:23 -msgid "Female" -msgstr "Weiblich" +#: ../../include/taxonomy.php:227 +msgid "Keywords" +msgstr "Schlüsselwörter" -#: ../../include/profile_selectors.php:6 -msgid "Currently Male" -msgstr "Momentan männlich" +#: ../../include/taxonomy.php:252 +msgid "have" +msgstr "habe" -#: ../../include/profile_selectors.php:6 -msgid "Currently Female" -msgstr "Momentan weiblich" +#: ../../include/taxonomy.php:252 +msgid "has" +msgstr "hat" -#: ../../include/profile_selectors.php:6 -msgid "Mostly Male" -msgstr "Größtenteils männlich" +#: ../../include/taxonomy.php:253 +msgid "want" +msgstr "will" -#: ../../include/profile_selectors.php:6 -msgid "Mostly Female" -msgstr "Größtenteils weiblich" +#: ../../include/taxonomy.php:253 +msgid "wants" +msgstr "will" -#: ../../include/profile_selectors.php:6 -msgid "Transgender" -msgstr "Transsexuell" +#: ../../include/taxonomy.php:254 ../../include/ItemObject.php:221 +msgid "like" +msgstr "mag" -#: ../../include/profile_selectors.php:6 -msgid "Intersex" -msgstr "Zwischengeschlechtlich" +#: ../../include/taxonomy.php:254 +msgid "likes" +msgstr "gefällt" -#: ../../include/profile_selectors.php:6 -msgid "Transsexual" -msgstr "Transsexuell" +#: ../../include/taxonomy.php:255 ../../include/ItemObject.php:222 +msgid "dislike" +msgstr "verurteile" -#: ../../include/profile_selectors.php:6 -msgid "Hermaphrodite" -msgstr "Zwitter" +#: ../../include/taxonomy.php:255 +msgid "dislikes" +msgstr "missfällt" -#: ../../include/profile_selectors.php:6 -msgid "Neuter" -msgstr "Geschlechtslos" +#: ../../include/taxonomy.php:338 ../../include/identity.php:1141 +#: ../../include/ItemObject.php:146 ../../mod/photos.php:1019 +msgctxt "noun" +msgid "Like" +msgid_plural "Likes" +msgstr[0] "Gefällt mir" +msgstr[1] "Gefällt mir" -#: ../../include/profile_selectors.php:6 -msgid "Non-specific" -msgstr "unklar" +#: ../../include/enotify.php:41 +msgid "Red Matrix Notification" +msgstr "Red Matrix Benachrichtigung" -#: ../../include/profile_selectors.php:6 -msgid "Undecided" -msgstr "Unentschieden" +#: ../../include/enotify.php:42 +msgid "redmatrix" +msgstr "redmatrix" -#: ../../include/profile_selectors.php:42 -#: ../../include/profile_selectors.php:61 -msgid "Males" -msgstr "Männer" +#: ../../include/enotify.php:44 +msgid "Thank You," +msgstr "Danke." -#: ../../include/profile_selectors.php:42 -#: ../../include/profile_selectors.php:61 -msgid "Females" -msgstr "Frauen" +#: ../../include/enotify.php:46 +#, php-format +msgid "%s Administrator" +msgstr "der Administrator von %s" -#: ../../include/profile_selectors.php:42 -msgid "Gay" -msgstr "Schwul" +#: ../../include/enotify.php:81 +#, php-format +msgid "%s " +msgstr "%s " -#: ../../include/profile_selectors.php:42 -msgid "Lesbian" -msgstr "Lesbisch" +#: ../../include/enotify.php:85 +#, php-format +msgid "[Red:Notify] New mail received at %s" +msgstr "[Red:Benachrichtigung] Neue Mail auf %s empfangen" -#: ../../include/profile_selectors.php:42 -msgid "No Preference" -msgstr "Keine Bevorzugung" +#: ../../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 hat Dir eine private Nachricht auf %3$s gesendet." -#: ../../include/profile_selectors.php:42 -msgid "Bisexual" -msgstr "Bisexuell" +#: ../../include/enotify.php:88 +#, php-format +msgid "%1$s sent you %2$s." +msgstr "%1$s hat Dir %2$s geschickt." -#: ../../include/profile_selectors.php:42 -msgid "Autosexual" -msgstr "Autosexuell" +#: ../../include/enotify.php:88 +msgid "a private message" +msgstr "eine private Nachricht" -#: ../../include/profile_selectors.php:42 -msgid "Abstinent" -msgstr "Enthaltsam" +#: ../../include/enotify.php:89 +#, php-format +msgid "Please visit %s to view and/or reply to your private messages." +msgstr "Bitte besuche %s, um die private Nachricht anzusehen und/oder darauf zu antworten." -#: ../../include/profile_selectors.php:42 -msgid "Virgin" -msgstr "Jungfräulich" +#: ../../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 hat [zrl=%3$s]a %4$s[/zrl] kommentiert" -#: ../../include/profile_selectors.php:42 -msgid "Deviant" -msgstr "Abweichend" +#: ../../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 hat [zrl=%3$s]%4$ss %5$s[/zrl] kommentiert" -#: ../../include/profile_selectors.php:42 -msgid "Fetish" -msgstr "Fetisch" +#: ../../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 hat [zrl=%3$s]Deinen %4$s[/zrl] kommentiert" -#: ../../include/profile_selectors.php:42 -msgid "Oodles" -msgstr "Unmengen" +#: ../../include/enotify.php:172 +#, php-format +msgid "[Red:Notify] Comment to conversation #%1$d by %2$s" +msgstr "[Red:Benachrichtigung] Kommentar in Unterhaltung #%1$d von %2$s" -#: ../../include/profile_selectors.php:42 -msgid "Nonsexual" -msgstr "Sexlos" +#: ../../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 hat eine Unterhaltung kommentiert, der Du folgst." -#: ../../include/profile_selectors.php:80 -#: ../../include/profile_selectors.php:97 -msgid "Single" -msgstr "Single" +#: ../../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 "Bitte besuche %s, um die Unterhaltung anzusehen und/oder zu kommentieren." + +#: ../../include/enotify.php:182 +#, php-format +msgid "[Red:Notify] %s posted to your profile wall" +msgstr "[Red:Hinweis] %s schrieb auf Deine Pinnwand" + +#: ../../include/enotify.php:184 +#, php-format +msgid "%1$s, %2$s posted to your profile wall at %3$s" +msgstr "%1$s, %2$s hat auf Deine Pinnwand auf %3$s geschrieben" + +#: ../../include/enotify.php:186 +#, php-format +msgid "%1$s, %2$s posted to [zrl=%3$s]your wall[/zrl]" +msgstr "%1$s, %2$s hat auf [zrl=%3$s]Deine Pinnwand[/zrl] geschrieben" + +#: ../../include/enotify.php:210 +#, php-format +msgid "[Red:Notify] %s tagged you" +msgstr "[Red:Benachrichtigung] %s hat Dich erwähnt" + +#: ../../include/enotify.php:211 +#, php-format +msgid "%1$s, %2$s tagged you at %3$s" +msgstr "%1$s, %2$s hat Dich auf %3$s erwähnt" + +#: ../../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]hat Dich erwähnt[/zrl]." + +#: ../../include/enotify.php:225 +#, php-format +msgid "[Red:Notify] %1$s poked you" +msgstr "[Red:Benachrichtigung] %1$s hat Dich angestupst" + +#: ../../include/enotify.php:226 +#, php-format +msgid "%1$s, %2$s poked you at %3$s" +msgstr "%1$s, %2$s hat Dich auf %3$s angestupst" + +#: ../../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]hat Dich angestupst[/zrl]." + +#: ../../include/enotify.php:243 +#, php-format +msgid "[Red:Notify] %s tagged your post" +msgstr "[Red:Benachrichtigung] %s hat Deinen Beitrag getaggt" + +#: ../../include/enotify.php:244 +#, php-format +msgid "%1$s, %2$s tagged your post at %3$s" +msgstr "%1$s, %2$s hat Deinen Beitrag auf %3$s verschlagwortet" + +#: ../../include/enotify.php:245 +#, php-format +msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]" +msgstr "%1$s, %2$s hat [zrl=%3$s]Deinen Beitrag[/zrl] verschlagwortet" + +#: ../../include/enotify.php:257 +msgid "[Red:Notify] Introduction received" +msgstr "[Red:Benachrichtigung] Vorstellung erhalten" + +#: ../../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, Du hast eine neue Verbindungsanfrage von '%2$s' auf %3$s erhalten" + +#: ../../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, Du hast [zrl=%2$s]eine neue Verbindungsanfrage[/zrl] von %3$s erhalten." + +#: ../../include/enotify.php:263 ../../include/enotify.php:282 +#, php-format +msgid "You may visit their profile at %s" +msgstr "Du kannst Dir das Profil unter %s ansehen" + +#: ../../include/enotify.php:265 +#, php-format +msgid "Please visit %s to approve or reject the connection request." +msgstr "Bitte besuche %s , um die Verbindungsanfrage anzunehmen oder abzulehnen." + +#: ../../include/enotify.php:272 +msgid "[Red:Notify] Friend suggestion received" +msgstr "[Red:Benachrichtigung] Freundschaftsvorschlag erhalten" + +#: ../../include/enotify.php:273 +#, php-format +msgid "%1$s, you've received a friend suggestion from '%2$s' at %3$s" +msgstr "%1$s, Du hast einen Kontaktvorschlag von „%2$s“ auf %3$s erhalten" + +#: ../../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, Du hast [zrl=%2$s]einen Kontaktvorschlag[/zrl] für %3$s von %4$s erhalten." + +#: ../../include/enotify.php:280 +msgid "Name:" +msgstr "Name:" + +#: ../../include/enotify.php:281 +msgid "Photo:" +msgstr "Foto:" + +#: ../../include/enotify.php:284 +#, php-format +msgid "Please visit %s to approve or reject the suggestion." +msgstr "Bitte besuche %s um den Vorschlag zu akzeptieren oder abzulehnen." + +#: ../../include/enotify.php:477 +msgid "[Red:Notify]" +msgstr "[Red:Benachrichtigung]" + +#: ../../include/chat.php:10 +msgid "Missing room name" +msgstr "Der Chatraum hat keinen Namen" + +#: ../../include/chat.php:19 +msgid "Duplicate room name" +msgstr "Name des Chatraums bereits vergeben" + +#: ../../include/chat.php:68 ../../include/chat.php:76 +msgid "Invalid room specifier." +msgstr "Ungültiger Raumbezeichner." + +#: ../../include/chat.php:105 +msgid "Room not found." +msgstr "Chatraum konnte nicht gefunden werden." + +#: ../../include/chat.php:126 +msgid "Room is full" +msgstr "Der Raum ist voll" + +#: ../../include/items.php:377 ../../mod/profperm.php:23 +#: ../../mod/subthread.php:49 ../../mod/group.php:68 ../../mod/like.php:246 +#: ../../index.php:400 +msgid "Permission denied" +msgstr "Keine Berechtigung" + +#: ../../include/items.php:964 ../../include/items.php:1009 +msgid "(Unknown)" +msgstr "(Unbekannt)" + +#: ../../include/items.php:1165 +msgid "Visible to anybody on the internet." +msgstr "Für jeden im Internet sichtbar." + +#: ../../include/items.php:1167 +msgid "Visible to you only." +msgstr "Nur für Dich sichtbar." + +#: ../../include/items.php:1169 +msgid "Visible to anybody in this network." +msgstr "Für jedes Mitglied der RedMatrix sichtbar." + +#: ../../include/items.php:1171 +msgid "Visible to anybody authenticated." +msgstr "Für jeden sichtbar, der angemeldet ist." + +#: ../../include/items.php:1173 +#, php-format +msgid "Visible to anybody on %s." +msgstr "Für jeden auf %s sichtbar." + +#: ../../include/items.php:1175 +msgid "Visible to all connections." +msgstr "Für alle Verbindungen sichtbar." + +#: ../../include/items.php:1177 +msgid "Visible to approved connections." +msgstr "Nur für akzeptierte Verbindungen sichtbar." + +#: ../../include/items.php:1179 +msgid "Visible to specific connections." +msgstr "Sichtbar für bestimmte Verbindungen." + +#: ../../include/items.php:3938 ../../mod/display.php:32 +#: ../../mod/filestorage.php:26 ../../mod/admin.php:168 +#: ../../mod/admin.php:898 ../../mod/admin.php:1101 ../../mod/thing.php:76 +#: ../../mod/viewsrc.php:20 +msgid "Item not found." +msgstr "Element nicht gefunden." + +#: ../../include/items.php:4391 ../../mod/group.php:38 ../../mod/group.php:140 +msgid "Collection not found." +msgstr "Sammlung nicht gefunden" + +#: ../../include/items.php:4406 +msgid "Collection is empty." +msgstr "Sammlung ist leer." + +#: ../../include/items.php:4413 +#, php-format +msgid "Collection: %s" +msgstr "Sammlung: %s" + +#: ../../include/items.php:4424 +#, php-format +msgid "Connection: %s" +msgstr "Verbindung: %s" + +#: ../../include/items.php:4427 +msgid "Connection not found." +msgstr "Die Verbindung wurde nicht gefunden." + +#: ../../include/text.php:321 +msgid "prev" +msgstr "vorherige" + +#: ../../include/text.php:323 +msgid "first" +msgstr "erste" + +#: ../../include/text.php:352 +msgid "last" +msgstr "letzte" + +#: ../../include/text.php:355 +msgid "next" +msgstr "nächste" + +#: ../../include/text.php:367 +msgid "older" +msgstr "älter" + +#: ../../include/text.php:369 +msgid "newer" +msgstr "neuer" + +#: ../../include/text.php:736 +msgid "No connections" +msgstr "Keine Verbindungen" + +#: ../../include/text.php:749 +#, php-format +msgid "%d Connection" +msgid_plural "%d Connections" +msgstr[0] "%d Verbindung" +msgstr[1] "%d Verbindungen" + +#: ../../include/text.php:762 +msgid "View Connections" +msgstr "Verbindungen anzeigen" + +#: ../../include/text.php:823 ../../include/text.php:835 +#: ../../include/widgets.php:193 ../../mod/rbmark.php:28 +#: ../../mod/rbmark.php:98 ../../mod/filer.php:50 ../../mod/admin.php:1341 +#: ../../mod/admin.php:1362 +msgid "Save" +msgstr "Speichern" + +#: ../../include/text.php:901 +msgid "poke" +msgstr "anstupsen" + +#: ../../include/text.php:902 +msgid "ping" +msgstr "anpingen" + +#: ../../include/text.php:902 +msgid "pinged" +msgstr "pingte" + +#: ../../include/text.php:903 +msgid "prod" +msgstr "knuffen" + +#: ../../include/text.php:903 +msgid "prodded" +msgstr "knuffte" + +#: ../../include/text.php:904 +msgid "slap" +msgstr "ohrfeigen" -#: ../../include/profile_selectors.php:80 -msgid "Lonely" -msgstr "Einsam" +#: ../../include/text.php:904 +msgid "slapped" +msgstr "ohrfeigte" -#: ../../include/profile_selectors.php:80 -msgid "Available" -msgstr "Verfügbar" +#: ../../include/text.php:905 +msgid "finger" +msgstr "befummeln" -#: ../../include/profile_selectors.php:80 -msgid "Unavailable" -msgstr "Nicht verfügbar" +#: ../../include/text.php:905 +msgid "fingered" +msgstr "befummelte" -#: ../../include/profile_selectors.php:80 -msgid "Has crush" -msgstr "Verguckt" +#: ../../include/text.php:906 +msgid "rebuff" +msgstr "eine Abfuhr erteilen" -#: ../../include/profile_selectors.php:80 -msgid "Infatuated" -msgstr "Verknallt" +#: ../../include/text.php:906 +msgid "rebuffed" +msgstr "zurückgewiesen" -#: ../../include/profile_selectors.php:80 -#: ../../include/profile_selectors.php:97 -msgid "Dating" -msgstr "Lerne gerade jemanden kennen" +#: ../../include/text.php:915 +msgid "happy" +msgstr "glücklich" -#: ../../include/profile_selectors.php:80 -msgid "Unfaithful" -msgstr "Treulos" +#: ../../include/text.php:916 +msgid "sad" +msgstr "traurig" -#: ../../include/profile_selectors.php:80 -msgid "Sex Addict" -msgstr "Sexabhängig" +#: ../../include/text.php:917 +msgid "mellow" +msgstr "sanft" -#: ../../include/profile_selectors.php:80 -msgid "Friends/Benefits" -msgstr "Freunde/Begünstigte" +#: ../../include/text.php:918 +msgid "tired" +msgstr "müde" -#: ../../include/profile_selectors.php:80 -msgid "Casual" -msgstr "Lose" +#: ../../include/text.php:919 +msgid "perky" +msgstr "frech" -#: ../../include/profile_selectors.php:80 -msgid "Engaged" -msgstr "Verlobt" +#: ../../include/text.php:920 +msgid "angry" +msgstr "sauer" -#: ../../include/profile_selectors.php:80 -#: ../../include/profile_selectors.php:97 -msgid "Married" -msgstr "Verheiratet" +#: ../../include/text.php:921 +msgid "stupified" +msgstr "verblüfft" -#: ../../include/profile_selectors.php:80 -msgid "Imaginarily married" -msgstr "Gewissermaßen verheiratet" +#: ../../include/text.php:922 +msgid "puzzled" +msgstr "verwirrt" -#: ../../include/profile_selectors.php:80 -msgid "Partners" -msgstr "Partner" +#: ../../include/text.php:923 +msgid "interested" +msgstr "interessiert" -#: ../../include/profile_selectors.php:80 -#: ../../include/profile_selectors.php:97 -msgid "Cohabiting" -msgstr "Lebensgemeinschaft" +#: ../../include/text.php:924 +msgid "bitter" +msgstr "verbittert" -#: ../../include/profile_selectors.php:80 -msgid "Common law" -msgstr "Informelle Ehe" +#: ../../include/text.php:925 +msgid "cheerful" +msgstr "fröhlich" -#: ../../include/profile_selectors.php:80 -msgid "Happy" -msgstr "Glücklich" +#: ../../include/text.php:926 +msgid "alive" +msgstr "lebendig" -#: ../../include/profile_selectors.php:80 -msgid "Not looking" -msgstr "Nicht Ausschau haltend" +#: ../../include/text.php:927 +msgid "annoyed" +msgstr "verärgert" -#: ../../include/profile_selectors.php:80 -msgid "Swinger" -msgstr "Swinger" +#: ../../include/text.php:928 +msgid "anxious" +msgstr "unruhig" -#: ../../include/profile_selectors.php:80 -msgid "Betrayed" -msgstr "Betrogen" +#: ../../include/text.php:929 +msgid "cranky" +msgstr "schrullig" -#: ../../include/profile_selectors.php:80 -#: ../../include/profile_selectors.php:97 -msgid "Separated" -msgstr "Getrennt" +#: ../../include/text.php:930 +msgid "disturbed" +msgstr "verstört" -#: ../../include/profile_selectors.php:80 -msgid "Unstable" -msgstr "Labil" +#: ../../include/text.php:931 +msgid "frustrated" +msgstr "frustriert" -#: ../../include/profile_selectors.php:80 -#: ../../include/profile_selectors.php:97 -msgid "Divorced" -msgstr "Geschieden" +#: ../../include/text.php:932 +msgid "depressed" +msgstr "deprimiert" -#: ../../include/profile_selectors.php:80 -msgid "Imaginarily divorced" -msgstr "Gewissermaßen geschieden" +#: ../../include/text.php:933 +msgid "motivated" +msgstr "motiviert" -#: ../../include/profile_selectors.php:80 -#: ../../include/profile_selectors.php:97 -msgid "Widowed" -msgstr "Verwitwet" +#: ../../include/text.php:934 +msgid "relaxed" +msgstr "entspannt" -#: ../../include/profile_selectors.php:80 -msgid "Uncertain" -msgstr "Ungewiss" +#: ../../include/text.php:935 +msgid "surprised" +msgstr "überrascht" -#: ../../include/profile_selectors.php:80 -#: ../../include/profile_selectors.php:97 -msgid "It's complicated" -msgstr "Es ist kompliziert" +#: ../../include/text.php:1099 +msgid "Monday" +msgstr "Montag" -#: ../../include/profile_selectors.php:80 -msgid "Don't care" -msgstr "Interessiert mich nicht" +#: ../../include/text.php:1099 +msgid "Tuesday" +msgstr "Dienstag" -#: ../../include/profile_selectors.php:80 -msgid "Ask me" -msgstr "Frag mich mal" +#: ../../include/text.php:1099 +msgid "Wednesday" +msgstr "Mittwoch" -#: ../../include/account.php:23 -msgid "Not a valid email address" -msgstr "Ungültige E-Mail-Adresse" +#: ../../include/text.php:1099 +msgid "Thursday" +msgstr "Donnerstag" -#: ../../include/account.php:25 -msgid "Your email domain is not among those allowed on this site" -msgstr "Deine E-Mail-Adresse ist dieser Seite nicht erlaubt" +#: ../../include/text.php:1099 +msgid "Friday" +msgstr "Freitag" -#: ../../include/account.php:31 -msgid "Your email address is already registered at this site." -msgstr "Deine E-Mail-Adresse ist auf dieser Seite bereits registriert." +#: ../../include/text.php:1099 +msgid "Saturday" +msgstr "Samstag" -#: ../../include/account.php:64 -msgid "An invitation is required." -msgstr "Eine Einladung wird benötigt" +#: ../../include/text.php:1099 +msgid "Sunday" +msgstr "Sonntag" -#: ../../include/account.php:68 -msgid "Invitation could not be verified." -msgstr "Die Einladung konnte nicht bestätigt werden" +#: ../../include/text.php:1103 +msgid "January" +msgstr "Januar" -#: ../../include/account.php:119 -msgid "Please enter the required information." -msgstr "Bitte gib die benötigten Informationen ein." +#: ../../include/text.php:1103 +msgid "February" +msgstr "Februar" -#: ../../include/account.php:187 -msgid "Failed to store account information." -msgstr "Speichern der Account-Informationen fehlgeschlagen" +#: ../../include/text.php:1103 +msgid "March" +msgstr "März" -#: ../../include/account.php:245 -#, php-format -msgid "Registration confirmation for %s" -msgstr "Registrierungsbestätigung für %s" +#: ../../include/text.php:1103 +msgid "April" +msgstr "April" -#: ../../include/account.php:313 -#, php-format -msgid "Registration request at %s" -msgstr "Registrierungsanfrage auf %s" +#: ../../include/text.php:1103 +msgid "May" +msgstr "Mai" -#: ../../include/account.php:315 ../../include/account.php:342 -#: ../../include/account.php:399 -msgid "Administrator" -msgstr "Administrator" +#: ../../include/text.php:1103 +msgid "June" +msgstr "Juni" -#: ../../include/account.php:337 -msgid "your registration password" -msgstr "Dein Registrierungspasswort" +#: ../../include/text.php:1103 +msgid "July" +msgstr "Juli" -#: ../../include/account.php:340 ../../include/account.php:397 -#, php-format -msgid "Registration details for %s" -msgstr "Registrierungsdetails für %s" +#: ../../include/text.php:1103 +msgid "August" +msgstr "August" -#: ../../include/account.php:406 -msgid "Account approved." -msgstr "Account bestätigt." +#: ../../include/text.php:1103 +msgid "September" +msgstr "September" -#: ../../include/account.php:440 -#, php-format -msgid "Registration revoked for %s" -msgstr "Registrierung für %s widerrufen" +#: ../../include/text.php:1103 +msgid "October" +msgstr "Oktober" -#: ../../include/account.php:486 -msgid "Account verified. Please login." -msgstr "Konto geprüft. Bitte melde Dich an!" +#: ../../include/text.php:1103 +msgid "November" +msgstr "November" -#: ../../include/account.php:647 ../../include/account.php:649 -msgid "Click here to upgrade." -msgstr "Klicke hier, um das Upgrade durchzuführen." +#: ../../include/text.php:1103 +msgid "December" +msgstr "Dezember" -#: ../../include/account.php:655 -msgid "This action exceeds the limits set by your subscription plan." -msgstr "Diese Aktion überschreitet die Grenzen Ihres Abonnements." +#: ../../include/text.php:1181 +msgid "unknown.???" +msgstr "unbekannt.???" -#: ../../include/account.php:660 -msgid "This action is not available under your subscription plan." -msgstr "Diese Aktion ist in Ihrem Abonnement nicht verfügbar." +#: ../../include/text.php:1182 +msgid "bytes" +msgstr "Bytes" -#: ../../include/oembed.php:171 -msgid "Embedded content" -msgstr "Eingebetteter Inhalt" +#: ../../include/text.php:1221 +msgid "remove category" +msgstr "Kategorie entfernen" -#: ../../include/oembed.php:180 -msgid "Embedding disabled" -msgstr "Einbetten ausgeschaltet" +#: ../../include/text.php:1291 +msgid "remove from file" +msgstr "aus der Datei entfernen" -#: ../../include/zot.php:655 -msgid "Invalid data packet" -msgstr "Ungültiges Datenpaket" +#: ../../include/text.php:1356 ../../include/text.php:1368 +msgid "Click to open/close" +msgstr "Klicke zum Öffnen/Schließen" -#: ../../include/zot.php:671 -msgid "Unable to verify channel signature" -msgstr "Konnte die Signatur des Kanals nicht verifizieren" +#: ../../include/text.php:1523 ../../mod/events.php:409 +msgid "Link to Source" +msgstr "Link zur Quelle" -#: ../../include/zot.php:1757 -#, php-format -msgid "Unable to verify site signature for %s" -msgstr "Kann die Signatur der Seite von %s nicht verifizieren" +#: ../../include/text.php:1542 +msgid "Select a page layout: " +msgstr "Ein Seiten-Layout auswählen:" -#: ../../include/network.php:590 -msgid "view full size" -msgstr "In Vollbildansicht anschauen" +#: ../../include/text.php:1545 ../../include/text.php:1610 +msgid "default" +msgstr "Standard" -#: ../../include/dba/dba_driver.php:50 -#, php-format -msgid "Cannot locate DNS info for database server '%s'" -msgstr "Kann die DNS-Informationen für den Datenbank-Server '%s' nicht finden" +#: ../../include/text.php:1581 +msgid "Page content type: " +msgstr "Content-Typ der Seite:" -#: ../../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 "Ein gelöschte Gruppe mit diesem Namen wurde gefunden. Existierende Zugangsregeln für Elemente könnten für diese Gruppe angewendet werden, sowie für alle zukünftigen Elemente." +#: ../../include/text.php:1622 +msgid "Select an alternate language" +msgstr "Wähle eine alternative Sprache" -#: ../../include/group.php:234 -msgid "Default privacy group for new contacts" -msgstr "Standard-Privatsphärengruppe für neue Kontakte" +#: ../../include/text.php:1756 +msgid "activity" +msgstr "Aktivität" -#: ../../include/group.php:253 ../../mod/admin.php:737 -msgid "All Channels" -msgstr "Alle Kanäle" +#: ../../include/text.php:2028 +msgid "Design" +msgstr "Design" -#: ../../include/group.php:275 -msgid "edit" -msgstr "Bearbeiten" +#: ../../include/text.php:2030 +msgid "Blocks" +msgstr "Blöcke" -#: ../../include/group.php:297 -msgid "Collections" -msgstr "Sammlungen" +#: ../../include/text.php:2031 +msgid "Menus" +msgstr "Menüs" -#: ../../include/group.php:298 -msgid "Edit collection" -msgstr "Bearbeite Sammlungen" +#: ../../include/text.php:2032 +msgid "Layouts" +msgstr "Layouts" -#: ../../include/group.php:299 -msgid "Create a new collection" -msgstr "Neue Sammlung erzeugen" +#: ../../include/text.php:2033 +msgid "Pages" +msgstr "Seiten" -#: ../../include/group.php:300 -msgid "Channels not in any collection" -msgstr "Kanäle, die nicht in einer Sammlung sind" +#: ../../include/features.php:23 +msgid "General Features" +msgstr "Allgemeine Funktionen" -#: ../../include/group.php:302 ../../include/widgets.php:273 -msgid "add" -msgstr "hinzufügen" +#: ../../include/features.php:25 +msgid "Content Expiration" +msgstr "Verfall von Inhalten" -#: ../../include/attach.php:221 ../../include/attach.php:275 -msgid "Item was not found." -msgstr "Beitrag wurde nicht gefunden." +#: ../../include/features.php:25 +msgid "Remove posts/comments and/or private messages at a future time" +msgstr "Lösche Beiträge, Kommentare und/oder private Nachrichten automatisch zu einem zukünftigen Datum." -#: ../../include/attach.php:331 -msgid "No source file." -msgstr "Keine Quelldatei." +#: ../../include/features.php:26 +msgid "Multiple Profiles" +msgstr "Mehrfachprofile" -#: ../../include/attach.php:348 -msgid "Cannot locate file to replace" -msgstr "Kann Datei zum Ersetzen nicht finden" +#: ../../include/features.php:26 +msgid "Ability to create multiple profiles" +msgstr "Mehrfachprofile anlegen können" -#: ../../include/attach.php:366 -msgid "Cannot locate file to revise/update" -msgstr "Kann Datei zum Prüfen/Aktualisieren nicht finden" +#: ../../include/features.php:27 +msgid "Advanced Profiles" +msgstr "Erweiterte Profile" -#: ../../include/attach.php:377 -#, php-format -msgid "File exceeds size limit of %d" -msgstr "Datei überschreitet das Größen-Limit von %d" +#: ../../include/features.php:27 +msgid "Additional profile sections and selections" +msgstr "Stellt zusätzliche Bereiche und Felder im Profil zur Verfügung" -#: ../../include/attach.php:389 -#, php-format -msgid "You have reached your limit of %1$.0f Mbytes attachment storage." -msgstr "Die Größe Deiner Datei-Anhänge hat das Maximum von %1$.0f MByte erreicht." +#: ../../include/features.php:28 +msgid "Profile Import/Export" +msgstr "Profil-Import/Export" -#: ../../include/attach.php:472 -msgid "File upload failed. Possible system limit or action terminated." -msgstr "Datei-Upload fehlgeschlagen. Mögliche Systembegrenzung oder abgebrochener Prozess." +#: ../../include/features.php:28 +msgid "Save and load profile details across sites/channels" +msgstr "Speichere Dein Profil, um es in einen anderen Kanal zu importieren" -#: ../../include/attach.php:484 -msgid "Stored file could not be verified. Upload failed." -msgstr "Gespeichert Datei konnte nicht verifiziert werden. Upload abgebrochen." +#: ../../include/features.php:29 +msgid "Web Pages" +msgstr "Webseiten" -#: ../../include/attach.php:526 ../../include/attach.php:543 -msgid "Path not available." -msgstr "Pfad nicht verfügbar." +#: ../../include/features.php:29 +msgid "Provide managed web pages on your channel" +msgstr "Stelle verwaltete Webseiten in Deinem Kanal zur Verfügung" -#: ../../include/attach.php:589 -msgid "Empty pathname" -msgstr "Leere Pfadangabe" +#: ../../include/features.php:30 +msgid "Private Notes" +msgstr "Private Notizen" -#: ../../include/attach.php:605 -msgid "duplicate filename or path" -msgstr "doppelter Dateiname oder Pfad" +#: ../../include/features.php:30 +msgid "Enables a tool to store notes and reminders" +msgstr "Werkzeug zum Speichern von Notizen und Erinnerungen aktivieren" -#: ../../include/attach.php:629 -msgid "Path not found." -msgstr "Pfad nicht gefunden." +#: ../../include/features.php:34 +msgid "Navigation Channel Select" +msgstr "Kanal-Auswahl in der Navigationsleiste" -#: ../../include/attach.php:680 -msgid "mkdir failed." -msgstr "mkdir fehlgeschlagen." +#: ../../include/features.php:34 +msgid "Change channels directly from within the navigation dropdown menu" +msgstr "Wechsle direkt über das Navigationsmenü zu anderen Kanälen" -#: ../../include/attach.php:684 -msgid "database storage failed." -msgstr "Speichern in der Datenbank fehlgeschlagen." +#: ../../include/features.php:38 +msgid "Extended Identity Sharing" +msgstr "Erweitertes Teilen von Identitäten" -#: ../../include/ItemObject.php:89 ../../include/conversation.php:645 -#: ../../mod/photos.php:862 -msgid "Private Message" -msgstr "Private Nachricht" +#: ../../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 "Teile Deine Identität mit allen Webseiten im Internet. Ist dies deaktiviert, wird Deine Identität nur mit Red-Servern geteilt." -#: ../../include/ItemObject.php:126 ../../include/conversation.php:637 -msgid "Select" -msgstr "Auswählen" +#: ../../include/features.php:39 +msgid "Expert Mode" +msgstr "Expertenmodus" -#: ../../include/ItemObject.php:130 -msgid "Save to Folder" -msgstr "In Ordner speichern" +#: ../../include/features.php:39 +msgid "Enable Expert Mode to provide advanced configuration options" +msgstr "Aktiviere den Expertenmodus, um fortgeschrittene Konfigurationsoptionen zu aktivieren" -#: ../../include/ItemObject.php:142 ../../include/ItemObject.php:154 -msgid "View all" -msgstr "Alles anzeigen" +#: ../../include/features.php:40 +msgid "Premium Channel" +msgstr "Premium-Kanal" -#: ../../include/ItemObject.php:151 -msgctxt "noun" -msgid "Dislike" -msgid_plural "Dislikes" -msgstr[0] "Gefällt nicht" -msgstr[1] "Gefällt nicht" +#: ../../include/features.php:40 +msgid "" +"Allows you to set restrictions and terms on those that connect with your " +"channel" +msgstr "Ermöglicht Einschränkungen und Bedingungen für Kontakte dieses Kanals" + +#: ../../include/features.php:45 +msgid "Post Composition Features" +msgstr "Nachbearbeitungsfunktionen" -#: ../../include/ItemObject.php:179 -msgid "Add Star" -msgstr "Stern hinzufügen" +#: ../../include/features.php:47 +msgid "Use Markdown" +msgstr "Markdown benutzen" -#: ../../include/ItemObject.php:180 -msgid "Remove Star" -msgstr "Stern entfernen" +#: ../../include/features.php:47 +msgid "Allow use of \"Markdown\" to format posts" +msgstr "Erlaube Markdown zur Formatierung von Beiträgen" -#: ../../include/ItemObject.php:181 -msgid "Toggle Star Status" -msgstr "Stern-Status umschalten" +#: ../../include/features.php:48 +msgid "Post Preview" +msgstr "Voransicht" -#: ../../include/ItemObject.php:185 -msgid "starred" -msgstr "markiert" +#: ../../include/features.php:48 +msgid "Allow previewing posts and comments before publishing them" +msgstr "Erlaube Voransicht von Beiträgen und Kommentaren vor Veröffentlichung" -#: ../../include/ItemObject.php:194 ../../include/conversation.php:652 -msgid "Message signature validated" -msgstr "Signatur überprüft" +#: ../../include/features.php:49 ../../include/widgets.php:513 +#: ../../mod/sources.php:88 +msgid "Channel Sources" +msgstr "Kanal-Quellen" -#: ../../include/ItemObject.php:195 ../../include/conversation.php:653 -msgid "Message signature incorrect" -msgstr "Signatur nicht korrekt" +#: ../../include/features.php:49 +msgid "Automatically import channel content from other channels or feeds" +msgstr "Importiere automatisch Inhalte für diesen Kanal von anderen Kanälen oder Feeds" -#: ../../include/ItemObject.php:203 -msgid "Add Tag" -msgstr "Tag hinzufügen" +#: ../../include/features.php:50 +msgid "Even More Encryption" +msgstr "Noch mehr Verschlüsselung" -#: ../../include/ItemObject.php:221 ../../mod/photos.php:992 -msgid "I like this (toggle)" -msgstr "Mir gefällt das (Umschalter)" +#: ../../include/features.php:50 +msgid "" +"Allow optional encryption of content end-to-end with a shared secret key" +msgstr "Erlaube optionale Verschlüsselung von Inhalten (Ende-zu-Ende mit geteiltem Sicherheitsschlüssel)" -#: ../../include/ItemObject.php:222 ../../mod/photos.php:993 -msgid "I don't like this (toggle)" -msgstr "Mir gefällt das nicht (Umschalter)" +#: ../../include/features.php:55 +msgid "Network and Stream Filtering" +msgstr "Netzwerk- und Stream-Filter" -#: ../../include/ItemObject.php:226 -msgid "Share This" -msgstr "Teilen" +#: ../../include/features.php:56 +msgid "Search by Date" +msgstr "Suche nach Datum" -#: ../../include/ItemObject.php:226 -msgid "share" -msgstr "Teilen" +#: ../../include/features.php:56 +msgid "Ability to select posts by date ranges" +msgstr "Möglichkeit, Beiträge nach Zeiträumen auszuwählen" -#: ../../include/ItemObject.php:249 ../../include/ItemObject.php:250 -#, php-format -msgid "View %s's profile - %s" -msgstr "Schaue Dir %ss Profil an – %s" +#: ../../include/features.php:57 +msgid "Collections Filter" +msgstr "Filter für Sammlung" -#: ../../include/ItemObject.php:251 -msgid "to" -msgstr "an" +#: ../../include/features.php:57 +msgid "Enable widget to display Network posts only from selected collections" +msgstr "Aktiviere nur Netzwerk-Beiträge von ausgewählten Sammlungen" -#: ../../include/ItemObject.php:252 -msgid "via" -msgstr "via" +#: ../../include/features.php:58 ../../include/widgets.php:272 +msgid "Saved Searches" +msgstr "Gespeicherte Suchanfragen" -#: ../../include/ItemObject.php:253 -msgid "Wall-to-Wall" -msgstr "Wall-to-Wall" +#: ../../include/features.php:58 +msgid "Save search terms for re-use" +msgstr "Suchbegriffe zur Wiederverwendung abspeichern" -#: ../../include/ItemObject.php:254 -msgid "via Wall-To-Wall:" -msgstr "via Wall-To-Wall:" +#: ../../include/features.php:59 +msgid "Network Personal Tab" +msgstr "Persönlicher Netzwerkreiter" -#: ../../include/ItemObject.php:265 ../../include/conversation.php:698 -#, php-format -msgid " from %s" -msgstr "von %s" +#: ../../include/features.php:59 +msgid "Enable tab to display only Network posts that you've interacted on" +msgstr "Aktiviere Reiter nur für die Netzwerk-Beiträge, mit denen Du interagiert hast" -#: ../../include/ItemObject.php:268 ../../include/conversation.php:701 -#, php-format -msgid "last edited: %s" -msgstr "zuletzt bearbeitet: %s" +#: ../../include/features.php:60 +msgid "Network New Tab" +msgstr "Netzwerkreiter Neu" -#: ../../include/ItemObject.php:269 ../../include/conversation.php:702 -#, php-format -msgid "Expires: %s" -msgstr "Verfällt: %s" +#: ../../include/features.php:60 +msgid "Enable tab to display all new Network activity" +msgstr "Aktiviere Reiter, um alle neuen Netzwerkaktivitäten zu zeigen" -#: ../../include/ItemObject.php:290 -msgid "Save Bookmarks" -msgstr "Favoriten speichern" +#: ../../include/features.php:61 +msgid "Affinity Tool" +msgstr "Beziehungs-Tool" -#: ../../include/ItemObject.php:291 -msgid "Add to Calendar" -msgstr "Zum Kalender hinzufügen" +#: ../../include/features.php:61 +msgid "Filter stream activity by depth of relationships" +msgstr "Filter Aktivitätenstream nach Tiefe der Beziehung" -#: ../../include/ItemObject.php:299 -msgctxt "noun" -msgid "Likes" -msgstr "Gefällt mir" +#: ../../include/features.php:62 +msgid "Suggest Channels" +msgstr "Kanäle vorschlagen" -#: ../../include/ItemObject.php:300 -msgctxt "noun" -msgid "Dislikes" -msgstr "Gefällt nicht" +#: ../../include/features.php:62 +msgid "Show channel suggestions" +msgstr "Kanal-Vorschläge anzeigen" -#: ../../include/ItemObject.php:305 ../../include/acl_selectors.php:249 -msgid "Close" -msgstr "Schließen" +#: ../../include/features.php:67 +msgid "Post/Comment Tools" +msgstr "Beitrag-/Kommentar-Tools" -#: ../../include/ItemObject.php:310 ../../include/conversation.php:719 -#: ../../include/conversation.php:1153 ../../mod/photos.php:995 -#: ../../mod/editpost.php:121 ../../mod/editwebpage.php:152 -#: ../../mod/mail.php:234 ../../mod/mail.php:349 ../../mod/editblock.php:120 -#: ../../mod/editlayout.php:115 -msgid "Please wait" -msgstr "Bitte warten" +#: ../../include/features.php:69 +msgid "Edit Sent Posts" +msgstr "Bearbeite gesendete Beiträge" -#: ../../include/ItemObject.php:331 -#, php-format -msgid "%d comment" -msgid_plural "%d comments" -msgstr[0] "%d Kommentar" -msgstr[1] "%d Kommentare" +#: ../../include/features.php:69 +msgid "Edit and correct posts and comments after sending" +msgstr "Bearbeite und korrigiere Beiträge und Kommentare nach dem Senden" -#: ../../include/ItemObject.php:596 ../../mod/photos.php:1011 -#: ../../mod/photos.php:1098 -msgid "This is you" -msgstr "Das bist Du" +#: ../../include/features.php:70 +msgid "Tagging" +msgstr "Verschlagworten" -#: ../../include/ItemObject.php:600 -msgid "Bold" -msgstr "Fett" +#: ../../include/features.php:70 +msgid "Ability to tag existing posts" +msgstr "Möglichkeit, um existierende Beiträge zu verschlagworten" -#: ../../include/ItemObject.php:601 -msgid "Italic" -msgstr "Kursiv" +#: ../../include/features.php:71 +msgid "Post Categories" +msgstr "Beitrags-Kategorien" -#: ../../include/ItemObject.php:602 -msgid "Underline" -msgstr "Unterstrichen" +#: ../../include/features.php:71 +msgid "Add categories to your posts" +msgstr "Kategorien für Beiträge" -#: ../../include/ItemObject.php:603 -msgid "Quote" -msgstr "Zitat" +#: ../../include/features.php:72 +msgid "Ability to file posts under folders" +msgstr "Möglichkeit, Beiträge in Verzeichnissen zu sammeln" -#: ../../include/ItemObject.php:604 -msgid "Code" -msgstr "Code" +#: ../../include/features.php:73 +msgid "Dislike Posts" +msgstr "Gefällt-mir-nicht Beiträge" -#: ../../include/ItemObject.php:605 -msgid "Image" -msgstr "Bild" +#: ../../include/features.php:73 +msgid "Ability to dislike posts/comments" +msgstr "„Gefällt mir nicht“ ermöglichen" -#: ../../include/ItemObject.php:606 -msgid "Link" -msgstr "Link" +#: ../../include/features.php:74 +msgid "Star Posts" +msgstr "Beiträge mit Sternchen versehen" -#: ../../include/ItemObject.php:607 -msgid "Video" -msgstr "Video" +#: ../../include/features.php:74 +msgid "Ability to mark special posts with a star indicator" +msgstr "Möglichkeit, spezielle Beiträge mit Sternchen-Symbol zu markieren" -#: ../../include/ItemObject.php:611 ../../include/conversation.php:1179 -#: ../../mod/editpost.php:148 ../../mod/mail.php:240 ../../mod/mail.php:354 -msgid "Encrypt text" -msgstr "Text verschlüsseln" +#: ../../include/features.php:75 +msgid "Tag Cloud" +msgstr "Schlagwort-Wolke" -#: ../../include/security.php:320 -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 "Das Security-Token des Formulars war nicht korrekt. Das ist wahrscheinlich passiert, weil das Formular zu lange (>3 Stunden) offen war, bevor es abgeschickt wurde." +#: ../../include/features.php:75 +msgid "Provide a personal tag cloud on your channel page" +msgstr "Persönliche Schlagwort-Wolke auf Deiner Kanal-Seite anzeigen" -#: ../../include/text.php:321 -msgid "prev" -msgstr "vorherige" +#: ../../include/follow.php:28 +msgid "Channel is blocked on this site." +msgstr "Der Kanal ist auf dieser Seite blockiert " -#: ../../include/text.php:323 -msgid "first" -msgstr "erste" +#: ../../include/follow.php:33 +msgid "Channel location missing." +msgstr "Adresse des Kanals fehlt." -#: ../../include/text.php:352 -msgid "last" -msgstr "letzte" +#: ../../include/follow.php:86 +msgid "Response from remote channel was incomplete." +msgstr "Antwort des entfernten Kanals war unvollständig." -#: ../../include/text.php:355 -msgid "next" -msgstr "nächste" +#: ../../include/follow.php:103 +msgid "Channel was deleted and no longer exists." +msgstr "Kanal wurde gelöscht und existiert nicht mehr." -#: ../../include/text.php:367 -msgid "older" -msgstr "älter" +#: ../../include/follow.php:139 ../../include/follow.php:208 +msgid "Protocol disabled." +msgstr "Protokoll deaktiviert." -#: ../../include/text.php:369 -msgid "newer" -msgstr "neuer" +#: ../../include/follow.php:182 +msgid "Channel discovery failed." +msgstr "Kanalsuche fehlgeschlagen" + +#: ../../include/follow.php:198 +msgid "local account not found." +msgstr "Lokales Konto nicht gefunden." -#: ../../include/text.php:736 -msgid "No connections" -msgstr "Keine Verbindungen" +#: ../../include/follow.php:225 +msgid "Cannot connect to yourself." +msgstr "Du kannst Dich nicht mit Dir selbst verbinden." -#: ../../include/text.php:749 -#, php-format -msgid "%d Connection" -msgid_plural "%d Connections" -msgstr[0] "%d Verbindung" -msgstr[1] "%d Verbindungen" +#: ../../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 "Es hat früher schon einmal eine Sammlung mit diesem Namen existiert, die gelöscht wurde. Es könnten von damals noch Elemente (Beiträge, Dateien etc.) vorhanden sein, die allen jetzigen und zukünftigen Mitgliedern dieser Sammlung den Zugriff erlauben. Wenn das nicht Dein Plan war, erstelle bitte eine neue Sammlung mit einem anderen Namen." -#: ../../include/text.php:762 -msgid "View Connections" -msgstr "Verbindungen anzeigen" +#: ../../include/group.php:234 +msgid "Default privacy group for new contacts" +msgstr "Standard-Sammlung für neue Kontakte" -#: ../../include/text.php:822 ../../include/text.php:834 -#: ../../include/nav.php:173 ../../include/apps.php:145 -#: ../../mod/search.php:30 -msgid "Search" -msgstr "Suche" +#: ../../include/group.php:253 ../../mod/admin.php:737 +msgid "All Channels" +msgstr "Alle Kanäle" -#: ../../include/text.php:823 ../../include/text.php:835 -#: ../../include/widgets.php:193 ../../mod/admin.php:1341 -#: ../../mod/admin.php:1362 ../../mod/filer.php:50 ../../mod/rbmark.php:28 -#: ../../mod/rbmark.php:98 -msgid "Save" -msgstr "Speichern" +#: ../../include/group.php:275 +msgid "edit" +msgstr "Bearbeiten" -#: ../../include/text.php:901 -msgid "poke" -msgstr "anstupsen" +#: ../../include/group.php:297 +msgid "Collections" +msgstr "Sammlungen" -#: ../../include/text.php:901 ../../include/conversation.php:243 -msgid "poked" -msgstr "stupste" +#: ../../include/group.php:298 +msgid "Edit collection" +msgstr "Sammlung bearbeiten" -#: ../../include/text.php:902 -msgid "ping" -msgstr "anpingen" +#: ../../include/group.php:299 +msgid "Create a new collection" +msgstr "Neue Sammlung erzeugen" -#: ../../include/text.php:902 -msgid "pinged" -msgstr "pingte" +#: ../../include/group.php:300 +msgid "Channels not in any collection" +msgstr "Kanäle, die nicht in einer Sammlung sind" -#: ../../include/text.php:903 -msgid "prod" -msgstr "knuffen" +#: ../../include/group.php:302 ../../include/widgets.php:273 +msgid "add" +msgstr "hinzufügen" -#: ../../include/text.php:903 -msgid "prodded" -msgstr "knuffte" +#: ../../include/identity.php:31 ../../mod/item.php:1358 +msgid "Unable to obtain identity information from database" +msgstr "Kann keine Identitäts-Informationen aus Datenbank beziehen" -#: ../../include/text.php:904 -msgid "slap" -msgstr "ohrfeigen" +#: ../../include/identity.php:66 +msgid "Empty name" +msgstr "Namensfeld leer" -#: ../../include/text.php:904 -msgid "slapped" -msgstr "ohrfeigte" +#: ../../include/identity.php:68 +msgid "Name too long" +msgstr "Name ist zu lang" -#: ../../include/text.php:905 -msgid "finger" -msgstr "befummeln" +#: ../../include/identity.php:169 +msgid "No account identifier" +msgstr "Keine Account-Kennung" -#: ../../include/text.php:905 -msgid "fingered" -msgstr "befummelte" +#: ../../include/identity.php:182 +msgid "Nickname is required." +msgstr "Spitzname ist erforderlich." -#: ../../include/text.php:906 -msgid "rebuff" -msgstr "eine Abfuhr erteilen" +#: ../../include/identity.php:196 +msgid "Reserved nickname. Please choose another." +msgstr "Reservierter Kurzname. Bitte wähle einen anderen." -#: ../../include/text.php:906 -msgid "rebuffed" -msgstr "zurückgewiesen" +#: ../../include/identity.php:201 ../../include/dimport.php:34 +msgid "" +"Nickname has unsupported characters or is already being used on this site." +msgstr "Der Spitzname enthält nicht-unterstütze Zeichen oder wird bereits auf dieser Seite genutzt." -#: ../../include/text.php:915 -msgid "happy" -msgstr "glücklich" +#: ../../include/identity.php:283 +msgid "Unable to retrieve created identity" +msgstr "Kann die erstellte Identität nicht empfangen" -#: ../../include/text.php:916 -msgid "sad" -msgstr "traurig" +#: ../../include/identity.php:343 +msgid "Default Profile" +msgstr "Standard-Profil" -#: ../../include/text.php:917 -msgid "mellow" -msgstr "sanft" +#: ../../include/identity.php:382 ../../include/identity.php:383 +#: ../../include/identity.php:390 ../../include/widgets.php:407 +#: ../../include/profile_selectors.php:80 ../../mod/settings.php:304 +#: ../../mod/settings.php:308 ../../mod/settings.php:309 +#: ../../mod/settings.php:312 ../../mod/settings.php:323 +#: ../../mod/connedit.php:501 +msgid "Friends" +msgstr "Freunde" -#: ../../include/text.php:918 -msgid "tired" -msgstr "müde" +#: ../../include/identity.php:638 +msgid "Requested channel is not available." +msgstr "Angeforderte Kanal nicht verfügbar." -#: ../../include/text.php:919 -msgid "perky" -msgstr "frech" +#: ../../include/identity.php:686 ../../mod/achievements.php:11 +#: ../../mod/profile.php:16 ../../mod/blocks.php:10 ../../mod/connect.php:13 +#: ../../mod/webpages.php:8 ../../mod/filestorage.php:48 +#: ../../mod/layouts.php:8 ../../mod/hcard.php:8 +msgid "Requested profile is not available." +msgstr "Erwünschte Profil ist nicht verfügbar." -#: ../../include/text.php:920 -msgid "angry" -msgstr "sauer" +#: ../../include/identity.php:849 ../../mod/profiles.php:722 +msgid "Change profile photo" +msgstr "Profilfoto ändern" -#: ../../include/text.php:921 -msgid "stupified" -msgstr "verblüfft" +#: ../../include/identity.php:855 +msgid "Profiles" +msgstr "Profile" -#: ../../include/text.php:922 -msgid "puzzled" -msgstr "verwirrt" +#: ../../include/identity.php:855 +msgid "Manage/edit profiles" +msgstr "Profile verwalten/bearbeiten" -#: ../../include/text.php:923 -msgid "interested" -msgstr "interessiert" +#: ../../include/identity.php:856 ../../mod/profiles.php:723 +msgid "Create New Profile" +msgstr "Neues Profil erstellen" -#: ../../include/text.php:924 -msgid "bitter" -msgstr "verbittert" +#: ../../include/identity.php:859 ../../include/nav.php:103 +msgid "Edit Profile" +msgstr "Profile bearbeiten" -#: ../../include/text.php:925 -msgid "cheerful" -msgstr "fröhlich" +#: ../../include/identity.php:870 ../../mod/profiles.php:734 +msgid "Profile Image" +msgstr "Profilfoto:" -#: ../../include/text.php:926 -msgid "alive" -msgstr "lebendig" +#: ../../include/identity.php:873 +msgid "visible to everybody" +msgstr "sichtbar für jeden" -#: ../../include/text.php:927 -msgid "annoyed" -msgstr "verärgert" +#: ../../include/identity.php:874 ../../mod/profiles.php:617 +#: ../../mod/profiles.php:738 +msgid "Edit visibility" +msgstr "Sichtbarkeit bearbeiten" -#: ../../include/text.php:928 -msgid "anxious" -msgstr "unruhig" +#: ../../include/identity.php:888 ../../include/identity.php:1125 +#: ../../mod/directory.php:158 +msgid "Gender:" +msgstr "Geschlecht:" -#: ../../include/text.php:929 -msgid "cranky" -msgstr "schrullig" +#: ../../include/identity.php:889 ../../include/identity.php:1169 +#: ../../mod/directory.php:160 +msgid "Status:" +msgstr "Status:" -#: ../../include/text.php:930 -msgid "disturbed" -msgstr "verstört" +#: ../../include/identity.php:890 ../../include/identity.php:1180 +#: ../../mod/directory.php:162 +msgid "Homepage:" +msgstr "Homepage:" -#: ../../include/text.php:931 -msgid "frustrated" -msgstr "frustriert" +#: ../../include/identity.php:891 ../../mod/dirprofile.php:151 +msgid "Online Now" +msgstr "gerade online" -#: ../../include/text.php:932 -msgid "depressed" -msgstr "deprimiert" +#: ../../include/identity.php:969 ../../include/identity.php:1049 +#: ../../mod/ping.php:298 +msgid "g A l F d" +msgstr "l, d. F G \\\\U\\\\h\\\\r" -#: ../../include/text.php:933 -msgid "motivated" -msgstr "motiviert" +#: ../../include/identity.php:970 ../../include/identity.php:1050 +msgid "F d" +msgstr "d. F" -#: ../../include/text.php:934 -msgid "relaxed" -msgstr "entspannt" +#: ../../include/identity.php:1015 ../../include/identity.php:1090 +#: ../../mod/ping.php:320 +msgid "[today]" +msgstr "[Heute]" -#: ../../include/text.php:935 -msgid "surprised" -msgstr "überrascht" +#: ../../include/identity.php:1027 +msgid "Birthday Reminders" +msgstr "Geburtstags Erinnerungen" -#: ../../include/text.php:1099 -msgid "Monday" -msgstr "Montag" +#: ../../include/identity.php:1028 +msgid "Birthdays this week:" +msgstr "Geburtstage in dieser Woche:" -#: ../../include/text.php:1099 -msgid "Tuesday" -msgstr "Dienstag" +#: ../../include/identity.php:1083 +msgid "[No description]" +msgstr "[Keine Beschreibung]" -#: ../../include/text.php:1099 -msgid "Wednesday" -msgstr "Mittwoch" +#: ../../include/identity.php:1101 +msgid "Event Reminders" +msgstr "Veranstaltungs- Erinnerungen" -#: ../../include/text.php:1099 -msgid "Thursday" -msgstr "Donnerstag" +#: ../../include/identity.php:1102 +msgid "Events this week:" +msgstr "Veranstaltungen in dieser Woche:" -#: ../../include/text.php:1099 -msgid "Friday" -msgstr "Freitag" +#: ../../include/identity.php:1123 ../../mod/settings.php:947 +msgid "Full Name:" +msgstr "Voller Name:" -#: ../../include/text.php:1099 -msgid "Saturday" -msgstr "Samstag" +#: ../../include/identity.php:1130 +msgid "Like this channel" +msgstr "Dieser Kanal gefällt mir" -#: ../../include/text.php:1099 -msgid "Sunday" -msgstr "Sonntag" +#: ../../include/identity.php:1154 +msgid "j F, Y" +msgstr "j. F Y" -#: ../../include/text.php:1103 -msgid "January" -msgstr "Januar" +#: ../../include/identity.php:1155 +msgid "j F" +msgstr "j. F" -#: ../../include/text.php:1103 -msgid "February" -msgstr "Februar" +#: ../../include/identity.php:1162 +msgid "Birthday:" +msgstr "Geburtstag:" + +#: ../../include/identity.php:1166 +msgid "Age:" +msgstr "Alter:" -#: ../../include/text.php:1103 -msgid "March" -msgstr "März" +#: ../../include/identity.php:1175 +#, php-format +msgid "for %1$d %2$s" +msgstr "seit %1$d %2$s" -#: ../../include/text.php:1103 -msgid "April" -msgstr "April" +#: ../../include/identity.php:1178 ../../mod/profiles.php:639 +msgid "Sexual Preference:" +msgstr "Sexuelle Orientierung:" -#: ../../include/text.php:1103 -msgid "May" -msgstr "Mai" +#: ../../include/identity.php:1182 ../../mod/profiles.php:641 +msgid "Hometown:" +msgstr "Heimatstadt:" -#: ../../include/text.php:1103 -msgid "June" -msgstr "Juni" +#: ../../include/identity.php:1184 +msgid "Tags:" +msgstr "Schlagworte:" -#: ../../include/text.php:1103 -msgid "July" -msgstr "Juli" +#: ../../include/identity.php:1186 ../../mod/profiles.php:642 +msgid "Political Views:" +msgstr "Politische Ansichten:" -#: ../../include/text.php:1103 -msgid "August" -msgstr "August" +#: ../../include/identity.php:1188 +msgid "Religion:" +msgstr "Religion:" -#: ../../include/text.php:1103 -msgid "September" -msgstr "September" +#: ../../include/identity.php:1190 ../../mod/directory.php:164 +msgid "About:" +msgstr "Über:" -#: ../../include/text.php:1103 -msgid "October" -msgstr "Oktober" +#: ../../include/identity.php:1192 +msgid "Hobbies/Interests:" +msgstr "Hobbys/Interessen:" -#: ../../include/text.php:1103 -msgid "November" -msgstr "November" +#: ../../include/identity.php:1194 ../../mod/profiles.php:645 +msgid "Likes:" +msgstr "Gefällt:" -#: ../../include/text.php:1103 -msgid "December" -msgstr "Dezember" +#: ../../include/identity.php:1196 ../../mod/profiles.php:646 +msgid "Dislikes:" +msgstr "Gefällt nicht:" -#: ../../include/text.php:1181 -msgid "unknown.???" -msgstr "unbekannt.???" +#: ../../include/identity.php:1199 +msgid "Contact information and Social Networks:" +msgstr "Kontaktinformation und soziale Netzwerke:" -#: ../../include/text.php:1182 -msgid "bytes" -msgstr "Bytes" +#: ../../include/identity.php:1201 +msgid "My other channels:" +msgstr "Meine anderen Kanäle:" -#: ../../include/text.php:1221 -msgid "remove category" -msgstr "Kategorie entfernen" +#: ../../include/identity.php:1203 +msgid "Musical interests:" +msgstr "Musikalische Interessen:" -#: ../../include/text.php:1291 -msgid "remove from file" -msgstr "aus der Datei entfernen" +#: ../../include/identity.php:1205 +msgid "Books, literature:" +msgstr "Bücher, Literatur:" -#: ../../include/text.php:1356 ../../include/text.php:1368 -msgid "Click to open/close" -msgstr "Klicke zum Öffnen/Schließen" +#: ../../include/identity.php:1207 +msgid "Television:" +msgstr "Fernsehen:" -#: ../../include/text.php:1523 ../../mod/events.php:414 -msgid "Link to Source" -msgstr "Link zur Quelle" +#: ../../include/identity.php:1209 +msgid "Film/dance/culture/entertainment:" +msgstr "Film/Tanz/Kultur/Unterhaltung:" -#: ../../include/text.php:1542 -msgid "Select a page layout: " -msgstr "Ein Seiten-Layout auswählen:" +#: ../../include/identity.php:1211 +msgid "Love/Romance:" +msgstr "Liebe/Romantik:" -#: ../../include/text.php:1545 ../../include/text.php:1610 -msgid "default" -msgstr "Standard" +#: ../../include/identity.php:1213 +msgid "Work/employment:" +msgstr "Arbeit/Anstellung:" -#: ../../include/text.php:1581 -msgid "Page content type: " -msgstr "Content-Typ der Seite:" +#: ../../include/identity.php:1215 +msgid "School/education:" +msgstr "Schule/Ausbildung:" -#: ../../include/text.php:1622 -msgid "Select an alternate language" -msgstr "Wähle eine alternative Sprache" +#: ../../include/identity.php:1235 +msgid "Like this thing" +msgstr "Gefällt mir" -#: ../../include/text.php:1743 ../../include/conversation.php:120 -#: ../../include/diaspora.php:1924 ../../mod/subthread.php:72 -#: ../../mod/subthread.php:174 ../../mod/tagger.php:45 ../../mod/like.php:294 -msgid "photo" -msgstr "Foto" +#: ../../include/widgets.php:86 ../../include/nav.php:171 +#: ../../mod/apps.php:33 +msgid "Apps" +msgstr "Apps" -#: ../../include/text.php:1746 ../../include/conversation.php:123 -#: ../../mod/tagger.php:49 -msgid "event" -msgstr "Ereignis" +#: ../../include/widgets.php:87 +msgid "System" +msgstr "System" -#: ../../include/text.php:1749 ../../include/conversation.php:148 -#: ../../include/diaspora.php:1924 ../../mod/subthread.php:72 -#: ../../mod/subthread.php:174 ../../mod/tagger.php:53 ../../mod/like.php:294 -msgid "status" -msgstr "Status" +#: ../../include/widgets.php:90 +msgid "Create Personal App" +msgstr "Persönliche App erstellen" -#: ../../include/text.php:1751 ../../include/conversation.php:150 -#: ../../mod/tagger.php:55 -msgid "comment" -msgstr "Kommentar" +#: ../../include/widgets.php:91 +msgid "Edit Personal App" +msgstr "Persönliche App bearbeiten" -#: ../../include/text.php:1756 -msgid "activity" -msgstr "Aktivität" +#: ../../include/widgets.php:137 ../../mod/suggest.php:53 +msgid "Ignore/Hide" +msgstr "Ignorieren/Verstecken" -#: ../../include/text.php:2028 -msgid "Design" -msgstr "Design" +#: ../../include/widgets.php:143 ../../mod/connections.php:267 +msgid "Suggestions" +msgstr "Vorschläge" -#: ../../include/text.php:2030 -msgid "Blocks" -msgstr "Blöcke" +#: ../../include/widgets.php:144 +msgid "See more..." +msgstr "Mehr anzeigen …" -#: ../../include/text.php:2031 -msgid "Menus" -msgstr "Menüs" +#: ../../include/widgets.php:166 +#, php-format +msgid "You have %1$.0f of %2$.0f allowed connections." +msgstr "Du bist %1$.0f von maximal %2$.0f erlaubten Verbindungen eingegangen." -#: ../../include/text.php:2032 -msgid "Layouts" -msgstr "Layouts" +#: ../../include/widgets.php:172 +msgid "Add New Connection" +msgstr "Neue Verbindung hinzufügen" -#: ../../include/text.php:2033 -msgid "Pages" -msgstr "Seiten" +#: ../../include/widgets.php:173 +msgid "Enter the channel address" +msgstr "Adresse des Kanals eingeben" -#: ../../include/dir_fns.php:56 -msgid "Sort Options" -msgstr "Sortieroptionen" +#: ../../include/widgets.php:174 +msgid "Example: bob@example.com, http://example.com/barbara" +msgstr "Beispiel: bob@beispiel.com, http://beispiel.com/barbara" -#: ../../include/dir_fns.php:57 -msgid "Alphabetic" -msgstr "alphabetisch" +#: ../../include/widgets.php:191 +msgid "Notes" +msgstr "Notizen" -#: ../../include/dir_fns.php:58 -msgid "Reverse Alphabetic" -msgstr "Entgegengesetzt alphabetisch" +#: ../../include/widgets.php:263 +msgid "Remove term" +msgstr "Eintrag löschen" -#: ../../include/dir_fns.php:59 -msgid "Newest to Oldest" -msgstr "Neueste zuerst" +#: ../../include/widgets.php:342 +msgid "Archives" +msgstr "Archive" -#: ../../include/dir_fns.php:71 -msgid "Enable Safe Search" -msgstr "Sichere Suche einschalten" +#: ../../include/widgets.php:404 +msgid "Refresh" +msgstr "Aktualisieren" -#: ../../include/dir_fns.php:73 -msgid "Disable Safe Search" -msgstr "Sichere Suche ausschalten" +#: ../../include/widgets.php:405 ../../mod/connedit.php:498 +msgid "Me" +msgstr "Ich" -#: ../../include/dir_fns.php:75 -msgid "Safe Mode" -msgstr "Sicherer Modus" +#: ../../include/widgets.php:406 ../../mod/connedit.php:500 +msgid "Best Friends" +msgstr "Beste Freunde" -#: ../../include/bbcode.php:112 ../../include/bbcode.php:653 -#: ../../include/bbcode.php:656 ../../include/bbcode.php:661 -#: ../../include/bbcode.php:664 ../../include/bbcode.php:667 -#: ../../include/bbcode.php:670 ../../include/bbcode.php:675 -#: ../../include/bbcode.php:678 ../../include/bbcode.php:683 -#: ../../include/bbcode.php:686 ../../include/bbcode.php:689 -#: ../../include/bbcode.php:692 -msgid "Image/photo" -msgstr "Bild/Foto" +#: ../../include/widgets.php:408 +msgid "Co-workers" +msgstr "Kollegen" -#: ../../include/bbcode.php:147 ../../include/bbcode.php:703 -msgid "Encrypted content" -msgstr "Verschlüsselter Inhalt" +#: ../../include/widgets.php:409 ../../mod/connedit.php:502 +msgid "Former Friends" +msgstr "ehem. Freunde" -#: ../../include/bbcode.php:165 -msgid "Install design element: " -msgstr "Design-Element installieren:" +#: ../../include/widgets.php:410 ../../mod/connedit.php:503 +msgid "Acquaintances" +msgstr "Bekannte" -#: ../../include/bbcode.php:171 -msgid "QR code" -msgstr "QR-Code" +#: ../../include/widgets.php:411 +msgid "Everybody" +msgstr "Jeder" -#: ../../include/bbcode.php:220 -#, php-format -msgid "%1$s wrote the following %2$s %3$s" -msgstr "%1$s schrieb den folgenden %2$s %3$s" +#: ../../include/widgets.php:445 +msgid "Account settings" +msgstr "Konto-Einstellungen" -#: ../../include/bbcode.php:222 -msgid "post" -msgstr "Beitrag" +#: ../../include/widgets.php:451 +msgid "Channel settings" +msgstr "Kanal-Einstellungen" -#: ../../include/bbcode.php:621 -msgid "$1 spoiler" -msgstr "$1 Spoiler" +#: ../../include/widgets.php:457 +msgid "Additional features" +msgstr "Zusätzliche Funktionen" -#: ../../include/bbcode.php:641 -msgid "$1 wrote:" -msgstr "$1 schrieb:" +#: ../../include/widgets.php:463 +msgid "Feature settings" +msgstr "Funktions-Einstellungen" -#: ../../include/enotify.php:41 -msgid "Red Matrix Notification" -msgstr "Red Matrix Benachrichtigung" +#: ../../include/widgets.php:469 +msgid "Display settings" +msgstr "Anzeige-Einstellungen" -#: ../../include/enotify.php:42 -msgid "redmatrix" -msgstr "redmatrix" +#: ../../include/widgets.php:475 +msgid "Connected apps" +msgstr "Verbundene Apps" -#: ../../include/enotify.php:44 -msgid "Thank You," -msgstr "Danke." +#: ../../include/widgets.php:481 +msgid "Export channel" +msgstr "Kanal exportieren" -#: ../../include/enotify.php:46 -#, php-format -msgid "%s Administrator" -msgstr "der Administrator von %s" +#: ../../include/widgets.php:487 +msgid "Export content" +msgstr "Kanal-Inhalte exportieren" -#: ../../include/enotify.php:81 -#, php-format -msgid "%s " -msgstr "%s " +#: ../../include/widgets.php:496 +msgid "Automatic Permissions (Advanced)" +msgstr "Automatische Berechtigungen (Erweitert)" -#: ../../include/enotify.php:85 -#, php-format -msgid "[Red:Notify] New mail received at %s" -msgstr "[Red:Benachrichtigung] Neue Mail auf %s empfangen" +#: ../../include/widgets.php:504 +msgid "Premium Channel Settings" +msgstr "Premium-Kanal-Einstellungen" -#: ../../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 hat Dir eine private Nachricht auf %3$s gesendet." +#: ../../include/widgets.php:538 ../../mod/mail.php:124 +#: ../../mod/message.php:31 +msgid "Messages" +msgstr "Nachrichten" -#: ../../include/enotify.php:88 -#, php-format -msgid "%1$s sent you %2$s." -msgstr "%1$s hat Dir %2$s geschickt." +#: ../../include/widgets.php:543 +msgid "Check Mail" +msgstr "E-Mails abrufen" -#: ../../include/enotify.php:88 -msgid "a private message" -msgstr "eine private Nachricht" +#: ../../include/widgets.php:548 ../../include/nav.php:209 +msgid "New Message" +msgstr "Neue Nachricht" -#: ../../include/enotify.php:89 -#, php-format -msgid "Please visit %s to view and/or reply to your private messages." -msgstr "Bitte besuche %s, um die private Nachricht anzusehen und/oder darauf zu antworten." +#: ../../include/widgets.php:624 +msgid "Chat Rooms" +msgstr "Chaträume" -#: ../../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 hat [zrl=%3$s]a %4$s[/zrl] kommentiert" +#: ../../include/widgets.php:642 +msgid "Bookmarked Chatrooms" +msgstr "Gespeicherte Chatrooms" -#: ../../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 hat [zrl=%3$s]%4$ss %5$s[/zrl] kommentiert" +#: ../../include/widgets.php:660 +msgid "Suggested Chatrooms" +msgstr "Chatraum-Vorschläge" -#: ../../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 hat [zrl=%3$s]Deinen %4$s[/zrl] kommentiert" +#: ../../include/Contact.php:123 +msgid "New window" +msgstr "Neues Fenster" -#: ../../include/enotify.php:172 -#, php-format -msgid "[Red:Notify] Comment to conversation #%1$d by %2$s" -msgstr "[Red:Benachrichtigung] Kommentar in Unterhaltung #%1$d von %2$s" +#: ../../include/Contact.php:124 +msgid "Open the selected location in a different window or browser tab" +msgstr "Öffne die markierte Adresse in einem neuen Browser Fenster oder Tab" -#: ../../include/enotify.php:173 +#: ../../include/Contact.php:211 ../../mod/admin.php:649 #, php-format -msgid "%1$s, %2$s commented on an item/conversation you have been following." -msgstr "%1$s, %2$s hat eine Unterhaltung kommentiert, der Du folgst." +msgid "User '%s' deleted" +msgstr "Benutzer '%s' gelöscht" -#: ../../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 "Bitte besuche %s, um die Unterhaltung anzusehen und/oder zu kommentieren." +#: ../../include/datetime.php:43 ../../include/datetime.php:45 +msgid "Miscellaneous" +msgstr "Verschiedenes" -#: ../../include/enotify.php:182 -#, php-format -msgid "[Red:Notify] %s posted to your profile wall" -msgstr "[Red:Hinweis] %s schrieb auf Deine Pinnwand" +#: ../../include/datetime.php:238 +msgid "never" +msgstr "Nie" -#: ../../include/enotify.php:184 -#, php-format -msgid "%1$s, %2$s posted to your profile wall at %3$s" -msgstr "%1$s, %2$s hat auf Deine Pinnwand auf %3$s geschrieben" +#: ../../include/datetime.php:244 +msgid "less than a second ago" +msgstr "Vor weniger als einer Sekunde" -#: ../../include/enotify.php:186 -#, php-format -msgid "%1$s, %2$s posted to [zrl=%3$s]your wall[/zrl]" -msgstr "%1$s, %2$s hat auf [zrl=%3$s]Deine Pinnwand[/zrl] geschrieben" +#: ../../include/datetime.php:247 +msgid "year" +msgstr "Jahr" -#: ../../include/enotify.php:210 -#, php-format -msgid "[Red:Notify] %s tagged you" -msgstr "[Red:Benachrichtigung] %s hat Dich erwähnt" +#: ../../include/datetime.php:247 +msgid "years" +msgstr "Jahre" -#: ../../include/enotify.php:211 -#, php-format -msgid "%1$s, %2$s tagged you at %3$s" -msgstr "%1$s, %2$s hat Dich auf %3$s erwähnt" +#: ../../include/datetime.php:248 +msgid "month" +msgstr "Monat" -#: ../../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]hat Dich erwähnt[/zrl]." +#: ../../include/datetime.php:248 +msgid "months" +msgstr "Monate" -#: ../../include/enotify.php:225 -#, php-format -msgid "[Red:Notify] %1$s poked you" -msgstr "[Red:Benachrichtigung] %1$s hat Dich angestupst" +#: ../../include/datetime.php:249 +msgid "week" +msgstr "Woche" -#: ../../include/enotify.php:226 -#, php-format -msgid "%1$s, %2$s poked you at %3$s" -msgstr "%1$s, %2$s hat Dich auf %3$s angestupst" +#: ../../include/datetime.php:249 +msgid "weeks" +msgstr "Wochen" -#: ../../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]hat Dich angestupst[/zrl]." +#: ../../include/datetime.php:250 +msgid "day" +msgstr "Tag" -#: ../../include/enotify.php:243 -#, php-format -msgid "[Red:Notify] %s tagged your post" -msgstr "[Red:Benachrichtigung] %s hat Deinen Beitrag getaggt" +#: ../../include/datetime.php:250 +msgid "days" +msgstr "Tage" -#: ../../include/enotify.php:244 -#, php-format -msgid "%1$s, %2$s tagged your post at %3$s" -msgstr "%1$s, %2$s hat Deinen Beitrag auf %3$s verschlagwortet" +#: ../../include/datetime.php:251 +msgid "hour" +msgstr "Stunde" -#: ../../include/enotify.php:245 -#, php-format -msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]" -msgstr "%1$s, %2$s hat [zrl=%3$s]Deinen Beitrag[/zrl] verschlagwortet" +#: ../../include/datetime.php:251 +msgid "hours" +msgstr "Stunden" -#: ../../include/enotify.php:257 -msgid "[Red:Notify] Introduction received" -msgstr "[Red:Benachrichtigung] Vorstellung erhalten" +#: ../../include/datetime.php:252 +msgid "minute" +msgstr "Minute" -#: ../../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, Du hast eine neue Verbindungsanfrage von '%2$s' auf %3$s erhalten" +#: ../../include/datetime.php:252 +msgid "minutes" +msgstr "Minuten" -#: ../../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, Du hast [zrl=%2$s]eine neue Verbindungsanfrage[/zrl] von %3$s erhalten." +#: ../../include/datetime.php:253 +msgid "second" +msgstr "Sekunde" -#: ../../include/enotify.php:263 ../../include/enotify.php:282 -#, php-format -msgid "You may visit their profile at %s" -msgstr "Du kannst Dir das Profil unter %s ansehen" +#: ../../include/datetime.php:253 +msgid "seconds" +msgstr "Sekunden" -#: ../../include/enotify.php:265 +#: ../../include/datetime.php:262 #, php-format -msgid "Please visit %s to approve or reject the connection request." -msgstr "Bitte besuche %s , um die Verbindungsanfrage anzunehmen oder abzulehnen." - -#: ../../include/enotify.php:272 -msgid "[Red:Notify] Friend suggestion received" -msgstr "[Red:Benachrichtigung] Freundschaftsvorschlag erhalten" +msgid "%1$d %2$s ago" +msgstr "vor %1$d %2$s" -#: ../../include/enotify.php:273 +#: ../../include/datetime.php:467 #, php-format -msgid "%1$s, you've received a friend suggestion from '%2$s' at %3$s" -msgstr "%1$s, Du hast einen Kontaktvorschlag von „%2$s“ auf %3$s erhalten" +msgid "%1$s's birthday" +msgstr "%1$ss Geburtstag" -#: ../../include/enotify.php:274 +#: ../../include/datetime.php:468 #, php-format -msgid "" -"%1$s, you've received [zrl=%2$s]a friend suggestion[/zrl] for %3$s from " -"%4$s." -msgstr "%1$s, Du hast [zrl=%2$s]einen Kontaktvorschlag[/zrl] für %3$s von %4$s erhalten." +msgid "Happy Birthday %1$s" +msgstr "Alles Gute zum Geburtstag, %1$s" -#: ../../include/enotify.php:280 -msgid "Name:" -msgstr "Name:" +#: ../../include/message.php:18 +msgid "No recipient provided." +msgstr "Kein Empfänger angegeben" -#: ../../include/enotify.php:281 -msgid "Photo:" -msgstr "Foto:" +#: ../../include/message.php:23 +msgid "[no subject]" +msgstr "[no subject]" -#: ../../include/enotify.php:284 -#, php-format -msgid "Please visit %s to approve or reject the suggestion." -msgstr "Bitte besuche %s um den Vorschlag zu akzeptieren oder abzulehnen." +#: ../../include/message.php:45 +msgid "Unable to determine sender." +msgstr "Kann Absender nicht bestimmen." -#: ../../include/enotify.php:477 -msgid "[Red:Notify]" -msgstr "[Red:Benachrichtigung]" +#: ../../include/message.php:200 +msgid "Stored post could not be verified." +msgstr "Gespeicherter Beitrag konnten nicht überprüft werden." -#: ../../include/bookmarks.php:35 -#, php-format -msgid "%1$s's bookmarks" -msgstr "%1$ss Lesezeichen" +#: ../../include/nav.php:95 ../../include/nav.php:128 ../../boot.php:1495 +msgid "Logout" +msgstr "Abmelden" #: ../../include/nav.php:95 ../../include/nav.php:128 msgid "End this session" @@ -2670,11 +2906,6 @@ msgstr "Home" msgid "Your posts and conversations" msgstr "Deine Beiträge und Unterhaltungen" -#: ../../include/nav.php:99 ../../include/conversation.php:945 -#: ../../mod/connedit.php:415 ../../mod/connedit.php:529 -msgid "View Profile" -msgstr "Profil ansehen" - #: ../../include/nav.php:99 msgid "Your profile page" msgstr "Deine Profilseite" @@ -2691,11 +2922,6 @@ msgstr "Profile verwalten" msgid "Edit your profile" msgstr "Profil bearbeiten" -#: ../../include/nav.php:105 ../../include/apps.php:137 -#: ../../include/conversation.php:1537 ../../mod/fbrowser.php:25 -msgid "Photos" -msgstr "Fotos" - #: ../../include/nav.php:105 msgid "Your photos" msgstr "Deine Bilder" @@ -2704,28 +2930,14 @@ msgstr "Deine Bilder" msgid "Your files" msgstr "Deine Dateien" -#: ../../include/nav.php:111 ../../include/apps.php:144 -msgid "Chat" -msgstr "Chat" - #: ../../include/nav.php:111 msgid "Your chatrooms" msgstr "Deine Chaträume" -#: ../../include/nav.php:117 ../../include/apps.php:127 -#: ../../include/conversation.php:1570 -msgid "Bookmarks" -msgstr "Lesezeichen" - #: ../../include/nav.php:117 msgid "Your bookmarks" msgstr "Deine Lesezeichen" -#: ../../include/nav.php:121 ../../include/apps.php:134 -#: ../../include/conversation.php:1581 ../../mod/webpages.php:129 -msgid "Webpages" -msgstr "Webseiten" - #: ../../include/nav.php:121 msgid "Your webpages" msgstr "Deine Webseiten" @@ -2751,24 +2963,18 @@ msgstr "Klicke, um Dich über Deinen Heimat-Server zu authentifizieren" msgid "Home Page" msgstr "Homepage" +#: ../../include/nav.php:163 ../../mod/register.php:220 ../../boot.php:1472 +msgid "Register" +msgstr "Registrieren" + #: ../../include/nav.php:163 msgid "Create an account" msgstr "Erzeuge ein Konto" -#: ../../include/nav.php:168 ../../include/apps.php:140 ../../mod/help.php:60 -#: ../../mod/help.php:65 -msgid "Help" -msgstr "Hilfe" - #: ../../include/nav.php:168 msgid "Help and documentation" msgstr "Hilfe und Dokumentation" -#: ../../include/nav.php:171 ../../include/widgets.php:86 -#: ../../mod/apps.php:33 -msgid "Apps" -msgstr "Apps" - #: ../../include/nav.php:171 msgid "Applications, utilities, links, games" msgstr "Anwendungen (Apps), Zubehör, Links, Spiele" @@ -2777,19 +2983,10 @@ msgstr "Anwendungen (Apps), Zubehör, Links, Spiele" msgid "Search site content" msgstr "Durchsuche Seiten-Inhalt" -#: ../../include/nav.php:176 ../../include/apps.php:139 -#: ../../mod/directory.php:226 -msgid "Directory" -msgstr "Verzeichnis" - #: ../../include/nav.php:176 msgid "Channel Locator" msgstr "Kanal-Verzeichnis" -#: ../../include/nav.php:190 ../../include/apps.php:131 -msgid "Matrix" -msgstr "Matrix" - #: ../../include/nav.php:190 msgid "Your matrix" msgstr "Deine Matrix" @@ -2798,10 +2995,6 @@ msgstr "Deine Matrix" msgid "Mark all matrix notifications seen" msgstr "Markiere alle Matrix-Benachrichtigungen als angesehen" -#: ../../include/nav.php:193 ../../include/apps.php:135 -msgid "Channel Home" -msgstr "Mein Kanal" - #: ../../include/nav.php:193 msgid "Channel home" msgstr "Mein Kanal" @@ -2830,10 +3023,6 @@ msgstr "Alle Benachrichtigungen ansehen" msgid "Mark all system notifications seen" msgstr "Markiere alle System-Benachrichtigungen als gesehen" -#: ../../include/nav.php:204 ../../include/apps.php:141 -msgid "Mail" -msgstr "Mail" - #: ../../include/nav.php:204 msgid "Private mail" msgstr "Persönliche Mail" @@ -2854,15 +3043,6 @@ msgstr "Eingang" msgid "Outbox" msgstr "Ausgang" -#: ../../include/nav.php:209 ../../include/widgets.php:545 -msgid "New Message" -msgstr "Neue Nachricht" - -#: ../../include/nav.php:212 ../../include/apps.php:138 -#: ../../mod/events.php:436 -msgid "Events" -msgstr "Veranstaltungen" - #: ../../include/nav.php:212 msgid "Event Calendar" msgstr "Veranstaltungskalender" @@ -2875,21 +3055,10 @@ msgstr "Alle Ereignisse ansehen" msgid "Mark all events seen" msgstr "Markiere alle Ereignisse als gesehen" -#: ../../include/nav.php:216 ../../include/apps.php:130 -#: ../../mod/manage.php:148 -msgid "Channel Manager" -msgstr "Kanal-Manager" - #: ../../include/nav.php:216 msgid "Manage Your Channels" msgstr "Verwalte Deine Kanäle" -#: ../../include/nav.php:218 ../../include/apps.php:132 -#: ../../include/widgets.php:521 ../../mod/admin.php:953 -#: ../../mod/admin.php:1158 -msgid "Settings" -msgstr "Einstellungen" - #: ../../include/nav.php:218 msgid "Account/Channel Settings" msgstr "Konto-/Kanal-Einstellungen" @@ -2902,4423 +3071,4158 @@ msgstr "Administration" msgid "Site Setup and Configuration" msgstr "Seiten-Einrichtung und -Konfiguration" -#: ../../include/nav.php:257 ../../include/conversation.php:847 -msgid "Loading..." -msgstr "Lädt ..." - #: ../../include/nav.php:262 msgid "Please wait..." msgstr "Bitte warten..." -#: ../../include/features.php:23 -msgid "General Features" -msgstr "Allgemeine Funktionen" - -#: ../../include/features.php:25 -msgid "Content Expiration" -msgstr "Verfall von Inhalten" - -#: ../../include/features.php:25 -msgid "Remove posts/comments and/or private messages at a future time" -msgstr "Lösche Beiträge, Kommentare und/oder private Nachrichten automatisch zu einem zukünftigen Datum." - -#: ../../include/features.php:26 -msgid "Multiple Profiles" -msgstr "Mehrfachprofile" - -#: ../../include/features.php:26 -msgid "Ability to create multiple profiles" -msgstr "Mehrfachprofile anlegen können" - -#: ../../include/features.php:27 -msgid "Advanced Profiles" -msgstr "Erweiterte Profile" - -#: ../../include/features.php:27 -msgid "Additional profile sections and selections" -msgstr "Stellt zusätzliche Bereiche und Felder im Profil zur Verfügung" - -#: ../../include/features.php:28 -msgid "Profile Import/Export" -msgstr "Profil-Import/Export" - -#: ../../include/features.php:28 -msgid "Save and load profile details across sites/channels" -msgstr "Speichere Dein Profil, um es in einen anderen Kanal zu importieren" - -#: ../../include/features.php:29 -msgid "Web Pages" -msgstr "Webseiten" - -#: ../../include/features.php:29 -msgid "Provide managed web pages on your channel" -msgstr "Stelle verwaltete Webseiten in Deinem Kanal zur Verfügung" - -#: ../../include/features.php:30 -msgid "Private Notes" -msgstr "Private Notizen" +#: ../../include/network.php:590 +msgid "view full size" +msgstr "In Vollbildansicht anschauen" -#: ../../include/features.php:30 -msgid "Enables a tool to store notes and reminders" -msgstr "Werkzeug zum Speichern von Notizen und Erinnerungen aktivieren" +#: ../../include/zot.php:661 +msgid "Invalid data packet" +msgstr "Ungültiges Datenpaket" -#: ../../include/features.php:34 -msgid "Navigation Channel Select" -msgstr "Kanal-Auswahl in der Navigationsleiste" +#: ../../include/zot.php:677 +msgid "Unable to verify channel signature" +msgstr "Konnte die Signatur des Kanals nicht verifizieren" -#: ../../include/features.php:34 -msgid "Change channels directly from within the navigation dropdown menu" -msgstr "Wechsle direkt über das Navigationsmenü zu anderen Kanälen" +#: ../../include/zot.php:1776 +#, php-format +msgid "Unable to verify site signature for %s" +msgstr "Kann die Signatur der Seite von %s nicht verifizieren" -#: ../../include/features.php:38 -msgid "Extended Identity Sharing" -msgstr "Erweitertes Teilen von Identitäten" +#: ../../include/acl_selectors.php:240 +msgid "Visible to your default audience" +msgstr "Standard-Sichtbarkeit" -#: ../../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 "Teile Deine Identität mit allen Webseiten im Internet. Ist dies deaktiviert, wird Deine Identität nur mit Red-Servern geteilt." +#: ../../include/acl_selectors.php:241 +msgid "Show" +msgstr "Zeigen" -#: ../../include/features.php:39 -msgid "Expert Mode" -msgstr "Expertenmodus" +#: ../../include/acl_selectors.php:242 +msgid "Don't show" +msgstr "Nicht zeigen" -#: ../../include/features.php:39 -msgid "Enable Expert Mode to provide advanced configuration options" -msgstr "Aktiviere den Expertenmodus, um fortgeschrittene Konfigurationsoptionen zu aktivieren" +#: ../../include/acl_selectors.php:248 ../../mod/photos.php:591 +#: ../../mod/photos.php:945 ../../mod/events.php:585 ../../mod/chat.php:209 +#: ../../mod/filestorage.php:137 +msgid "Permissions" +msgstr "Berechtigungen" -#: ../../include/features.php:40 -msgid "Premium Channel" -msgstr "Premium-Kanal" +#: ../../include/acl_selectors.php:249 ../../include/ItemObject.php:305 +#: ../../mod/photos.php:1141 +msgid "Close" +msgstr "Schließen" -#: ../../include/features.php:40 -msgid "" -"Allows you to set restrictions and terms on those that connect with your " -"channel" -msgstr "Ermöglicht Einschränkungen und Bedingungen für Kontakte dieses Kanals" +#: ../../include/api.php:1084 +msgid "Public Timeline" +msgstr "Öffentliche Zeitleiste" -#: ../../include/features.php:45 -msgid "Post Composition Features" -msgstr "Nachbearbeitungsfunktionen" +#: ../../include/photos.php:104 +#, php-format +msgid "Image exceeds website size limit of %lu bytes" +msgstr "Bild überschreitet das Limit der Webseite von %lu bytes" -#: ../../include/features.php:47 -msgid "Use Markdown" -msgstr "Markdown benutzen" +#: ../../include/photos.php:111 +msgid "Image file is empty." +msgstr "Bilddatei ist leer." -#: ../../include/features.php:47 -msgid "Allow use of \"Markdown\" to format posts" -msgstr "Erlaube Markdown zur Formatierung von Beiträgen" +#: ../../include/photos.php:140 ../../mod/profile_photo.php:216 +msgid "Unable to process image" +msgstr "Kann Bild nicht verarbeiten" -#: ../../include/features.php:48 -msgid "Post Preview" -msgstr "Voransicht" +#: ../../include/photos.php:212 +msgid "Photo storage failed." +msgstr "Foto speichern schlug fehl" -#: ../../include/features.php:48 -msgid "Allow previewing posts and comments before publishing them" -msgstr "Erlaube Voransicht von Beiträgen und Kommentaren vor Veröffentlichung" +#: ../../include/photos.php:344 +msgid "Upload New Photos" +msgstr "Lade neue Fotos hoch" -#: ../../include/features.php:49 ../../include/widgets.php:510 -#: ../../mod/sources.php:88 -msgid "Channel Sources" -msgstr "Kanal-Quellen" +#: ../../include/js_strings.php:5 +msgid "Delete this item?" +msgstr "Dieses Element löschen?" -#: ../../include/features.php:49 -msgid "Automatically import channel content from other channels or feeds" -msgstr "Importiere automatisch Inhalte für diesen Kanal von anderen Kanälen oder Feeds" +#: ../../include/js_strings.php:6 ../../include/ItemObject.php:598 +#: ../../mod/photos.php:988 ../../mod/photos.php:1098 +msgid "Comment" +msgstr "Kommentar" -#: ../../include/features.php:50 -msgid "Even More Encryption" -msgstr "Noch mehr Verschlüsselung" +#: ../../include/js_strings.php:7 ../../include/ItemObject.php:332 +msgid "[+] show all" +msgstr "[+] Zeige alle" -#: ../../include/features.php:50 -msgid "" -"Allow optional encryption of content end-to-end with a shared secret key" -msgstr "Erlaube optionale Verschlüsselung von Inhalten (Ende-zu-Ende mit geteiltem Sicherheitsschlüssel)" +#: ../../include/js_strings.php:8 +msgid "[-] show less" +msgstr "[-] zeige weniger" -#: ../../include/features.php:55 -msgid "Network and Stream Filtering" -msgstr "Netzwerk- und Stream-Filter" +#: ../../include/js_strings.php:9 +msgid "[+] expand" +msgstr "[+] aufklappen" -#: ../../include/features.php:56 -msgid "Search by Date" -msgstr "Suche nach Datum" +#: ../../include/js_strings.php:10 +msgid "[-] collapse" +msgstr "[-] einklappen" -#: ../../include/features.php:56 -msgid "Ability to select posts by date ranges" -msgstr "Möglichkeit, Beiträge nach Zeiträumen auszuwählen" +#: ../../include/js_strings.php:11 +msgid "Password too short" +msgstr "Kennwort zu kurz" -#: ../../include/features.php:57 -msgid "Collections Filter" -msgstr "Filter für Sammlung" +#: ../../include/js_strings.php:12 +msgid "Passwords do not match" +msgstr "Kennwörter stimmen nicht überein" -#: ../../include/features.php:57 -msgid "Enable widget to display Network posts only from selected collections" -msgstr "Aktiviere nur Netzwerk-Beiträge von ausgewählten Sammlungen" +#: ../../include/js_strings.php:13 ../../mod/photos.php:39 +msgid "everybody" +msgstr "alle" -#: ../../include/features.php:58 ../../include/widgets.php:272 -msgid "Saved Searches" -msgstr "Gespeicherte Suchanfragen" +#: ../../include/js_strings.php:14 +msgid "Secret Passphrase" +msgstr "geheime Passphrase" -#: ../../include/features.php:58 -msgid "Save search terms for re-use" -msgstr "Suchbegriffe zur Wiederverwendung abspeichern" +#: ../../include/js_strings.php:15 +msgid "Passphrase hint" +msgstr "Hinweis zur Passphrase" -#: ../../include/features.php:59 -msgid "Network Personal Tab" -msgstr "Persönlicher Netzwerkreiter" +#: ../../include/js_strings.php:16 +msgid "Notice: Permissions have changed but have not yet been submitted." +msgstr "Achtung: Berechtigungen wurden verändert, aber noch nicht gespeichert." -#: ../../include/features.php:59 -msgid "Enable tab to display only Network posts that you've interacted on" -msgstr "Aktiviere Reiter nur für die Netzwerk-Beiträge, mit denen Du interagiert hast" +#: ../../include/js_strings.php:17 +msgid "close all" +msgstr "Alle schließen" -#: ../../include/features.php:60 -msgid "Network New Tab" -msgstr "Netzwerkreiter Neu" +#: ../../include/js_strings.php:18 +msgid "Nothing new here" +msgstr "Nichts Neues hier" -#: ../../include/features.php:60 -msgid "Enable tab to display all new Network activity" -msgstr "Aktiviere Reiter, um alle neuen Netzwerkaktivitäten zu zeigen" +#: ../../include/js_strings.php:20 +msgid "timeago.prefixAgo" +msgstr "timeago.prefixAgo" -#: ../../include/features.php:61 -msgid "Affinity Tool" -msgstr "Beziehungs-Tool" +#: ../../include/js_strings.php:21 +msgid "timeago.prefixFromNow" +msgstr " " -#: ../../include/features.php:61 -msgid "Filter stream activity by depth of relationships" -msgstr "Filter Aktivitätenstream nach Tiefe der Beziehung" +#: ../../include/js_strings.php:22 +msgid "ago" +msgstr "her" -#: ../../include/features.php:62 -msgid "Suggest Channels" -msgstr "Kanäle vorschlagen" +#: ../../include/js_strings.php:23 +msgid "from now" +msgstr "von jetzt" -#: ../../include/features.php:62 -msgid "Show channel suggestions" -msgstr "Kanal-Vorschläge anzeigen" +#: ../../include/js_strings.php:24 +msgid "less than a minute" +msgstr "weniger als eine Minute" -#: ../../include/features.php:67 -msgid "Post/Comment Tools" -msgstr "Beitrag-/Kommentar-Tools" +#: ../../include/js_strings.php:25 +msgid "about a minute" +msgstr "ungefähr eine Minute" -#: ../../include/features.php:69 -msgid "Edit Sent Posts" -msgstr "Bearbeite gesendete Beiträge" +#: ../../include/js_strings.php:26 +#, php-format +msgid "%d minutes" +msgstr "%d Minuten" -#: ../../include/features.php:69 -msgid "Edit and correct posts and comments after sending" -msgstr "Bearbeite und korrigiere Beiträge und Kommentare nach dem Senden" +#: ../../include/js_strings.php:27 +msgid "about an hour" +msgstr "ungefähr eine Stunde" -#: ../../include/features.php:70 -msgid "Tagging" -msgstr "Verschlagworten" +#: ../../include/js_strings.php:28 +#, php-format +msgid "about %d hours" +msgstr "ungefähr %d Stunden" -#: ../../include/features.php:70 -msgid "Ability to tag existing posts" -msgstr "Möglichkeit, um existierende Beiträge zu verschlagworten" +#: ../../include/js_strings.php:29 +msgid "a day" +msgstr "ein Tag" -#: ../../include/features.php:71 -msgid "Post Categories" -msgstr "Beitrags-Kategorien" +#: ../../include/js_strings.php:30 +#, php-format +msgid "%d days" +msgstr "%d Tage" -#: ../../include/features.php:71 -msgid "Add categories to your posts" -msgstr "Kategorien für Beiträge" +#: ../../include/js_strings.php:31 +msgid "about a month" +msgstr "ungefähr ein Monat" -#: ../../include/features.php:72 -msgid "Ability to file posts under folders" -msgstr "Möglichkeit, Beiträge in Verzeichnissen zu sammeln" +#: ../../include/js_strings.php:32 +#, php-format +msgid "%d months" +msgstr "%d Monate" -#: ../../include/features.php:73 -msgid "Dislike Posts" -msgstr "Gefällt-mir-nicht Beiträge" +#: ../../include/js_strings.php:33 +msgid "about a year" +msgstr "ungefähr ein Jahr" -#: ../../include/features.php:73 -msgid "Ability to dislike posts/comments" -msgstr "„Gefällt mir nicht“ ermöglichen" +#: ../../include/js_strings.php:34 +#, php-format +msgid "%d years" +msgstr "%d Jahre" -#: ../../include/features.php:74 -msgid "Star Posts" -msgstr "Beiträge mit Sternchen versehen" +#: ../../include/js_strings.php:35 +msgid " " +msgstr " " -#: ../../include/features.php:74 -msgid "Ability to mark special posts with a star indicator" -msgstr "Möglichkeit, spezielle Beiträge mit Sternchen-Symbol zu markieren" +#: ../../include/js_strings.php:36 +msgid "timeago.numbers" +msgstr "timeago.numbers" -#: ../../include/features.php:75 -msgid "Tag Cloud" -msgstr "Schlagwort-Wolke" +#: ../../include/profile_selectors.php:6 +#: ../../include/profile_selectors.php:23 +msgid "Male" +msgstr "Männlich" -#: ../../include/features.php:75 -msgid "Provide a personal tag cloud on your channel page" -msgstr "Persönliche Schlagwort-Wolke auf Deiner Kanal-Seite anzeigen" +#: ../../include/profile_selectors.php:6 +#: ../../include/profile_selectors.php:23 +msgid "Female" +msgstr "Weiblich" -#: ../../include/notify.php:23 -msgid "created a new post" -msgstr "Neuer Beitrag wurde erzeugt" +#: ../../include/profile_selectors.php:6 +msgid "Currently Male" +msgstr "Momentan männlich" -#: ../../include/notify.php:24 -#, php-format -msgid "commented on %s's post" -msgstr "hat %s's Beitrag kommentiert" +#: ../../include/profile_selectors.php:6 +msgid "Currently Female" +msgstr "Momentan weiblich" -#: ../../include/apps.php:126 -msgid "Site Admin" -msgstr "Hub-Administration" +#: ../../include/profile_selectors.php:6 +msgid "Mostly Male" +msgstr "Größtenteils männlich" -#: ../../include/apps.php:128 -msgid "Address Book" -msgstr "Adressbuch" +#: ../../include/profile_selectors.php:6 +msgid "Mostly Female" +msgstr "Größtenteils weiblich" -#: ../../include/apps.php:142 ../../mod/mood.php:131 -msgid "Mood" -msgstr "Laune" +#: ../../include/profile_selectors.php:6 +msgid "Transgender" +msgstr "Transsexuell" -#: ../../include/apps.php:143 ../../include/conversation.php:951 -msgid "Poke" -msgstr "Anstupsen" +#: ../../include/profile_selectors.php:6 +msgid "Intersex" +msgstr "Zwischengeschlechtlich" -#: ../../include/apps.php:146 -msgid "Probe" -msgstr "Testen" +#: ../../include/profile_selectors.php:6 +msgid "Transsexual" +msgstr "Transsexuell" -#: ../../include/apps.php:147 -msgid "Suggest" -msgstr "Empfehlungen" +#: ../../include/profile_selectors.php:6 +msgid "Hermaphrodite" +msgstr "Zwitter" -#: ../../include/apps.php:148 -msgid "Random Channel" -msgstr "Zufälliger Kanal" +#: ../../include/profile_selectors.php:6 +msgid "Neuter" +msgstr "Geschlechtslos" -#: ../../include/apps.php:149 -msgid "Invite" -msgstr "Einladen" +#: ../../include/profile_selectors.php:6 +msgid "Non-specific" +msgstr "unklar" -#: ../../include/apps.php:150 -msgid "Features" -msgstr "Funktionen" +#: ../../include/profile_selectors.php:6 +msgid "Undecided" +msgstr "Unentschieden" -#: ../../include/apps.php:151 -msgid "Language" -msgstr "Sprache" +#: ../../include/profile_selectors.php:42 +#: ../../include/profile_selectors.php:61 +msgid "Males" +msgstr "Männer" -#: ../../include/apps.php:152 -msgid "Post" -msgstr "Beitrag" +#: ../../include/profile_selectors.php:42 +#: ../../include/profile_selectors.php:61 +msgid "Females" +msgstr "Frauen" -#: ../../include/apps.php:153 -msgid "Profile Photo" -msgstr "Profilfoto" +#: ../../include/profile_selectors.php:42 +msgid "Gay" +msgstr "Schwul" -#: ../../include/apps.php:242 ../../mod/settings.php:79 -#: ../../mod/settings.php:545 -msgid "Update" -msgstr "Aktualisieren" +#: ../../include/profile_selectors.php:42 +msgid "Lesbian" +msgstr "Lesbisch" -#: ../../include/apps.php:242 -msgid "Install" -msgstr "Installieren" +#: ../../include/profile_selectors.php:42 +msgid "No Preference" +msgstr "Keine Bevorzugung" -#: ../../include/apps.php:247 -msgid "Purchase" -msgstr "Kaufen" +#: ../../include/profile_selectors.php:42 +msgid "Bisexual" +msgstr "Bisexuell" -#: ../../include/api.php:1072 -msgid "Public Timeline" -msgstr "Öffentliche Zeitleiste" +#: ../../include/profile_selectors.php:42 +msgid "Autosexual" +msgstr "Autosexuell" -#: ../../include/chat.php:10 -msgid "Missing room name" -msgstr "Der Chatraum hat keinen Namen" +#: ../../include/profile_selectors.php:42 +msgid "Abstinent" +msgstr "Enthaltsam" -#: ../../include/chat.php:19 -msgid "Duplicate room name" -msgstr "Name des Chatraums bereits vergeben" +#: ../../include/profile_selectors.php:42 +msgid "Virgin" +msgstr "Jungfräulich" -#: ../../include/chat.php:68 ../../include/chat.php:76 -msgid "Invalid room specifier." -msgstr "Ungültiger Raumbezeichner." +#: ../../include/profile_selectors.php:42 +msgid "Deviant" +msgstr "Abweichend" -#: ../../include/chat.php:105 -msgid "Room not found." -msgstr "Chatraum konnte nicht gefunden werden." +#: ../../include/profile_selectors.php:42 +msgid "Fetish" +msgstr "Fetisch" -#: ../../include/chat.php:126 -msgid "Room is full" -msgstr "Der Raum ist voll" +#: ../../include/profile_selectors.php:42 +msgid "Oodles" +msgstr "Unmengen" -#: ../../include/conversation.php:126 ../../mod/like.php:89 -msgid "channel" -msgstr "Kanal" +#: ../../include/profile_selectors.php:42 +msgid "Nonsexual" +msgstr "Sexlos" -#: ../../include/conversation.php:164 ../../include/diaspora.php:1953 -#: ../../mod/like.php:331 -#, php-format -msgid "%1$s likes %2$s's %3$s" -msgstr "%1$s gefällt %2$ss %3$s" +#: ../../include/profile_selectors.php:80 +#: ../../include/profile_selectors.php:97 +msgid "Single" +msgstr "Single" -#: ../../include/conversation.php:167 ../../mod/like.php:333 -#, php-format -msgid "%1$s doesn't like %2$s's %3$s" -msgstr "%1$s gefällt %2$ss %3$s nicht" +#: ../../include/profile_selectors.php:80 +msgid "Lonely" +msgstr "Einsam" -#: ../../include/conversation.php:204 -#, php-format -msgid "%1$s is now connected with %2$s" -msgstr "%1$s ist jetzt mit %2$s verbunden" +#: ../../include/profile_selectors.php:80 +msgid "Available" +msgstr "Verfügbar" -#: ../../include/conversation.php:239 -#, php-format -msgid "%1$s poked %2$s" -msgstr "%1$s stupste %2$s an" +#: ../../include/profile_selectors.php:80 +msgid "Unavailable" +msgstr "Nicht verfügbar" -#: ../../include/conversation.php:261 ../../mod/mood.php:63 -#, php-format -msgctxt "mood" -msgid "%1$s is %2$s" -msgstr "%1$s ist %2$s" +#: ../../include/profile_selectors.php:80 +msgid "Has crush" +msgstr "Verguckt" -#: ../../include/conversation.php:674 -#, php-format -msgid "View %s's profile @ %s" -msgstr "%ss Profil auf %s ansehen" +#: ../../include/profile_selectors.php:80 +msgid "Infatuated" +msgstr "Verknallt" -#: ../../include/conversation.php:689 -msgid "Categories:" -msgstr "Kategorien:" +#: ../../include/profile_selectors.php:80 +#: ../../include/profile_selectors.php:97 +msgid "Dating" +msgstr "Lerne gerade jemanden kennen" -#: ../../include/conversation.php:690 -msgid "Filed under:" -msgstr "Gespeichert unter:" +#: ../../include/profile_selectors.php:80 +msgid "Unfaithful" +msgstr "Treulos" -#: ../../include/conversation.php:717 -msgid "View in context" -msgstr "Im Zusammenhang anschauen" +#: ../../include/profile_selectors.php:80 +msgid "Sex Addict" +msgstr "Sexabhängig" -#: ../../include/conversation.php:843 -msgid "remove" -msgstr "lösche" +#: ../../include/profile_selectors.php:80 +msgid "Friends/Benefits" +msgstr "Freunde/Begünstigte" -#: ../../include/conversation.php:848 -msgid "Delete Selected Items" -msgstr "Lösche die ausgewählten Elemente" +#: ../../include/profile_selectors.php:80 +msgid "Casual" +msgstr "Lose" -#: ../../include/conversation.php:942 -msgid "View Source" -msgstr "Quelle anzeigen" +#: ../../include/profile_selectors.php:80 +msgid "Engaged" +msgstr "Verlobt" -#: ../../include/conversation.php:943 -msgid "Follow Thread" -msgstr "Unterhaltung folgen" +#: ../../include/profile_selectors.php:80 +#: ../../include/profile_selectors.php:97 +msgid "Married" +msgstr "Verheiratet" -#: ../../include/conversation.php:944 -msgid "View Status" -msgstr "Status ansehen" +#: ../../include/profile_selectors.php:80 +msgid "Imaginarily married" +msgstr "Gewissermaßen verheiratet" -#: ../../include/conversation.php:946 -msgid "View Photos" -msgstr "Fotos ansehen" +#: ../../include/profile_selectors.php:80 +msgid "Partners" +msgstr "Partner" -#: ../../include/conversation.php:947 -msgid "Matrix Activity" -msgstr "Matrix-Aktivität" +#: ../../include/profile_selectors.php:80 +#: ../../include/profile_selectors.php:97 +msgid "Cohabiting" +msgstr "Lebensgemeinschaft" -#: ../../include/conversation.php:949 -msgid "Edit Contact" -msgstr "Kontakt bearbeiten" +#: ../../include/profile_selectors.php:80 +msgid "Common law" +msgstr "Informelle Ehe" -#: ../../include/conversation.php:950 -msgid "Send PM" -msgstr "Sende PN" +#: ../../include/profile_selectors.php:80 +msgid "Happy" +msgstr "Glücklich" -#: ../../include/conversation.php:1024 -#, php-format -msgid "%s likes this." -msgstr "%s gefällt das." +#: ../../include/profile_selectors.php:80 +msgid "Not looking" +msgstr "Nicht Ausschau haltend" -#: ../../include/conversation.php:1024 -#, php-format -msgid "%s doesn't like this." -msgstr "%s gefällt das nicht." +#: ../../include/profile_selectors.php:80 +msgid "Swinger" +msgstr "Swinger" -#: ../../include/conversation.php:1028 -#, php-format -msgid "%2$d people like this." -msgid_plural "%2$d people like this." -msgstr[0] "%2$d Person gefällt das." -msgstr[1] "%2$d Leuten gefällt das." +#: ../../include/profile_selectors.php:80 +msgid "Betrayed" +msgstr "Betrogen" -#: ../../include/conversation.php:1030 -#, php-format -msgid "%2$d people don't like this." -msgid_plural "%2$d people don't like this." -msgstr[0] "%2$d Person gefällt das nicht." -msgstr[1] "%2$d Leuten gefällt das nicht." +#: ../../include/profile_selectors.php:80 +#: ../../include/profile_selectors.php:97 +msgid "Separated" +msgstr "Getrennt" -#: ../../include/conversation.php:1036 -msgid "and" -msgstr "und" +#: ../../include/profile_selectors.php:80 +msgid "Unstable" +msgstr "Labil" -#: ../../include/conversation.php:1039 -#, php-format -msgid ", and %d other people" -msgid_plural ", and %d other people" -msgstr[0] "" -msgstr[1] ", und %d andere" +#: ../../include/profile_selectors.php:80 +#: ../../include/profile_selectors.php:97 +msgid "Divorced" +msgstr "Geschieden" -#: ../../include/conversation.php:1040 -#, php-format -msgid "%s like this." -msgstr "%s gefällt das." +#: ../../include/profile_selectors.php:80 +msgid "Imaginarily divorced" +msgstr "Gewissermaßen geschieden" -#: ../../include/conversation.php:1040 -#, php-format -msgid "%s don't like this." -msgstr "%s gefällt das nicht." +#: ../../include/profile_selectors.php:80 +#: ../../include/profile_selectors.php:97 +msgid "Widowed" +msgstr "Verwitwet" -#: ../../include/conversation.php:1097 -msgid "Visible to everybody" -msgstr "Sichtbar für jeden" +#: ../../include/profile_selectors.php:80 +msgid "Uncertain" +msgstr "Ungewiss" -#: ../../include/conversation.php:1098 ../../mod/mail.php:170 -#: ../../mod/mail.php:282 -msgid "Please enter a link URL:" -msgstr "Gib eine URL ein:" +#: ../../include/profile_selectors.php:80 +#: ../../include/profile_selectors.php:97 +msgid "It's complicated" +msgstr "Es ist kompliziert" -#: ../../include/conversation.php:1099 -msgid "Please enter a video link/URL:" -msgstr "Gib einen Video-Link/URL ein:" +#: ../../include/profile_selectors.php:80 +msgid "Don't care" +msgstr "Interessiert mich nicht" -#: ../../include/conversation.php:1100 -msgid "Please enter an audio link/URL:" -msgstr "Gib einen Audio-Link/URL ein:" +#: ../../include/profile_selectors.php:80 +msgid "Ask me" +msgstr "Frag mich mal" -#: ../../include/conversation.php:1101 -msgid "Tag term:" -msgstr "Schlagwort:" +#: ../../include/ItemObject.php:130 +msgid "Save to Folder" +msgstr "In Ordner speichern" -#: ../../include/conversation.php:1102 ../../mod/filer.php:49 -msgid "Save to Folder:" -msgstr "Speichern in Ordner:" +#: ../../include/ItemObject.php:142 ../../include/ItemObject.php:154 +#: ../../mod/photos.php:1015 ../../mod/photos.php:1027 +msgid "View all" +msgstr "Alles anzeigen" -#: ../../include/conversation.php:1103 -msgid "Where are you right now?" -msgstr "Wo bist Du jetzt grade?" +#: ../../include/ItemObject.php:151 ../../mod/photos.php:1024 +msgctxt "noun" +msgid "Dislike" +msgid_plural "Dislikes" +msgstr[0] "Gefällt nicht" +msgstr[1] "Gefällt nicht" -#: ../../include/conversation.php:1104 ../../mod/editpost.php:52 -#: ../../mod/mail.php:171 ../../mod/mail.php:283 -msgid "Expires YYYY-MM-DD HH:MM" -msgstr "Verfällt YYYY-MM-DD HH;MM" +#: ../../include/ItemObject.php:179 +msgid "Add Star" +msgstr "Stern hinzufügen" -#: ../../include/conversation.php:1128 ../../mod/photos.php:994 -#: ../../mod/editwebpage.php:201 ../../mod/layouts.php:122 -#: ../../mod/editblock.php:168 ../../mod/editlayout.php:161 -msgid "Share" -msgstr "Teilen" +#: ../../include/ItemObject.php:180 +msgid "Remove Star" +msgstr "Stern entfernen" + +#: ../../include/ItemObject.php:181 +msgid "Toggle Star Status" +msgstr "Stern-Status umschalten" -#: ../../include/conversation.php:1130 ../../mod/editwebpage.php:139 -msgid "Page link title" -msgstr "Seitentitel-Link" +#: ../../include/ItemObject.php:185 +msgid "starred" +msgstr "markiert" -#: ../../include/conversation.php:1133 -msgid "Post as" -msgstr "Posten als" +#: ../../include/ItemObject.php:203 +msgid "Add Tag" +msgstr "Tag hinzufügen" -#: ../../include/conversation.php:1134 ../../mod/editpost.php:113 -#: ../../mod/editwebpage.php:144 ../../mod/mail.php:231 ../../mod/mail.php:345 -#: ../../mod/editblock.php:112 ../../mod/editlayout.php:107 -msgid "Upload photo" -msgstr "Foto hochladen" +#: ../../include/ItemObject.php:221 ../../mod/photos.php:967 +msgid "I like this (toggle)" +msgstr "Mir gefällt das (Umschalter)" -#: ../../include/conversation.php:1135 -msgid "upload photo" -msgstr "Foto hochladen" +#: ../../include/ItemObject.php:222 ../../mod/photos.php:968 +msgid "I don't like this (toggle)" +msgstr "Mir gefällt das nicht (Umschalter)" -#: ../../include/conversation.php:1136 ../../mod/editpost.php:114 -#: ../../mod/editwebpage.php:145 ../../mod/mail.php:232 ../../mod/mail.php:346 -#: ../../mod/editblock.php:113 ../../mod/editlayout.php:108 -msgid "Attach file" -msgstr "Datei anhängen" +#: ../../include/ItemObject.php:226 +msgid "Share This" +msgstr "Teilen" -#: ../../include/conversation.php:1137 -msgid "attach file" -msgstr "Datei anfügen" +#: ../../include/ItemObject.php:226 +msgid "share" +msgstr "Teilen" -#: ../../include/conversation.php:1138 ../../mod/editpost.php:115 -#: ../../mod/editwebpage.php:146 ../../mod/mail.php:233 ../../mod/mail.php:347 -#: ../../mod/editblock.php:114 ../../mod/editlayout.php:109 -msgid "Insert web link" -msgstr "Link einfügen" +#: ../../include/ItemObject.php:249 ../../include/ItemObject.php:250 +#, php-format +msgid "View %s's profile - %s" +msgstr "Schaue Dir %ss Profil an – %s" -#: ../../include/conversation.php:1139 -msgid "web link" -msgstr "Web-Link" +#: ../../include/ItemObject.php:251 +msgid "to" +msgstr "an" -#: ../../include/conversation.php:1140 -msgid "Insert video link" -msgstr "Video-Link einfügen" +#: ../../include/ItemObject.php:252 +msgid "via" +msgstr "via" -#: ../../include/conversation.php:1141 -msgid "video link" -msgstr "Video-Link" +#: ../../include/ItemObject.php:253 +msgid "Wall-to-Wall" +msgstr "Wall-to-Wall" -#: ../../include/conversation.php:1142 -msgid "Insert audio link" -msgstr "Audio-Link einfügen" +#: ../../include/ItemObject.php:254 +msgid "via Wall-To-Wall:" +msgstr "via Wall-To-Wall:" -#: ../../include/conversation.php:1143 -msgid "audio link" -msgstr "Audio-Link" +#: ../../include/ItemObject.php:290 +msgid "Save Bookmarks" +msgstr "Favoriten speichern" -#: ../../include/conversation.php:1144 ../../mod/editpost.php:119 -#: ../../mod/editwebpage.php:150 ../../mod/editblock.php:118 -#: ../../mod/editlayout.php:113 -msgid "Set your location" -msgstr "Standort" +#: ../../include/ItemObject.php:291 +msgid "Add to Calendar" +msgstr "Zum Kalender hinzufügen" -#: ../../include/conversation.php:1145 -msgid "set location" -msgstr "Standort" +#: ../../include/ItemObject.php:299 ../../mod/photos.php:1135 +msgctxt "noun" +msgid "Likes" +msgstr "Gefällt mir" -#: ../../include/conversation.php:1146 ../../mod/editpost.php:120 -#: ../../mod/editwebpage.php:151 ../../mod/editblock.php:119 -#: ../../mod/editlayout.php:114 -msgid "Clear browser location" -msgstr "Browser-Standort löschen" +#: ../../include/ItemObject.php:300 ../../mod/photos.php:1136 +msgctxt "noun" +msgid "Dislikes" +msgstr "Gefällt nicht" -#: ../../include/conversation.php:1147 -msgid "clear location" -msgstr "Standort löschen" +#: ../../include/ItemObject.php:331 +#, php-format +msgid "%d comment" +msgid_plural "%d comments" +msgstr[0] "%d Kommentar" +msgstr[1] "%d Kommentare" -#: ../../include/conversation.php:1149 ../../mod/editpost.php:132 -#: ../../mod/editwebpage.php:167 ../../mod/editblock.php:132 -#: ../../mod/editlayout.php:126 -msgid "Set title" -msgstr "Titel" +#: ../../include/ItemObject.php:596 ../../mod/photos.php:986 +#: ../../mod/photos.php:1096 +msgid "This is you" +msgstr "Das bist Du" -#: ../../include/conversation.php:1152 ../../mod/editpost.php:134 -#: ../../mod/editwebpage.php:169 ../../mod/events.php:560 -#: ../../mod/editblock.php:135 ../../mod/editlayout.php:129 -msgid "Categories (comma-separated list)" -msgstr "Kategorien (Kommagetrennte Liste)" +#: ../../include/ItemObject.php:599 ../../mod/mood.php:135 +#: ../../mod/photos.php:547 ../../mod/photos.php:661 ../../mod/photos.php:949 +#: ../../mod/photos.php:989 ../../mod/photos.php:1099 +#: ../../mod/settings.php:518 ../../mod/settings.php:630 +#: ../../mod/settings.php:659 ../../mod/settings.php:683 +#: ../../mod/settings.php:759 ../../mod/settings.php:939 +#: ../../mod/poke.php:166 ../../mod/profiles.php:615 ../../mod/events.php:587 +#: ../../mod/chat.php:177 ../../mod/chat.php:211 ../../mod/connect.php:92 +#: ../../mod/connedit.php:546 ../../mod/setup.php:307 ../../mod/setup.php:350 +#: ../../mod/pdledit.php:58 ../../mod/sources.php:104 +#: ../../mod/sources.php:138 ../../mod/filestorage.php:146 +#: ../../mod/fsuggest.php:108 ../../mod/group.php:81 ../../mod/admin.php:414 +#: ../../mod/admin.php:725 ../../mod/admin.php:861 ../../mod/admin.php:994 +#: ../../mod/admin.php:1193 ../../mod/admin.php:1280 ../../mod/thing.php:284 +#: ../../mod/thing.php:327 ../../mod/import.php:480 ../../mod/invite.php:142 +#: ../../mod/mail.php:348 ../../mod/appman.php:99 ../../mod/poll.php:68 +#: ../../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 "Bestätigen" -#: ../../include/conversation.php:1154 ../../mod/editpost.php:122 -#: ../../mod/editwebpage.php:153 ../../mod/editblock.php:121 -#: ../../mod/editlayout.php:116 -msgid "Permission settings" -msgstr "Berechtigungs-Einstellungen" +#: ../../include/ItemObject.php:600 +msgid "Bold" +msgstr "Fett" -#: ../../include/conversation.php:1155 -msgid "permissions" -msgstr "Berechtigungen" +#: ../../include/ItemObject.php:601 +msgid "Italic" +msgstr "Kursiv" -#: ../../include/conversation.php:1162 ../../mod/editpost.php:129 -#: ../../mod/editwebpage.php:162 ../../mod/editblock.php:129 -#: ../../mod/editlayout.php:123 -msgid "Public post" -msgstr "Öffentlicher Beitrag" +#: ../../include/ItemObject.php:602 +msgid "Underline" +msgstr "Unterstrichen" -#: ../../include/conversation.php:1164 ../../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 "Beispiel: bob@example.com, mary@example.com" +#: ../../include/ItemObject.php:603 +msgid "Quote" +msgstr "Zitat" -#: ../../include/conversation.php:1177 ../../mod/editpost.php:146 -#: ../../mod/editwebpage.php:179 ../../mod/mail.php:238 ../../mod/mail.php:352 -#: ../../mod/editblock.php:146 ../../mod/editlayout.php:140 -msgid "Set expiration date" -msgstr "Verfallsdatum" +#: ../../include/ItemObject.php:604 +msgid "Code" +msgstr "Code" -#: ../../include/conversation.php:1181 ../../mod/editpost.php:150 -#: ../../mod/events.php:567 -msgid "OK" -msgstr "Ok" +#: ../../include/ItemObject.php:605 +msgid "Image" +msgstr "Bild" -#: ../../include/conversation.php:1182 ../../mod/settings.php:520 -#: ../../mod/settings.php:546 ../../mod/fbrowser.php:82 -#: ../../mod/fbrowser.php:117 ../../mod/editpost.php:151 -#: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/events.php:566 -msgid "Cancel" -msgstr "Abbrechen" +#: ../../include/ItemObject.php:606 +msgid "Link" +msgstr "Link" -#: ../../include/conversation.php:1426 -msgid "Discover" -msgstr "Entdecken" +#: ../../include/ItemObject.php:607 +msgid "Video" +msgstr "Video" -#: ../../include/conversation.php:1429 -msgid "Imported public streams" -msgstr "Importierte öffentliche Beiträge" +#: ../../mod/mood.php:132 +msgid "Set your current mood and tell your friends" +msgstr "Wähle Deine aktuelle Stimmung und teile sie mit Deinen Freunden" -#: ../../include/conversation.php:1434 -msgid "Commented Order" -msgstr "Neueste Kommentare" +#: ../../mod/photos.php:77 +msgid "Page owner information could not be retrieved." +msgstr "Informationen über den Besitzer der Seite konnten nicht gefunden werden." -#: ../../include/conversation.php:1437 -msgid "Sort by Comment Date" -msgstr "Nach Kommentardatum sortiert" +#: ../../mod/photos.php:97 +msgid "Album not found." +msgstr "Album nicht gefunden." -#: ../../include/conversation.php:1441 -msgid "Posted Order" -msgstr "Neueste Beiträge" +#: ../../mod/photos.php:119 ../../mod/photos.php:662 +msgid "Delete Album" +msgstr "Album löschen" -#: ../../include/conversation.php:1444 -msgid "Sort by Post Date" -msgstr "Nach Beitragsdatum sortiert" +#: ../../mod/photos.php:159 ../../mod/photos.php:950 +msgid "Delete Photo" +msgstr "Foto löschen" -#: ../../include/conversation.php:1449 ../../include/widgets.php:89 -msgid "Personal" -msgstr "Persönlich" +#: ../../mod/photos.php:451 ../../mod/search.php:13 ../../mod/directory.php:15 +#: ../../mod/dirprofile.php:9 ../../mod/display.php:9 +#: ../../mod/viewconnections.php:17 +msgid "Public access denied." +msgstr "Öffentlicher Zugang verweigert." -#: ../../include/conversation.php:1452 -msgid "Posts that mention or involve you" -msgstr "Beiträge mit Beteiligung Deinerseits" +#: ../../mod/photos.php:461 +msgid "No photos selected" +msgstr "Keine Fotos ausgewählt" -#: ../../include/conversation.php:1458 ../../mod/connections.php:211 -#: ../../mod/connections.php:224 ../../mod/menu.php:61 -msgid "New" -msgstr "Neu" +#: ../../mod/photos.php:507 +msgid "Access to this item is restricted." +msgstr "Der Zugriff auf dieses Foto ist eingeschränkt." -#: ../../include/conversation.php:1461 -msgid "Activity Stream - by date" -msgstr "Activity Stream – nach Datum sortiert" +#: ../../mod/photos.php:558 +#, php-format +msgid "%1$.2f MB of %2$.2f MB photo storage used." +msgstr "%1$.2f MB von %2$.2f MB Foto-Speicher belegt." -#: ../../include/conversation.php:1467 -msgid "Starred" -msgstr "Markiert" +#: ../../mod/photos.php:561 +#, php-format +msgid "%1$.2f MB photo storage used." +msgstr "%1$.2f MB Foto-Speicher belegt." -#: ../../include/conversation.php:1470 -msgid "Favourite Posts" -msgstr "Markierte Beiträge" +#: ../../mod/photos.php:583 +msgid "Upload Photos" +msgstr "Fotos hochladen" -#: ../../include/conversation.php:1477 -msgid "Spam" -msgstr "Spam" +#: ../../mod/photos.php:587 +msgid "Enter a new album name or select an existing one:" +msgstr "Gib einen neuen Albumnamen ein oder wähle einen bereits existierenden:" -#: ../../include/conversation.php:1480 -msgid "Posts flagged as SPAM" -msgstr "Nachrichten, die als SPAM markiert wurden" +#: ../../mod/photos.php:588 +msgid "Do not show a status post for this upload" +msgstr "Keine Statusnachricht für diesen Upload senden" -#: ../../include/conversation.php:1516 ../../mod/admin.php:867 -msgid "Channel" -msgstr "Kanal" +#: ../../mod/photos.php:609 +msgid "Album name could not be decoded" +msgstr "Albumname konnte nicht dekodiert werden" -#: ../../include/conversation.php:1519 -msgid "Status Messages and Posts" -msgstr "Statusnachrichten und Beiträge" +#: ../../mod/photos.php:645 ../../mod/photos.php:1159 +#: ../../mod/photos.php:1174 +msgid "Contact Photos" +msgstr "Kontakt-Bilder" -#: ../../include/conversation.php:1528 -msgid "About" -msgstr "Über" +#: ../../mod/photos.php:656 +msgid "New album name: " +msgstr "Name des neuen Albums:" -#: ../../include/conversation.php:1531 -msgid "Profile Details" -msgstr "Profil-Details" +#: ../../mod/photos.php:668 +msgid "Show Newest First" +msgstr "Zeige Neueste zuerst" -#: ../../include/conversation.php:1549 -msgid "Files and Storage" -msgstr "Dateien und Speicher" +#: ../../mod/photos.php:670 +msgid "Show Oldest First" +msgstr "Zeige Älteste zuerst" -#: ../../include/conversation.php:1558 ../../include/conversation.php:1561 -msgid "Chatrooms" -msgstr "Chaträume" +#: ../../mod/photos.php:697 ../../mod/photos.php:1206 +msgid "View Photo" +msgstr "Foto ansehen" -#: ../../include/conversation.php:1573 -msgid "Saved Bookmarks" -msgstr "Gespeicherte Lesezeichen" +#: ../../mod/photos.php:726 +msgid "Edit Album" +msgstr "Album bearbeiten" -#: ../../include/conversation.php:1584 -msgid "Manage Webpages" -msgstr "Webseiten verwalten" +#: ../../mod/photos.php:777 +msgid "Permission denied. Access to this item may be restricted." +msgstr "Berechtigung verweigert. Der Zugriff ist wahrscheinlich eingeschränkt worden." + +#: ../../mod/photos.php:779 +msgid "Photo not available" +msgstr "Foto nicht verfügbar" -#: ../../include/bb2diaspora.php:360 -msgid "Attachments:" -msgstr "Anhänge:" +#: ../../mod/photos.php:839 +msgid "Use as profile photo" +msgstr "Als Profilfoto verwenden" -#: ../../include/acl_selectors.php:240 -msgid "Visible to your default audience" -msgstr "Standard-Sichtbarkeit" +#: ../../mod/photos.php:846 +msgid "Private Photo" +msgstr "Privates Foto" -#: ../../include/acl_selectors.php:241 -msgid "Show" -msgstr "Zeigen" +#: ../../mod/photos.php:857 ../../mod/events.php:433 +msgid "Previous" +msgstr "Voriges" -#: ../../include/acl_selectors.php:242 -msgid "Don't show" -msgstr "Nicht zeigen" +#: ../../mod/photos.php:861 +msgid "View Full Size" +msgstr "In voller Größe anzeigen" -#: ../../include/acl_selectors.php:248 ../../mod/filestorage.php:137 -#: ../../mod/photos.php:604 ../../mod/photos.php:970 ../../mod/chat.php:209 -#: ../../mod/events.php:585 -msgid "Permissions" -msgstr "Berechtigungen" +#: ../../mod/photos.php:866 ../../mod/events.php:434 ../../mod/setup.php:261 +msgid "Next" +msgstr "Nächste" -#: ../../include/widgets.php:87 -msgid "System" -msgstr "System" +#: ../../mod/photos.php:903 ../../mod/delegate.php:130 ../../mod/tagrm.php:133 +msgid "Remove" +msgstr "Entferne" -#: ../../include/widgets.php:90 -msgid "Create Personal App" -msgstr "Persönliche App erstellen" +#: ../../mod/photos.php:933 +msgid "Edit photo" +msgstr "Foto bearbeiten" -#: ../../include/widgets.php:91 -msgid "Edit Personal App" -msgstr "Persönliche App bearbeiten" +#: ../../mod/photos.php:935 +msgid "Rotate CW (right)" +msgstr "Drehen im UZS (rechts)" -#: ../../include/widgets.php:137 ../../mod/suggest.php:53 -msgid "Ignore/Hide" -msgstr "Ignorieren/Verstecken" +#: ../../mod/photos.php:936 +msgid "Rotate CCW (left)" +msgstr "Drehen gegen UZS (links)" -#: ../../include/widgets.php:143 ../../mod/connections.php:267 -msgid "Suggestions" -msgstr "Vorschläge" +#: ../../mod/photos.php:939 +msgid "New album name" +msgstr "Name des neuen Albums:" -#: ../../include/widgets.php:144 -msgid "See more..." -msgstr "Mehr anzeigen …" +#: ../../mod/photos.php:942 +msgid "Caption" +msgstr "Bildunterschrift" -#: ../../include/widgets.php:166 -#, php-format -msgid "You have %1$.0f of %2$.0f allowed connections." -msgstr "Du bist %1$.0f von maximal %2$.0f erlaubten Verbindungen eingegangen." +#: ../../mod/photos.php:944 +msgid "Add a Tag" +msgstr "Schlagwort hinzufügen" -#: ../../include/widgets.php:172 -msgid "Add New Connection" -msgstr "Neue Verbindung hinzufügen" +#: ../../mod/photos.php:947 +msgid "Example: @bob, @Barbara_Jensen, @jim@example.com" +msgstr "Beispiele: @ben, @Karl_Prester, @lieschen@example.com" -#: ../../include/widgets.php:173 -msgid "Enter the channel address" -msgstr "Adresse des Kanals eingeben" +#: ../../mod/photos.php:1125 +msgid "In This Photo:" +msgstr "Auf diesem Foto:" -#: ../../include/widgets.php:174 -msgid "Example: bob@example.com, http://example.com/barbara" -msgstr "Beispiel: bob@beispiel.com, http://beispiel.com/barbara" +#: ../../mod/photos.php:1212 +msgid "View Album" +msgstr "Album ansehen" -#: ../../include/widgets.php:191 -msgid "Notes" -msgstr "Notizen" +#: ../../mod/photos.php:1235 +msgid "Recent Photos" +msgstr "Neueste Fotos" -#: ../../include/widgets.php:263 -msgid "Remove term" -msgstr "Eintrag löschen" +#: ../../mod/mitem.php:14 ../../mod/menu.php:92 +msgid "Menu not found." +msgstr "Menü nicht gefunden" -#: ../../include/widgets.php:342 -msgid "Archives" -msgstr "Archive" +#: ../../mod/mitem.php:47 +msgid "Menu element updated." +msgstr "Menü-Element aktualisiert." -#: ../../include/widgets.php:404 -msgid "Refresh" -msgstr "Aktualisieren" +#: ../../mod/mitem.php:51 +msgid "Unable to update menu element." +msgstr "Kann Menü-Element nicht aktualisieren." -#: ../../include/widgets.php:405 ../../mod/connedit.php:492 -msgid "Me" -msgstr "Ich" +#: ../../mod/mitem.php:57 +msgid "Menu element added." +msgstr "Menü-Bestandteil hinzugefügt." -#: ../../include/widgets.php:406 ../../mod/connedit.php:494 -msgid "Best Friends" -msgstr "Beste Freunde" +#: ../../mod/mitem.php:61 +msgid "Unable to add menu element." +msgstr "Kann Menü-Bestandteil nicht hinzufügen." -#: ../../include/widgets.php:408 -msgid "Co-workers" -msgstr "Kollegen" +#: ../../mod/mitem.php:78 ../../mod/dirprofile.php:175 ../../mod/menu.php:120 +#: ../../mod/xchan.php:38 +msgid "Not found." +msgstr "Nicht gefunden." -#: ../../include/widgets.php:409 ../../mod/connedit.php:496 -msgid "Former Friends" -msgstr "ehem. Freunde" +#: ../../mod/mitem.php:96 +msgid "Manage Menu Elements" +msgstr "Menü-Bestandteile verwalten" -#: ../../include/widgets.php:410 ../../mod/connedit.php:497 -msgid "Acquaintances" -msgstr "Bekannte" +#: ../../mod/mitem.php:99 +msgid "Edit menu" +msgstr "Menü bearbeiten" -#: ../../include/widgets.php:411 -msgid "Everybody" -msgstr "Jeder" +#: ../../mod/mitem.php:102 +msgid "Edit element" +msgstr "Bestandteil bearbeiten" -#: ../../include/widgets.php:443 -msgid "Account settings" -msgstr "Konto-Einstellungen" +#: ../../mod/mitem.php:103 +msgid "Drop element" +msgstr "Bestandteil löschen" -#: ../../include/widgets.php:449 -msgid "Channel settings" -msgstr "Kanal-Einstellungen" +#: ../../mod/mitem.php:104 +msgid "New element" +msgstr "Neues Bestandteil" -#: ../../include/widgets.php:455 -msgid "Additional features" -msgstr "Zusätzliche Funktionen" +#: ../../mod/mitem.php:105 +msgid "Edit this menu container" +msgstr "Diesen Menü-Container bearbeiten" -#: ../../include/widgets.php:461 -msgid "Feature settings" -msgstr "Funktions-Einstellungen" +#: ../../mod/mitem.php:106 +msgid "Add menu element" +msgstr "Menüelement hinzufügen" -#: ../../include/widgets.php:467 -msgid "Display settings" -msgstr "Anzeige-Einstellungen" +#: ../../mod/mitem.php:107 +msgid "Delete this menu item" +msgstr "Lösche dieses Menü-Bestandteil" -#: ../../include/widgets.php:473 -msgid "Connected apps" -msgstr "Verbundene Apps" +#: ../../mod/mitem.php:108 +msgid "Edit this menu item" +msgstr "Bearbeite dieses Menü-Bestandteil" -#: ../../include/widgets.php:479 -msgid "Export channel" -msgstr "Kanal exportieren" +#: ../../mod/mitem.php:131 +msgid "New Menu Element" +msgstr "Neues Menü-Bestandteil" -#: ../../include/widgets.php:485 -msgid "Export content" -msgstr "Kanal-Inhalte exportieren" +#: ../../mod/mitem.php:133 ../../mod/mitem.php:176 +msgid "Menu Item Permissions" +msgstr "Zugriffsrechte des Menü-Elements" -#: ../../include/widgets.php:491 -msgid "Automatic Permissions (Advanced)" -msgstr "Automatische Berechtigungen (Erweitert)" +#: ../../mod/mitem.php:134 ../../mod/mitem.php:177 ../../mod/settings.php:974 +msgid "(click to open/close)" +msgstr "(zum öffnen/schließen anklicken)" -#: ../../include/widgets.php:501 -msgid "Premium Channel Settings" -msgstr "Premium-Kanal-Einstellungen" +#: ../../mod/mitem.php:136 ../../mod/mitem.php:180 +msgid "Link text" +msgstr "Link Text" -#: ../../include/widgets.php:535 ../../mod/message.php:31 -#: ../../mod/mail.php:124 -msgid "Messages" -msgstr "Nachrichten" +#: ../../mod/mitem.php:137 ../../mod/mitem.php:181 +msgid "URL of link" +msgstr "URL des Links" -#: ../../include/widgets.php:540 -msgid "Check Mail" -msgstr "E-Mails abrufen" +#: ../../mod/mitem.php:138 ../../mod/mitem.php:182 +msgid "Use Red magic-auth if available" +msgstr "Verwende Red Magic-Auth wenn verfügbar" -#: ../../include/widgets.php:621 -msgid "Chat Rooms" -msgstr "Chaträume" +#: ../../mod/mitem.php:139 ../../mod/mitem.php:183 +msgid "Open link in new window" +msgstr "Öffne Link in neuem Fenster" -#: ../../include/widgets.php:639 -msgid "Bookmarked Chatrooms" -msgstr "Gespeicherte Chatrooms" +#: ../../mod/mitem.php:141 ../../mod/mitem.php:185 +msgid "Order in list" +msgstr "Reihenfolge in der Liste" -#: ../../include/widgets.php:657 -msgid "Suggested Chatrooms" -msgstr "Chatraum-Vorschläge" +#: ../../mod/mitem.php:141 ../../mod/mitem.php:185 +msgid "Higher numbers will sink to bottom of listing" +msgstr "Größere Nummern werden weiter unten in der Auflistung einsortiert" -#: ../../include/follow.php:26 -msgid "Channel is blocked on this site." -msgstr "Der Kanal ist auf dieser Seite blockiert " +#: ../../mod/mitem.php:154 +msgid "Menu item not found." +msgstr "Menü-Bestandteil nicht gefunden." -#: ../../include/follow.php:31 -msgid "Channel location missing." -msgstr "Adresse des Kanals fehlt." +#: ../../mod/mitem.php:163 +msgid "Menu item deleted." +msgstr "Menü-Bestandteil gelöscht." -#: ../../include/follow.php:80 -msgid "Response from remote channel was incomplete." -msgstr "Antwort des entfernten Kanals war unvollständig." +#: ../../mod/mitem.php:165 +msgid "Menu item could not be deleted." +msgstr "Menü-Bestandteil kann nicht gelöscht werden." -#: ../../include/follow.php:97 -msgid "Channel was deleted and no longer exists." -msgstr "Kanal wurde gelöscht und existiert nicht mehr." +#: ../../mod/mitem.php:174 +msgid "Edit Menu Element" +msgstr "Bearbeite Menü-Bestandteil" -#: ../../include/follow.php:133 ../../include/follow.php:202 -msgid "Protocol disabled." -msgstr "Protokoll deaktiviert." +#: ../../mod/mitem.php:186 ../../mod/menu.php:114 +msgid "Modify" +msgstr "Ändern" -#: ../../include/follow.php:176 -msgid "Channel discovery failed." -msgstr "Kanalsuche fehlgeschlagen" +#: ../../mod/achievements.php:34 +msgid "Some blurb about what to do when you're new here" +msgstr "Ein Hinweis, was man tun kann, wenn man neu hier ist" -#: ../../include/follow.php:192 -msgid "local account not found." -msgstr "Lokales Konto nicht gefunden." +#: ../../mod/ping.php:237 +msgid "sent you a private message" +msgstr "eine private Nachricht schicken" -#: ../../include/follow.php:219 -msgid "Cannot connect to yourself." -msgstr "Du kannst Dich nicht mit Dir selbst verbinden." +#: ../../mod/ping.php:288 +msgid "added your channel" +msgstr "hat deinen Kanal hinzugefügt" -#: ../../mod/post.php:229 -msgid "" -"Remote authentication blocked. You are logged into this site locally. Please" -" logout and retry." -msgstr "Fern-Authentifizierung blockiert. Du bist lokal auf diesem Server angemeldet. Bitte melde Dich ab und versuche es erneut." +#: ../../mod/ping.php:329 +msgid "posted an event" +msgstr "hat eine Veranstaltung veröffentlicht" -#: ../../mod/post.php:261 ../../mod/openid.php:72 ../../mod/openid.php:180 -#, php-format -msgid "Welcome %s. Remote authentication successful." -msgstr "Willkommen %s. Entfernte Authentifizierung erfolgreich." +#: ../../mod/acl.php:244 +msgid "network" +msgstr "Netzwerk" -#: ../../mod/settings.php:71 +#: ../../mod/settings.php:73 msgid "Name is required" msgstr "Name ist erforderlich" -#: ../../mod/settings.php:75 +#: ../../mod/settings.php:77 msgid "Key and Secret are required" msgstr "Schlüssel und Geheimnis werden benötigt" -#: ../../mod/settings.php:198 +#: ../../mod/settings.php:197 msgid "Passwords do not match. Password unchanged." msgstr "Kennwörter stimmen nicht überein. Kennwort nicht verändert." -#: ../../mod/settings.php:202 +#: ../../mod/settings.php:201 msgid "Empty passwords are not allowed. Password unchanged." msgstr "Leere Kennwörter sind nicht erlaubt. Kennwort nicht verändert." -#: ../../mod/settings.php:216 +#: ../../mod/settings.php:215 msgid "Password changed." msgstr "Kennwort geändert." -#: ../../mod/settings.php:218 +#: ../../mod/settings.php:217 msgid "Password update failed. Please try again." msgstr "Kennwortänderung fehlgeschlagen. Bitte versuche es noch einmal." -#: ../../mod/settings.php:232 +#: ../../mod/settings.php:231 msgid "Not valid email." msgstr "Keine gültige E-Mail Adresse." -#: ../../mod/settings.php:235 +#: ../../mod/settings.php:234 msgid "Protected email address. Cannot change to that email." msgstr "Geschützte E-Mail Adresse. Diese kann nicht verändert werden." -#: ../../mod/settings.php:244 +#: ../../mod/settings.php:243 msgid "System failure storing new email. Please try again." msgstr "Systemfehler während des Speicherns der neuen Mail. Bitte versuche es noch einmal." -#: ../../mod/settings.php:447 +#: ../../mod/settings.php:448 msgid "Settings updated." msgstr "Einstellungen aktualisiert." -#: ../../mod/settings.php:518 ../../mod/settings.php:544 -#: ../../mod/settings.php:580 +#: ../../mod/settings.php:517 ../../mod/settings.php:543 +#: ../../mod/settings.php:579 msgid "Add application" msgstr "Anwendung hinzufügen" -#: ../../mod/settings.php:521 +#: ../../mod/settings.php:520 msgid "Name of application" msgstr "Name der Anwendung" -#: ../../mod/settings.php:522 ../../mod/settings.php:548 +#: ../../mod/settings.php:521 ../../mod/settings.php:547 msgid "Consumer Key" msgstr "Consumer Key" -#: ../../mod/settings.php:522 ../../mod/settings.php:523 +#: ../../mod/settings.php:521 ../../mod/settings.php:522 msgid "Automatically generated - change if desired. Max length 20" msgstr "Automatisch erzeugt – ändern, falls erwünscht. Maximale Länge 20" -#: ../../mod/settings.php:523 ../../mod/settings.php:549 +#: ../../mod/settings.php:522 ../../mod/settings.php:548 msgid "Consumer Secret" msgstr "Consumer Secret" -#: ../../mod/settings.php:524 ../../mod/settings.php:550 +#: ../../mod/settings.php:523 ../../mod/settings.php:549 msgid "Redirect" msgstr "Umleitung" -#: ../../mod/settings.php:524 +#: ../../mod/settings.php:523 msgid "" "Redirect URI - leave blank unless your application specifically requires " "this" msgstr "Umleitungs-URl – lasse das leer, wenn Deine Anwendung es nicht explizit erfordert" -#: ../../mod/settings.php:525 ../../mod/settings.php:551 +#: ../../mod/settings.php:524 ../../mod/settings.php:550 msgid "Icon url" msgstr "Symbol-URL" -#: ../../mod/settings.php:525 +#: ../../mod/settings.php:524 msgid "Optional" msgstr "Optional" -#: ../../mod/settings.php:536 +#: ../../mod/settings.php:535 msgid "You can't edit this application." msgstr "Diese Anwendung kann nicht bearbeitet werden." -#: ../../mod/settings.php:579 +#: ../../mod/settings.php:578 msgid "Connected Apps" msgstr "Verbundene Apps" -#: ../../mod/settings.php:583 +#: ../../mod/settings.php:582 msgid "Client key starts with" msgstr "Client Key beginnt mit" -#: ../../mod/settings.php:584 +#: ../../mod/settings.php:583 msgid "No name" msgstr "Kein Name" -#: ../../mod/settings.php:585 +#: ../../mod/settings.php:584 msgid "Remove authorization" msgstr "Authorisierung aufheben" -#: ../../mod/settings.php:596 +#: ../../mod/settings.php:595 msgid "No feature settings configured" msgstr "Keine Funktions-Einstellungen konfiguriert" -#: ../../mod/settings.php:604 +#: ../../mod/settings.php:603 msgid "Feature Settings" msgstr "Funktions-Einstellungen" -#: ../../mod/settings.php:627 +#: ../../mod/settings.php:626 msgid "Account Settings" msgstr "Konto-Einstellungen" -#: ../../mod/settings.php:628 +#: ../../mod/settings.php:627 msgid "Password Settings" msgstr "Kennwort-Einstellungen" -#: ../../mod/settings.php:629 +#: ../../mod/settings.php:628 msgid "New Password:" msgstr "Neues Passwort:" -#: ../../mod/settings.php:630 +#: ../../mod/settings.php:629 msgid "Confirm:" msgstr "Bestätigen:" -#: ../../mod/settings.php:630 +#: ../../mod/settings.php:629 msgid "Leave password fields blank unless changing" msgstr "Lasse die Passwort-Felder leer, außer Du möchtest das Passwort ändern" -#: ../../mod/settings.php:632 ../../mod/settings.php:954 +#: ../../mod/settings.php:631 ../../mod/settings.php:948 msgid "Email Address:" msgstr "Email Adresse:" -#: ../../mod/settings.php:633 ../../mod/removeaccount.php:61 +#: ../../mod/settings.php:632 ../../mod/removeaccount.php:61 msgid "Remove Account" msgstr "Konto entfernen" -#: ../../mod/settings.php:634 +#: ../../mod/settings.php:633 msgid "Remove this account from this server including all its channels" msgstr "Lösche dieses Konto einschließlich aller zugehörigen Kanäle von diesem Server" -#: ../../mod/settings.php:635 ../../mod/settings.php:1019 +#: ../../mod/settings.php:634 ../../mod/settings.php:1014 msgid "Warning: This action is permanent and cannot be reversed." msgstr "Achtung: Diese Aktion ist endgültig und kann nicht rückgängig gemacht werden." -#: ../../mod/settings.php:651 +#: ../../mod/settings.php:650 msgid "Off" msgstr "Aus" -#: ../../mod/settings.php:651 +#: ../../mod/settings.php:650 msgid "On" msgstr "An" -#: ../../mod/settings.php:658 +#: ../../mod/settings.php:657 msgid "Additional Features" msgstr "Zusätzliche Funktionen" -#: ../../mod/settings.php:683 +#: ../../mod/settings.php:682 msgid "Connector Settings" msgstr "Connector-Einstellungen" -#: ../../mod/settings.php:713 ../../mod/admin.php:362 +#: ../../mod/settings.php:712 ../../mod/admin.php:362 msgid "No special theme for mobile devices" -msgstr "Keine spezielle Theme für mobile Geräte" - -#: ../../mod/settings.php:722 -#, php-format -msgid "%s - (Experimental)" -msgstr "%s – (experimentell)" - -#: ../../mod/settings.php:758 -msgid "Display Settings" -msgstr "Anzeige-Einstellungen" - -#: ../../mod/settings.php:764 -msgid "Display Theme:" -msgstr "Anzeige-Theme:" - -#: ../../mod/settings.php:765 -msgid "Mobile Theme:" -msgstr "Mobile Theme:" - -#: ../../mod/settings.php:766 -msgid "Enable user zoom on mobile devices" -msgstr "Zoom auf Mobilgeräten aktivieren" - -#: ../../mod/settings.php:767 -msgid "Update browser every xx seconds" -msgstr "Browser alle xx Sekunden aktualisieren" - -#: ../../mod/settings.php:767 -msgid "Minimum of 10 seconds, no maximum" -msgstr "Minimum 10 Sekunden, kein Maximum" - -#: ../../mod/settings.php:768 -msgid "Maximum number of conversations to load at any time:" -msgstr "Maximale Anzahl von Unterhaltungen, die auf einmal geladen werden sollen:" - -#: ../../mod/settings.php:768 -msgid "Maximum of 100 items" -msgstr "Maximum: 100 Beiträge" - -#: ../../mod/settings.php:769 -msgid "Don't show emoticons" -msgstr "Emoticons nicht zeigen" - -#: ../../mod/settings.php:770 -msgid "Link post titles to source" -msgstr "Beitragstitel zum Originalbeitrag verlinken" - -#: ../../mod/settings.php:771 -msgid "System Page Layout Editor - (advanced)" -msgstr "System-Seitenlayout-Editor (für Experten)" - -#: ../../mod/settings.php:807 -msgid "Nobody except yourself" -msgstr "Niemand außer Dir selbst" - -#: ../../mod/settings.php:808 -msgid "Only those you specifically allow" -msgstr "Nur die, denen Du es explizit erlaubst" - -#: ../../mod/settings.php:809 -msgid "Approved connections" -msgstr "Angenommene Verbindungen" - -#: ../../mod/settings.php:810 -msgid "Any connections" -msgstr "Beliebige Verbindungen" - -#: ../../mod/settings.php:811 -msgid "Anybody on this website" -msgstr "Jeder auf dieser Website" - -#: ../../mod/settings.php:812 -msgid "Anybody in this network" -msgstr "Alle Red-Nutzer" - -#: ../../mod/settings.php:813 -msgid "Anybody authenticated" -msgstr "Jeder authentifizierte" - -#: ../../mod/settings.php:814 -msgid "Anybody on the internet" -msgstr "Jeder im Internet" - -#: ../../mod/settings.php:891 -msgid "Publish your default profile in the network directory" -msgstr "Standard-Profil im Netzwerk-Verzeichnis veröffentlichen" - -#: ../../mod/settings.php:891 ../../mod/settings.php:896 -#: ../../mod/settings.php:973 ../../mod/admin.php:392 -#: ../../mod/profiles.php:602 ../../mod/api.php:106 -msgid "No" -msgstr "Nein" - -#: ../../mod/settings.php:891 ../../mod/settings.php:896 -#: ../../mod/settings.php:973 ../../mod/admin.php:394 -#: ../../mod/profiles.php:601 ../../mod/api.php:105 -msgid "Yes" -msgstr "Ja" - -#: ../../mod/settings.php:896 -msgid "Allow us to suggest you as a potential friend to new members?" -msgstr "Dürfen wir Dich neuen Mitgliedern als potentiellen Kontakt vorschlagen?" - -#: ../../mod/settings.php:900 ../../mod/profile_photo.php:365 -msgid "or" -msgstr "oder" - -#: ../../mod/settings.php:905 -msgid "Your channel address is" -msgstr "Deine Kanal-Adresse lautet" - -#: ../../mod/settings.php:943 -msgid "Channel Settings" -msgstr "Kanal-Einstellungen" - -#: ../../mod/settings.php:952 -msgid "Basic Settings" -msgstr "Grundeinstellungen" - -#: ../../mod/settings.php:955 -msgid "Your Timezone:" -msgstr "Ihre Zeitzone:" - -#: ../../mod/settings.php:956 -msgid "Default Post Location:" -msgstr "Standardstandort:" - -#: ../../mod/settings.php:956 -msgid "Geographical location to display on your posts" -msgstr "Geografischer Ort, der bei Deinen Beiträgen angezeigt werden soll" - -#: ../../mod/settings.php:957 -msgid "Use Browser Location:" -msgstr "Standort des Browsers verwenden:" - -#: ../../mod/settings.php:959 -msgid "Adult Content" -msgstr "Nicht jugendfreie Inhalte" - -#: ../../mod/settings.php:959 -msgid "" -"This channel frequently or regularly publishes adult content. (Please tag " -"any adult material and/or nudity with #NSFW)" -msgstr "Dieser Kanal veröffentlicht regelmäßig Inhalte, die für Minderjährige ungeeignet sind. (Bitte markiere solche Inhalte mit dem Schlagwort #NSFW)" - -#: ../../mod/settings.php:961 -msgid "Security and Privacy Settings" -msgstr "Sicherheits- und Datenschutz-Einstellungen" - -#: ../../mod/settings.php:963 -msgid "Your permissions are already configured. Click to view/adjust" -msgstr "Deine Zugriffsrechte sind schon konfiguriert. Klicke hier, um sie zu betrachten oder zu ändern" - -#: ../../mod/settings.php:965 -msgid "Hide my online presence" -msgstr "Meine Online-Präsenz verbergen" - -#: ../../mod/settings.php:965 -msgid "Prevents displaying in your profile that you are online" -msgstr "Verhindert die Anzeige Deines Online-Status in deinem Profil" - -#: ../../mod/settings.php:967 -msgid "Simple Privacy Settings:" -msgstr "Einfache Privatsphäre-Einstellungen" - -#: ../../mod/settings.php:968 -msgid "" -"Very Public - extremely permissive (should be used with caution)" -msgstr "Komplett offen – extrem ungeschützt (mit großer Vorsicht verwenden!)" - -#: ../../mod/settings.php:969 -msgid "" -"Typical - default public, privacy when desired (similar to social " -"network permissions but with improved privacy)" -msgstr "Typisch – Standard öffentlich, Privatsphäre, wo sie erwünscht ist (ähnlich den Einstellungen in sozialen Netzwerken, aber mit besser geschützter Privatsphäre)" - -#: ../../mod/settings.php:970 -msgid "Private - default private, never open or public" -msgstr "Private – Standard privat, nie offen oder öffentlich" - -#: ../../mod/settings.php:971 -msgid "Blocked - default blocked to/from everybody" -msgstr "Blockiert – Alle standardmäßig blockiert" - -#: ../../mod/settings.php:973 -msgid "Allow others to tag your posts" -msgstr "Erlaube anderen, Deine Beiträge zu taggen" - -#: ../../mod/settings.php:973 -msgid "" -"Often used by the community to retro-actively flag inappropriate content" -msgstr "Wird oft von der Community genutzt um rückwirkend anstößigen Inhalt zu markieren" - -#: ../../mod/settings.php:975 -msgid "Advanced Privacy Settings" -msgstr "Fortgeschrittene Privatsphäre-Einstellungen" - -#: ../../mod/settings.php:977 -msgid "Expire other channel content after this many days" -msgstr "Den Inhalt anderer Kanäle nach dieser Anzahl Tage verfallen lassen" - -#: ../../mod/settings.php:977 -msgid "0 or blank prevents expiration" -msgstr "0 oder kein Inhalt verhindern das Verfallen" - -#: ../../mod/settings.php:978 -msgid "Maximum Friend Requests/Day:" -msgstr "Maximale Kontaktanfragen pro Tag:" - -#: ../../mod/settings.php:978 -msgid "May reduce spam activity" -msgstr "Kann die Spam-Aktivität verringern" - -#: ../../mod/settings.php:979 -msgid "Default Post Permissions" -msgstr "Standardeinstellungen für Beitrags-Zugriffsrechte" - -#: ../../mod/settings.php:980 ../../mod/mitem.php:134 ../../mod/mitem.php:177 -msgid "(click to open/close)" -msgstr "(zum öffnen/schließen anklicken)" - -#: ../../mod/settings.php:991 -msgid "Maximum private messages per day from unknown people:" -msgstr "Maximale Anzahl privater Nachrichten pro Tag von unbekannten Leuten:" - -#: ../../mod/settings.php:991 -msgid "Useful to reduce spamming" -msgstr "Nützlich, um Spam zu verringern" - -#: ../../mod/settings.php:994 -msgid "Notification Settings" -msgstr "Benachrichtigungs-Einstellungen" - -#: ../../mod/settings.php:995 -msgid "By default post a status message when:" -msgstr "Sende standardmäßig Status-Nachrichten, wenn:" - -#: ../../mod/settings.php:996 -msgid "accepting a friend request" -msgstr "Du eine Kontaktanfrage annimmst" - -#: ../../mod/settings.php:997 -msgid "joining a forum/community" -msgstr "Du einem Forum beitrittst" - -#: ../../mod/settings.php:998 -msgid "making an interesting profile change" -msgstr "Du eine interessante Änderung an Deinem Profil vornimmst" - -#: ../../mod/settings.php:999 -msgid "Send a notification email when:" -msgstr "Eine E-Mail-Benachrichtigung senden, wenn:" - -#: ../../mod/settings.php:1000 -msgid "You receive a connection request" -msgstr "Du eine Verbindungsanfrage erhältst" - -#: ../../mod/settings.php:1001 -msgid "Your connections are confirmed" -msgstr "Eine Verbindung bestätigt wurde" - -#: ../../mod/settings.php:1002 -msgid "Someone writes on your profile wall" -msgstr "Jemand auf Deine Pinnwand schreibt" +msgstr "Keine spezielle Theme für mobile Geräte" -#: ../../mod/settings.php:1003 -msgid "Someone writes a followup comment" -msgstr "Jemand einen Beitrag kommentiert" +#: ../../mod/settings.php:721 +#, php-format +msgid "%s - (Experimental)" +msgstr "%s – (experimentell)" -#: ../../mod/settings.php:1004 -msgid "You receive a private message" -msgstr "Du eine private Nachricht erhältst" +#: ../../mod/settings.php:757 +msgid "Display Settings" +msgstr "Anzeige-Einstellungen" -#: ../../mod/settings.php:1005 -msgid "You receive a friend suggestion" -msgstr "Du einen Kontaktvorschlag erhältst" +#: ../../mod/settings.php:763 +msgid "Display Theme:" +msgstr "Anzeige-Theme:" -#: ../../mod/settings.php:1006 -msgid "You are tagged in a post" -msgstr "Du in einem Beitrag erwähnt wurdest" +#: ../../mod/settings.php:764 +msgid "Mobile Theme:" +msgstr "Mobile Theme:" -#: ../../mod/settings.php:1007 -msgid "You are poked/prodded/etc. in a post" -msgstr "Du in einem Beitrag angestupst/geknufft/o.ä. wurdest" +#: ../../mod/settings.php:765 +msgid "Enable user zoom on mobile devices" +msgstr "Zoom auf Mobilgeräten aktivieren" -#: ../../mod/settings.php:1010 -msgid "Advanced Account/Page Type Settings" -msgstr "Erweiterte Account- und Seitenart-Einstellungen" +#: ../../mod/settings.php:766 +msgid "Update browser every xx seconds" +msgstr "Browser alle xx Sekunden aktualisieren" -#: ../../mod/settings.php:1011 -msgid "Change the behaviour of this account for special situations" -msgstr "Ändere das Verhalten dieses Accounts unter speziellen Umständen" +#: ../../mod/settings.php:766 +msgid "Minimum of 10 seconds, no maximum" +msgstr "Minimum 10 Sekunden, kein Maximum" -#: ../../mod/settings.php:1014 -msgid "" -"Please enable expert mode (in Settings > " -"Additional features) to adjust!" -msgstr "Aktiviere den Expertenmodus (unter Settings > Zusätzliche Funktionen), um hier Einstellungen vorzunehmen!" +#: ../../mod/settings.php:767 +msgid "Maximum number of conversations to load at any time:" +msgstr "Maximale Anzahl von Unterhaltungen, die auf einmal geladen werden sollen:" -#: ../../mod/settings.php:1015 -msgid "Miscellaneous Settings" -msgstr "Sonstige Einstellungen" +#: ../../mod/settings.php:767 +msgid "Maximum of 100 items" +msgstr "Maximum: 100 Beiträge" -#: ../../mod/settings.php:1017 -msgid "Personal menu to display in your channel pages" -msgstr "Eigenes Menü zur Anzeige auf den Seiten deines Kanals" +#: ../../mod/settings.php:768 +msgid "Don't show emoticons" +msgstr "Emoticons nicht zeigen" -#: ../../mod/settings.php:1018 -msgid "Remove this channel" -msgstr "Diesen Kanal löschen" +#: ../../mod/settings.php:769 +msgid "Link post titles to source" +msgstr "Beitragstitel zum Originalbeitrag verlinken" -#: ../../mod/filestorage.php:76 -msgid "Permission Denied." -msgstr "Zugriff verweigert." +#: ../../mod/settings.php:770 +msgid "System Page Layout Editor - (advanced)" +msgstr "System-Seitenlayout-Editor (für Experten)" -#: ../../mod/filestorage.php:92 -msgid "File not found." -msgstr "Datei nicht gefunden." +#: ../../mod/settings.php:804 +msgid "Nobody except yourself" +msgstr "Niemand außer Dir selbst" -#: ../../mod/filestorage.php:131 -msgid "Edit file permissions" -msgstr "Dateiberechtigungen bearbeiten" +#: ../../mod/settings.php:805 +msgid "Only those you specifically allow" +msgstr "Nur die, denen Du es explizit erlaubst" -#: ../../mod/filestorage.php:140 -msgid "Set/edit permissions" -msgstr "Berechtigungen setzen/ändern" +#: ../../mod/settings.php:806 +msgid "Approved connections" +msgstr "Angenommene Verbindungen" -#: ../../mod/filestorage.php:141 -msgid "Include all files and sub folders" -msgstr "Alle Dateien und Unterverzeichnisse einbinden" +#: ../../mod/settings.php:807 +msgid "Any connections" +msgstr "Beliebige Verbindungen" -#: ../../mod/filestorage.php:142 -msgid "Return to file list" -msgstr "Zurück zur Dateiliste" +#: ../../mod/settings.php:808 +msgid "Anybody on this website" +msgstr "Jeder auf dieser Website" -#: ../../mod/filestorage.php:144 -msgid "Copy/paste this code to attach file to a post" -msgstr "Diesen Code kopieren und einfügen, um die Datei an einen Beitrag anzuhängen" +#: ../../mod/settings.php:809 +msgid "Anybody in this network" +msgstr "Alle Red-Nutzer" -#: ../../mod/filestorage.php:145 -msgid "Copy/paste this URL to link file from a web page" -msgstr "Diese URL verwenden, um von einer Webseite aus auf die Datei zu verlinken" +#: ../../mod/settings.php:810 +msgid "Anybody authenticated" +msgstr "Jeder authentifizierte" -#: ../../mod/home.php:46 -msgid "Red Matrix - "The Network"" -msgstr "RedMatrix – "Das Netzwerk"" +#: ../../mod/settings.php:811 +msgid "Anybody on the internet" +msgstr "Jeder im Internet" -#: ../../mod/home.php:101 -#, php-format -msgid "Welcome to %s" -msgstr "Willkommen auf %s" +#: ../../mod/settings.php:885 +msgid "Publish your default profile in the network directory" +msgstr "Standard-Profil im Netzwerk-Verzeichnis veröffentlichen" -#: ../../mod/probe.php:23 ../../mod/probe.php:29 -#, php-format -msgid "Fetching URL returns error: %1$s" -msgstr "Abrufen der URL gab einen Fehler zurück: %1$s" +#: ../../mod/settings.php:885 ../../mod/settings.php:890 +#: ../../mod/settings.php:967 ../../mod/api.php:106 ../../mod/profiles.php:574 +#: ../../mod/admin.php:392 +msgid "No" +msgstr "Nein" -#: ../../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 "[Eingebettete Inhalte – lade die Seite neu, um sie anzuzeigen]" +#: ../../mod/settings.php:885 ../../mod/settings.php:890 +#: ../../mod/settings.php:967 ../../mod/api.php:105 ../../mod/profiles.php:573 +#: ../../mod/admin.php:394 +msgid "Yes" +msgstr "Ja" -#: ../../mod/new_channel.php:109 -msgid "Add a Channel" -msgstr "Kanal hinzufügen" +#: ../../mod/settings.php:890 +msgid "Allow us to suggest you as a potential friend to new members?" +msgstr "Dürfen wir Dich neuen Mitgliedern als potentiellen Kontakt vorschlagen?" -#: ../../mod/new_channel.php:110 -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 "Ein Kanal ist Deine eigene Sammlung von verbundenen Webseiten. Ein Kanal kann genutzt werden, um ein Social-Network-Profil, ein Blog, eine Gesprächsgruppe oder ein Forum, Promi-Seiten und vieles mehr zu erstellen. Du kannst so viele Kanäle erstellen, wie es der Betreiber Deiner Seite zulässt." +#: ../../mod/settings.php:894 ../../mod/profile_photo.php:365 +msgid "or" +msgstr "oder" -#: ../../mod/new_channel.php:112 ../../mod/sources.php:103 -#: ../../mod/sources.php:137 -msgid "Channel Name" -msgstr "Name des Kanals" +#: ../../mod/settings.php:899 +msgid "Your channel address is" +msgstr "Deine Kanal-Adresse lautet" -#: ../../mod/new_channel.php:113 -msgid "Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\" " -msgstr "Beispiele: „Horst Weidinger“, „Lisa und ihr Meerschweinchen“, „Fußball“, „Segelflieger-Forum“ " +#: ../../mod/settings.php:937 +msgid "Channel Settings" +msgstr "Kanal-Einstellungen" -#: ../../mod/new_channel.php:114 -msgid "Choose a short nickname" -msgstr "Wähle einen kurzen Spitznamen" +#: ../../mod/settings.php:946 +msgid "Basic Settings" +msgstr "Grundeinstellungen" -#: ../../mod/new_channel.php:115 -msgid "" -"Your nickname will be used to create an easily remembered channel address " -"(like an email address) which you can share with others." -msgstr "Dein Spitzname wird verwendet, um eine leicht zu merkende Kanal-Adresse (ähnlich einer E-Mail-Adresse) zu erzeugen, die Du mit anderen austauschen kannst." +#: ../../mod/settings.php:949 +msgid "Your Timezone:" +msgstr "Ihre Zeitzone:" -#: ../../mod/new_channel.php:116 -msgid "Or import an existing channel from another location" -msgstr "Oder importiere einen bestehenden Kanal von einem anderen Server" +#: ../../mod/settings.php:950 +msgid "Default Post Location:" +msgstr "Standardstandort:" -#: ../../mod/new_channel.php:118 -msgid "Channel Type" -msgstr "Kanaltyp" +#: ../../mod/settings.php:950 +msgid "Geographical location to display on your posts" +msgstr "Geografischer Ort, der bei Deinen Beiträgen angezeigt werden soll" -#: ../../mod/new_channel.php:119 -msgid "" -"Please choose a channel type (such as social networking or community forum) " -"and privacy requirements so we can select the best permissions for you" -msgstr "Wähle einen Kanaltyp (wie Soziales Netzwerk oder Forum) und Privatsphäre-Vorgaben, so dass wir die passenden Kanal-Zugriffsrechte für Dich setzen können" +#: ../../mod/settings.php:951 +msgid "Use Browser Location:" +msgstr "Standort des Browsers verwenden:" -#: ../../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 "Wir haben ein Problem mit der OpenID festgestellt, mit der Du Dich anmelden wolltest. Bitte überprüfe sie noch einmal." +#: ../../mod/settings.php:953 +msgid "Adult Content" +msgstr "Nicht jugendfreie Inhalte" -#: ../../mod/rmagic.php:38 -msgid "The error message was:" -msgstr "Die Fehlermeldung war:" +#: ../../mod/settings.php:953 +msgid "" +"This channel frequently or regularly publishes adult content. (Please tag " +"any adult material and/or nudity with #NSFW)" +msgstr "Dieser Kanal veröffentlicht regelmäßig Inhalte, die für Minderjährige ungeeignet sind. (Bitte markiere solche Inhalte mit dem Schlagwort #NSFW)" -#: ../../mod/rmagic.php:42 -msgid "Authentication failed." -msgstr "Authentifizierung fehlgeschlagen." +#: ../../mod/settings.php:955 +msgid "Security and Privacy Settings" +msgstr "Sicherheits- und Datenschutz-Einstellungen" -#: ../../mod/rmagic.php:82 -msgid "Remote Authentication" -msgstr "Entfernte Authentifizierung" +#: ../../mod/settings.php:957 +msgid "Your permissions are already configured. Click to view/adjust" +msgstr "Deine Zugriffsrechte sind schon konfiguriert. Klicke hier, um sie zu betrachten oder zu ändern" -#: ../../mod/rmagic.php:83 -msgid "Enter your channel address (e.g. channel@example.com)" -msgstr "Deine Kanal-Adresse (z. B. channel@example.com)" +#: ../../mod/settings.php:959 +msgid "Hide my online presence" +msgstr "Meine Online-Präsenz verbergen" -#: ../../mod/rmagic.php:84 -msgid "Authenticate" -msgstr "Authentifizieren" +#: ../../mod/settings.php:959 +msgid "Prevents displaying in your profile that you are online" +msgstr "Verhindert die Anzeige Deines Online-Status in deinem Profil" -#: ../../mod/admin.php:52 -msgid "Theme settings updated." -msgstr "Theme-Einstellungen aktualisiert." +#: ../../mod/settings.php:961 +msgid "Simple Privacy Settings:" +msgstr "Einfache Privatsphäre-Einstellungen" -#: ../../mod/admin.php:97 ../../mod/admin.php:413 -msgid "Site" -msgstr "Seite" +#: ../../mod/settings.php:962 +msgid "" +"Very Public - extremely permissive (should be used with caution)" +msgstr "Komplett offen – extrem ungeschützt (mit großer Vorsicht verwenden!)" -#: ../../mod/admin.php:98 -msgid "Accounts" -msgstr "Konten" +#: ../../mod/settings.php:963 +msgid "" +"Typical - default public, privacy when desired (similar to social " +"network permissions but with improved privacy)" +msgstr "Typisch – Standard öffentlich, Privatsphäre, wo sie erwünscht ist (ähnlich den Einstellungen in sozialen Netzwerken, aber mit besser geschützter Privatsphäre)" -#: ../../mod/admin.php:99 ../../mod/admin.php:860 -msgid "Channels" -msgstr "Kanäle" +#: ../../mod/settings.php:964 +msgid "Private - default private, never open or public" +msgstr "Private – Standard privat, nie offen oder öffentlich" -#: ../../mod/admin.php:100 ../../mod/admin.php:951 ../../mod/admin.php:993 -msgid "Plugins" -msgstr "Plug-Ins" +#: ../../mod/settings.php:965 +msgid "Blocked - default blocked to/from everybody" +msgstr "Blockiert – Alle standardmäßig blockiert" -#: ../../mod/admin.php:101 ../../mod/admin.php:1156 ../../mod/admin.php:1192 -msgid "Themes" -msgstr "Themes" +#: ../../mod/settings.php:967 +msgid "Allow others to tag your posts" +msgstr "Erlaube anderen, Deine Beiträge zu taggen" -#: ../../mod/admin.php:102 ../../mod/admin.php:515 -msgid "Server" -msgstr "Server" +#: ../../mod/settings.php:967 +msgid "" +"Often used by the community to retro-actively flag inappropriate content" +msgstr "Wird oft von der Community genutzt um rückwirkend anstößigen Inhalt zu markieren" -#: ../../mod/admin.php:103 -msgid "Profile Config" -msgstr "Profilkonfiguration" +#: ../../mod/settings.php:969 +msgid "Advanced Privacy Settings" +msgstr "Fortgeschrittene Privatsphäre-Einstellungen" -#: ../../mod/admin.php:104 -msgid "DB updates" -msgstr "DB-Aktualisierungen" +#: ../../mod/settings.php:971 +msgid "Expire other channel content after this many days" +msgstr "Den Inhalt anderer Kanäle nach dieser Anzahl Tage verfallen lassen" -#: ../../mod/admin.php:118 ../../mod/admin.php:125 ../../mod/admin.php:1279 -msgid "Logs" -msgstr "Protokolle" +#: ../../mod/settings.php:971 +msgid "0 or blank prevents expiration" +msgstr "0 oder kein Inhalt verhindern das Verfallen" -#: ../../mod/admin.php:124 -msgid "Plugin Features" -msgstr "Plug-In Funktionen" +#: ../../mod/settings.php:972 +msgid "Maximum Friend Requests/Day:" +msgstr "Maximale Kontaktanfragen pro Tag:" -#: ../../mod/admin.php:126 -msgid "User registrations waiting for confirmation" -msgstr "Nutzer-Anmeldungen, die auf Bestätigung warten" +#: ../../mod/settings.php:972 +msgid "May reduce spam activity" +msgstr "Kann die Spam-Aktivität verringern" -#: ../../mod/admin.php:206 -msgid "Message queues" -msgstr "Nachrichten-Warteschlangen" +#: ../../mod/settings.php:973 +msgid "Default Post Permissions" +msgstr "Standardeinstellungen für Beitrags-Zugriffsrechte" -#: ../../mod/admin.php:211 ../../mod/admin.php:412 ../../mod/admin.php:514 -#: ../../mod/admin.php:723 ../../mod/admin.php:859 ../../mod/admin.php:950 -#: ../../mod/admin.php:992 ../../mod/admin.php:1155 ../../mod/admin.php:1191 -#: ../../mod/admin.php:1278 -msgid "Administration" -msgstr "Administration" +#: ../../mod/settings.php:978 +msgid "Channel permissions category:" +msgstr "Zugriffsrechte-Kategorie des Kanals:" -#: ../../mod/admin.php:212 -msgid "Summary" -msgstr "Zusammenfassung" +#: ../../mod/settings.php:986 +msgid "Maximum private messages per day from unknown people:" +msgstr "Maximale Anzahl privater Nachrichten pro Tag von unbekannten Leuten:" -#: ../../mod/admin.php:214 -msgid "Registered users" -msgstr "Registrierte Benutzer" +#: ../../mod/settings.php:986 +msgid "Useful to reduce spamming" +msgstr "Nützlich, um Spam zu verringern" -#: ../../mod/admin.php:216 ../../mod/admin.php:518 -msgid "Pending registrations" -msgstr "Ausstehende Registrierungen" +#: ../../mod/settings.php:989 +msgid "Notification Settings" +msgstr "Benachrichtigungs-Einstellungen" -#: ../../mod/admin.php:217 -msgid "Version" -msgstr "Version" +#: ../../mod/settings.php:990 +msgid "By default post a status message when:" +msgstr "Sende standardmäßig Status-Nachrichten, wenn:" -#: ../../mod/admin.php:219 ../../mod/admin.php:519 -msgid "Active plugins" -msgstr "Aktive Plug-Ins" +#: ../../mod/settings.php:991 +msgid "accepting a friend request" +msgstr "Du eine Kontaktanfrage annimmst" -#: ../../mod/admin.php:333 -msgid "Site settings updated." -msgstr "Site-Einstellungen aktualisiert." +#: ../../mod/settings.php:992 +msgid "joining a forum/community" +msgstr "Du einem Forum beitrittst" -#: ../../mod/admin.php:364 -msgid "No special theme for accessibility" -msgstr "Kein spezielles Accessibility-Theme vorhanden" +#: ../../mod/settings.php:993 +msgid "making an interesting profile change" +msgstr "Du eine interessante Änderung an Deinem Profil vornimmst" -#: ../../mod/admin.php:393 -msgid "Yes - with approval" -msgstr "Ja - mit Zustimmung" +#: ../../mod/settings.php:994 +msgid "Send a notification email when:" +msgstr "Eine E-Mail-Benachrichtigung senden, wenn:" -#: ../../mod/admin.php:399 -msgid "My site is not a public server" -msgstr "Meine Server ist kein öffentlicher Server" +#: ../../mod/settings.php:995 +msgid "You receive a connection request" +msgstr "Du eine Verbindungsanfrage erhältst" -#: ../../mod/admin.php:400 -msgid "My site has paid access only" -msgstr "Mein Server erlaubt nur bezahlten Zugang" +#: ../../mod/settings.php:996 +msgid "Your connections are confirmed" +msgstr "Eine Verbindung bestätigt wurde" -#: ../../mod/admin.php:401 -msgid "My site has free access only" -msgstr "Mein Server erlaubt ausschließlich freien Zugang" +#: ../../mod/settings.php:997 +msgid "Someone writes on your profile wall" +msgstr "Jemand auf Deine Pinnwand schreibt" -#: ../../mod/admin.php:402 -msgid "My site offers free accounts with optional paid upgrades" -msgstr "Mein Server bietet kostenlose Konten mit der Möglichkeit zu bezahlten Upgrades" +#: ../../mod/settings.php:998 +msgid "Someone writes a followup comment" +msgstr "Jemand einen Beitrag kommentiert" -#: ../../mod/admin.php:415 ../../mod/register.php:203 -msgid "Registration" -msgstr "Registrierung" +#: ../../mod/settings.php:999 +msgid "You receive a private message" +msgstr "Du eine private Nachricht erhältst" -#: ../../mod/admin.php:416 -msgid "File upload" -msgstr "Dateiupload" +#: ../../mod/settings.php:1000 +msgid "You receive a friend suggestion" +msgstr "Du einen Kontaktvorschlag erhältst" -#: ../../mod/admin.php:417 -msgid "Policies" -msgstr "Richtlinien" +#: ../../mod/settings.php:1001 +msgid "You are tagged in a post" +msgstr "Du in einem Beitrag erwähnt wurdest" -#: ../../mod/admin.php:422 -msgid "Site name" -msgstr "Seitenname" +#: ../../mod/settings.php:1002 +msgid "You are poked/prodded/etc. in a post" +msgstr "Du in einem Beitrag angestupst/geknufft/o.ä. wurdest" -#: ../../mod/admin.php:423 -msgid "Banner/Logo" -msgstr "Banner/Logo" +#: ../../mod/settings.php:1005 +msgid "Advanced Account/Page Type Settings" +msgstr "Erweiterte Account- und Seitenart-Einstellungen" -#: ../../mod/admin.php:424 -msgid "Administrator Information" -msgstr "Administrator-Informationen" +#: ../../mod/settings.php:1006 +msgid "Change the behaviour of this account for special situations" +msgstr "Ändere das Verhalten dieses Accounts unter speziellen Umständen" -#: ../../mod/admin.php:424 +#: ../../mod/settings.php:1009 msgid "" -"Contact information for site administrators. Displayed on siteinfo page. " -"BBCode can be used here" -msgstr "Kontaktinformationen für Administratoren des Servers. Wird auf der siteinfo-Seite angezeigt. BBCode kann verwendet werden." +"Please enable expert mode (in Settings > " +"Additional features) to adjust!" +msgstr "Aktiviere den Expertenmodus (unter Settings > Zusätzliche Funktionen), um hier Einstellungen vorzunehmen!" -#: ../../mod/admin.php:425 -msgid "System language" -msgstr "System-Sprache" +#: ../../mod/settings.php:1010 +msgid "Miscellaneous Settings" +msgstr "Sonstige Einstellungen" -#: ../../mod/admin.php:426 -msgid "System theme" -msgstr "System-Theme" +#: ../../mod/settings.php:1012 +msgid "Personal menu to display in your channel pages" +msgstr "Eigenes Menü zur Anzeige auf den Seiten deines Kanals" -#: ../../mod/admin.php:426 -msgid "" -"Default system theme - may be over-ridden by user profiles - change theme settings" -msgstr "Standard-System-Theme – kann durch Nutzerprofile überschieben werden – Theme-Einstellungen ändern" +#: ../../mod/settings.php:1013 +msgid "Remove this channel" +msgstr "Diesen Kanal löschen" -#: ../../mod/admin.php:427 -msgid "Mobile system theme" -msgstr "Mobile System-Theme:" +#: ../../mod/poke.php:159 +msgid "Poke/Prod" +msgstr "Anstupsen/Knuffen" -#: ../../mod/admin.php:427 -msgid "Theme for mobile devices" -msgstr "Theme für mobile Geräte" +#: ../../mod/poke.php:160 +msgid "poke, prod or do other things to somebody" +msgstr "Stupse Leute an oder mache anderes mit ihnen" -#: ../../mod/admin.php:428 -msgid "Accessibility system theme" -msgstr "Accessibility-System-Theme" +#: ../../mod/poke.php:161 +msgid "Recipient" +msgstr "Empfänger" -#: ../../mod/admin.php:428 -msgid "Accessibility theme" -msgstr "Accessibility-Theme" +#: ../../mod/poke.php:162 +msgid "Choose what you wish to do to recipient" +msgstr "Wähle, was Du mit dem/r Empfänger/in tun willst" -#: ../../mod/admin.php:430 -msgid "Enable Diaspora Protocol" -msgstr "Diaspora-Protokoll aktivieren" +#: ../../mod/poke.php:165 +msgid "Make this post private" +msgstr "Diesen Beitrag privat machen" -#: ../../mod/admin.php:430 -msgid "Communicate with Diaspora and Friendica - experimental" -msgstr "Kommunikation mit Diaspora und Friendica – experimentell" +#: ../../mod/api.php:76 ../../mod/api.php:102 +msgid "Authorize application connection" +msgstr "Zugriff für die Anwendung autorisieren" -#: ../../mod/admin.php:431 -msgid "Allow Feeds as Connections" -msgstr "Feeds als Verbindungen erlauben" +#: ../../mod/api.php:77 +msgid "Return to your app and insert this Securty Code:" +msgstr "Trage folgenden Sicherheitscode in der Anwendung ein:" -#: ../../mod/admin.php:431 -msgid "(Heavy system resource usage)" -msgstr "(führt zu hoher Systemlast)" +#: ../../mod/api.php:89 +msgid "Please login to continue." +msgstr "Zum Weitermachen, bitte einloggen." -#: ../../mod/admin.php:432 -msgid "Maximum image size" -msgstr "Maximale Bildgröße" +#: ../../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 "Möchtest Du dieser Anwendung erlauben, Deine Nachrichten und Kontakte abzurufen und/oder neue Nachrichten für Dich zu erstellen?" -#: ../../mod/admin.php:432 +#: ../../mod/post.php:229 msgid "" -"Maximum size in bytes of uploaded images. Default is 0, which means no " -"limits." -msgstr "Maximale Größe hochgeladener Bilder in Bytes. Standard ist 0 (keine Einschränkung)." +"Remote authentication blocked. You are logged into this site locally. Please" +" logout and retry." +msgstr "Fern-Authentifizierung blockiert. Du bist lokal auf diesem Server angemeldet. Bitte melde Dich ab und versuche es erneut." -#: ../../mod/admin.php:433 -msgid "Does this site allow new member registration?" -msgstr "Erlaubt dieser Server die Registrierung neuer Nutzer?" +#: ../../mod/post.php:261 ../../mod/openid.php:72 ../../mod/openid.php:180 +#, php-format +msgid "Welcome %s. Remote authentication successful." +msgstr "Willkommen %s. Entfernte Authentifizierung erfolgreich." + +#: ../../mod/attach.php:9 +msgid "Item not available." +msgstr "Element nicht verfügbar." + +#: ../../mod/probe.php:23 ../../mod/probe.php:29 +#, php-format +msgid "Fetching URL returns error: %1$s" +msgstr "Abrufen der URL gab einen Fehler zurück: %1$s" + +#: ../../mod/block.php:27 ../../mod/page.php:33 +msgid "Invalid item." +msgstr "Ungültiges Element." + +#: ../../mod/block.php:39 ../../mod/wall_upload.php:28 ../../mod/page.php:45 +msgid "Channel not found." +msgstr "Kanal nicht gefunden." -#: ../../mod/admin.php:434 -msgid "Which best describes the types of account offered by this hub?" -msgstr "Was ist die passendste Beschreibung der Konten auf diesem Hub?" +#: ../../mod/block.php:75 ../../mod/display.php:102 ../../mod/help.php:70 +#: ../../mod/page.php:81 ../../index.php:252 +msgid "Page not found." +msgstr "Seite nicht gefunden." -#: ../../mod/admin.php:435 -msgid "Register text" -msgstr "Registrierungstext" +#: ../../mod/siteinfo.php:90 +#, php-format +msgid "Version %s" +msgstr "Version %s" -#: ../../mod/admin.php:435 -msgid "Will be displayed prominently on the registration page." -msgstr "Wird gut sichtbar auf der Registrierungs-Seite angezeigt." +#: ../../mod/siteinfo.php:111 +msgid "Installed plugins/addons/apps:" +msgstr "Installierte Plugins/Addons/Apps" -#: ../../mod/admin.php:436 -msgid "Accounts abandoned after x days" -msgstr "Konten gelten nach X Tagen als unbenutzt" +#: ../../mod/siteinfo.php:124 +msgid "No installed plugins/addons/apps" +msgstr "Keine installierten Plugins/Addons/Apps" -#: ../../mod/admin.php:436 +#: ../../mod/siteinfo.php:132 +msgid "Red" +msgstr "Red" + +#: ../../mod/siteinfo.php:133 msgid "" -"Will not waste system resources polling external sites for abandonded " -"accounts. Enter 0 for no time limit." -msgstr "Verschwende keine Systemressourcen auf das Pollen von externen Seiten, wenn das Konto nicht mehr benutzt wird. Trage hier 0 für kein zeitliches Limit." +"This is a hub of the Red Matrix - a global cooperative network of " +"decentralized privacy enhanced websites." +msgstr "Dieser Hub ist Teil der RedMatrix – eines globalen, kooperativen Netzwerks aus dezentralen Websites, die Rücksicht auf Deine Privatsphäre nehmen." -#: ../../mod/admin.php:437 -msgid "Allowed friend domains" -msgstr "Erlaubte Domains für Kontakte" +#: ../../mod/siteinfo.php:137 +msgid "Running at web location" +msgstr "Erreichbar unter der Web-Adresse" -#: ../../mod/admin.php:437 +#: ../../mod/siteinfo.php:138 msgid "" -"Comma separated list of domains which are allowed to establish friendships " -"with this site. Wildcards are accepted. Empty to allow any domains" -msgstr "Liste der Domains, die für Freundschaften erlaubt sind, durch Kommas getrennt. Platzhalter werden akzeptiert. Leer lassen, um alle Domains zu erlauben." +"Please visit GetZot.com to learn more " +"about the Red Matrix." +msgstr "Besuche GetZot.com, um mehr über die Red-Matrix zu erfahren." -#: ../../mod/admin.php:438 -msgid "Allowed email domains" -msgstr "Erlaubte Domains für E-Mails" +#: ../../mod/siteinfo.php:139 +msgid "Bug reports and issues: please visit" +msgstr "Probleme oder Fehler gefunden? Bitte besuche" -#: ../../mod/admin.php:438 +#: ../../mod/siteinfo.php:142 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 "Liste der Domains, die für E-Mail-Adressen bei der Registrierung erlaubt sind, durch Kommas getrennt. Platzhalter werden akzeptiert. Leer lassen, um alle Domains zu erlauben." +"Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot " +"com" +msgstr "Vorschläge, Lob, usw.: E-Mail an 'redmatrix' at librelist - dot - com" -#: ../../mod/admin.php:439 -msgid "Block public" -msgstr "Öffentlichen Zugriff blockieren" +#: ../../mod/siteinfo.php:144 +msgid "Site Administrators" +msgstr "Administratoren" -#: ../../mod/admin.php:439 -msgid "" -"Check to block public access to all otherwise public personal pages on this " -"site unless you are currently logged in." -msgstr "Zugriff auf sonst öffentliche persönliche Seiten blockieren, wenn man nicht eingeloggt ist." +#: ../../mod/blocks.php:62 +msgid "Block Name" +msgstr "Block-Name" -#: ../../mod/admin.php:440 -msgid "Verify Email Addresses" -msgstr "E-Mail-Adressen überprüfen" +#: ../../mod/profiles.php:18 ../../mod/profiles.php:165 +#: ../../mod/profiles.php:222 ../../mod/profiles.php:547 +msgid "Profile not found." +msgstr "Profil nicht gefunden." -#: ../../mod/admin.php:440 -msgid "" -"Check to verify email addresses used in account registration (recommended)." -msgstr "Aktivieren, um die Überprüfung von E-Mail-Adressen bei der Registrierung von Benutzerkonten zu aktivieren (empfohlen)." +#: ../../mod/profiles.php:38 +msgid "Profile deleted." +msgstr "Profil gelöscht." -#: ../../mod/admin.php:441 -msgid "Force publish" -msgstr "Veröffentlichung erzwingen" +#: ../../mod/profiles.php:56 ../../mod/profiles.php:92 +msgid "Profile-" +msgstr "Profil-" -#: ../../mod/admin.php:441 -msgid "" -"Check to force all profiles on this site to be listed in the site directory." -msgstr "Die Veröffentlichung aller Profile dieses Servers im Verzeichnis erzwingen." +#: ../../mod/profiles.php:77 ../../mod/profiles.php:120 +msgid "New profile created." +msgstr "Neues Profil erstellt." -#: ../../mod/admin.php:442 -msgid "Disable discovery tab" -msgstr "Den „Entdecken“-Reiter ausblenden" +#: ../../mod/profiles.php:98 +msgid "Profile unavailable to clone." +msgstr "Profil kann nicht geklont werden." -#: ../../mod/admin.php:442 -msgid "" -"Remove the tab in the network view with public content pulled from sources " -"chosen for this site." -msgstr "Entferne den „Entdecken“-Reiter aus der Matrix-Seite, in dem öffentliche Inhalte von anderen RedMatrix-Hubs angezeigt werden können." +#: ../../mod/profiles.php:136 +msgid "Profile unavailable to export." +msgstr "Dieses Profil kann nicht exportiert werden." -#: ../../mod/admin.php:443 -msgid "No login on Homepage" -msgstr "Kein Login auf der Homepage" +#: ../../mod/profiles.php:232 +msgid "Profile Name is required." +msgstr "Profil-Name erforderlich." -#: ../../mod/admin.php:443 -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 "Aktivieren, um das Login-Formular auf der Startseite der Seite zu verbergen (z.B. weil es das Layout der Homepage des Seiten-Kanals stört)." +#: ../../mod/profiles.php:362 +msgid "Marital Status" +msgstr "Familienstand" -#: ../../mod/admin.php:445 -msgid "Proxy user" -msgstr "Proxy Benutzer" +#: ../../mod/profiles.php:366 +msgid "Romantic Partner" +msgstr "Romantische Partner" -#: ../../mod/admin.php:446 -msgid "Proxy URL" -msgstr "Proxy URL" +#: ../../mod/profiles.php:370 +msgid "Likes" +msgstr "Gefällt" -#: ../../mod/admin.php:447 -msgid "Network timeout" -msgstr "Netzwerk-Timeout" +#: ../../mod/profiles.php:374 +msgid "Dislikes" +msgstr "Gefällt nicht" -#: ../../mod/admin.php:447 -msgid "Value is in seconds. Set to 0 for unlimited (not recommended)." -msgstr "Wert in Sekunden. 0 für unbegrenzt (nicht empfohlen)." +#: ../../mod/profiles.php:378 +msgid "Work/Employment" +msgstr "Arbeit/Anstellung" -#: ../../mod/admin.php:448 -msgid "Delivery interval" -msgstr "Auslieferung Intervall" +#: ../../mod/profiles.php:381 +msgid "Religion" +msgstr "Religion" -#: ../../mod/admin.php:448 -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 "Verzögere im Hintergrund laufende Auslieferungsprozesse um die angegebene Anzahl Sekunden, um die Systemlast zu verringern. Empfehlungen: 4-5 für Shared Hosts, 2-3 für VPS, 0-1 für große dedizierte Server." +#: ../../mod/profiles.php:385 +msgid "Political Views" +msgstr "Politische Ansichten" -#: ../../mod/admin.php:449 -msgid "Poll interval" -msgstr "Abfrageintervall" +#: ../../mod/profiles.php:389 +msgid "Gender" +msgstr "Geschlecht" -#: ../../mod/admin.php:449 -msgid "" -"Delay background polling processes by this many seconds to reduce system " -"load. If 0, use delivery interval." -msgstr "Verzögere Hintergrundprozesse um diese Anzahl Sekunden, um die Systemlast zu reduzieren. Bei 0 wird das Auslieferungsintervall verwendet." +#: ../../mod/profiles.php:393 +msgid "Sexual Preference" +msgstr "Sexuelle Orientierung" -#: ../../mod/admin.php:450 -msgid "Maximum Load Average" -msgstr "Maximales Load Average" +#: ../../mod/profiles.php:397 +msgid "Homepage" +msgstr "Webseite" -#: ../../mod/admin.php:450 -msgid "" -"Maximum system load before delivery and poll processes are deferred - " -"default 50." -msgstr "Maximale Systemlast, bevor Verteil- und Empfangsprozesse verschoben werden – Standard 50" +#: ../../mod/profiles.php:401 +msgid "Interests" +msgstr "Hobbys/Interessen" -#: ../../mod/admin.php:506 -msgid "No server found" -msgstr "Kein Server gefunden" +#: ../../mod/profiles.php:405 ../../mod/admin.php:868 +msgid "Address" +msgstr "Adresse" -#: ../../mod/admin.php:513 ../../mod/admin.php:737 -msgid "ID" -msgstr "ID" +#: ../../mod/profiles.php:412 ../../mod/pubsites.php:25 +msgid "Location" +msgstr "Ort" -#: ../../mod/admin.php:513 -msgid "for channel" -msgstr "für Kanal" +#: ../../mod/profiles.php:495 +msgid "Profile updated." +msgstr "Profil aktualisiert." -#: ../../mod/admin.php:513 -msgid "on server" -msgstr "auf Server" +#: ../../mod/profiles.php:572 +msgid "Hide your contact/friend list from viewers of this profile?" +msgstr "Deine Kontaktliste vor Betrachtern dieses Profils verbergen?" -#: ../../mod/admin.php:513 -msgid "Status" -msgstr "Status" +#: ../../mod/profiles.php:614 +msgid "Edit Profile Details" +msgstr "Bearbeite Profil-Details" -#: ../../mod/admin.php:534 -msgid "Update has been marked successful" -msgstr "Update wurde als erfolgreich markiert" +#: ../../mod/profiles.php:616 +msgid "View this profile" +msgstr "Dieses Profil ansehen" -#: ../../mod/admin.php:544 -#, php-format -msgid "Executing %s failed. Check system logs." -msgstr "Ausführen von %s fehlgeschlagen. Überprüfe die Systemprotokolle." +#: ../../mod/profiles.php:618 +msgid "Change Profile Photo" +msgstr "Profilfoto ändern" -#: ../../mod/admin.php:547 -#, php-format -msgid "Update %s was successfully applied." -msgstr "Update %s wurde erfolgreich ausgeführt." +#: ../../mod/profiles.php:619 +msgid "Create a new profile using these settings" +msgstr "Neues Profil anlegen und diese Einstellungen übernehmen" -#: ../../mod/admin.php:551 -#, php-format -msgid "Update %s did not return a status. Unknown if it succeeded." -msgstr "Update %s lieferte keinen Rückgabewert. Erfolg unbekannt." +#: ../../mod/profiles.php:620 +msgid "Clone this profile" +msgstr "Dieses Profil klonen" -#: ../../mod/admin.php:554 -#, php-format -msgid "Update function %s could not be found." -msgstr "Update-Funktion %s konnte nicht gefunden werden." +#: ../../mod/profiles.php:621 +msgid "Delete this profile" +msgstr "Dieses Profil löschen" + +#: ../../mod/profiles.php:623 +msgid "Import profile from file" +msgstr "Profil aus einer Datei importieren" + +#: ../../mod/profiles.php:624 +msgid "Export profile to file" +msgstr "Profil in eine Datei exportieren" + +#: ../../mod/profiles.php:625 +msgid "Profile Name:" +msgstr "Profilname:" + +#: ../../mod/profiles.php:626 +msgid "Your Full Name:" +msgstr "Dein voller Name:" -#: ../../mod/admin.php:569 -msgid "No failed updates." -msgstr "Keine fehlgeschlagenen Aktualisierungen." +#: ../../mod/profiles.php:627 +msgid "Title/Description:" +msgstr "Titel/Stellenbeschreibung:" -#: ../../mod/admin.php:573 -msgid "Failed Updates" -msgstr "Fehlgeschlagene Aktualisierungen" +#: ../../mod/profiles.php:628 +msgid "Your Gender:" +msgstr "Dein Geschlecht:" -#: ../../mod/admin.php:575 -msgid "Mark success (if update was manually applied)" -msgstr "Als erfolgreich markieren (wenn das Update manuell ausgeführt wurde)" +#: ../../mod/profiles.php:629 +msgid "Birthday :" +msgstr "Geburtstag:" -#: ../../mod/admin.php:576 -msgid "Attempt to execute this update step automatically" -msgstr "Versuche, diesen Updateschritt automatisch auszuführen" +#: ../../mod/profiles.php:630 +msgid "Street Address:" +msgstr "Straße und Hausnummer:" -#: ../../mod/admin.php:602 -#, php-format -msgid "%s user blocked/unblocked" -msgid_plural "%s users blocked/unblocked" -msgstr[0] "%s Nutzer blockiert/freigegeben" -msgstr[1] "%s Nutzer blockiert/freigegeben" +#: ../../mod/profiles.php:631 +msgid "Locality/City:" +msgstr "Wohnort:" -#: ../../mod/admin.php:609 -#, php-format -msgid "%s user deleted" -msgid_plural "%s users deleted" -msgstr[0] "%s Nutzer gelöscht" -msgstr[1] "%s Nutzer gelöscht" +#: ../../mod/profiles.php:632 +msgid "Postal/Zip Code:" +msgstr "Postleitzahl:" -#: ../../mod/admin.php:638 -msgid "Account not found" -msgstr "Konto nicht gefunden" +#: ../../mod/profiles.php:633 +msgid "Country:" +msgstr "Land:" -#: ../../mod/admin.php:658 -#, php-format -msgid "User '%s' unblocked" -msgstr "Benutzer '%s' freigegeben" +#: ../../mod/profiles.php:634 +msgid "Region/State:" +msgstr "Region/Bundesstaat:" -#: ../../mod/admin.php:658 -#, php-format -msgid "User '%s' blocked" -msgstr "Benutzer '%s' blockiert" +#: ../../mod/profiles.php:635 +msgid "♥ Marital Status:" +msgstr "♥ Beziehungsstatus:" -#: ../../mod/admin.php:724 ../../mod/admin.php:736 -msgid "Users" -msgstr "Benutzer" +#: ../../mod/profiles.php:636 +msgid "Who: (if applicable)" +msgstr "Wer: (falls anwendbar)" -#: ../../mod/admin.php:726 ../../mod/admin.php:862 -msgid "select all" -msgstr "Alle auswählen" +#: ../../mod/profiles.php:637 +msgid "Examples: cathy123, Cathy Williams, cathy@example.com" +msgstr "Beispiele: cathy123, Cathy Williams, cathy@example.com" -#: ../../mod/admin.php:727 -msgid "User registrations waiting for confirm" -msgstr "Neuanmeldungen, die auf Deine Bestätigung warten" +#: ../../mod/profiles.php:638 +msgid "Since [date]:" +msgstr "Seit [Datum]:" -#: ../../mod/admin.php:728 -msgid "Request date" -msgstr "Antragsdatum" +#: ../../mod/profiles.php:640 +msgid "Homepage URL:" +msgstr "Homepage URL:" -#: ../../mod/admin.php:729 -msgid "No registrations." -msgstr "Keine Registrierungen." +#: ../../mod/profiles.php:643 +msgid "Religious Views:" +msgstr "Religiöse Ansichten:" -#: ../../mod/admin.php:730 -msgid "Approve" -msgstr "Genehmigen" +#: ../../mod/profiles.php:644 +msgid "Keywords:" +msgstr "Schlüsselwörter:" -#: ../../mod/admin.php:731 -msgid "Deny" -msgstr "Verweigern" +#: ../../mod/profiles.php:647 +msgid "Example: fishing photography software" +msgstr "Beispiel: Angeln Fotografie Software" -#: ../../mod/admin.php:733 ../../mod/connedit.php:436 -#: ../../mod/connedit.php:579 -msgid "Block" -msgstr "Blockieren" +#: ../../mod/profiles.php:648 +msgid "Used in directory listings" +msgstr "Wird in Verzeichnis-Auflistungen verwendet" -#: ../../mod/admin.php:734 ../../mod/connedit.php:436 -#: ../../mod/connedit.php:579 -msgid "Unblock" -msgstr "Freigeben" +#: ../../mod/profiles.php:649 +msgid "Tell us about yourself..." +msgstr "Erzähle uns ein wenig von Dir …" -#: ../../mod/admin.php:737 -msgid "Register date" -msgstr "Registrierungs-Datum" +#: ../../mod/profiles.php:650 +msgid "Hobbies/Interests" +msgstr "Hobbys/Interessen" -#: ../../mod/admin.php:737 -msgid "Last login" -msgstr "Letzte Anmeldung" +#: ../../mod/profiles.php:651 +msgid "Contact information and Social Networks" +msgstr "Kontaktinformation und soziale Netzwerke" -#: ../../mod/admin.php:737 -msgid "Expires" -msgstr "Verfällt" +#: ../../mod/profiles.php:652 +msgid "My other channels" +msgstr "Meine anderen Kanäle" -#: ../../mod/admin.php:737 -msgid "Service Class" -msgstr "Service-Klasse" +#: ../../mod/profiles.php:653 +msgid "Musical interests" +msgstr "Musikalische Interessen" -#: ../../mod/admin.php:739 -msgid "" -"Selected users will be deleted!\\n\\nEverything these users had posted on " -"this site will be permanently deleted!\\n\\nAre you sure?" -msgstr "Die markierten Nutzer werden gelöscht!\\n\\nAlles, was diese Nutzer auf dieser Seite veröffentlicht haben, wird endgültig gelöscht!\\n\\nBist Du sicher?" +#: ../../mod/profiles.php:654 +msgid "Books, literature" +msgstr "Bücher, Literatur" -#: ../../mod/admin.php:740 -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 "Der Nutzer {0} wird gelöscht!\\n\\nAlles, was dieser Nutzer auf dieser Seite veröffentlicht hat, wird endgültig gelöscht werden!\\n\\nBist Du sicher?" +#: ../../mod/profiles.php:655 +msgid "Television" +msgstr "Fernsehen" -#: ../../mod/admin.php:773 -#, php-format -msgid "%s channel censored/uncensored" -msgid_plural "%s channels censored/uncensored" -msgstr[0] "%s Kanal gesperrt/freigegeben" -msgstr[1] "%s Kanäle gesperrt/freigegeben" +#: ../../mod/profiles.php:656 +msgid "Film/dance/culture/entertainment" +msgstr "Film/Tanz/Kultur/Unterhaltung" -#: ../../mod/admin.php:780 -#, php-format -msgid "%s channel deleted" -msgid_plural "%s channels deleted" -msgstr[0] "%s Kanal gelöscht" -msgstr[1] "%s Kanäle gelöscht" +#: ../../mod/profiles.php:657 +msgid "Love/romance" +msgstr "Liebe/Romantik" -#: ../../mod/admin.php:799 -msgid "Channel not found" -msgstr "Kanal nicht gefunden" +#: ../../mod/profiles.php:658 +msgid "Work/employment" +msgstr "Arbeit/Anstellung" -#: ../../mod/admin.php:810 -#, php-format -msgid "Channel '%s' deleted" -msgstr "Kanal '%s' gelöscht" +#: ../../mod/profiles.php:659 +msgid "School/education" +msgstr "Schule/Ausbildung" -#: ../../mod/admin.php:821 -#, php-format -msgid "Channel '%s' uncensored" -msgstr "Kanal '%s' freigegeben" +#: ../../mod/profiles.php:665 +msgid "This is your default profile." +msgstr "Das ist Dein Standardprofil" -#: ../../mod/admin.php:821 -#, php-format -msgid "Channel '%s' censored" -msgstr "Kanal '%s' gesperrt" +#: ../../mod/profiles.php:676 ../../mod/directory.php:143 +#: ../../mod/dirprofile.php:92 +msgid "Age: " +msgstr "Alter:" -#: ../../mod/admin.php:864 -msgid "Censor" -msgstr "Sperren" +#: ../../mod/profiles.php:719 +msgid "Edit/Manage Profiles" +msgstr "Profile bearbeiten/verwalten" -#: ../../mod/admin.php:865 -msgid "Uncensor" -msgstr "Freigeben" +#: ../../mod/profiles.php:720 +msgid "Add profile things" +msgstr "Sachen zum Profil hinzufügen" -#: ../../mod/admin.php:868 -msgid "UID" -msgstr "UID" +#: ../../mod/profiles.php:721 +msgid "Include desirable objects in your profile" +msgstr "Binde begehrenswerte Dinge in Dein Profil ein" -#: ../../mod/admin.php:868 ../../mod/profiles.php:433 -msgid "Address" -msgstr "Adresse" +#: ../../mod/profperm.php:29 ../../mod/profperm.php:58 +msgid "Invalid profile identifier." +msgstr "Ungültiger Profil-Identifikator" -#: ../../mod/admin.php:870 -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 "Alle ausgewählten Kanäle werden gelöscht!\\n\\nAlles was von diesen Kanälen auf diesem Server geschrieben wurde, wird dauerhaft gelöscht!\\n\\nBist Du sicher?" +#: ../../mod/profperm.php:110 +msgid "Profile Visibility Editor" +msgstr "Profil-Sichtbarkeits-Editor" -#: ../../mod/admin.php:871 -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 "Der Kanal {0} wird gelöscht!\\n\\nAlles was von diesem Kanal auf diesem Server geschrieben wurde, wird gelöscht!\\n\\nBist Du sicher?" +#: ../../mod/profperm.php:114 +msgid "Click on a contact to add or remove." +msgstr "Klicke auf einen Kontakt, um ihn hinzuzufügen oder zu entfernen." -#: ../../mod/admin.php:910 -#, php-format -msgid "Plugin %s disabled." -msgstr "Plug-In %s deaktiviert." +#: ../../mod/profperm.php:123 +msgid "Visible To" +msgstr "Sichtbar für" -#: ../../mod/admin.php:914 -#, php-format -msgid "Plugin %s enabled." -msgstr "Plug-In %s aktiviert." +#: ../../mod/profperm.php:139 ../../mod/connections.php:279 +msgid "All Connections" +msgstr "Alle Verbindungen" -#: ../../mod/admin.php:924 ../../mod/admin.php:1126 -msgid "Disable" -msgstr "Deaktivieren" +#: ../../mod/events.php:81 +msgid "Event can not end before it has started." +msgstr "Termin-Ende liegt vor dem Beginn." -#: ../../mod/admin.php:926 ../../mod/admin.php:1128 -msgid "Enable" -msgstr "Aktivieren" +#: ../../mod/events.php:86 +msgid "Event title and start time are required." +msgstr "Veranstaltungs- Titel und Startzeit sind erforderlich." -#: ../../mod/admin.php:952 ../../mod/admin.php:1157 -msgid "Toggle" -msgstr "Umschalten" +#: ../../mod/events.php:100 +msgid "Event not found." +msgstr "Termin nicht gefunden." -#: ../../mod/admin.php:960 ../../mod/admin.php:1167 -msgid "Author: " -msgstr "Autor: " +#: ../../mod/events.php:364 +msgid "l, F j" +msgstr "l, j. F" -#: ../../mod/admin.php:961 ../../mod/admin.php:1168 -msgid "Maintainer: " -msgstr "Betreuer:" +#: ../../mod/events.php:386 +msgid "Edit event" +msgstr "Veranstaltung bearbeiten" -#: ../../mod/admin.php:1090 -msgid "No themes found." -msgstr "Keine Theme gefunden." +#: ../../mod/events.php:432 +msgid "Create New Event" +msgstr "Neue Veranstaltung erstellen" -#: ../../mod/admin.php:1149 -msgid "Screenshot" -msgstr "Bildschirmfoto" +#: ../../mod/events.php:560 +msgid "Event details" +msgstr "Veranstaltungs-Details" -#: ../../mod/admin.php:1197 -msgid "[Experimental]" -msgstr "[Experimentell]" +#: ../../mod/events.php:561 +msgid "Starting date and Title are required." +msgstr "Startdatum und Titel sind erforderlich." -#: ../../mod/admin.php:1198 -msgid "[Unsupported]" -msgstr "[Nicht unterstützt]" +#: ../../mod/events.php:565 +msgid "Event Starts:" +msgstr "Veranstaltung startet:" -#: ../../mod/admin.php:1225 -msgid "Log settings updated." -msgstr "Protokoll-Einstellungen aktualisiert." +#: ../../mod/events.php:565 ../../mod/events.php:581 ../../mod/appman.php:91 +#: ../../mod/appman.php:92 +msgid "Required" +msgstr "Benötigt" -#: ../../mod/admin.php:1281 -msgid "Clear" -msgstr "Leeren" +#: ../../mod/events.php:571 +msgid "Finish date/time is not known or not relevant" +msgstr "Ende Datum/Zeit sind unbekannt oder unwichtig" -#: ../../mod/admin.php:1287 -msgid "Debugging" -msgstr "Debugging" +#: ../../mod/events.php:573 +msgid "Event Finishes:" +msgstr "Veranstaltung endet:" -#: ../../mod/admin.php:1288 -msgid "Log file" -msgstr "Protokolldatei" +#: ../../mod/events.php:575 +msgid "Adjust for viewer timezone" +msgstr "An die Zeitzone des Betrachters anpassen" -#: ../../mod/admin.php:1288 -msgid "" -"Must be writable by web server. Relative to your Red top-level directory." -msgstr "Muss für den Web-Server schreibbar sein. Relativ zum Red-Stammverzeichnis." +#: ../../mod/events.php:577 +msgid "Description:" +msgstr "Beschreibung:" -#: ../../mod/admin.php:1289 -msgid "Log level" -msgstr "Protokollstufe" +#: ../../mod/events.php:581 +msgid "Title:" +msgstr "Titel:" -#: ../../mod/admin.php:1336 -msgid "New Profile Field" -msgstr "Neues Profilfeld" +#: ../../mod/events.php:583 +msgid "Share this event" +msgstr "Die Veranstaltung teilen" -#: ../../mod/admin.php:1337 ../../mod/admin.php:1358 -msgid "Field nickname" -msgstr "Kurzname für das Feld" +#: ../../mod/pubsites.php:16 +msgid "Public Sites" +msgstr "Öffentliche Server" -#: ../../mod/admin.php:1337 ../../mod/admin.php:1358 -msgid "System name of field" -msgstr "Systemname des Feldes" +#: ../../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 "Die hier aufgeführten Server erlauben Dir, einen Account in der Red-Matrix anzulegen. Alle Server der Matrix sind miteinander verbunden, so dass die Mitgliedschaft auf einem Server eine Verbindung zu beliebigen anderen Servern der Matrix ermöglicht. Es könnte sein, dass einige dieser Server kostenpflichtig sind oder abgestufte, je nach Umfang kostenpflichtige Mitgliedschaften anbieten. Auf den jeweiligen Seiten könnten nähere Details dazu stehen." -#: ../../mod/admin.php:1338 ../../mod/admin.php:1359 -msgid "Input type" -msgstr "Art des Inhalts" +#: ../../mod/pubsites.php:25 +msgid "Site URL" +msgstr "Server-URL" -#: ../../mod/admin.php:1339 ../../mod/admin.php:1360 -msgid "Field Name" -msgstr "Feldname" +#: ../../mod/pubsites.php:25 +msgid "Access Type" +msgstr "Zugangstyp" -#: ../../mod/admin.php:1339 ../../mod/admin.php:1360 -msgid "Label on profile pages" -msgstr "Bezeichnung auf Profilseiten" +#: ../../mod/pubsites.php:25 +msgid "Registration Policy" +msgstr "Registrierungsrichtlinien" -#: ../../mod/admin.php:1340 ../../mod/admin.php:1361 -msgid "Help text" -msgstr "Hilfetext" +#: ../../mod/channel.php:25 ../../mod/chat.php:19 +msgid "You must be logged in to see this page." +msgstr "Du musst angemeldet sein, um diese Seite betrachten zu können." -#: ../../mod/admin.php:1340 ../../mod/admin.php:1361 -msgid "Additional info (optional)" -msgstr "Zusätzliche Informationen (optional)" +#: ../../mod/channel.php:86 +msgid "Insufficient permissions. Request redirected to profile page." +msgstr "Unzureichende Zugriffsrechte. Die Anfrage wurde zur Profil-Seite umgeleitet." -#: ../../mod/admin.php:1351 -msgid "Field definition not found" -msgstr "Feld-Definition nicht gefunden" +#: ../../mod/rbmark.php:88 +msgid "Select a bookmark folder" +msgstr "Lesezeichenordner wählen" -#: ../../mod/admin.php:1357 -msgid "Edit Profile Field" -msgstr "Profilfeld bearbeiten" +#: ../../mod/rbmark.php:93 +msgid "Save Bookmark" +msgstr "Lesezeichen speichern" -#: ../../mod/filer.php:49 -msgid "- select -" -msgstr "– auswählen –" +#: ../../mod/rbmark.php:94 +msgid "URL of bookmark" +msgstr "URL des Lesezeichens" -#: ../../mod/connections.php:37 ../../mod/connedit.php:64 -msgid "Could not access contact record." -msgstr "Konnte nicht auf den Kontakteintrag zugreifen." +#: ../../mod/rbmark.php:95 ../../mod/appman.php:93 +msgid "Description" +msgstr "Beschreibung" -#: ../../mod/connections.php:51 ../../mod/connedit.php:78 -msgid "Could not locate selected profile." -msgstr "Gewähltes Profil nicht gefunden." +#: ../../mod/rbmark.php:99 +msgid "Or enter new bookmark folder name" +msgstr "Oder gib einen neuen Namen für den Lesezeichenordner ein" -#: ../../mod/connections.php:94 ../../mod/connedit.php:132 -msgid "Connection updated." -msgstr "Verbindung aktualisiert." +#: ../../mod/chat.php:167 +msgid "Room not found" +msgstr "Chatraum nicht gefunden" -#: ../../mod/connections.php:96 ../../mod/connedit.php:134 -msgid "Failed to update connection record." -msgstr "Konnte den Verbindungseintrag nicht aktualisieren." +#: ../../mod/chat.php:178 +msgid "Leave Room" +msgstr "Raum verlassen" -#: ../../mod/connections.php:191 ../../mod/connections.php:292 -msgid "Blocked" -msgstr "Blockiert" +#: ../../mod/chat.php:179 +msgid "Delete This Room" +msgstr "Diesen Raum löschen" -#: ../../mod/connections.php:196 ../../mod/connections.php:299 -msgid "Ignored" -msgstr "Ignoriert" +#: ../../mod/chat.php:180 +msgid "I am away right now" +msgstr "Ich bin gerade nicht da" -#: ../../mod/connections.php:201 ../../mod/connections.php:313 -msgid "Hidden" -msgstr "Versteckt" +#: ../../mod/chat.php:181 +msgid "I am online" +msgstr "Ich bin online" -#: ../../mod/connections.php:206 ../../mod/connections.php:306 -msgid "Archived" -msgstr "Archiviert" +#: ../../mod/chat.php:183 +msgid "Bookmark this room" +msgstr "Lesezeichen für diesen Raum setzen" -#: ../../mod/connections.php:230 ../../mod/connections.php:245 -msgid "All" -msgstr "Alle" +#: ../../mod/chat.php:207 ../../mod/chat.php:229 +msgid "New Chatroom" +msgstr "Neuer Chatraum" -#: ../../mod/connections.php:270 -msgid "Suggest new connections" -msgstr "Neue Verbindungen vorschlagen" +#: ../../mod/chat.php:208 +msgid "Chatroom Name" +msgstr "Name des Chatraums" -#: ../../mod/connections.php:273 -msgid "New Connections" -msgstr "Neue Verbindungen" +#: ../../mod/chat.php:225 +#, php-format +msgid "%1$s's Chatrooms" +msgstr "%1$ss Chaträume" -#: ../../mod/connections.php:276 -msgid "Show pending (new) connections" -msgstr "Zeige ausstehende (neue) Verbindungsanfragen" +#: ../../mod/register.php:42 +msgid "Maximum daily site registrations exceeded. Please try again tomorrow." +msgstr "Maximale Anzahl täglicher Neuanmeldungen erreicht. Bitte versuche es morgen noch einmal." -#: ../../mod/connections.php:279 ../../mod/profperm.php:139 -msgid "All Connections" -msgstr "Alle Verbindungen" +#: ../../mod/register.php:48 +msgid "" +"Please indicate acceptance of the Terms of Service. Registration failed." +msgstr "Bitte stimme den Nutzungsbedingungen zu. Registrierung fehlgeschlagen." -#: ../../mod/connections.php:282 -msgid "Show all connections" -msgstr "Zeige alle Verbindungen" +#: ../../mod/register.php:82 +msgid "Passwords do not match." +msgstr "Passwörter stimmen nicht überein." -#: ../../mod/connections.php:285 -msgid "Unblocked" -msgstr "Freigegeben" +#: ../../mod/register.php:115 +msgid "" +"Registration successful. Please check your email for validation " +"instructions." +msgstr "Registrierung erfolgreich. Eine E-Mail mit weiteren Anweisungen wurde an Dich gesendet." -#: ../../mod/connections.php:288 -msgid "Only show unblocked connections" -msgstr "Zeige nur freigegebene Verbindungen" +#: ../../mod/register.php:121 +msgid "Your registration is pending approval by the site owner." +msgstr "Deine Registrierung muss noch vom Betreiber der Seite freigegeben werden." -#: ../../mod/connections.php:295 -msgid "Only show blocked connections" -msgstr "Zeige nur blockierte Verbindungen" +#: ../../mod/register.php:124 +msgid "Your registration can not be processed." +msgstr "Deine Registrierung konnte nicht verarbeitet werden." -#: ../../mod/connections.php:302 -msgid "Only show ignored connections" -msgstr "Zeige nur ignorierte Verbindungen" +#: ../../mod/register.php:161 +msgid "Registration on this site/hub is by approval only." +msgstr "Anmeldungen auf diesem Server erfordern Zustimmung durch den Administrator" -#: ../../mod/connections.php:309 -msgid "Only show archived connections" -msgstr "Zeige nur archivierte Verbindungen" +#: ../../mod/register.php:162 +msgid "Register at another affiliated site/hub" +msgstr "Registrierung auf einem anderen, angeschlossenen Server" -#: ../../mod/connections.php:316 -msgid "Only show hidden connections" -msgstr "Zeige nur versteckte Verbindungen" +#: ../../mod/register.php:170 +msgid "" +"This site has exceeded the number of allowed daily account registrations. " +"Please try again tomorrow." +msgstr "Die maximale Anzahl täglicher Registrierungen auf diesem Server wurde überschritten. Bitte versuche es morgen noch einmal." + +#: ../../mod/register.php:181 +msgid "Terms of Service" +msgstr "Nutzungsbedingungen" -#: ../../mod/connections.php:371 +#: ../../mod/register.php:187 #, php-format -msgid "%1$s [%2$s]" -msgstr "%1$s [%2$s]" +msgid "I accept the %s for this website" +msgstr "Ich akzeptiere die %s für diese Webseite" -#: ../../mod/connections.php:372 -msgid "Edit connection" -msgstr "Verbindung bearbeiten" +#: ../../mod/register.php:189 +#, php-format +msgid "I am over 13 years of age and accept the %s for this website" +msgstr "Ich bin älter als 13 Jahre und akzeptiere die %s dieser Webseite" -#: ../../mod/connections.php:410 -msgid "Search your connections" -msgstr "Verbindungen durchsuchen" +#: ../../mod/register.php:203 ../../mod/admin.php:415 +msgid "Registration" +msgstr "Registrierung" -#: ../../mod/connections.php:411 -msgid "Finding: " -msgstr "Ergebnisse:" +#: ../../mod/register.php:208 +msgid "Membership on this site is by invitation only." +msgstr "Mitgliedschaft auf dieser Seite ist nur nach vorheriger Einladung möglich." -#: ../../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 "Öffentlicher Zugang verweigert." +#: ../../mod/register.php:209 +msgid "Please enter your invitation code" +msgstr "Bitte trage Deinen Einladungs-Code ein" -#: ../../mod/dirprofile.php:92 ../../mod/directory.php:143 -#: ../../mod/profiles.php:704 -msgid "Age: " -msgstr "Alter:" +#: ../../mod/register.php:212 +msgid "Your email address" +msgstr "Ihre E-Mail Adresse" -#: ../../mod/dirprofile.php:95 ../../mod/directory.php:146 -msgid "Gender: " -msgstr "Geschlecht:" +#: ../../mod/register.php:213 +msgid "Choose a password" +msgstr "Passwort" -#: ../../mod/dirprofile.php:108 -msgid "Status: " -msgstr "Status:" +#: ../../mod/register.php:214 +msgid "Please re-enter your password" +msgstr "Bitte gib Dein Passwort noch einmal ein" -#: ../../mod/dirprofile.php:109 -msgid "Sexual Preference: " -msgstr "Sexuelle Ausrichtung:" +#: ../../mod/chatsvc.php:111 +msgid "Away" +msgstr "Abwesend" -#: ../../mod/dirprofile.php:111 -msgid "Homepage: " -msgstr "Webseite:" +#: ../../mod/chatsvc.php:115 +msgid "Online" +msgstr "Online" -#: ../../mod/dirprofile.php:112 -msgid "Hometown: " -msgstr "Wohnort:" +#: ../../mod/regmod.php:11 +msgid "Please login." +msgstr "Bitte melde dich an." -#: ../../mod/dirprofile.php:114 -msgid "About: " -msgstr "Über:" +#: ../../mod/removeme.php:29 +msgid "" +"Channel removals are not allowed within 48 hours of changing the account " +"password." +msgstr "Innerhalb von 48 Stunden nach einer Änderung des Passworts können keine Kanäle gelöscht werden." -#: ../../mod/dirprofile.php:162 -msgid "Keywords: " -msgstr "Schlüsselwörter:" +#: ../../mod/removeme.php:57 +msgid "Remove This Channel" +msgstr "Diesen Kanal löschen" -#: ../../mod/dirprofile.php:175 ../../mod/mitem.php:78 ../../mod/xchan.php:38 -#: ../../mod/menu.php:120 -msgid "Not found." -msgstr "Nicht gefunden." +#: ../../mod/removeme.php:58 +msgid "" +"This will completely remove this channel from the network. Once this has " +"been done it is not recoverable." +msgstr "Hiermit wird dieser Kanal komplett aus dem Netzwerk gelöscht. Einmal eingeleitet kann dieser Prozess nicht rückgängig gemacht werden." -#: ../../mod/photos.php:77 -msgid "Page owner information could not be retrieved." -msgstr "Informationen über den Besitzer der Seite konnten nicht gefunden werden." +#: ../../mod/removeme.php:59 ../../mod/removeaccount.php:59 +msgid "Please enter your password for verification:" +msgstr "Bitte gib zur Bestätigung Dein Passwort ein:" -#: ../../mod/photos.php:97 -msgid "Album not found." -msgstr "Album nicht gefunden." +#: ../../mod/removeme.php:60 +msgid "Remove this channel and all its clones from the network" +msgstr "Lösche diesen Kanal und all seine Klone aus dem Netzwerk" -#: ../../mod/photos.php:119 ../../mod/photos.php:673 -msgid "Delete Album" -msgstr "Album löschen" +#: ../../mod/removeme.php:60 +msgid "" +"By default only the instance of the channel located on this hub will be " +"removed from the network" +msgstr "Standardmäßig wird der Kanal nur auf diesem Server gelöscht, seine Klone verbleiben im Netzwerk" -#: ../../mod/photos.php:159 ../../mod/photos.php:975 -msgid "Delete Photo" -msgstr "Foto löschen" +#: ../../mod/removeme.php:61 +msgid "Remove Channel" +msgstr "Kanal löschen" -#: ../../mod/photos.php:453 -msgid "No photos selected" -msgstr "Keine Fotos ausgewählt" +#: ../../mod/common.php:10 +msgid "No channel." +msgstr "Kein Kanal." -#: ../../mod/photos.php:500 -msgid "Access to this item is restricted." -msgstr "Der Zugriff auf dieses Foto ist eingeschränkt." +#: ../../mod/common.php:39 +msgid "Common connections" +msgstr "Gemeinsame Verbindungen" -#: ../../mod/photos.php:574 -#, php-format -msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage." -msgstr "Du benutzt %1$.2f MBytes Deines %2$.2f MBytes großen Bilder-Speichers." +#: ../../mod/common.php:44 +msgid "No connections in common." +msgstr "Keine gemeinsamen Verbindungen." -#: ../../mod/photos.php:577 -#, php-format -msgid "You have used %1$.2f Mbytes of photo storage." -msgstr "Du verwendest %1$.2f MBytes Deines Foto-Speichers." +#: ../../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 "Wir haben ein Problem mit der OpenID festgestellt, mit der Du Dich anmelden wolltest. Bitte überprüfe sie noch einmal." -#: ../../mod/photos.php:596 -msgid "Upload Photos" -msgstr "Fotos hochladen" +#: ../../mod/rmagic.php:38 +msgid "The error message was:" +msgstr "Die Fehlermeldung war:" -#: ../../mod/photos.php:600 ../../mod/photos.php:668 -msgid "New album name: " -msgstr "Name des neuen Albums:" +#: ../../mod/rmagic.php:42 +msgid "Authentication failed." +msgstr "Authentifizierung fehlgeschlagen." -#: ../../mod/photos.php:601 -msgid "or existing album name: " -msgstr "Oder bestehender Album-Name:" +#: ../../mod/rmagic.php:82 +msgid "Remote Authentication" +msgstr "Entfernte Authentifizierung" -#: ../../mod/photos.php:602 -msgid "Do not show a status post for this upload" -msgstr "Keine Statusnachricht für diesen Upload senden" +#: ../../mod/rmagic.php:83 +msgid "Enter your channel address (e.g. channel@example.com)" +msgstr "Deine Kanal-Adresse (z. B. channel@example.com)" -#: ../../mod/photos.php:622 -msgid "Album name could not be decoded" -msgstr "Albumname konnte nicht dekodiert werden" +#: ../../mod/rmagic.php:84 +msgid "Authenticate" +msgstr "Authentifizieren" -#: ../../mod/photos.php:657 ../../mod/photos.php:679 ../../mod/photos.php:1148 -#: ../../mod/photos.php:1163 -msgid "Contact Photos" -msgstr "Kontakt-Bilder" +#: ../../mod/connect.php:55 ../../mod/connect.php:103 +msgid "Continue" +msgstr "Fortfahren" -#: ../../mod/photos.php:681 -msgid "Edit Album" -msgstr "Album bearbeiten" +#: ../../mod/connect.php:84 +msgid "Premium Channel Setup" +msgstr "Premium-Kanal-Einrichtung" -#: ../../mod/photos.php:687 -msgid "Show Newest First" -msgstr "Zeige Neueste zuerst" +#: ../../mod/connect.php:86 +msgid "Enable premium channel connection restrictions" +msgstr "Einschränkungen für einen Premium-Kanal aktivieren" -#: ../../mod/photos.php:689 -msgid "Show Oldest First" -msgstr "Zeige Älteste zuerst" +#: ../../mod/connect.php:87 +msgid "" +"Please enter your restrictions or conditions, such as paypal receipt, usage " +"guidelines, etc." +msgstr "Bitte gib Deine Nutzungsbedingungen ein, z.B. Paypal-Quittung, Richtlinien etc." -#: ../../mod/photos.php:716 ../../mod/photos.php:1195 -msgid "View Photo" -msgstr "Foto ansehen" +#: ../../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 "Unter Umständen sind weitere Schritte oder die Bestätigung der folgenden Bedingungen vor dem Verbinden mit diesem Kanal nötig." -#: ../../mod/photos.php:794 -msgid "Permission denied. Access to this item may be restricted." -msgstr "Berechtigung verweigert. Der Zugriff ist wahrscheinlich eingeschränkt worden." +#: ../../mod/connect.php:90 +msgid "" +"Potential connections will then see the following text before proceeding:" +msgstr "Potentielle Kontakte werden den folgenden Text sehen, bevor fortgefahren wird:" -#: ../../mod/photos.php:796 -msgid "Photo not available" -msgstr "Foto nicht verfügbar" +#: ../../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 "Indem ich fortfahre, bestätige ich die Erfüllung aller Anweisungen aus dieser Seite." -#: ../../mod/photos.php:856 -msgid "Use as profile photo" -msgstr "Als Profilfoto verwenden" +#: ../../mod/connect.php:100 +msgid "(No specific instructions have been provided by the channel owner.)" +msgstr "(Der Kanal-Besitzer hat keine speziellen Anweisungen hinterlegt.)" -#: ../../mod/photos.php:880 -msgid "View Full Size" -msgstr "In voller Größe anzeigen" +#: ../../mod/connect.php:108 +msgid "Restricted or Premium Channel" +msgstr "Eingeschränkter oder Premium-Kanal" -#: ../../mod/photos.php:924 ../../mod/delegate.php:130 ../../mod/tagrm.php:93 -msgid "Remove" -msgstr "Entferne" +#: ../../mod/network.php:79 +msgid "No such group" +msgstr "Sammlung nicht gefunden" -#: ../../mod/photos.php:958 -msgid "Edit photo" -msgstr "Foto bearbeiten" +#: ../../mod/network.php:118 +msgid "Search Results For:" +msgstr "Suchergebnisse für:" -#: ../../mod/photos.php:960 -msgid "Rotate CW (right)" -msgstr "Drehen im UZS (rechts)" +#: ../../mod/network.php:172 +msgid "Collection is empty" +msgstr "Sammlung ist leer" -#: ../../mod/photos.php:961 -msgid "Rotate CCW (left)" -msgstr "Drehen gegen UZS (links)" +#: ../../mod/network.php:180 +msgid "Collection: " +msgstr "Sammlung:" -#: ../../mod/photos.php:964 -msgid "New album name" -msgstr "Name des neuen Albums:" +#: ../../mod/network.php:193 +msgid "Connection: " +msgstr "Verbindung:" -#: ../../mod/photos.php:967 -msgid "Caption" -msgstr "Bildunterschrift" +#: ../../mod/network.php:196 +msgid "Invalid connection." +msgstr "Ungültige Verbindung." -#: ../../mod/photos.php:969 -msgid "Add a Tag" -msgstr "Schlagwort hinzufügen" +#: ../../mod/connections.php:37 ../../mod/connedit.php:64 +msgid "Could not access contact record." +msgstr "Konnte nicht auf den Kontakteintrag zugreifen." -#: ../../mod/photos.php:972 -msgid "" -"Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" -msgstr "Beispiel: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" +#: ../../mod/connections.php:51 ../../mod/connedit.php:78 +msgid "Could not locate selected profile." +msgstr "Gewähltes Profil nicht gefunden." -#: ../../mod/photos.php:1125 -msgid "In This Photo:" -msgstr "Auf diesem Foto:" +#: ../../mod/connections.php:94 ../../mod/connedit.php:132 +msgid "Connection updated." +msgstr "Verbindung aktualisiert." -#: ../../mod/photos.php:1201 -msgid "View Album" -msgstr "Album ansehen" +#: ../../mod/connections.php:96 ../../mod/connedit.php:134 +msgid "Failed to update connection record." +msgstr "Konnte den Verbindungseintrag nicht aktualisieren." + +#: ../../mod/connections.php:191 ../../mod/connections.php:292 +msgid "Blocked" +msgstr "Blockiert" -#: ../../mod/photos.php:1224 -msgid "Recent Photos" -msgstr "Neueste Fotos" +#: ../../mod/connections.php:196 ../../mod/connections.php:299 +msgid "Ignored" +msgstr "Ignoriert" -#: ../../mod/mitem.php:14 ../../mod/menu.php:92 -msgid "Menu not found." -msgstr "Menü nicht gefunden" +#: ../../mod/connections.php:201 ../../mod/connections.php:313 +msgid "Hidden" +msgstr "Versteckt" -#: ../../mod/mitem.php:47 -msgid "Menu element updated." -msgstr "Menü-Element aktualisiert." +#: ../../mod/connections.php:206 ../../mod/connections.php:306 +msgid "Archived" +msgstr "Archiviert" -#: ../../mod/mitem.php:51 -msgid "Unable to update menu element." -msgstr "Kann Menü-Element nicht aktualisieren." +#: ../../mod/connections.php:230 ../../mod/connections.php:245 +msgid "All" +msgstr "Alle" -#: ../../mod/mitem.php:57 -msgid "Menu element added." -msgstr "Menü-Bestandteil hinzugefügt." +#: ../../mod/connections.php:270 +msgid "Suggest new connections" +msgstr "Neue Verbindungen vorschlagen" -#: ../../mod/mitem.php:61 -msgid "Unable to add menu element." -msgstr "Kann Menü-Bestandteil nicht hinzufügen." +#: ../../mod/connections.php:273 +msgid "New Connections" +msgstr "Neue Verbindungen" -#: ../../mod/mitem.php:96 -msgid "Manage Menu Elements" -msgstr "Menü-Bestandteile verwalten" +#: ../../mod/connections.php:276 +msgid "Show pending (new) connections" +msgstr "Zeige ausstehende (neue) Verbindungsanfragen" -#: ../../mod/mitem.php:99 -msgid "Edit menu" -msgstr "Menü bearbeiten" +#: ../../mod/connections.php:282 +msgid "Show all connections" +msgstr "Zeige alle Verbindungen" -#: ../../mod/mitem.php:102 -msgid "Edit element" -msgstr "Bestandteil bearbeiten" +#: ../../mod/connections.php:285 +msgid "Unblocked" +msgstr "Freigegeben" -#: ../../mod/mitem.php:103 -msgid "Drop element" -msgstr "Bestandteil löschen" +#: ../../mod/connections.php:288 +msgid "Only show unblocked connections" +msgstr "Zeige nur freigegebene Verbindungen" -#: ../../mod/mitem.php:104 -msgid "New element" -msgstr "Neues Bestandteil" +#: ../../mod/connections.php:295 +msgid "Only show blocked connections" +msgstr "Zeige nur blockierte Verbindungen" -#: ../../mod/mitem.php:105 -msgid "Edit this menu container" -msgstr "Diesen Menü-Container bearbeiten" +#: ../../mod/connections.php:302 +msgid "Only show ignored connections" +msgstr "Zeige nur ignorierte Verbindungen" -#: ../../mod/mitem.php:106 -msgid "Add menu element" -msgstr "Menüelement hinzufügen" +#: ../../mod/connections.php:309 +msgid "Only show archived connections" +msgstr "Zeige nur archivierte Verbindungen" -#: ../../mod/mitem.php:107 -msgid "Delete this menu item" -msgstr "Lösche dieses Menü-Bestandteil" +#: ../../mod/connections.php:316 +msgid "Only show hidden connections" +msgstr "Zeige nur versteckte Verbindungen" -#: ../../mod/mitem.php:108 -msgid "Edit this menu item" -msgstr "Bearbeite dieses Menü-Bestandteil" +#: ../../mod/connections.php:371 +#, php-format +msgid "%1$s [%2$s]" +msgstr "%1$s [%2$s]" -#: ../../mod/mitem.php:131 -msgid "New Menu Element" -msgstr "Neues Menü-Bestandteil" +#: ../../mod/connections.php:372 +msgid "Edit connection" +msgstr "Verbindung bearbeiten" -#: ../../mod/mitem.php:133 ../../mod/mitem.php:176 -msgid "Menu Item Permissions" -msgstr "Zugriffsrechte des Menü-Elements" +#: ../../mod/connections.php:410 +msgid "Search your connections" +msgstr "Verbindungen durchsuchen" -#: ../../mod/mitem.php:136 ../../mod/mitem.php:180 -msgid "Link text" -msgstr "Link Text" +#: ../../mod/connections.php:411 +msgid "Finding: " +msgstr "Ergebnisse:" -#: ../../mod/mitem.php:137 ../../mod/mitem.php:181 -msgid "URL of link" -msgstr "URL des Links" +#: ../../mod/rpost.php:97 ../../mod/editpost.php:42 +msgid "Edit post" +msgstr "Bearbeite Beitrag" -#: ../../mod/mitem.php:138 ../../mod/mitem.php:182 -msgid "Use Red magic-auth if available" -msgstr "Verwende Red Magic-Auth wenn verfügbar" +#: ../../mod/connedit.php:181 +msgid "is now connected to" +msgstr "ist jetzt verbunden mit" -#: ../../mod/mitem.php:139 ../../mod/mitem.php:183 -msgid "Open link in new window" -msgstr "Öffne Link in neuem Fenster" +#: ../../mod/connedit.php:302 +msgid "Could not access address book record." +msgstr "Konnte nicht auf den Adressbuch-Eintrag zugreifen." -#: ../../mod/mitem.php:141 ../../mod/mitem.php:185 -msgid "Order in list" -msgstr "Reihenfolge in der Liste" +#: ../../mod/connedit.php:316 +msgid "Refresh failed - channel is currently unavailable." +msgstr "Aktualisierung fehlgeschlagen – der Kanal ist im Moment nicht erreichbar." -#: ../../mod/mitem.php:141 ../../mod/mitem.php:185 -msgid "Higher numbers will sink to bottom of listing" -msgstr "Größere Nummern werden weiter unten in der Auflistung einsortiert" +#: ../../mod/connedit.php:323 +msgid "Channel has been unblocked" +msgstr "Kanal nicht mehr blockiert" -#: ../../mod/mitem.php:154 -msgid "Menu item not found." -msgstr "Menü-Bestandteil nicht gefunden." +#: ../../mod/connedit.php:324 +msgid "Channel has been blocked" +msgstr "Kanal blockiert" -#: ../../mod/mitem.php:163 -msgid "Menu item deleted." -msgstr "Menü-Bestandteil gelöscht." +#: ../../mod/connedit.php:328 ../../mod/connedit.php:340 +#: ../../mod/connedit.php:352 ../../mod/connedit.php:364 +#: ../../mod/connedit.php:380 +msgid "Unable to set address book parameters." +msgstr "Konnte die Adressbuch-Parameter nicht setzen." -#: ../../mod/mitem.php:165 -msgid "Menu item could not be deleted." -msgstr "Menü-Bestandteil kann nicht gelöscht werden." +#: ../../mod/connedit.php:335 +msgid "Channel has been unignored" +msgstr "Kanal wird nicht mehr ignoriert" -#: ../../mod/mitem.php:174 -msgid "Edit Menu Element" -msgstr "Bearbeite Menü-Bestandteil" +#: ../../mod/connedit.php:336 +msgid "Channel has been ignored" +msgstr "Kanal wird ignoriert" -#: ../../mod/mitem.php:186 ../../mod/menu.php:114 -msgid "Modify" -msgstr "Ändern" +#: ../../mod/connedit.php:347 +msgid "Channel has been unarchived" +msgstr "Kanal wurde aus dem Archiv zurück geholt" -#: ../../mod/subthread.php:103 -#, php-format -msgid "%1$s is following %2$s's %3$s" -msgstr "%1$s folgt nun %2$ss %3$s" +#: ../../mod/connedit.php:348 +msgid "Channel has been archived" +msgstr "Kanal wurde archiviert" -#: ../../mod/regmod.php:11 -msgid "Please login." -msgstr "Bitte melde dich an." +#: ../../mod/connedit.php:359 +msgid "Channel has been unhidden" +msgstr "Kanal wird nicht mehr versteckt" -#: ../../mod/mood.php:132 -msgid "Set your current mood and tell your friends" -msgstr "Wähle Deine aktuelle Stimmung und teile sie mit Deinen Freunden" +#: ../../mod/connedit.php:360 +msgid "Channel has been hidden" +msgstr "Kanal wurde versteckt" -#: ../../mod/impel.php:33 -msgid "webpage" -msgstr "Webseite" +#: ../../mod/connedit.php:375 +msgid "Channel has been approved" +msgstr "Kanal wurde zugelassen" -#: ../../mod/impel.php:38 -msgid "block" -msgstr "Block" +#: ../../mod/connedit.php:376 +msgid "Channel has been unapproved" +msgstr "Zulassung des Kanals entfernt" -#: ../../mod/impel.php:43 -msgid "layout" -msgstr "Layout" +#: ../../mod/connedit.php:404 +msgid "Connection has been removed." +msgstr "Verbindung wurde gelöscht." -#: ../../mod/impel.php:117 +#: ../../mod/connedit.php:424 #, php-format -msgid "%s element installed" -msgstr "Element für %s installiert" - -#: ../../mod/lockview.php:31 -msgid "Remote privacy information not available." -msgstr "Privatsphäre-Einstellungen anderer Nutzer sind nicht verfügbar." +msgid "View %s's profile" +msgstr "%ss Profil ansehen" -#: ../../mod/lockview.php:52 -msgid "Visible to:" -msgstr "Sichtbar für:" +#: ../../mod/connedit.php:428 +msgid "Refresh Permissions" +msgstr "Zugriffsrechte neu laden" -#: ../../mod/rbmark.php:88 -msgid "Select a bookmark folder" -msgstr "Lesezeichenordner wählen" +#: ../../mod/connedit.php:431 +msgid "Fetch updated permissions" +msgstr "Aktualisierte Zugriffsrechte abfragen" -#: ../../mod/rbmark.php:93 -msgid "Save Bookmark" -msgstr "Lesezeichen speichern" +#: ../../mod/connedit.php:435 +msgid "Recent Activity" +msgstr "Kürzliche Aktivitäten" -#: ../../mod/rbmark.php:94 -msgid "URL of bookmark" -msgstr "URL des Lesezeichens" +#: ../../mod/connedit.php:438 +msgid "View recent posts and comments" +msgstr "Betrachte die neuesten Beiträge und Kommentare" -#: ../../mod/rbmark.php:95 ../../mod/appman.php:93 -msgid "Description" -msgstr "Beschreibung" +#: ../../mod/connedit.php:442 ../../mod/connedit.php:585 +#: ../../mod/admin.php:734 +msgid "Unblock" +msgstr "Freigeben" -#: ../../mod/rbmark.php:99 -msgid "Or enter new bookmark folder name" -msgstr "Oder gib einen neuen Namen für den Lesezeichenordner ein" +#: ../../mod/connedit.php:442 ../../mod/connedit.php:585 +#: ../../mod/admin.php:733 +msgid "Block" +msgstr "Blockieren" -#: ../../mod/pdledit.php:13 -msgid "Layout updated." -msgstr "Layout aktualisiert." +#: ../../mod/connedit.php:445 +msgid "Block or Unblock this connection" +msgstr "Verbindung blockieren oder freigeben" -#: ../../mod/pdledit.php:28 ../../mod/pdledit.php:53 -msgid "Edit System Page Description" -msgstr "Systemseitenbeschreibung bearbeiten" +#: ../../mod/connedit.php:449 ../../mod/connedit.php:586 +msgid "Unignore" +msgstr "Nicht ignorieren" -#: ../../mod/pdledit.php:48 -msgid "Layout not found." -msgstr "Layout nicht gefunden." +#: ../../mod/connedit.php:449 ../../mod/connedit.php:586 +#: ../../mod/notifications.php:51 +msgid "Ignore" +msgstr "Ignorieren" -#: ../../mod/pdledit.php:54 -msgid "Module Name:" -msgstr "Modulname:" +#: ../../mod/connedit.php:452 +msgid "Ignore or Unignore this connection" +msgstr "Verbindung ignorieren oder wieder beachten" -#: ../../mod/pdledit.php:55 ../../mod/layouts.php:59 -msgid "Layout Help" -msgstr "Layout-Hilfe" +#: ../../mod/connedit.php:455 +msgid "Unarchive" +msgstr "Aus Archiv zurückholen" -#: ../../mod/profile_photo.php:108 -msgid "Image uploaded but image cropping failed." -msgstr "Bild hochgeladen, aber das Zurechtschneiden schlug fehl." +#: ../../mod/connedit.php:455 +msgid "Archive" +msgstr "Archivieren" -#: ../../mod/profile_photo.php:161 -msgid "Image resize failed." -msgstr "Bild-Anpassung fehlgeschlagen." +#: ../../mod/connedit.php:458 +msgid "Archive or Unarchive this connection" +msgstr "Verbindung archivieren oder aus dem Archiv zurückholen" -#: ../../mod/profile_photo.php:205 -msgid "" -"Shift-reload the page or clear browser cache if the new photo does not " -"display immediately." -msgstr "Leere den Browser Cache oder nutze Umschalten-Neu Laden, falls das neue Foto nicht sofort angezeigt wird." +#: ../../mod/connedit.php:461 +msgid "Unhide" +msgstr "Wieder sichtbar machen" -#: ../../mod/profile_photo.php:232 -#, php-format -msgid "Image exceeds size limit of %d" -msgstr "Bild ist größer als das Limit von %d" +#: ../../mod/connedit.php:461 +msgid "Hide" +msgstr "Verstecken" -#: ../../mod/profile_photo.php:241 -msgid "Unable to process image." -msgstr "Kann Bild nicht verarbeiten." +#: ../../mod/connedit.php:464 +msgid "Hide or Unhide this connection" +msgstr "Diese Verbindung verstecken oder wieder sichtbar machen" -#: ../../mod/profile_photo.php:290 ../../mod/profile_photo.php:339 -msgid "Photo not available." -msgstr "Foto nicht verfügbar." +#: ../../mod/connedit.php:471 +msgid "Delete this connection" +msgstr "Verbindung löschen" -#: ../../mod/profile_photo.php:358 -msgid "Upload File:" -msgstr "Datei hochladen:" +#: ../../mod/connedit.php:514 ../../mod/connedit.php:543 +msgid "Approve this connection" +msgstr "Verbindung genehmigen" -#: ../../mod/profile_photo.php:359 -msgid "Select a profile:" -msgstr "Wähle ein Profil:" +#: ../../mod/connedit.php:514 +msgid "Accept connection to allow communication" +msgstr "Akzeptiere die Verbindung, um Kommunikation zu ermöglichen" -#: ../../mod/profile_photo.php:360 -msgid "Upload Profile Photo" -msgstr "Lade neues Profilfoto hoch" +#: ../../mod/connedit.php:530 +msgid "Automatic Permissions Settings" +msgstr "Automatische Berechtigungs-Einstellungen" -#: ../../mod/profile_photo.php:365 -msgid "skip this step" -msgstr "diesen Schritt überspringen" +#: ../../mod/connedit.php:530 +#, php-format +msgid "Connections: settings for %s" +msgstr "Verbindungseinstellungen für %s" -#: ../../mod/profile_photo.php:365 -msgid "select a photo from your photo albums" -msgstr "ein Foto aus meinen Fotoalben" +#: ../../mod/connedit.php:534 +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 "Wenn eine Verbindungsanfrage empfangen wird, werden die hier getroffenen Einstellungen automatisch angewandt, und die Anfrage wird genehmigt. Verlasse diese Seite, wenn Du diese Funktion nicht verwenden möchtest." -#: ../../mod/profile_photo.php:381 -msgid "Crop Image" -msgstr "Bild zuschneiden" +#: ../../mod/connedit.php:536 +msgid "Slide to adjust your degree of friendship" +msgstr "Verschieben, um den Grad der Freundschaft zu einzustellen" -#: ../../mod/profile_photo.php:382 -msgid "Please adjust the image cropping for optimum viewing." -msgstr "Bitte schneide das Bild für eine optimale Anzeige passend zu." +#: ../../mod/connedit.php:542 +msgid "inherited" +msgstr "geerbt" -#: ../../mod/profile_photo.php:384 -msgid "Done Editing" -msgstr "Bearbeitung fertigstellen" +#: ../../mod/connedit.php:544 +msgid "Connection has no individual permissions!" +msgstr "Diese Verbindung hat keine individuellen Zugriffsrechte!" -#: ../../mod/profile_photo.php:427 -msgid "Image uploaded successfully." -msgstr "Bild erfolgreich hochgeladen." +#: ../../mod/connedit.php:545 +msgid "" +"This may be appropriate based on your privacy " +"settings, though you may wish to review the \"Advanced Permissions\"." +msgstr "Abhängig von Deinen Privatsphäre-Einstellungen könnte das passen, eventuell solltest Du aber die „Zugriffsrechte für Fortgeschrittene“ überprüfen." -#: ../../mod/profile_photo.php:429 -msgid "Image upload failed." -msgstr "Hochladen des Bilds fehlgeschlagen." +#: ../../mod/connedit.php:547 +msgid "Profile Visibility" +msgstr "Sichtbarkeit des Profils" -#: ../../mod/profile_photo.php:438 +#: ../../mod/connedit.php:548 #, php-format -msgid "Image size reduction [%s] failed." -msgstr "Reduzierung der Bildgröße [%s] fehlgeschlagen." +msgid "" +"Please choose the profile you would like to display to %s when viewing your " +"profile securely." +msgstr "Bitte wähle ein Profil, das wir %s zeigen sollen, wenn Deine Profilseite über eine verifizierte Verbindung aufgerufen wird." -#: ../../mod/acl.php:244 -msgid "network" -msgstr "Netzwerk" +#: ../../mod/connedit.php:549 +msgid "Contact Information / Notes" +msgstr "Kontaktinformationen / Notizen" -#: ../../mod/menu.php:21 -msgid "Menu updated." -msgstr "Menü aktualisiert." +#: ../../mod/connedit.php:550 +msgid "Edit contact notes" +msgstr "Kontaktnotizen bearbeiten" -#: ../../mod/menu.php:25 -msgid "Unable to update menu." -msgstr "Kann Menü nicht aktualisieren." +#: ../../mod/connedit.php:552 +msgid "Their Settings" +msgstr "Deren Einstellungen" -#: ../../mod/menu.php:30 -msgid "Menu created." -msgstr "Menü erstellt." +#: ../../mod/connedit.php:553 +msgid "My Settings" +msgstr "Meine Einstellungen" -#: ../../mod/menu.php:34 -msgid "Unable to create menu." -msgstr "Kann Menü nicht erstellen." +#: ../../mod/connedit.php:555 +msgid "Clear/Disable Automatic Permissions" +msgstr "Automatische Berechtigungen abschalten/entfernen" -#: ../../mod/menu.php:57 -msgid "Manage Menus" -msgstr "Menüs verwalten" +#: ../../mod/connedit.php:556 +msgid "Forum Members" +msgstr "Forum Mitglieder" -#: ../../mod/menu.php:60 -msgid "Drop" -msgstr "Löschen" +#: ../../mod/connedit.php:557 +msgid "Soapbox" +msgstr "Marktschreier" -#: ../../mod/menu.php:62 -msgid "Create a new menu" -msgstr "Neues Menü erstellen" +#: ../../mod/connedit.php:558 +msgid "Full Sharing (typical social network permissions)" +msgstr "Vollumfängliches Teilen (übliche Berechtigungen in sozialen Netzwerken)" -#: ../../mod/menu.php:63 -msgid "Delete this menu" -msgstr "Lösche dieses Menü" +#: ../../mod/connedit.php:559 +msgid "Cautious Sharing " +msgstr "Vorsichtiges Teilen" -#: ../../mod/menu.php:64 ../../mod/menu.php:109 -msgid "Edit menu contents" -msgstr "Bearbeite Menü Inhalte" +#: ../../mod/connedit.php:560 +msgid "Follow Only" +msgstr "Nur folgen" -#: ../../mod/menu.php:65 -msgid "Edit this menu" -msgstr "Dieses Menü bearbeiten" +#: ../../mod/connedit.php:561 +msgid "Individual Permissions" +msgstr "Individuelle Zugriffsrechte" -#: ../../mod/menu.php:80 -msgid "New Menu" -msgstr "Neues Menü" +#: ../../mod/connedit.php:562 +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 "Einige Berechtigungen werden von den Sicherheits- und Privatsphäre-Einstellungen dieses Kanals geerbt, die eine höhere Priorität haben als die Einstellungen bei einer Verbindung. Werden geerbte Einstellungen hier geändert, hat das keine Auswirkungen." -#: ../../mod/menu.php:81 ../../mod/menu.php:110 -msgid "Menu name" -msgstr "Menü Name" +#: ../../mod/connedit.php:563 +msgid "Advanced Permissions" +msgstr "Zugriffsrechte für Fortgeschrittene" -#: ../../mod/menu.php:81 ../../mod/menu.php:110 -msgid "Must be unique, only seen by you" -msgstr "Muss eindeutig sein, ist aber nur für Dich sichtbar" +#: ../../mod/connedit.php:564 +msgid "Simple Permissions (select one and submit)" +msgstr "Einfache Berechtigungs-Einstellungen (wähle eine aus und klicke auf Senden)" -#: ../../mod/menu.php:82 ../../mod/menu.php:111 -msgid "Menu title" -msgstr "Menü Titel" +#: ../../mod/connedit.php:568 +#, php-format +msgid "Visit %s's profile - %s" +msgstr "%ss Profil besuchen - %s" -#: ../../mod/menu.php:82 ../../mod/menu.php:111 -msgid "Menu title as seen by others" -msgstr "Menü Titel wie er von anderen gesehen wird" +#: ../../mod/connedit.php:569 +msgid "Block/Unblock contact" +msgstr "Kontakt blockieren/freigeben" -#: ../../mod/menu.php:83 ../../mod/menu.php:112 -msgid "Allow bookmarks" -msgstr "Erlaube Lesezeichen" +#: ../../mod/connedit.php:570 +msgid "Ignore contact" +msgstr "Kontakt ignorieren" -#: ../../mod/menu.php:83 ../../mod/menu.php:112 -msgid "Menu may be used to store saved bookmarks" -msgstr "Im Menü können gespeicherte Lesezeichen abgelegt werden" +#: ../../mod/connedit.php:571 +msgid "Repair URL settings" +msgstr "URL-Einstellungen reparieren" -#: ../../mod/menu.php:98 -msgid "Menu deleted." -msgstr "Menü gelöscht." +#: ../../mod/connedit.php:572 +msgid "View conversations" +msgstr "Unterhaltungen anzeigen" -#: ../../mod/menu.php:100 -msgid "Menu could not be deleted." -msgstr "Menü konnte nicht gelöscht werden." +#: ../../mod/connedit.php:574 +msgid "Delete contact" +msgstr "Kontakt löschen" -#: ../../mod/menu.php:106 -msgid "Edit Menu" -msgstr "Menü bearbeiten" +#: ../../mod/connedit.php:577 +msgid "Last update:" +msgstr "Letzte Aktualisierung:" -#: ../../mod/menu.php:108 -msgid "Add or remove entries to this menu" -msgstr "Einträge zu diesem Menü hinzufügen oder entfernen" +#: ../../mod/connedit.php:579 +msgid "Update public posts" +msgstr "Öffentliche Beiträge aktualisieren" -#: ../../mod/block.php:27 ../../mod/page.php:35 -msgid "Invalid item." -msgstr "Ungültiges Element." +#: ../../mod/connedit.php:581 +msgid "Update now" +msgstr "Jetzt aktualisieren" -#: ../../mod/block.php:39 ../../mod/wall_upload.php:28 ../../mod/page.php:47 -msgid "Channel not found." -msgstr "Kanal nicht gefunden." +#: ../../mod/connedit.php:587 +msgid "Currently blocked" +msgstr "Derzeit blockiert" -#: ../../mod/block.php:75 ../../mod/help.php:72 ../../mod/display.php:102 -#: ../../mod/page.php:83 ../../index.php:240 -msgid "Page not found." -msgstr "Seite nicht gefunden." +#: ../../mod/connedit.php:588 +msgid "Currently ignored" +msgstr "Derzeit ignoriert" -#: ../../mod/tagger.php:98 -#, php-format -msgid "%1$s tagged %2$s's %3$s with %4$s" -msgstr "%1$s hat %2$ss %3$s mit %4$s verschlagwortet" +#: ../../mod/connedit.php:589 +msgid "Currently archived" +msgstr "Derzeit archiviert" -#: ../../mod/wall_upload.php:34 -msgid "Wall Photos" -msgstr "Wall Fotos" +#: ../../mod/connedit.php:590 +msgid "Currently pending" +msgstr "Derzeit anstehend" -#: ../../mod/openid.php:26 -msgid "OpenID protocol error. No ID returned." -msgstr "OpenID Protokollfehler. Keine ID zurückgegeben." +#: ../../mod/connedit.php:591 +msgid "Hide this contact from others" +msgstr "Diese Verbindung vor den anderen verbergen." -#: ../../mod/suggest.php:35 +#: ../../mod/connedit.php:591 msgid "" -"No suggestions available. If this is a new site, please try again in 24 " -"hours." -msgstr "Keine Vorschläge vorhanden. Wenn das ein neuer Server ist, versuche es in 24 Stunden noch einmal." +"Replies/likes to your public posts may still be visible" +msgstr "Antworten/Likes auf deine öffentlichen Beiträge können immer noch sichtbar sein" -#: ../../mod/connedit.php:181 -msgid "is now connected to" -msgstr "ist jetzt verbunden mit" +#: ../../mod/delegate.php:95 +msgid "No potential page delegates located." +msgstr "Keine potentiellen Bevollmächtigten für die Seite gefunden." -#: ../../mod/connedit.php:296 -msgid "Could not access address book record." -msgstr "Konnte nicht auf den Adressbuch-Eintrag zugreifen." +#: ../../mod/delegate.php:121 +msgid "Delegate Page Management" +msgstr "Delegiere das Management für diese Seite" -#: ../../mod/connedit.php:310 -msgid "Refresh failed - channel is currently unavailable." -msgstr "Aktualisierung fehlgeschlagen – der Kanal ist im Moment nicht erreichbar." +#: ../../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 "Bevollmächtigte sind in der Lage, alle Aspekte dieses Kontos/dieser Seite zu verwalten, abgesehen von den Grundeinstellungen des Kontos. Gib niemandem eine Bevollmächtigung für Deinen privaten Account, dem Du nicht absolut vertraust!" -#: ../../mod/connedit.php:317 -msgid "Channel has been unblocked" -msgstr "Kanal nicht mehr blockiert" +#: ../../mod/delegate.php:124 +msgid "Existing Page Managers" +msgstr "Vorhandene Seitenmanager" -#: ../../mod/connedit.php:318 -msgid "Channel has been blocked" -msgstr "Kanal blockiert" +#: ../../mod/delegate.php:126 +msgid "Existing Page Delegates" +msgstr "Vorhandene Bevollmächtigte für die Seite" -#: ../../mod/connedit.php:322 ../../mod/connedit.php:334 -#: ../../mod/connedit.php:346 ../../mod/connedit.php:358 -#: ../../mod/connedit.php:374 -msgid "Unable to set address book parameters." -msgstr "Konnte die Adressbuch-Parameter nicht setzen." +#: ../../mod/delegate.php:128 +msgid "Potential Delegates" +msgstr "Potentielle Bevollmächtigte" -#: ../../mod/connedit.php:329 -msgid "Channel has been unignored" -msgstr "Kanal wird nicht mehr ignoriert" +#: ../../mod/delegate.php:131 +msgid "Add" +msgstr "Hinzufügen" -#: ../../mod/connedit.php:330 -msgid "Channel has been ignored" -msgstr "Kanal wird ignoriert" +#: ../../mod/delegate.php:132 +msgid "No entries." +msgstr "Keine Einträge." -#: ../../mod/connedit.php:341 -msgid "Channel has been unarchived" -msgstr "Kanal wurde aus dem Archiv zurück geholt" +#: ../../mod/directory.php:146 ../../mod/dirprofile.php:95 +msgid "Gender: " +msgstr "Geschlecht:" -#: ../../mod/connedit.php:342 -msgid "Channel has been archived" -msgstr "Kanal wurde archiviert" +#: ../../mod/directory.php:223 +msgid "Finding:" +msgstr "Ergebnisse:" -#: ../../mod/connedit.php:353 -msgid "Channel has been unhidden" -msgstr "Kanal wird nicht mehr versteckt" +#: ../../mod/directory.php:228 +msgid "next page" +msgstr "nächste Seite" -#: ../../mod/connedit.php:354 -msgid "Channel has been hidden" -msgstr "Kanal wurde versteckt" +#: ../../mod/directory.php:228 +msgid "previous page" +msgstr "vorherige Seite" -#: ../../mod/connedit.php:369 -msgid "Channel has been approved" -msgstr "Kanal wurde zugelassen" +#: ../../mod/directory.php:245 +msgid "No entries (some entries may be hidden)." +msgstr "Keine Einträge gefunden (einige könnten versteckt sein)." -#: ../../mod/connedit.php:370 -msgid "Channel has been unapproved" -msgstr "Zulassung des Kanals entfernt" +#: ../../mod/bookmarks.php:38 +msgid "Bookmark added" +msgstr "Lesezeichen hinzugefügt" -#: ../../mod/connedit.php:398 -msgid "Connection has been removed." -msgstr "Verbindung wurde gelöscht." +#: ../../mod/bookmarks.php:60 +msgid "My Bookmarks" +msgstr "Meine Lesezeichen" -#: ../../mod/connedit.php:418 -#, php-format -msgid "View %s's profile" -msgstr "%ss Profil ansehen" +#: ../../mod/bookmarks.php:71 +msgid "My Connections Bookmarks" +msgstr "Lesezeichen meiner Kontakte" -#: ../../mod/connedit.php:422 -msgid "Refresh Permissions" -msgstr "Zugriffsrechte neu laden" +#: ../../mod/dirprofile.php:108 +msgid "Status: " +msgstr "Status:" -#: ../../mod/connedit.php:425 -msgid "Fetch updated permissions" -msgstr "Aktualisierte Zugriffsrechte abfragen" +#: ../../mod/dirprofile.php:109 +msgid "Sexual Preference: " +msgstr "Sexuelle Ausrichtung:" -#: ../../mod/connedit.php:429 -msgid "Recent Activity" -msgstr "Kürzliche Aktivitäten" +#: ../../mod/dirprofile.php:111 +msgid "Homepage: " +msgstr "Webseite:" -#: ../../mod/connedit.php:432 -msgid "View recent posts and comments" -msgstr "Betrachte die neuesten Beiträge und Kommentare" +#: ../../mod/dirprofile.php:112 +msgid "Hometown: " +msgstr "Wohnort:" -#: ../../mod/connedit.php:439 -msgid "Block or Unblock this connection" -msgstr "Verbindung blockieren oder freigeben" +#: ../../mod/dirprofile.php:114 +msgid "About: " +msgstr "Über:" -#: ../../mod/connedit.php:443 ../../mod/connedit.php:580 -msgid "Unignore" -msgstr "Nicht ignorieren" +#: ../../mod/dirprofile.php:162 +msgid "Keywords: " +msgstr "Schlüsselwörter:" -#: ../../mod/connedit.php:443 ../../mod/connedit.php:580 -#: ../../mod/notifications.php:51 -msgid "Ignore" -msgstr "Ignorieren" +#: ../../mod/dirsearch.php:21 +msgid "This site is not a directory server" +msgstr "Diese Website ist kein Verzeichnis-Server" -#: ../../mod/connedit.php:446 -msgid "Ignore or Unignore this connection" -msgstr "Verbindung ignorieren oder wieder beachten" +#: ../../mod/cloud.php:130 +msgid "RedMatrix - Guests: Username: {your email address}, Password: +++" +msgstr "RedMatrix – Gäste: Username: {Deine E-Mail-Adresse}, Passwort: +++" -#: ../../mod/connedit.php:449 -msgid "Unarchive" -msgstr "Aus Archiv zurückholen" +#: ../../mod/setup.php:162 +msgid "Red Matrix Server - Setup" +msgstr "Red Matrix Server - Installation" -#: ../../mod/connedit.php:449 -msgid "Archive" -msgstr "Archivieren" +#: ../../mod/setup.php:168 +msgid "Could not connect to database." +msgstr "Kann nicht mit der Datenbank verbinden." -#: ../../mod/connedit.php:452 -msgid "Archive or Unarchive this connection" -msgstr "Verbindung archivieren oder aus dem Archiv zurückholen" +#: ../../mod/setup.php:172 +msgid "" +"Could not connect to specified site URL. Possible SSL certificate or DNS " +"issue." +msgstr "Konnte die angegebene Webseiten-URL nicht erreichen. Möglicherweise ein Problem mit dem SSL-Zertifikat oder dem DNS." -#: ../../mod/connedit.php:455 -msgid "Unhide" -msgstr "Wieder sichtbar machen" +#: ../../mod/setup.php:179 +msgid "Could not create table." +msgstr "Kann Tabelle nicht erstellen." -#: ../../mod/connedit.php:455 -msgid "Hide" -msgstr "Verstecken" +#: ../../mod/setup.php:185 +msgid "Your site database has been installed." +msgstr "Die Datenbank Deines Servers wurde installiert." -#: ../../mod/connedit.php:458 -msgid "Hide or Unhide this connection" -msgstr "Diese Verbindung verstecken oder wieder sichtbar machen" +#: ../../mod/setup.php:190 +msgid "" +"You may need to import the file \"install/database.sql\" manually using " +"phpmyadmin or mysql." +msgstr "Eventuell musst Du die Datei \"install/database.sql\" per Hand mit phpmyadmin oder mysql importieren." -#: ../../mod/connedit.php:465 -msgid "Delete this connection" -msgstr "Verbindung löschen" +#: ../../mod/setup.php:191 ../../mod/setup.php:260 ../../mod/setup.php:655 +msgid "Please see the file \"install/INSTALL.txt\"." +msgstr "Lies die Datei \"install/INSTALL.txt\"." -#: ../../mod/connedit.php:508 ../../mod/connedit.php:537 -msgid "Approve this connection" -msgstr "Verbindung genehmigen" +#: ../../mod/setup.php:257 +msgid "System check" +msgstr "Systemprüfung" -#: ../../mod/connedit.php:508 -msgid "Accept connection to allow communication" -msgstr "Akzeptiere die Verbindung, um Kommunikation zu ermöglichen" +#: ../../mod/setup.php:262 +msgid "Check again" +msgstr "Bitte nochmal prüfen" -#: ../../mod/connedit.php:524 -msgid "Automatic Permissions Settings" -msgstr "Automatische Berechtigungs-Einstellungen" +#: ../../mod/setup.php:284 +msgid "Database connection" +msgstr "Datenbank Verbindung" -#: ../../mod/connedit.php:524 -#, php-format -msgid "Connections: settings for %s" -msgstr "Verbindungseinstellungen für %s" +#: ../../mod/setup.php:285 +msgid "" +"In order to install Red Matrix we need to know how to connect to your " +"database." +msgstr "Um die Red-Matrix installieren zu können, müssen wir wissen, wie wir eine Verbindung zu Deiner Datenbank aufbauen können." -#: ../../mod/connedit.php:528 +#: ../../mod/setup.php:286 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 "Wenn eine Verbindungsanfrage empfangen wird, werden die hier getroffenen Einstellungen automatisch angewandt, und die Anfrage wird genehmigt. Verlasse diese Seite, wenn Du diese Funktion nicht verwenden möchtest." +"Please contact your hosting provider or site administrator if you have " +"questions about these settings." +msgstr "Bitte kontaktiere Deinen Hosting-Provider oder Administrator, falls Du Fragen zu diesen Einstellungen hast." -#: ../../mod/connedit.php:530 -msgid "Slide to adjust your degree of friendship" -msgstr "Verschieben, um den Grad der Freundschaft zu einzustellen" +#: ../../mod/setup.php:287 +msgid "" +"The database you specify below should already exist. If it does not, please " +"create it before continuing." +msgstr "Die Datenbank, die Du weiter unten angibst, sollte bereits existieren. Sollte das noch nicht der Fall sein, erzeuge sie bitte bevor Du fortfährst." -#: ../../mod/connedit.php:536 -msgid "inherited" -msgstr "geerbt" +#: ../../mod/setup.php:291 +msgid "Database Server Name" +msgstr "Datenbank-Servername" -#: ../../mod/connedit.php:538 -msgid "Connection has no individual permissions!" -msgstr "Diese Verbindung hat keine individuellen Zugriffsrechte!" +#: ../../mod/setup.php:291 +msgid "Default is localhost" +msgstr "Standard ist localhost" -#: ../../mod/connedit.php:539 -msgid "" -"This may be appropriate based on your privacy " -"settings, though you may wish to review the \"Advanced Permissions\"." -msgstr "Abhängig von Deinen Privatsphäre-Einstellungen könnte das passen, eventuell solltest Du aber die „Zugriffsrechte für Fortgeschrittene“ überprüfen." +#: ../../mod/setup.php:292 +msgid "Database Port" +msgstr "Datenbank-Port" -#: ../../mod/connedit.php:541 -msgid "Profile Visibility" -msgstr "Sichtbarkeit des Profils" +#: ../../mod/setup.php:292 +msgid "Communication port number - use 0 for default" +msgstr "Port-Nummer für die Kommunikation – verwende 0 für die Standardeinstellung" -#: ../../mod/connedit.php:542 -#, php-format -msgid "" -"Please choose the profile you would like to display to %s when viewing your " -"profile securely." -msgstr "Bitte wähle ein Profil, das wir %s zeigen sollen, wenn Deine Profilseite über eine verifizierte Verbindung aufgerufen wird." +#: ../../mod/setup.php:293 +msgid "Database Login Name" +msgstr "Datenbank-Benutzername" -#: ../../mod/connedit.php:543 -msgid "Contact Information / Notes" -msgstr "Kontaktinformationen / Notizen" +#: ../../mod/setup.php:294 +msgid "Database Login Password" +msgstr "Datenbank-Kennwort" -#: ../../mod/connedit.php:544 -msgid "Edit contact notes" -msgstr "Kontaktnotizen bearbeiten" +#: ../../mod/setup.php:295 +msgid "Database Name" +msgstr "Datenbank-Name" -#: ../../mod/connedit.php:546 -msgid "Their Settings" -msgstr "Deren Einstellungen" +#: ../../mod/setup.php:297 ../../mod/setup.php:339 +msgid "Site administrator email address" +msgstr "E-Mail Adresse des Seiten-Administrators" -#: ../../mod/connedit.php:547 -msgid "My Settings" -msgstr "Meine Einstellungen" +#: ../../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 "Die E-Mail-Adresse Deines Accounts muss dieser Adresse entsprechen, damit Du Zugriff zur Administrations-Seite erhältst." -#: ../../mod/connedit.php:549 -msgid "Clear/Disable Automatic Permissions" -msgstr "Automatische Berechtigungen abschalten/entfernen" +#: ../../mod/setup.php:298 ../../mod/setup.php:341 +msgid "Website URL" +msgstr "Server-URL" -#: ../../mod/connedit.php:550 -msgid "Forum Members" -msgstr "Forum Mitglieder" +#: ../../mod/setup.php:298 ../../mod/setup.php:341 +msgid "Please use SSL (https) URL if available." +msgstr "Nutze wenn möglich eine SSL-URL (https)." -#: ../../mod/connedit.php:551 -msgid "Soapbox" -msgstr "Marktschreier" +#: ../../mod/setup.php:301 ../../mod/setup.php:344 +msgid "Please select a default timezone for your website" +msgstr "Standard-Zeitzone für Deinen Server" -#: ../../mod/connedit.php:552 -msgid "Full Sharing (typical social network permissions)" -msgstr "Vollumfängliches Teilen (übliche Berechtigungen in sozialen Netzwerken)" +#: ../../mod/setup.php:328 +msgid "Site settings" +msgstr "Seiteneinstellungen" -#: ../../mod/connedit.php:553 -msgid "Cautious Sharing " -msgstr "Vorsichtiges Teilen" +#: ../../mod/setup.php:387 +msgid "Could not find a command line version of PHP in the web server PATH." +msgstr "Konnte die Kommandozeilen-Version von PHP nicht im PATH des Web-Servers finden." -#: ../../mod/connedit.php:554 -msgid "Follow Only" -msgstr "Nur folgen" +#: ../../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 "Ohne Kommandozeilen-Version von PHP auf dem Server wirst Du nicht in der Lage sein, Hintergrundprozesse via cron auszuführen." -#: ../../mod/connedit.php:555 -msgid "Individual Permissions" -msgstr "Individuelle Zugriffsrechte" +#: ../../mod/setup.php:392 +msgid "PHP executable path" +msgstr "PHP Pfad zu ausführbarer Datei" -#: ../../mod/connedit.php:556 +#: ../../mod/setup.php:392 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 "Einige Berechtigungen werden von den Sicherheits- und Privatsphäre-Einstellungen dieses Kanals geerbt, die eine höhere Priorität haben als die Einstellungen bei einer Verbindung. Werden geerbte Einstellungen hier geändert, hat das keine Auswirkungen." +"Enter full path to php executable. You can leave this blank to continue the " +"installation." +msgstr "Gib den vollen Pfad zum PHP-Interpreter an. Du kannst dieses Feld frei lassen und mit der Installation fortfahren." -#: ../../mod/connedit.php:557 -msgid "Advanced Permissions" -msgstr "Zugriffsrechte für Fortgeschrittene" +#: ../../mod/setup.php:397 +msgid "Command line PHP" +msgstr "PHP Befehlszeile" -#: ../../mod/connedit.php:558 -msgid "Simple Permissions (select one and submit)" -msgstr "Einfache Berechtigungs-Einstellungen (wähle eine aus und klicke auf Senden)" +#: ../../mod/setup.php:406 +msgid "" +"The command line version of PHP on your system does not have " +"\"register_argc_argv\" enabled." +msgstr "Bei der Kommandozeilen-Version von PHP auf Deinem System ist \"register_argc_argv\" nicht aktiviert." -#: ../../mod/connedit.php:562 -#, php-format -msgid "Visit %s's profile - %s" -msgstr "%ss Profil besuchen - %s" +#: ../../mod/setup.php:407 +msgid "This is required for message delivery to work." +msgstr "Das wird benötigt, damit die Auslieferung von Nachrichten funktioniert." -#: ../../mod/connedit.php:563 -msgid "Block/Unblock contact" -msgstr "Kontakt blockieren/freigeben" +#: ../../mod/setup.php:409 +msgid "PHP register_argc_argv" +msgstr "PHP register_argc_argv" -#: ../../mod/connedit.php:564 -msgid "Ignore contact" -msgstr "Kontakt ignorieren" +#: ../../mod/setup.php:430 +msgid "" +"Error: the \"openssl_pkey_new\" function on this system is not able to " +"generate encryption keys" +msgstr "Fehler: Die „openssl_pkey_new“-Funktion auf diesem System ist nicht in der Lage, Schlüssel für die Verschlüsselung zu erzeugen." -#: ../../mod/connedit.php:565 -msgid "Repair URL settings" -msgstr "URL-Einstellungen reparieren" +#: ../../mod/setup.php:431 +msgid "" +"If running under Windows, please see " +"\"http://www.php.net/manual/en/openssl.installation.php\"." +msgstr "Wenn Du Windows verwendest, findest Du unter http://www.php.net/manual/en/openssl.installation.php eine Installationsanleitung." -#: ../../mod/connedit.php:566 -msgid "View conversations" -msgstr "Unterhaltungen anzeigen" +#: ../../mod/setup.php:433 +msgid "Generate encryption keys" +msgstr "Verschlüsselungsschlüssel generieren" -#: ../../mod/connedit.php:568 -msgid "Delete contact" -msgstr "Kontakt löschen" +#: ../../mod/setup.php:440 +msgid "libCurl PHP module" +msgstr "libCurl-PHP-Modul" -#: ../../mod/connedit.php:571 -msgid "Last update:" -msgstr "Letzte Aktualisierung:" +#: ../../mod/setup.php:441 +msgid "GD graphics PHP module" +msgstr "GD-Grafik-PHP-Modul" -#: ../../mod/connedit.php:573 -msgid "Update public posts" -msgstr "Öffentliche Beiträge aktualisieren" +#: ../../mod/setup.php:442 +msgid "OpenSSL PHP module" +msgstr "OpenSSL-PHP-Modul" -#: ../../mod/connedit.php:575 -msgid "Update now" -msgstr "Jetzt aktualisieren" +#: ../../mod/setup.php:443 +msgid "mysqli PHP module" +msgstr "mysqli-PHP-Modul" -#: ../../mod/connedit.php:581 -msgid "Currently blocked" -msgstr "Derzeit blockiert" +#: ../../mod/setup.php:444 +msgid "mb_string PHP module" +msgstr "mb_string-PHP-Modul" -#: ../../mod/connedit.php:582 -msgid "Currently ignored" -msgstr "Derzeit ignoriert" +#: ../../mod/setup.php:445 +msgid "mcrypt PHP module" +msgstr "mcrypt-PHP-Modul" -#: ../../mod/connedit.php:583 -msgid "Currently archived" -msgstr "Derzeit archiviert" +#: ../../mod/setup.php:450 ../../mod/setup.php:452 +msgid "Apache mod_rewrite module" +msgstr "Apache-mod_rewrite-Modul" -#: ../../mod/connedit.php:584 -msgid "Currently pending" -msgstr "Derzeit anstehend" +#: ../../mod/setup.php:450 +msgid "" +"Error: Apache webserver mod-rewrite module is required but not installed." +msgstr "Fehler: Das Apache-Modul mod-rewrite wird benötigt, ist aber nicht installiert." -#: ../../mod/connedit.php:585 -msgid "Hide this contact from others" -msgstr "Diese Verbindung vor den anderen verbergen." +#: ../../mod/setup.php:456 ../../mod/setup.php:459 +msgid "proc_open" +msgstr "proc_open" -#: ../../mod/connedit.php:585 +#: ../../mod/setup.php:456 msgid "" -"Replies/likes to your public posts may still be visible" -msgstr "Antworten/Likes auf deine öffentlichen Beiträge können immer noch sichtbar sein" +"Error: proc_open is required but is either not installed or has been " +"disabled in php.ini" +msgstr "Fehler: proc_open wird benötigt, ist aber entweder nicht installiert oder wurde in der php.ini deaktiviert" -#: ../../mod/message.php:41 -msgid "Conversation removed." -msgstr "Unterhaltung gelöscht." +#: ../../mod/setup.php:464 +msgid "Error: libCURL PHP module required but not installed." +msgstr "Fehler: Das PHP-Modul libCURL wird benötigt, ist aber nicht installiert." -#: ../../mod/message.php:56 -msgid "No messages." -msgstr "Keine Nachrichten." +#: ../../mod/setup.php:468 +msgid "" +"Error: GD graphics PHP module with JPEG support required but not installed." +msgstr "Fehler: Das PHP-Modul GD-Grafik mit JPEG-Unterstützung wird benötigt, ist aber nicht installiert." -#: ../../mod/message.php:72 ../../mod/mail.php:329 -msgid "Delete conversation" -msgstr "Unterhaltung löschen" +#: ../../mod/setup.php:472 +msgid "Error: openssl PHP module required but not installed." +msgstr "Fehler: Das PHP-Modul openssl wird benötigt, ist aber nicht installiert." -#: ../../mod/message.php:74 -msgid "D, d M Y - g:i A" -msgstr "D, d. M Y - G:i" +#: ../../mod/setup.php:476 +msgid "Error: mysqli PHP module required but not installed." +msgstr "Fehler: Das PHP-Modul mysqli wird benötigt, ist aber nicht installiert." -#: ../../mod/ping.php:237 -msgid "sent you a private message" -msgstr "eine private Nachricht schicken" +#: ../../mod/setup.php:480 +msgid "Error: mb_string PHP module required but not installed." +msgstr "Fehler: Das PHP-Modul mb_string wird benötigt, ist aber nicht installiert." -#: ../../mod/ping.php:288 -msgid "added your channel" -msgstr "hat deinen Kanal hinzugefügt" +#: ../../mod/setup.php:484 +msgid "Error: mcrypt PHP module required but not installed." +msgstr "Fehler: Das PHP-Modul mcrypt wird benötigt, ist aber nicht installiert." -#: ../../mod/ping.php:329 -msgid "posted an event" -msgstr "hat eine Veranstaltung veröffentlicht" +#: ../../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 "Der Installations-Assistent muss in der Lage sein, die Datei \".htconfig.php\" im Stammverzeichnis des Web-Servers anzulegen, ist er aber nicht." -#: ../../mod/setup.php:162 -msgid "Red Matrix Server - Setup" -msgstr "Red Matrix Server - Installation" +#: ../../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 "Meist liegt das daran, dass der Nutzer, unter dem der Web-Server läuft, keine Rechte Schreibrechte in dem Verzeichnis hat – selbst wenn Du selbst das darfst." -#: ../../mod/setup.php:168 -msgid "Could not connect to database." -msgstr "Kann nicht mit der Datenbank verbinden." +#: ../../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 "Am Schluss dieses Vorgangs wird ein Text generiert, den Du unter dem Dateinamen .htconfig.php im Stammverzeichnis Deiner Red-Installation speichern musst." -#: ../../mod/setup.php:172 +#: ../../mod/setup.php:503 msgid "" -"Could not connect to specified site URL. Possible SSL certificate or DNS " -"issue." -msgstr "Konnte die angegebene Webseiten-URL nicht erreichen. Möglicherweise ein Problem mit dem SSL-Zertifikat oder dem DNS." +"You can alternatively skip this procedure and perform a manual installation." +" Please see the file \"install/INSTALL.txt\" for instructions." +msgstr "Alternativ kannst Du diesen Schritt überspringen und die Installation manuell vornehmen. Lies dazu die Datei install/INSTALL.txt." -#: ../../mod/setup.php:179 -msgid "Could not create table." -msgstr "Kann Tabelle nicht erstellen." +#: ../../mod/setup.php:506 +msgid ".htconfig.php is writable" +msgstr ".htconfig.php ist beschreibbar" -#: ../../mod/setup.php:185 -msgid "Your site database has been installed." -msgstr "Die Datenbank Deines Servers wurde installiert." +#: ../../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 verwendet Smarty3 um Vorlagen für die Webdarstellung zu übersetzen. Smarty3 übersetzt diese Vorlagen nach PHP, um die Darstellung zu beschleunigen." -#: ../../mod/setup.php:190 +#: ../../mod/setup.php:517 +#, php-format msgid "" -"You may need to import the file \"install/database.sql\" manually using " -"phpmyadmin or mysql." -msgstr "Eventuell musst Du die Datei \"install/database.sql\" per Hand mit phpmyadmin oder mysql importieren." +"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 "Um diese kompilierten Vorlagen speichern zu können braucht der Web-Server Schreibzugriff auf das Verzeichnis %s unterhalb des Red-Installationsverzeichnisses." -#: ../../mod/setup.php:191 ../../mod/setup.php:260 ../../mod/setup.php:655 -msgid "Please see the file \"install/INSTALL.txt\"." -msgstr "Lies die Datei \"install/INSTALL.txt\"." +#: ../../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 "Bitte stelle sicher, dass der Nutzer, unter dem der Webserver läuft (z.B. www-data), Schreibzugriff auf dieses Verzeichnis hat." -#: ../../mod/setup.php:257 -msgid "System check" -msgstr "Systemprüfung" +#: ../../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 " Hinweis: Aus Sicherheitsgründen sollte der Web-Server nur auf %s Schreibrechte haben, nicht in der restlichen Red-Installation." -#: ../../mod/setup.php:261 ../../mod/events.php:439 -msgid "Next" -msgstr "Nächste" +#: ../../mod/setup.php:522 +#, php-format +msgid "%s is writable" +msgstr "%s ist beschreibbar" -#: ../../mod/setup.php:262 -msgid "Check again" -msgstr "Bitte nochmal prüfen" +#: ../../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 benutzt das Verzeichnis store, um hochgeladene Dateien zu speichern. Der Web-Server benötigt Schreibrechte für dieses Verzeichnis direkt unterhalb des Red-Stammverzeichnisses" -#: ../../mod/setup.php:284 -msgid "Database connection" -msgstr "Datenbank Verbindung" +#: ../../mod/setup.php:539 +msgid "store is writable" +msgstr "store ist schreibbar" -#: ../../mod/setup.php:285 +#: ../../mod/setup.php:569 msgid "" -"In order to install Red Matrix we need to know how to connect to your " -"database." -msgstr "Um die Red-Matrix installieren zu können, müssen wir wissen, wie wir eine Verbindung zu Deiner Datenbank aufbauen können." +"SSL certificate cannot be validated. Fix certificate or disable https access" +" to this site." +msgstr "Das SSL-Zertifikat konnte nicht validiert werden. Korrigiere das Zertifikat oder deaktiviere den HTTPS-Zugriff auf diesen Server." -#: ../../mod/setup.php:286 +#: ../../mod/setup.php:570 msgid "" -"Please contact your hosting provider or site administrator if you have " -"questions about these settings." -msgstr "Bitte kontaktiere Deinen Hosting-Provider oder Administrator, falls Du Fragen zu diesen Einstellungen hast." +"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 "Wenn Du via HTTPS auf Deinen Server zugreifen möchtest, also Verbindungen über den Port 443 möglich sein sollen, ist ein SSL-Zertifikat einer Zertifizierungsstelle (CA) notwendig, das von den Browsern ohne Sicherheitsabfrage akzeptiert wird. Die Verwendung eines selbst signierten Zertifikates ist nicht möglich." -#: ../../mod/setup.php:287 +#: ../../mod/setup.php:571 msgid "" -"The database you specify below should already exist. If it does not, please " -"create it before continuing." -msgstr "Die Datenbank, die Du weiter unten angibst, sollte bereits existieren. Sollte das noch nicht der Fall sein, erzeuge sie bitte bevor Du fortfährst." +"This restriction is incorporated because public posts from you may for " +"example contain references to images on your own hub." +msgstr "Diese Einschränkung wurde eingebaut, weil Deine öffentlichen Beiträge zum Beispiel Verweise auf Bilder auf Deinem eigenen Hub enthalten können." -#: ../../mod/setup.php:291 -msgid "Database Server Name" -msgstr "Datenbank-Servername" +#: ../../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 "Wenn Dein Zertifikat nicht von jedem Browser akzeptiert wird, erhalten die Mitglieder anderer Red-Server (die mit korrekten Zertifikate ausgestattet sind) Sicherheits-Warnmeldungen, obwohl sie gar nicht direkt auf Deinem Server unterwegs sind (zum Beispiel, wenn ein Bild aus einem Deiner Beiträge angezeigt wird)." -#: ../../mod/setup.php:291 -msgid "Default is localhost" -msgstr "Standard ist localhost" +#: ../../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 "Dies kann Probleme für andere Nutzer (nicht nur auf Deinem eigenen Server) verursachen, so dass wir auf dieser Forderung bestehen müssen.. " -#: ../../mod/setup.php:292 -msgid "Database Port" -msgstr "Datenbank-Port" +#: ../../mod/setup.php:574 +msgid "" +"Providers are available that issue free certificates which are browser-" +"valid." +msgstr "Es gibt einige Zertifizierungsstellen (CAs), bei denen solche Zertifikate kostenlos zu haben sind." -#: ../../mod/setup.php:292 -msgid "Communication port number - use 0 for default" -msgstr "Port-Nummer für die Kommunikation – verwende 0 für die Standardeinstellung" +#: ../../mod/setup.php:576 +msgid "SSL certificate validation" +msgstr "SSL Zertifikatverifizierung" -#: ../../mod/setup.php:293 -msgid "Database Login Name" -msgstr "Datenbank-Benutzername" +#: ../../mod/setup.php:582 +msgid "" +"Url rewrite in .htaccess is not working. Check your server configuration." +msgstr "URL rewrite via .htaccess funktioniert nicht. Überprüfe Deine Server-Konfiguration." -#: ../../mod/setup.php:294 -msgid "Database Login Password" -msgstr "Datenbank-Kennwort" +#: ../../mod/setup.php:584 +msgid "Url rewrite is working" +msgstr "Url rewrite funktioniert" -#: ../../mod/setup.php:295 -msgid "Database Name" -msgstr "Datenbank-Name" +#: ../../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 "Die Datenbank-Konfigurationsdatei „.htconfig.php“ konnte nicht geschrieben werden. Bitte verwende den unten angegebenen Text, um die Konfigurationsdatei im Stammverzeichnis des Webservers anzulegen." -#: ../../mod/setup.php:297 ../../mod/setup.php:339 -msgid "Site administrator email address" -msgstr "E-Mail Adresse des Seiten-Administrators" +#: ../../mod/setup.php:618 +msgid "Errors encountered creating database tables." +msgstr "Fehler beim Anlegen der Datenbank-Tabellen aufgetreten." -#: ../../mod/setup.php:297 ../../mod/setup.php:339 +#: ../../mod/setup.php:653 +msgid "

    What next

    " +msgstr "

    Was als Nächstes

    " + +#: ../../mod/setup.php:654 msgid "" -"Your account email address must match this in order to use the web admin " -"panel." -msgstr "Die E-Mail-Adresse Deines Accounts muss dieser Adresse entsprechen, damit Du Zugriff zur Administrations-Seite erhältst." +"IMPORTANT: You will need to [manually] setup a scheduled task for the " +"poller." +msgstr "WICHTIG: Du musst [manuell] einen Cronjob für den Poller einrichten." -#: ../../mod/setup.php:298 ../../mod/setup.php:341 -msgid "Website URL" -msgstr "Server-URL" +#: ../../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 "Element nicht gefunden" -#: ../../mod/setup.php:298 ../../mod/setup.php:341 -msgid "Please use SSL (https) URL if available." -msgstr "Nutze wenn möglich eine SSL-URL (https)." +#: ../../mod/editblock.php:77 +msgid "Edit Block" +msgstr "Block bearbeiten" -#: ../../mod/setup.php:301 ../../mod/setup.php:344 -msgid "Please select a default timezone for your website" -msgstr "Standard-Zeitzone für Deinen Server" +#: ../../mod/editblock.php:87 +msgid "Delete block?" +msgstr "Block löschen?" -#: ../../mod/setup.php:328 -msgid "Site settings" -msgstr "Seiteneinstellungen" +#: ../../mod/editblock.php:115 ../../mod/editlayout.php:110 +#: ../../mod/editpost.php:116 ../../mod/editwebpage.php:147 +msgid "Insert YouTube video" +msgstr "YouTube-Video einfügen" -#: ../../mod/setup.php:387 -msgid "Could not find a command line version of PHP in the web server PATH." -msgstr "Konnte die Kommandozeilen-Version von PHP nicht im PATH des Web-Servers finden." +#: ../../mod/editblock.php:116 ../../mod/editlayout.php:111 +#: ../../mod/editpost.php:117 ../../mod/editwebpage.php:148 +msgid "Insert Vorbis [.ogg] video" +msgstr "Vorbis [.ogg]-Video einfügen" -#: ../../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 "Ohne Kommandozeilen-Version von PHP auf dem Server wirst Du nicht in der Lage sein, Hintergrundprozesse via cron auszuführen." +#: ../../mod/editblock.php:117 ../../mod/editlayout.php:112 +#: ../../mod/editpost.php:118 ../../mod/editwebpage.php:149 +msgid "Insert Vorbis [.ogg] audio" +msgstr "Vorbis [.ogg]-Audio einfügen" -#: ../../mod/setup.php:392 -msgid "PHP executable path" -msgstr "PHP Pfad zu ausführbarer Datei" +#: ../../mod/editblock.php:153 +msgid "Delete Block" +msgstr "Block löschen" -#: ../../mod/setup.php:392 -msgid "" -"Enter full path to php executable. You can leave this blank to continue the " -"installation." -msgstr "Gib den vollen Pfad zum PHP-Interpreter an. Du kannst dieses Feld frei lassen und mit der Installation fortfahren." +#: ../../mod/pdledit.php:13 +msgid "Layout updated." +msgstr "Layout aktualisiert." -#: ../../mod/setup.php:397 -msgid "Command line PHP" -msgstr "PHP Befehlszeile" +#: ../../mod/pdledit.php:28 ../../mod/pdledit.php:53 +msgid "Edit System Page Description" +msgstr "Systemseitenbeschreibung bearbeiten" -#: ../../mod/setup.php:406 -msgid "" -"The command line version of PHP on your system does not have " -"\"register_argc_argv\" enabled." -msgstr "Bei der Kommandozeilen-Version von PHP auf Deinem System ist \"register_argc_argv\" nicht aktiviert." +#: ../../mod/pdledit.php:48 +msgid "Layout not found." +msgstr "Layout nicht gefunden." -#: ../../mod/setup.php:407 -msgid "This is required for message delivery to work." -msgstr "Das wird benötigt, damit die Auslieferung von Nachrichten funktioniert." +#: ../../mod/pdledit.php:54 +msgid "Module Name:" +msgstr "Modulname:" -#: ../../mod/setup.php:409 -msgid "PHP register_argc_argv" -msgstr "PHP register_argc_argv" +#: ../../mod/pdledit.php:55 ../../mod/layouts.php:59 +msgid "Layout Help" +msgstr "Layout-Hilfe" -#: ../../mod/setup.php:430 -msgid "" -"Error: the \"openssl_pkey_new\" function on this system is not able to " -"generate encryption keys" -msgstr "Fehler: Die „openssl_pkey_new“-Funktion auf diesem System ist nicht in der Lage, Schlüssel für die Verschlüsselung zu erzeugen." +#: ../../mod/editlayout.php:72 +msgid "Edit Layout" +msgstr "Layout bearbeiten" -#: ../../mod/setup.php:431 -msgid "" -"If running under Windows, please see " -"\"http://www.php.net/manual/en/openssl.installation.php\"." -msgstr "Wenn Du Windows verwendest, findest Du unter http://www.php.net/manual/en/openssl.installation.php eine Installationsanleitung." +#: ../../mod/editlayout.php:82 +msgid "Delete layout?" +msgstr "Layout löschen?" -#: ../../mod/setup.php:433 -msgid "Generate encryption keys" -msgstr "Verschlüsselungsschlüssel generieren" +#: ../../mod/editlayout.php:146 +msgid "Delete Layout" +msgstr "Layout löschen" -#: ../../mod/setup.php:440 -msgid "libCurl PHP module" -msgstr "libCurl-PHP-Modul" +#: ../../mod/editpost.php:31 +msgid "Item is not editable" +msgstr "Element kann nicht bearbeitet werden." + +#: ../../mod/editpost.php:53 +msgid "Delete item?" +msgstr "Eintrag löschen?" -#: ../../mod/setup.php:441 -msgid "GD graphics PHP module" -msgstr "GD-Grafik-PHP-Modul" +#: ../../mod/editwebpage.php:106 +msgid "Edit Webpage" +msgstr "Webseite bearbeiten" -#: ../../mod/setup.php:442 -msgid "OpenSSL PHP module" -msgstr "OpenSSL-PHP-Modul" +#: ../../mod/editwebpage.php:116 +msgid "Delete webpage?" +msgstr "Webseite löschen?" -#: ../../mod/setup.php:443 -msgid "mysqli PHP module" -msgstr "mysqli-PHP-Modul" +#: ../../mod/editwebpage.php:186 +msgid "Delete Webpage" +msgstr "Webseite löschen" -#: ../../mod/setup.php:444 -msgid "mb_string PHP module" -msgstr "mb_string-PHP-Modul" +#: ../../mod/impel.php:33 +msgid "webpage" +msgstr "Webseite" -#: ../../mod/setup.php:445 -msgid "mcrypt PHP module" -msgstr "mcrypt-PHP-Modul" +#: ../../mod/impel.php:38 +msgid "block" +msgstr "Block" -#: ../../mod/setup.php:450 ../../mod/setup.php:452 -msgid "Apache mod_rewrite module" -msgstr "Apache-mod_rewrite-Modul" +#: ../../mod/impel.php:43 +msgid "layout" +msgstr "Layout" -#: ../../mod/setup.php:450 -msgid "" -"Error: Apache webserver mod-rewrite module is required but not installed." -msgstr "Fehler: Das Apache-Modul mod-rewrite wird benötigt, ist aber nicht installiert." +#: ../../mod/impel.php:117 +#, php-format +msgid "%s element installed" +msgstr "Element für %s installiert" -#: ../../mod/setup.php:456 ../../mod/setup.php:459 -msgid "proc_open" -msgstr "proc_open" +#: ../../mod/profile_photo.php:108 +msgid "Image uploaded but image cropping failed." +msgstr "Bild hochgeladen, aber das Zurechtschneiden schlug fehl." -#: ../../mod/setup.php:456 +#: ../../mod/profile_photo.php:161 +msgid "Image resize failed." +msgstr "Bild-Anpassung fehlgeschlagen." + +#: ../../mod/profile_photo.php:205 msgid "" -"Error: proc_open is required but is either not installed or has been " -"disabled in php.ini" -msgstr "Fehler: proc_open wird benötigt, ist aber entweder nicht installiert oder wurde in der php.ini deaktiviert" +"Shift-reload the page or clear browser cache if the new photo does not " +"display immediately." +msgstr "Leere den Browser Cache oder nutze Umschalten-Neu Laden, falls das neue Foto nicht sofort angezeigt wird." -#: ../../mod/setup.php:464 -msgid "Error: libCURL PHP module required but not installed." -msgstr "Fehler: Das PHP-Modul libCURL wird benötigt, ist aber nicht installiert." +#: ../../mod/profile_photo.php:232 +#, php-format +msgid "Image exceeds size limit of %d" +msgstr "Bild ist größer als das Limit von %d" -#: ../../mod/setup.php:468 -msgid "" -"Error: GD graphics PHP module with JPEG support required but not installed." -msgstr "Fehler: Das PHP-Modul GD-Grafik mit JPEG-Unterstützung wird benötigt, ist aber nicht installiert." +#: ../../mod/profile_photo.php:241 +msgid "Unable to process image." +msgstr "Kann Bild nicht verarbeiten." -#: ../../mod/setup.php:472 -msgid "Error: openssl PHP module required but not installed." -msgstr "Fehler: Das PHP-Modul openssl wird benötigt, ist aber nicht installiert." +#: ../../mod/profile_photo.php:290 ../../mod/profile_photo.php:339 +msgid "Photo not available." +msgstr "Foto nicht verfügbar." -#: ../../mod/setup.php:476 -msgid "Error: mysqli PHP module required but not installed." -msgstr "Fehler: Das PHP-Modul mysqli wird benötigt, ist aber nicht installiert." +#: ../../mod/profile_photo.php:358 +msgid "Upload File:" +msgstr "Datei hochladen:" -#: ../../mod/setup.php:480 -msgid "Error: mb_string PHP module required but not installed." -msgstr "Fehler: Das PHP-Modul mb_string wird benötigt, ist aber nicht installiert." +#: ../../mod/profile_photo.php:359 +msgid "Select a profile:" +msgstr "Wähle ein Profil:" -#: ../../mod/setup.php:484 -msgid "Error: mcrypt PHP module required but not installed." -msgstr "Fehler: Das PHP-Modul mcrypt wird benötigt, ist aber nicht installiert." +#: ../../mod/profile_photo.php:360 +msgid "Upload Profile Photo" +msgstr "Lade neues Profilfoto hoch" -#: ../../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 "Der Installations-Assistent muss in der Lage sein, die Datei \".htconfig.php\" im Stammverzeichnis des Web-Servers anzulegen, ist er aber nicht." +#: ../../mod/profile_photo.php:365 +msgid "skip this step" +msgstr "diesen Schritt überspringen" -#: ../../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 "Meist liegt das daran, dass der Nutzer, unter dem der Web-Server läuft, keine Rechte Schreibrechte in dem Verzeichnis hat – selbst wenn Du selbst das darfst." +#: ../../mod/profile_photo.php:365 +msgid "select a photo from your photo albums" +msgstr "ein Foto aus meinen Fotoalben" -#: ../../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 "Am Schluss dieses Vorgangs wird ein Text generiert, den Du unter dem Dateinamen .htconfig.php im Stammverzeichnis Deiner Red-Installation speichern musst." +#: ../../mod/profile_photo.php:381 +msgid "Crop Image" +msgstr "Bild zuschneiden" -#: ../../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 "Alternativ kannst Du diesen Schritt überspringen und die Installation manuell vornehmen. Lies dazu die Datei install/INSTALL.txt." +#: ../../mod/profile_photo.php:382 +msgid "Please adjust the image cropping for optimum viewing." +msgstr "Bitte schneide das Bild für eine optimale Anzeige passend zu." -#: ../../mod/setup.php:506 -msgid ".htconfig.php is writable" -msgstr ".htconfig.php ist beschreibbar" +#: ../../mod/profile_photo.php:384 +msgid "Done Editing" +msgstr "Bearbeitung fertigstellen" -#: ../../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 verwendet Smarty3 um Vorlagen für die Webdarstellung zu übersetzen. Smarty3 übersetzt diese Vorlagen nach PHP, um die Darstellung zu beschleunigen." +#: ../../mod/profile_photo.php:427 +msgid "Image uploaded successfully." +msgstr "Bild erfolgreich hochgeladen." -#: ../../mod/setup.php:517 +#: ../../mod/profile_photo.php:429 +msgid "Image upload failed." +msgstr "Hochladen des Bilds fehlgeschlagen." + +#: ../../mod/profile_photo.php:438 #, 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 "Um diese kompilierten Vorlagen speichern zu können braucht der Web-Server Schreibzugriff auf das Verzeichnis %s unterhalb des Red-Installationsverzeichnisses." +msgid "Image size reduction [%s] failed." +msgstr "Reduzierung der Bildgröße [%s] fehlgeschlagen." -#: ../../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 "Bitte stelle sicher, dass der Nutzer, unter dem der Webserver läuft (z.B. www-data), Schreibzugriff auf dieses Verzeichnis hat." +#: ../../mod/sources.php:32 +msgid "Failed to create source. No channel selected." +msgstr "Konnte die Quelle nicht anlegen. Kein Kanal ausgewählt." -#: ../../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 " Hinweis: Aus Sicherheitsgründen sollte der Web-Server nur auf %s Schreibrechte haben, nicht in der restlichen Red-Installation." +#: ../../mod/sources.php:45 +msgid "Source created." +msgstr "Quelle erstellt." -#: ../../mod/setup.php:522 -#, php-format -msgid "%s is writable" -msgstr "%s ist beschreibbar" +#: ../../mod/sources.php:57 +msgid "Source updated." +msgstr "Quelle aktualisiert." -#: ../../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 benutzt das Verzeichnis store, um hochgeladene Dateien zu speichern. Der Web-Server benötigt Schreibrechte für dieses Verzeichnis direkt unterhalb des Red-Stammverzeichnisses" +#: ../../mod/sources.php:82 +msgid "*" +msgstr "*" -#: ../../mod/setup.php:539 -msgid "store is writable" -msgstr "store ist schreibbar" +#: ../../mod/sources.php:89 +msgid "Manage remote sources of content for your channel." +msgstr "Quellen von Inhalten Deines Kanals verwalten." -#: ../../mod/setup.php:569 -msgid "" -"SSL certificate cannot be validated. Fix certificate or disable https access" -" to this site." -msgstr "Das SSL-Zertifikat konnte nicht validiert werden. Korrigiere das Zertifikat oder deaktiviere den HTTPS-Zugriff auf diesen Server." +#: ../../mod/sources.php:90 ../../mod/sources.php:100 +msgid "New Source" +msgstr "Neue Quelle" -#: ../../mod/setup.php:570 +#: ../../mod/sources.php:101 ../../mod/sources.php:133 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 "Wenn Du via HTTPS auf Deinen Server zugreifen möchtest, also Verbindungen über den Port 443 möglich sein sollen, ist ein SSL-Zertifikat einer Zertifizierungsstelle (CA) notwendig, das von den Browsern ohne Sicherheitsabfrage akzeptiert wird. Die Verwendung eines selbst signierten Zertifikates ist nicht möglich." +"Import all or selected content from the following channel into this channel " +"and distribute it according to your channel settings." +msgstr "Importiere alle oder ausgewählte Inhalte des folgenden Kanals in diesen Kanal und verteile sie gemäß der Einstellungen dieses Kanals." -#: ../../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 "Diese Einschränkung wurde eingebaut, weil Deine öffentlichen Beiträge zum Beispiel Verweise auf Bilder auf Deinem eigenen Hub enthalten können." +#: ../../mod/sources.php:102 ../../mod/sources.php:134 +msgid "Only import content with these words (one per line)" +msgstr "Importiere nur Beiträge, die folgende Wörter (eines pro Zeile) enthalten" -#: ../../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 "Wenn Dein Zertifikat nicht von jedem Browser akzeptiert wird, erhalten die Mitglieder anderer Red-Server (die mit korrekten Zertifikate ausgestattet sind) Sicherheits-Warnmeldungen, obwohl sie gar nicht direkt auf Deinem Server unterwegs sind (zum Beispiel, wenn ein Bild aus einem Deiner Beiträge angezeigt wird)." +#: ../../mod/sources.php:102 ../../mod/sources.php:134 +msgid "Leave blank to import all public content" +msgstr "Leer lassen, um alle öffentlichen Beiträge zu importieren" -#: ../../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 "Dies kann Probleme für andere Nutzer (nicht nur auf Deinem eigenen Server) verursachen, so dass wir auf dieser Forderung bestehen müssen.. " +#: ../../mod/sources.php:103 ../../mod/sources.php:137 +#: ../../mod/new_channel.php:112 +msgid "Channel Name" +msgstr "Name des Kanals" -#: ../../mod/setup.php:574 -msgid "" -"Providers are available that issue free certificates which are browser-" -"valid." -msgstr "Es gibt einige Zertifizierungsstellen (CAs), bei denen solche Zertifikate kostenlos zu haben sind." +#: ../../mod/sources.php:123 ../../mod/sources.php:150 +msgid "Source not found." +msgstr "Quelle nicht gefunden." -#: ../../mod/setup.php:576 -msgid "SSL certificate validation" -msgstr "SSL Zertifikatverifizierung" +#: ../../mod/sources.php:130 +msgid "Edit Source" +msgstr "Quelle bearbeiten" + +#: ../../mod/sources.php:131 +msgid "Delete Source" +msgstr "Quelle löschen" -#: ../../mod/setup.php:582 -msgid "" -"Url rewrite in .htaccess is not working. Check your server configuration." -msgstr "URL rewrite via .htaccess funktioniert nicht. Überprüfe Deine Server-Konfiguration." +#: ../../mod/sources.php:158 +msgid "Source removed" +msgstr "Quelle gelöscht" -#: ../../mod/setup.php:584 -msgid "Url rewrite is working" -msgstr "Url rewrite funktioniert" +#: ../../mod/sources.php:160 +msgid "Unable to remove source." +msgstr "Konnte die Quelle nicht löschen." -#: ../../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 "Die Datenbank-Konfigurationsdatei „.htconfig.php“ konnte nicht geschrieben werden. Bitte verwende den unten angegebenen Text, um die Konfigurationsdatei im Stammverzeichnis des Webservers anzulegen." +#: ../../mod/filer.php:49 +msgid "- select -" +msgstr "– auswählen –" -#: ../../mod/setup.php:618 -msgid "Errors encountered creating database tables." -msgstr "Fehler beim Anlegen der Datenbank-Tabellen aufgetreten." +#: ../../mod/filestorage.php:76 +msgid "Permission Denied." +msgstr "Zugriff verweigert." -#: ../../mod/setup.php:653 -msgid "

    What next

    " -msgstr "

    Was als Nächstes

    " +#: ../../mod/filestorage.php:92 +msgid "File not found." +msgstr "Datei nicht gefunden." -#: ../../mod/setup.php:654 -msgid "" -"IMPORTANT: You will need to [manually] setup a scheduled task for the " -"poller." -msgstr "WICHTIG: Du musst [manuell] einen Cronjob für den Poller einrichten." +#: ../../mod/filestorage.php:131 +msgid "Edit file permissions" +msgstr "Dateiberechtigungen bearbeiten" -#: ../../mod/magic.php:70 -msgid "Hub not found." -msgstr "Server nicht gefunden." +#: ../../mod/filestorage.php:140 +msgid "Set/edit permissions" +msgstr "Berechtigungen setzen/ändern" -#: ../../mod/invite.php:25 -msgid "Total invitation limit exceeded." -msgstr "Einladungslimit überschritten." +#: ../../mod/filestorage.php:141 +msgid "Include all files and sub folders" +msgstr "Alle Dateien und Unterverzeichnisse einbinden" -#: ../../mod/invite.php:49 -#, php-format -msgid "%s : Not a valid email address." -msgstr "%s : Keine gültige Email Adresse." +#: ../../mod/filestorage.php:142 +msgid "Return to file list" +msgstr "Zurück zur Dateiliste" -#: ../../mod/invite.php:76 -msgid "Please join us on Red" -msgstr "Schließe Dich uns an und werde Teil der Red-Matrix" +#: ../../mod/filestorage.php:144 +msgid "Copy/paste this code to attach file to a post" +msgstr "Diesen Code kopieren und einfügen, um die Datei an einen Beitrag anzuhängen" -#: ../../mod/invite.php:87 -msgid "Invitation limit exceeded. Please contact your site administrator." -msgstr "Einladungslimit überschritten. Bitte kontaktiere den Administrator Deines Red-Servers." +#: ../../mod/filestorage.php:145 +msgid "Copy/paste this URL to link file from a web page" +msgstr "Diese URL verwenden, um von einer Webseite aus auf die Datei zu verlinken" -#: ../../mod/invite.php:92 -#, php-format -msgid "%s : Message delivery failed." -msgstr "%s : Nachricht konnte nicht zugestellt werden." +#: ../../mod/help.php:41 ../../mod/help.php:47 ../../mod/help.php:53 +msgid "Help:" +msgstr "Hilfe:" -#: ../../mod/invite.php:96 -#, php-format -msgid "%d message sent." -msgid_plural "%d messages sent." -msgstr[0] "%d Nachricht gesendet." -msgstr[1] "%d Nachrichten gesendet." +#: ../../mod/help.php:67 ../../index.php:249 +msgid "Not Found" +msgstr "Nicht gefunden" -#: ../../mod/invite.php:115 -msgid "You have no more invitations available" -msgstr "Du hast keine weiteren verfügbare Einladungen" +#: ../../mod/follow.php:25 +msgid "Channel added." +msgstr "Kanal hinzugefügt." -#: ../../mod/invite.php:129 -msgid "Send invitations" -msgstr "Einladungen senden" +#: ../../mod/subthread.php:103 +#, php-format +msgid "%1$s is following %2$s's %3$s" +msgstr "%1$s folgt nun %2$ss %3$s" -#: ../../mod/invite.php:130 -msgid "Enter email addresses, one per line:" -msgstr "Email-Adressen eintragen, eine pro Zeile:" +#: ../../mod/fsuggest.php:20 ../../mod/fsuggest.php:92 +msgid "Contact not found." +msgstr "Kontakt nicht gefunden" -#: ../../mod/invite.php:131 ../../mod/mail.php:228 ../../mod/mail.php:341 -msgid "Your message:" -msgstr "Deine Nachricht:" +#: ../../mod/fsuggest.php:63 +msgid "Friend suggestion sent." +msgstr "Freundschaftsempfehlung senden." -#: ../../mod/invite.php:132 -msgid "Please join my community on RedMatrix." -msgstr "Schließe Dich uns in der RedMatrix an!" +#: ../../mod/fsuggest.php:97 +msgid "Suggest Friends" +msgstr "Kontakte vorschlagen" -#: ../../mod/invite.php:134 -msgid "You will need to supply this invitation code: " -msgstr "Gib diesen Invite-Code ein:" +#: ../../mod/fsuggest.php:99 +#, php-format +msgid "Suggest a friend for %s" +msgstr "Schlage %s einen Kontakt vor" -#: ../../mod/invite.php:135 -msgid "1. Register at any RedMatrix location (they are all inter-connected)" -msgstr "1. Registriere Dich auf irgendeinem RedMatrix-Server (sie sind alle miteinander verbunden)" +#: ../../mod/suggest.php:35 +msgid "" +"No suggestions available. If this is a new site, please try again in 24 " +"hours." +msgstr "Keine Vorschläge vorhanden. Wenn das ein neuer Server ist, versuche es in 24 Stunden noch einmal." -#: ../../mod/invite.php:137 -msgid "2. Enter my RedMatrix network address into the site searchbar." -msgstr "2. Gib meine RedMatrix-Adresse im Suchfeld ein." +#: ../../mod/group.php:20 +msgid "Collection created." +msgstr "Sammlung erstellt." -#: ../../mod/invite.php:138 -msgid "or visit " -msgstr "oder besuche" +#: ../../mod/group.php:26 +msgid "Could not create collection." +msgstr "Sammlung kann nicht erstellt werden." -#: ../../mod/invite.php:140 -msgid "3. Click [Connect]" -msgstr "3. Klicke auf [Verbinden]" +#: ../../mod/group.php:54 +msgid "Collection updated." +msgstr "Sammlung aktualisiert." -#: ../../mod/thing.php:96 -msgid "Thing updated" -msgstr "Sache aktualisiert" +#: ../../mod/group.php:86 +msgid "Create a collection of channels." +msgstr "Erstelle eine Sammlung von Kanälen." -#: ../../mod/thing.php:156 -msgid "Object store: failed" -msgstr "Speichern des Objekts fehlgeschlagen" +#: ../../mod/group.php:87 ../../mod/group.php:183 +msgid "Collection Name: " +msgstr "Name der Sammlung:" -#: ../../mod/thing.php:160 -msgid "Thing added" -msgstr "Sache hinzugefügt" +#: ../../mod/group.php:89 ../../mod/group.php:186 +msgid "Members are visible to other channels" +msgstr "Mitglieder sind sichtbar für andere Kanäle" -#: ../../mod/thing.php:180 -#, php-format -msgid "OBJ: %1$s %2$s %3$s" -msgstr "OBJ: %1$s %2$s %3$s" +#: ../../mod/group.php:107 +msgid "Collection removed." +msgstr "Sammlung gelöscht." -#: ../../mod/thing.php:232 -msgid "Show Thing" -msgstr "Sache anzeigen" +#: ../../mod/group.php:109 +msgid "Unable to remove collection." +msgstr "Löschen der Sammlung nicht möglich." -#: ../../mod/thing.php:239 -msgid "item not found." -msgstr "Eintrag nicht gefunden" +#: ../../mod/group.php:182 +msgid "Collection Editor" +msgstr "Sammlung-Editor" -#: ../../mod/thing.php:270 -msgid "Edit Thing" -msgstr "Sache bearbeiten" +#: ../../mod/group.php:196 +msgid "Members" +msgstr "Mitglieder" -#: ../../mod/thing.php:272 ../../mod/thing.php:319 -msgid "Select a profile" -msgstr "Wähle ein Profil" +#: ../../mod/group.php:198 +msgid "All Connected Channels" +msgstr "Alle verbundenen Kanäle" -#: ../../mod/thing.php:276 ../../mod/thing.php:322 -msgid "Post an activity" -msgstr "Aktivitätsnachricht senden" +#: ../../mod/group.php:233 +msgid "Click on a channel to add or remove." +msgstr "Wähle einen Kanal zum hinzufügen oder entfernen aus." -#: ../../mod/thing.php:276 ../../mod/thing.php:322 -msgid "Only sends to viewers of the applicable profile" -msgstr "Nur an Betrachter des ausgewählten Profils senden" +#: ../../mod/tagger.php:98 +#, php-format +msgid "%1$s tagged %2$s's %3$s with %4$s" +msgstr "%1$s hat %2$ss %3$s mit %4$s verschlagwortet" -#: ../../mod/thing.php:278 ../../mod/thing.php:324 -msgid "Name of thing e.g. something" -msgstr "Name der Sache, z. B. irgendwas" +#: ../../mod/like.php:15 +msgid "Like/Dislike" +msgstr "Mögen/Nicht mögen" -#: ../../mod/thing.php:280 ../../mod/thing.php:325 -msgid "URL of thing (optional)" -msgstr "URL der Sache (optional)" +#: ../../mod/like.php:20 +msgid "This action is restricted to members." +msgstr "Diese Aktion kann nur von Mitgliedern ausgeführt werden." -#: ../../mod/thing.php:282 ../../mod/thing.php:326 -msgid "URL for photo of thing (optional)" -msgstr "URL eines Fotos der Sache (optional)" +#: ../../mod/like.php:21 +msgid "" +"Please login with your RedMatrix ID or register as a new RedMatrix member to continue." +msgstr "Bitte melde Dich mit Deiner RedMatrix-ID an oder registriere Dich als neues Mitglied der RedMatrix, um fortzufahren." -#: ../../mod/thing.php:317 -msgid "Add Thing to your Profile" -msgstr "Die Sache Deinem Profil hinzufügen" +#: ../../mod/like.php:77 ../../mod/like.php:104 ../../mod/like.php:142 +msgid "Invalid request." +msgstr "Ungültige Anfrage." -#: ../../mod/oexchange.php:23 -msgid "Unable to find your hub." -msgstr "Konnte Deinen Server nicht finden." +#: ../../mod/like.php:119 +msgid "thing" +msgstr "Sache" -#: ../../mod/oexchange.php:37 -msgid "Post successful." -msgstr "Veröffentlichung erfolgreich." +#: ../../mod/like.php:165 +msgid "Channel unavailable." +msgstr "Kanal nicht vorhanden." -#: ../../mod/help.php:43 ../../mod/help.php:49 ../../mod/help.php:55 -msgid "Help:" -msgstr "Hilfe:" +#: ../../mod/like.php:204 +msgid "Previous action reversed." +msgstr "Die vorherige Aktion wurde rückgängig gemacht." -#: ../../mod/help.php:69 ../../index.php:237 -msgid "Not Found" -msgstr "Nicht gefunden" +#: ../../mod/like.php:430 +msgid "Action completed." +msgstr "Aktion durchgeführt." -#: ../../mod/viewconnections.php:58 -msgid "No connections." -msgstr "Keine Verbindungen." +#: ../../mod/like.php:431 +msgid "Thank you." +msgstr "Vielen Dank." -#: ../../mod/viewconnections.php:71 -#, php-format -msgid "Visit %s's profile [%s]" -msgstr "%ss Profil [%s] besuchen" +#: ../../mod/tagrm.php:44 ../../mod/tagrm.php:94 +msgid "Tag removed" +msgstr "Schlagwort entfernt" -#: ../../mod/viewconnections.php:86 -msgid "View Connnections" -msgstr "Zeige Verbindungen" +#: ../../mod/tagrm.php:119 +msgid "Remove Item Tag" +msgstr "Schlagwort entfernen" -#: ../../mod/removeaccount.php:30 -msgid "" -"Account removals are not allowed within 48 hours of changing the account " -"password." -msgstr "Das Löschen von Konten innerhalb 48 Stunden nachdem deren Passwort geändert wurde ist nicht erlaubt." +#: ../../mod/tagrm.php:121 +msgid "Select a tag to remove: " +msgstr "Schlagwort zum Entfernen auswählen:" -#: ../../mod/removeaccount.php:57 -msgid "Remove This Account" -msgstr "Dieses Konto löschen" +#: ../../mod/admin.php:52 +msgid "Theme settings updated." +msgstr "Theme-Einstellungen aktualisiert." -#: ../../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 "Hiermit wird dieses Nutzerkonto einschließlich all seiner Kanäle komplett aus dem Netzwerk entfernt. Dieser Vorgang kann nicht rückgängig gemacht werden." +#: ../../mod/admin.php:97 ../../mod/admin.php:413 +msgid "Site" +msgstr "Seite" -#: ../../mod/removeaccount.php:59 ../../mod/removeme.php:59 -msgid "Please enter your password for verification:" -msgstr "Bitte gib zur Bestätigung Dein Passwort ein:" +#: ../../mod/admin.php:98 +msgid "Accounts" +msgstr "Konten" -#: ../../mod/removeaccount.php:60 -msgid "" -"Remove this account, all its channels and all its channel clones from the " -"network" -msgstr "Dieses Konto, all seine Kanäle sowie alle Kanal-Klone aus dem Netzwerk löschen" +#: ../../mod/admin.php:99 ../../mod/admin.php:860 +msgid "Channels" +msgstr "Kanäle" -#: ../../mod/removeaccount.php:60 -msgid "" -"By default only the instances of the channels located on this hub will be " -"removed from the network" -msgstr "Standardmäßig werden nur die Kanalklone auf diesem RedMatrix-Hub aus dem Netzwerk entfernt" +#: ../../mod/admin.php:100 ../../mod/admin.php:951 ../../mod/admin.php:993 +msgid "Plugins" +msgstr "Plug-Ins" -#: ../../mod/profperm.php:29 ../../mod/profperm.php:58 -msgid "Invalid profile identifier." -msgstr "Ungültiger Profil-Identifikator" +#: ../../mod/admin.php:101 ../../mod/admin.php:1156 ../../mod/admin.php:1192 +msgid "Themes" +msgstr "Themes" -#: ../../mod/profperm.php:110 -msgid "Profile Visibility Editor" -msgstr "Profil-Sichtbarkeits-Editor" +#: ../../mod/admin.php:102 ../../mod/admin.php:515 +msgid "Server" +msgstr "Server" -#: ../../mod/profperm.php:114 -msgid "Click on a contact to add or remove." -msgstr "Klicke auf einen Kontakt, um ihn hinzuzufügen oder zu entfernen." +#: ../../mod/admin.php:103 +msgid "Profile Config" +msgstr "Profilkonfiguration" -#: ../../mod/profperm.php:123 -msgid "Visible To" -msgstr "Sichtbar für" +#: ../../mod/admin.php:104 +msgid "DB updates" +msgstr "DB-Aktualisierungen" -#: ../../mod/register.php:42 -msgid "Maximum daily site registrations exceeded. Please try again tomorrow." -msgstr "Maximale Anzahl täglicher Neuanmeldungen erreicht. Bitte versuche es morgen noch einmal." +#: ../../mod/admin.php:118 ../../mod/admin.php:125 ../../mod/admin.php:1279 +msgid "Logs" +msgstr "Protokolle" -#: ../../mod/register.php:48 -msgid "" -"Please indicate acceptance of the Terms of Service. Registration failed." -msgstr "Bitte stimme den Nutzungsbedingungen zu. Registrierung fehlgeschlagen." +#: ../../mod/admin.php:124 +msgid "Plugin Features" +msgstr "Plug-In Funktionen" -#: ../../mod/register.php:82 -msgid "Passwords do not match." -msgstr "Passwörter stimmen nicht überein." +#: ../../mod/admin.php:126 +msgid "User registrations waiting for confirmation" +msgstr "Nutzer-Anmeldungen, die auf Bestätigung warten" -#: ../../mod/register.php:115 -msgid "" -"Registration successful. Please check your email for validation " -"instructions." -msgstr "Registrierung erfolgreich. Eine E-Mail mit weiteren Anweisungen wurde an Dich gesendet." +#: ../../mod/admin.php:206 +msgid "Message queues" +msgstr "Nachrichten-Warteschlangen" -#: ../../mod/register.php:121 -msgid "Your registration is pending approval by the site owner." -msgstr "Deine Registrierung muss noch vom Betreiber der Seite freigegeben werden." +#: ../../mod/admin.php:211 ../../mod/admin.php:412 ../../mod/admin.php:514 +#: ../../mod/admin.php:723 ../../mod/admin.php:859 ../../mod/admin.php:950 +#: ../../mod/admin.php:992 ../../mod/admin.php:1155 ../../mod/admin.php:1191 +#: ../../mod/admin.php:1278 +msgid "Administration" +msgstr "Administration" -#: ../../mod/register.php:124 -msgid "Your registration can not be processed." -msgstr "Deine Registrierung konnte nicht verarbeitet werden." +#: ../../mod/admin.php:212 +msgid "Summary" +msgstr "Zusammenfassung" -#: ../../mod/register.php:161 -msgid "Registration on this site/hub is by approval only." -msgstr "Anmeldungen auf diesem Server erfordern Zustimmung durch den Administrator" +#: ../../mod/admin.php:214 +msgid "Registered users" +msgstr "Registrierte Benutzer" -#: ../../mod/register.php:162 -msgid "Register at another affiliated site/hub" -msgstr "Registrierung auf einem anderen, angeschlossenen Server" +#: ../../mod/admin.php:216 ../../mod/admin.php:518 +msgid "Pending registrations" +msgstr "Ausstehende Registrierungen" -#: ../../mod/register.php:170 -msgid "" -"This site has exceeded the number of allowed daily account registrations. " -"Please try again tomorrow." -msgstr "Die maximale Anzahl täglicher Registrierungen auf diesem Server wurde überschritten. Bitte versuche es morgen noch einmal." +#: ../../mod/admin.php:217 +msgid "Version" +msgstr "Version" -#: ../../mod/register.php:181 -msgid "Terms of Service" -msgstr "Nutzungsbedingungen" +#: ../../mod/admin.php:219 ../../mod/admin.php:519 +msgid "Active plugins" +msgstr "Aktive Plug-Ins" -#: ../../mod/register.php:187 -#, php-format -msgid "I accept the %s for this website" -msgstr "Ich akzeptiere die %s für diese Webseite" +#: ../../mod/admin.php:333 +msgid "Site settings updated." +msgstr "Site-Einstellungen aktualisiert." -#: ../../mod/register.php:189 -#, php-format -msgid "I am over 13 years of age and accept the %s for this website" -msgstr "Ich bin älter als 13 Jahre und akzeptiere die %s dieser Webseite" +#: ../../mod/admin.php:364 +msgid "No special theme for accessibility" +msgstr "Kein spezielles Accessibility-Theme vorhanden" -#: ../../mod/register.php:208 -msgid "Membership on this site is by invitation only." -msgstr "Mitgliedschaft auf dieser Seite ist nur nach vorheriger Einladung möglich." +#: ../../mod/admin.php:393 +msgid "Yes - with approval" +msgstr "Ja - mit Zustimmung" -#: ../../mod/register.php:209 -msgid "Please enter your invitation code" -msgstr "Bitte trage Deinen Einladungs-Code ein" +#: ../../mod/admin.php:399 +msgid "My site is not a public server" +msgstr "Meine Server ist kein öffentlicher Server" -#: ../../mod/register.php:212 -msgid "Your email address" -msgstr "Ihre E-Mail Adresse" +#: ../../mod/admin.php:400 +msgid "My site has paid access only" +msgstr "Mein Server erlaubt nur bezahlten Zugang" -#: ../../mod/register.php:213 -msgid "Choose a password" -msgstr "Passwort" +#: ../../mod/admin.php:401 +msgid "My site has free access only" +msgstr "Mein Server erlaubt ausschließlich freien Zugang" -#: ../../mod/register.php:214 -msgid "Please re-enter your password" -msgstr "Bitte gib Dein Passwort noch einmal ein" +#: ../../mod/admin.php:402 +msgid "My site offers free accounts with optional paid upgrades" +msgstr "Mein Server bietet kostenlose Konten mit der Möglichkeit zu bezahlten Upgrades" -#: ../../mod/network.php:79 -msgid "No such group" -msgstr "Gruppe existiert nicht" +#: ../../mod/admin.php:416 +msgid "File upload" +msgstr "Dateiupload" -#: ../../mod/network.php:118 -msgid "Search Results For:" -msgstr "Suchergebnisse für:" +#: ../../mod/admin.php:417 +msgid "Policies" +msgstr "Richtlinien" -#: ../../mod/network.php:172 -msgid "Collection is empty" -msgstr "Sammlung ist leer" +#: ../../mod/admin.php:422 +msgid "Site name" +msgstr "Seitenname" -#: ../../mod/network.php:180 -msgid "Collection: " -msgstr "Sammlung:" +#: ../../mod/admin.php:423 +msgid "Banner/Logo" +msgstr "Banner/Logo" -#: ../../mod/network.php:193 -msgid "Connection: " -msgstr "Verbindung:" +#: ../../mod/admin.php:424 +msgid "Administrator Information" +msgstr "Administrator-Informationen" -#: ../../mod/network.php:196 -msgid "Invalid connection." -msgstr "Ungültige Verbindung." +#: ../../mod/admin.php:424 +msgid "" +"Contact information for site administrators. Displayed on siteinfo page. " +"BBCode can be used here" +msgstr "Kontaktinformationen für Administratoren des Servers. Wird auf der siteinfo-Seite angezeigt. BBCode kann verwendet werden." -#: ../../mod/delegate.php:95 -msgid "No potential page delegates located." -msgstr "Keine potentiellen Bevollmächtigten für die Seite gefunden." +#: ../../mod/admin.php:425 +msgid "System language" +msgstr "System-Sprache" -#: ../../mod/delegate.php:121 -msgid "Delegate Page Management" -msgstr "Delegiere das Management für diese Seite" +#: ../../mod/admin.php:426 +msgid "System theme" +msgstr "System-Theme" -#: ../../mod/delegate.php:123 +#: ../../mod/admin.php:426 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 "Bevollmächtigte sind in der Lage, alle Aspekte dieses Kontos/dieser Seite zu verwalten, abgesehen von den Grundeinstellungen des Kontos. Gib niemandem eine Bevollmächtigung für Deinen privaten Account, dem Du nicht absolut vertraust!" +"Default system theme - may be over-ridden by user profiles - change theme settings" +msgstr "Standard-System-Theme – kann durch Nutzerprofile überschieben werden – Theme-Einstellungen ändern" -#: ../../mod/delegate.php:124 -msgid "Existing Page Managers" -msgstr "Vorhandene Seitenmanager" +#: ../../mod/admin.php:427 +msgid "Mobile system theme" +msgstr "Mobile System-Theme:" -#: ../../mod/delegate.php:126 -msgid "Existing Page Delegates" -msgstr "Vorhandene Bevollmächtigte für die Seite" +#: ../../mod/admin.php:427 +msgid "Theme for mobile devices" +msgstr "Theme für mobile Geräte" -#: ../../mod/delegate.php:128 -msgid "Potential Delegates" -msgstr "Potentielle Bevollmächtigte" +#: ../../mod/admin.php:428 +msgid "Accessibility system theme" +msgstr "Accessibility-System-Theme" -#: ../../mod/delegate.php:131 -msgid "Add" -msgstr "Hinzufügen" +#: ../../mod/admin.php:428 +msgid "Accessibility theme" +msgstr "Accessibility-Theme" -#: ../../mod/delegate.php:132 -msgid "No entries." -msgstr "Keine Einträge." +#: ../../mod/admin.php:430 +msgid "Enable Diaspora Protocol" +msgstr "Diaspora-Protokoll aktivieren" -#: ../../mod/connect.php:55 ../../mod/connect.php:103 -msgid "Continue" -msgstr "Fortfahren" +#: ../../mod/admin.php:430 +msgid "Communicate with Diaspora and Friendica - experimental" +msgstr "Kommunikation mit Diaspora und Friendica – experimentell" -#: ../../mod/connect.php:84 -msgid "Premium Channel Setup" -msgstr "Premium-Kanal-Einrichtung" +#: ../../mod/admin.php:431 +msgid "Allow Feeds as Connections" +msgstr "Feeds als Verbindungen erlauben" -#: ../../mod/connect.php:86 -msgid "Enable premium channel connection restrictions" -msgstr "Einschränkungen für einen Premium-Kanal aktivieren" +#: ../../mod/admin.php:431 +msgid "(Heavy system resource usage)" +msgstr "(führt zu hoher Systemlast)" -#: ../../mod/connect.php:87 -msgid "" -"Please enter your restrictions or conditions, such as paypal receipt, usage " -"guidelines, etc." -msgstr "Bitte gib Deine Nutzungsbedingungen ein, z.B. Paypal-Quittung, Richtlinien etc." +#: ../../mod/admin.php:432 +msgid "Maximum image size" +msgstr "Maximale Bildgröße" -#: ../../mod/connect.php:89 ../../mod/connect.php:109 +#: ../../mod/admin.php:432 msgid "" -"This channel may require additional steps or acknowledgement of the " -"following conditions prior to connecting:" -msgstr "Unter Umständen sind weitere Schritte oder die Bestätigung der folgenden Bedingungen vor dem Verbinden mit diesem Kanal nötig." +"Maximum size in bytes of uploaded images. Default is 0, which means no " +"limits." +msgstr "Maximale Größe hochgeladener Bilder in Bytes. Standard ist 0 (keine Einschränkung)." -#: ../../mod/connect.php:90 -msgid "" -"Potential connections will then see the following text before proceeding:" -msgstr "Potentielle Kontakte werden den folgenden Text sehen, bevor fortgefahren wird:" +#: ../../mod/admin.php:433 +msgid "Does this site allow new member registration?" +msgstr "Erlaubt dieser Server die Registrierung neuer Nutzer?" -#: ../../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 "Indem ich fortfahre, bestätige ich die Erfüllung aller Anweisungen aus dieser Seite." +#: ../../mod/admin.php:434 +msgid "Which best describes the types of account offered by this hub?" +msgstr "Was ist die passendste Beschreibung der Konten auf diesem Hub?" -#: ../../mod/connect.php:100 -msgid "(No specific instructions have been provided by the channel owner.)" -msgstr "(Der Kanal-Besitzer hat keine speziellen Anweisungen hinterlegt.)" +#: ../../mod/admin.php:435 +msgid "Register text" +msgstr "Registrierungstext" -#: ../../mod/connect.php:108 -msgid "Restricted or Premium Channel" -msgstr "Eingeschränkter oder Premium-Kanal" +#: ../../mod/admin.php:435 +msgid "Will be displayed prominently on the registration page." +msgstr "Wird gut sichtbar auf der Registrierungs-Seite angezeigt." -#: ../../mod/fsuggest.php:20 ../../mod/fsuggest.php:92 -msgid "Contact not found." -msgstr "Kontakt nicht gefunden" +#: ../../mod/admin.php:436 +msgid "Accounts abandoned after x days" +msgstr "Konten gelten nach X Tagen als unbenutzt" -#: ../../mod/fsuggest.php:63 -msgid "Friend suggestion sent." -msgstr "Freundschaftsempfehlung senden." +#: ../../mod/admin.php:436 +msgid "" +"Will not waste system resources polling external sites for abandonded " +"accounts. Enter 0 for no time limit." +msgstr "Verschwende keine Systemressourcen auf das Pollen von externen Seiten, wenn das Konto nicht mehr benutzt wird. Trage hier 0 für kein zeitliches Limit." -#: ../../mod/fsuggest.php:97 -msgid "Suggest Friends" -msgstr "Kontakte vorschlagen" +#: ../../mod/admin.php:437 +msgid "Allowed friend domains" +msgstr "Erlaubte Domains für Kontakte" -#: ../../mod/fsuggest.php:99 -#, php-format -msgid "Suggest a friend for %s" -msgstr "Schlage %s einen Kontakt vor" +#: ../../mod/admin.php:437 +msgid "" +"Comma separated list of domains which are allowed to establish friendships " +"with this site. Wildcards are accepted. Empty to allow any domains" +msgstr "Liste der Domains, die für Freundschaften erlaubt sind, durch Kommas getrennt. Platzhalter werden akzeptiert. Leer lassen, um alle Domains zu erlauben." -#: ../../mod/manage.php:136 -#, php-format -msgid "You have created %1$.0f of %2$.0f allowed channels." -msgstr "Du hast %1$.0f von maximal %2$.0f erlaubten Kanälen eingerichtet." +#: ../../mod/admin.php:438 +msgid "Allowed email domains" +msgstr "Erlaubte Domains für E-Mails" -#: ../../mod/manage.php:144 -msgid "Create a new channel" -msgstr "Neuen Kanal anlegen" +#: ../../mod/admin.php:438 +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 "Liste der Domains, die für E-Mail-Adressen bei der Registrierung erlaubt sind, durch Kommas getrennt. Platzhalter werden akzeptiert. Leer lassen, um alle Domains zu erlauben." -#: ../../mod/manage.php:149 -msgid "Current Channel" -msgstr "Aktueller Kanal" +#: ../../mod/admin.php:439 +msgid "Block public" +msgstr "Öffentlichen Zugriff blockieren" -#: ../../mod/manage.php:151 -msgid "Attach to one of your channels by selecting it." -msgstr "Wähle einen Deiner Kanäle aus, um ihn zu verwenden." +#: ../../mod/admin.php:439 +msgid "" +"Check to block public access to all otherwise public personal pages on this " +"site unless you are currently logged in." +msgstr "Zugriff auf sonst öffentliche persönliche Seiten blockieren, wenn man nicht eingeloggt ist." -#: ../../mod/manage.php:152 -msgid "Default Channel" -msgstr "Standard Kanal" +#: ../../mod/admin.php:440 +msgid "Verify Email Addresses" +msgstr "E-Mail-Adressen überprüfen" -#: ../../mod/manage.php:153 -msgid "Make Default" -msgstr "Zum Standard machen" +#: ../../mod/admin.php:440 +msgid "" +"Check to verify email addresses used in account registration (recommended)." +msgstr "Aktivieren, um die Überprüfung von E-Mail-Adressen bei der Registrierung von Benutzerkonten zu aktivieren (empfohlen)." -#: ../../mod/removeme.php:29 +#: ../../mod/admin.php:441 +msgid "Force publish" +msgstr "Veröffentlichung erzwingen" + +#: ../../mod/admin.php:441 msgid "" -"Channel removals are not allowed within 48 hours of changing the account " -"password." -msgstr "Innerhalb von 48 Stunden nach einer Änderung des Passworts können keine Kanäle gelöscht werden." +"Check to force all profiles on this site to be listed in the site directory." +msgstr "Die Veröffentlichung aller Profile dieses Servers im Verzeichnis erzwingen." -#: ../../mod/removeme.php:57 -msgid "Remove This Channel" -msgstr "Diesen Kanal löschen" +#: ../../mod/admin.php:442 +msgid "Disable discovery tab" +msgstr "Den „Entdecken“-Reiter ausblenden" -#: ../../mod/removeme.php:58 +#: ../../mod/admin.php:442 msgid "" -"This will completely remove this channel from the network. Once this has " -"been done it is not recoverable." -msgstr "Hiermit wird dieser Kanal komplett aus dem Netzwerk gelöscht. Einmal eingeleitet kann dieser Prozess nicht rückgängig gemacht werden." +"Remove the tab in the network view with public content pulled from sources " +"chosen for this site." +msgstr "Entferne den „Entdecken“-Reiter aus der Matrix-Seite, in dem öffentliche Inhalte von anderen RedMatrix-Hubs angezeigt werden können." -#: ../../mod/removeme.php:60 -msgid "Remove this channel and all its clones from the network" -msgstr "Lösche diesen Kanal und all seine Klone aus dem Netzwerk" +#: ../../mod/admin.php:443 +msgid "No login on Homepage" +msgstr "Kein Login auf der Homepage" -#: ../../mod/removeme.php:60 +#: ../../mod/admin.php:443 msgid "" -"By default only the instance of the channel located on this hub will be " -"removed from the network" -msgstr "Standardmäßig wird der Kanal nur auf diesem Server gelöscht, seine Klone verbleiben im Netzwerk" +"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 "Aktivieren, um das Login-Formular auf der Startseite der Seite zu verbergen (z.B. weil es das Layout der Homepage des Seiten-Kanals stört)." -#: ../../mod/removeme.php:61 -msgid "Remove Channel" -msgstr "Kanal löschen" +#: ../../mod/admin.php:445 +msgid "Proxy user" +msgstr "Proxy Benutzer" -#: ../../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 "Element nicht gefunden" +#: ../../mod/admin.php:446 +msgid "Proxy URL" +msgstr "Proxy URL" -#: ../../mod/editpost.php:31 -msgid "Item is not editable" -msgstr "Element kann nicht bearbeitet werden." +#: ../../mod/admin.php:447 +msgid "Network timeout" +msgstr "Netzwerk-Timeout" -#: ../../mod/editpost.php:42 ../../mod/rpost.php:97 -msgid "Edit post" -msgstr "Bearbeite Beitrag" +#: ../../mod/admin.php:447 +msgid "Value is in seconds. Set to 0 for unlimited (not recommended)." +msgstr "Wert in Sekunden. 0 für unbegrenzt (nicht empfohlen)." -#: ../../mod/editpost.php:53 -msgid "Delete item?" -msgstr "Eintrag löschen?" +#: ../../mod/admin.php:448 +msgid "Delivery interval" +msgstr "Auslieferung Intervall" -#: ../../mod/editpost.php:116 ../../mod/editwebpage.php:147 -#: ../../mod/editblock.php:115 ../../mod/editlayout.php:110 -msgid "Insert YouTube video" -msgstr "YouTube-Video einfügen" +#: ../../mod/admin.php:448 +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 "Verzögere im Hintergrund laufende Auslieferungsprozesse um die angegebene Anzahl Sekunden, um die Systemlast zu verringern. Empfehlungen: 4-5 für Shared Hosts, 2-3 für VPS, 0-1 für große dedizierte Server." -#: ../../mod/editpost.php:117 ../../mod/editwebpage.php:148 -#: ../../mod/editblock.php:116 ../../mod/editlayout.php:111 -msgid "Insert Vorbis [.ogg] video" -msgstr "Vorbis [.ogg]-Video einfügen" +#: ../../mod/admin.php:449 +msgid "Poll interval" +msgstr "Abfrageintervall" + +#: ../../mod/admin.php:449 +msgid "" +"Delay background polling processes by this many seconds to reduce system " +"load. If 0, use delivery interval." +msgstr "Verzögere Hintergrundprozesse um diese Anzahl Sekunden, um die Systemlast zu reduzieren. Bei 0 wird das Auslieferungsintervall verwendet." -#: ../../mod/editpost.php:118 ../../mod/editwebpage.php:149 -#: ../../mod/editblock.php:117 ../../mod/editlayout.php:112 -msgid "Insert Vorbis [.ogg] audio" -msgstr "Vorbis [.ogg]-Audio einfügen" +#: ../../mod/admin.php:450 +msgid "Maximum Load Average" +msgstr "Maximales Load Average" -#: ../../mod/editwebpage.php:106 -msgid "Edit Webpage" -msgstr "Webseite bearbeiten" +#: ../../mod/admin.php:450 +msgid "" +"Maximum system load before delivery and poll processes are deferred - " +"default 50." +msgstr "Maximale Systemlast, bevor Verteil- und Empfangsprozesse verschoben werden – Standard 50" -#: ../../mod/editwebpage.php:116 -msgid "Delete webpage?" -msgstr "Webseite löschen?" +#: ../../mod/admin.php:506 +msgid "No server found" +msgstr "Kein Server gefunden" -#: ../../mod/editwebpage.php:186 -msgid "Delete Webpage" -msgstr "Webseite löschen" +#: ../../mod/admin.php:513 ../../mod/admin.php:737 +msgid "ID" +msgstr "ID" -#: ../../mod/poke.php:159 -msgid "Poke/Prod" -msgstr "Anstupsen/Knuffen" +#: ../../mod/admin.php:513 +msgid "for channel" +msgstr "für Kanal" -#: ../../mod/poke.php:160 -msgid "poke, prod or do other things to somebody" -msgstr "Stupse Leute an oder mache anderes mit ihnen" +#: ../../mod/admin.php:513 +msgid "on server" +msgstr "auf Server" -#: ../../mod/poke.php:161 -msgid "Recipient" -msgstr "Empfänger" +#: ../../mod/admin.php:513 +msgid "Status" +msgstr "Status" -#: ../../mod/poke.php:162 -msgid "Choose what you wish to do to recipient" -msgstr "Wähle, was Du mit dem/r Empfänger/in tun willst" +#: ../../mod/admin.php:534 +msgid "Update has been marked successful" +msgstr "Update wurde als erfolgreich markiert" -#: ../../mod/poke.php:165 -msgid "Make this post private" -msgstr "Diesen Beitrag privat machen" +#: ../../mod/admin.php:544 +#, php-format +msgid "Executing %s failed. Check system logs." +msgstr "Ausführen von %s fehlgeschlagen. Überprüfe die Systemprotokolle." -#: ../../mod/blocks.php:62 -msgid "Block Name" -msgstr "Block-Name" +#: ../../mod/admin.php:547 +#, php-format +msgid "Update %s was successfully applied." +msgstr "Update %s wurde erfolgreich ausgeführt." -#: ../../mod/group.php:20 -msgid "Collection created." -msgstr "Sammlung erstellt." +#: ../../mod/admin.php:551 +#, php-format +msgid "Update %s did not return a status. Unknown if it succeeded." +msgstr "Update %s lieferte keinen Rückgabewert. Erfolg unbekannt." -#: ../../mod/group.php:26 -msgid "Could not create collection." -msgstr "Sammlung kann nicht erstellt werden." +#: ../../mod/admin.php:554 +#, php-format +msgid "Update function %s could not be found." +msgstr "Update-Funktion %s konnte nicht gefunden werden." -#: ../../mod/group.php:54 -msgid "Collection updated." -msgstr "Sammlung aktualisiert." +#: ../../mod/admin.php:569 +msgid "No failed updates." +msgstr "Keine fehlgeschlagenen Aktualisierungen." -#: ../../mod/group.php:86 -msgid "Create a collection of channels." -msgstr "Erstelle eine Sammlung von Kanälen." +#: ../../mod/admin.php:573 +msgid "Failed Updates" +msgstr "Fehlgeschlagene Aktualisierungen" -#: ../../mod/group.php:87 ../../mod/group.php:183 -msgid "Collection Name: " -msgstr "Name der Sammlung:" +#: ../../mod/admin.php:575 +msgid "Mark success (if update was manually applied)" +msgstr "Als erfolgreich markieren (wenn das Update manuell ausgeführt wurde)" -#: ../../mod/group.php:89 ../../mod/group.php:186 -msgid "Members are visible to other channels" -msgstr "Mitglieder sind sichtbar für andere Kanäle" +#: ../../mod/admin.php:576 +msgid "Attempt to execute this update step automatically" +msgstr "Versuche, diesen Updateschritt automatisch auszuführen" -#: ../../mod/group.php:107 -msgid "Collection removed." -msgstr "Sammlung gelöscht." +#: ../../mod/admin.php:602 +#, php-format +msgid "%s user blocked/unblocked" +msgid_plural "%s users blocked/unblocked" +msgstr[0] "%s Nutzer blockiert/freigegeben" +msgstr[1] "%s Nutzer blockiert/freigegeben" -#: ../../mod/group.php:109 -msgid "Unable to remove collection." -msgstr "Löschen der Sammlung nicht möglich." +#: ../../mod/admin.php:609 +#, php-format +msgid "%s user deleted" +msgid_plural "%s users deleted" +msgstr[0] "%s Nutzer gelöscht" +msgstr[1] "%s Nutzer gelöscht" -#: ../../mod/group.php:182 -msgid "Collection Editor" -msgstr "Sammlung-Editor" +#: ../../mod/admin.php:638 +msgid "Account not found" +msgstr "Konto nicht gefunden" -#: ../../mod/group.php:196 -msgid "Members" -msgstr "Mitglieder" +#: ../../mod/admin.php:658 +#, php-format +msgid "User '%s' unblocked" +msgstr "Benutzer '%s' freigegeben" -#: ../../mod/group.php:198 -msgid "All Connected Channels" -msgstr "Alle verbundenen Kanäle" +#: ../../mod/admin.php:658 +#, php-format +msgid "User '%s' blocked" +msgstr "Benutzer '%s' blockiert" -#: ../../mod/group.php:233 -msgid "Click on a channel to add or remove." -msgstr "Wähle einen Kanal zum hinzufügen oder entfernen aus." +#: ../../mod/admin.php:724 ../../mod/admin.php:736 +msgid "Users" +msgstr "Benutzer" -#: ../../mod/tagrm.php:41 -msgid "Tag removed" -msgstr "Schlagwort entfernt" +#: ../../mod/admin.php:726 ../../mod/admin.php:862 +msgid "select all" +msgstr "Alle auswählen" -#: ../../mod/tagrm.php:79 -msgid "Remove Item Tag" -msgstr "Schlagwort entfernen" +#: ../../mod/admin.php:727 +msgid "User registrations waiting for confirm" +msgstr "Neuanmeldungen, die auf Deine Bestätigung warten" -#: ../../mod/tagrm.php:81 -msgid "Select a tag to remove: " -msgstr "Schlagwort zum Entfernen auswählen:" +#: ../../mod/admin.php:728 +msgid "Request date" +msgstr "Antragsdatum" -#: ../../mod/attach.php:9 -msgid "Item not available." -msgstr "Element nicht verfügbar." +#: ../../mod/admin.php:729 +msgid "No registrations." +msgstr "Keine Registrierungen." -#: ../../mod/service_limits.php:19 -msgid "No service class restrictions found." -msgstr "Keine Dienstklassenbeschränkungen gefunden." +#: ../../mod/admin.php:730 +msgid "Approve" +msgstr "Genehmigen" -#: ../../mod/item.php:150 -msgid "Unable to locate original post." -msgstr "Originalbeitrag nicht gefunden." +#: ../../mod/admin.php:731 +msgid "Deny" +msgstr "Verweigern" -#: ../../mod/item.php:383 -msgid "Empty post discarded." -msgstr "Leeren Beitrag verworfen." +#: ../../mod/admin.php:737 +msgid "Register date" +msgstr "Registrierungs-Datum" -#: ../../mod/item.php:425 -msgid "Executable content type not permitted to this channel." -msgstr "Ausführbarer Content-Typ ist für diesen Kanal nicht freigegeben." +#: ../../mod/admin.php:737 +msgid "Last login" +msgstr "Letzte Anmeldung" -#: ../../mod/item.php:855 -msgid "System error. Post not saved." -msgstr "Systemfehler. Beitrag nicht gespeichert." +#: ../../mod/admin.php:737 +msgid "Expires" +msgstr "Verfällt" -#: ../../mod/item.php:1324 -#, php-format -msgid "You have reached your limit of %1$.0f top level posts." -msgstr "Du hast die maximale Anzahl von %1$.0f Beiträgen erreicht." +#: ../../mod/admin.php:737 +msgid "Service Class" +msgstr "Service-Klasse" -#: ../../mod/item.php:1330 -#, php-format -msgid "You have reached your limit of %1$.0f webpages." -msgstr "Du hast die maximale Anzahl von %1$.0f Webseiten erreicht." +#: ../../mod/admin.php:739 +msgid "" +"Selected users will be deleted!\\n\\nEverything these users had posted on " +"this site will be permanently deleted!\\n\\nAre you sure?" +msgstr "Die markierten Nutzer werden gelöscht!\\n\\nAlles, was diese Nutzer auf dieser Seite veröffentlicht haben, wird endgültig gelöscht!\\n\\nBist Du sicher?" -#: ../../mod/cloud.php:130 -msgid "RedMatrix - Guests: Username: {your email address}, Password: +++" -msgstr "RedMatrix – Gäste: Username: {Deine E-Mail-Adresse}, Passwort: +++" +#: ../../mod/admin.php:740 +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 "Der Nutzer {0} wird gelöscht!\\n\\nAlles, was dieser Nutzer auf dieser Seite veröffentlicht hat, wird endgültig gelöscht werden!\\n\\nBist Du sicher?" -#: ../../mod/chatsvc.php:111 -msgid "Away" -msgstr "Abwesend" +#: ../../mod/admin.php:773 +#, php-format +msgid "%s channel censored/uncensored" +msgid_plural "%s channels censored/uncensored" +msgstr[0] "%s Kanal gesperrt/freigegeben" +msgstr[1] "%s Kanäle gesperrt/freigegeben" -#: ../../mod/chatsvc.php:115 -msgid "Online" -msgstr "Online" +#: ../../mod/admin.php:780 +#, php-format +msgid "%s channel deleted" +msgid_plural "%s channels deleted" +msgstr[0] "%s Kanal gelöscht" +msgstr[1] "%s Kanäle gelöscht" -#: ../../mod/directory.php:223 -msgid "Finding:" -msgstr "Ergebnisse:" +#: ../../mod/admin.php:799 +msgid "Channel not found" +msgstr "Kanal nicht gefunden" -#: ../../mod/directory.php:228 -msgid "next page" -msgstr "nächste Seite" +#: ../../mod/admin.php:810 +#, php-format +msgid "Channel '%s' deleted" +msgstr "Kanal '%s' gelöscht" -#: ../../mod/directory.php:228 -msgid "previous page" -msgstr "vorherige Seite" +#: ../../mod/admin.php:821 +#, php-format +msgid "Channel '%s' uncensored" +msgstr "Kanal '%s' freigegeben" -#: ../../mod/directory.php:245 -msgid "No entries (some entries may be hidden)." -msgstr "Keine Einträge gefunden (einige könnten versteckt sein)." +#: ../../mod/admin.php:821 +#, php-format +msgid "Channel '%s' censored" +msgstr "Kanal '%s' gesperrt" -#: ../../mod/match.php:16 -msgid "Profile Match" -msgstr "Profil-Übereinstimmungen" +#: ../../mod/admin.php:864 +msgid "Censor" +msgstr "Sperren" -#: ../../mod/match.php:24 -msgid "No keywords to match. Please add keywords to your default profile." -msgstr "Keine Schlüsselwörter für den Abgleich gefunden. Bitte füge Schlüsselwörter zu Deinem Standardprofil hinzu." +#: ../../mod/admin.php:865 +msgid "Uncensor" +msgstr "Freigeben" -#: ../../mod/match.php:61 -msgid "is interested in:" -msgstr "interessiert sich für:" +#: ../../mod/admin.php:868 +msgid "UID" +msgstr "UID" -#: ../../mod/match.php:69 -msgid "No matches" -msgstr "Keine Übereinstimmungen" +#: ../../mod/admin.php:870 +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 "Alle ausgewählten Kanäle werden gelöscht!\\n\\nAlles was von diesen Kanälen auf diesem Server geschrieben wurde, wird dauerhaft gelöscht!\\n\\nBist Du sicher?" -#: ../../mod/dirsearch.php:21 -msgid "This site is not a directory server" -msgstr "Diese Website ist kein Verzeichnis-Server" +#: ../../mod/admin.php:871 +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 "Der Kanal {0} wird gelöscht!\\n\\nAlles was von diesem Kanal auf diesem Server geschrieben wurde, wird gelöscht!\\n\\nBist Du sicher?" -#: ../../mod/siteinfo.php:90 +#: ../../mod/admin.php:910 #, php-format -msgid "Version %s" -msgstr "Version %s" - -#: ../../mod/siteinfo.php:111 -msgid "Installed plugins/addons/apps:" -msgstr "Installierte Plugins/Addons/Apps" - -#: ../../mod/siteinfo.php:124 -msgid "No installed plugins/addons/apps" -msgstr "Keine installierten Plugins/Addons/Apps" +msgid "Plugin %s disabled." +msgstr "Plug-In %s deaktiviert." -#: ../../mod/siteinfo.php:132 -msgid "Red" -msgstr "Red" +#: ../../mod/admin.php:914 +#, php-format +msgid "Plugin %s enabled." +msgstr "Plug-In %s aktiviert." -#: ../../mod/siteinfo.php:133 -msgid "" -"This is a hub of the Red Matrix - a global cooperative network of " -"decentralized privacy enhanced websites." -msgstr "Dieser Hub ist Teil der RedMatrix – eines globalen, kooperativen Netzwerks aus dezentralen Websites, die Rücksicht auf Deine Privatsphäre nehmen." +#: ../../mod/admin.php:924 ../../mod/admin.php:1126 +msgid "Disable" +msgstr "Deaktivieren" -#: ../../mod/siteinfo.php:137 -msgid "Running at web location" -msgstr "Erreichbar unter der Web-Adresse" +#: ../../mod/admin.php:926 ../../mod/admin.php:1128 +msgid "Enable" +msgstr "Aktivieren" -#: ../../mod/siteinfo.php:138 -msgid "" -"Please visit GetZot.com to learn more " -"about the Red Matrix." -msgstr "Besuche GetZot.com, um mehr über die Red-Matrix zu erfahren." +#: ../../mod/admin.php:952 ../../mod/admin.php:1157 +msgid "Toggle" +msgstr "Umschalten" -#: ../../mod/siteinfo.php:139 -msgid "Bug reports and issues: please visit" -msgstr "Probleme oder Fehler gefunden? Bitte besuche" +#: ../../mod/admin.php:960 ../../mod/admin.php:1167 +msgid "Author: " +msgstr "Autor: " -#: ../../mod/siteinfo.php:142 -msgid "" -"Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot " -"com" -msgstr "Vorschläge, Lob, usw.: E-Mail an 'redmatrix' at librelist - dot - com" +#: ../../mod/admin.php:961 ../../mod/admin.php:1168 +msgid "Maintainer: " +msgstr "Betreuer:" -#: ../../mod/siteinfo.php:144 -msgid "Site Administrators" -msgstr "Administratoren" +#: ../../mod/admin.php:1090 +msgid "No themes found." +msgstr "Keine Theme gefunden." -#: ../../mod/appman.php:28 ../../mod/appman.php:44 -msgid "App installed." -msgstr "App installiert." +#: ../../mod/admin.php:1149 +msgid "Screenshot" +msgstr "Bildschirmfoto" -#: ../../mod/appman.php:37 -msgid "Malformed app." -msgstr "Fehlerhafte App." +#: ../../mod/admin.php:1197 +msgid "[Experimental]" +msgstr "[Experimentell]" -#: ../../mod/appman.php:80 -msgid "Embed code" -msgstr "Code einbetten" +#: ../../mod/admin.php:1198 +msgid "[Unsupported]" +msgstr "[Nicht unterstützt]" -#: ../../mod/appman.php:86 -msgid "Edit App" -msgstr "App bearbeiten" +#: ../../mod/admin.php:1225 +msgid "Log settings updated." +msgstr "Protokoll-Einstellungen aktualisiert." -#: ../../mod/appman.php:86 -msgid "Create App" -msgstr "App erstellen" +#: ../../mod/admin.php:1281 +msgid "Clear" +msgstr "Leeren" -#: ../../mod/appman.php:91 -msgid "Name of app" -msgstr "Name der App" +#: ../../mod/admin.php:1287 +msgid "Debugging" +msgstr "Debugging" -#: ../../mod/appman.php:91 ../../mod/appman.php:92 ../../mod/events.php:562 -#: ../../mod/events.php:581 -msgid "Required" -msgstr "Benötigt" +#: ../../mod/admin.php:1288 +msgid "Log file" +msgstr "Protokolldatei" -#: ../../mod/appman.php:92 -msgid "Location (URL) of app" -msgstr "Ort (URL) der App" +#: ../../mod/admin.php:1288 +msgid "" +"Must be writable by web server. Relative to your Red top-level directory." +msgstr "Muss für den Web-Server schreibbar sein. Relativ zum Red-Stammverzeichnis." -#: ../../mod/appman.php:94 -msgid "Photo icon URL" -msgstr "URL zum Icon" +#: ../../mod/admin.php:1289 +msgid "Log level" +msgstr "Protokollstufe" -#: ../../mod/appman.php:94 -msgid "80 x 80 pixels - optional" -msgstr "80 x 80 Pixel – optional" +#: ../../mod/admin.php:1336 +msgid "New Profile Field" +msgstr "Neues Profilfeld" -#: ../../mod/appman.php:95 -msgid "Version ID" -msgstr "Versions-ID" +#: ../../mod/admin.php:1337 ../../mod/admin.php:1358 +msgid "Field nickname" +msgstr "Kurzname für das Feld" -#: ../../mod/appman.php:96 -msgid "Price of app" -msgstr "Preis der App" +#: ../../mod/admin.php:1337 ../../mod/admin.php:1358 +msgid "System name of field" +msgstr "Systemname des Feldes" -#: ../../mod/appman.php:97 -msgid "Location (URL) to purchase app" -msgstr "Ort (URL), um die App zu kaufen" +#: ../../mod/admin.php:1338 ../../mod/admin.php:1359 +msgid "Input type" +msgstr "Art des Inhalts" -#: ../../mod/sources.php:32 -msgid "Failed to create source. No channel selected." -msgstr "Konnte die Quelle nicht anlegen. Kein Kanal ausgewählt." +#: ../../mod/admin.php:1339 ../../mod/admin.php:1360 +msgid "Field Name" +msgstr "Feldname" -#: ../../mod/sources.php:45 -msgid "Source created." -msgstr "Quelle erstellt." +#: ../../mod/admin.php:1339 ../../mod/admin.php:1360 +msgid "Label on profile pages" +msgstr "Bezeichnung auf Profilseiten" -#: ../../mod/sources.php:57 -msgid "Source updated." -msgstr "Quelle aktualisiert." +#: ../../mod/admin.php:1340 ../../mod/admin.php:1361 +msgid "Help text" +msgstr "Hilfetext" -#: ../../mod/sources.php:82 -msgid "*" -msgstr "*" +#: ../../mod/admin.php:1340 ../../mod/admin.php:1361 +msgid "Additional info (optional)" +msgstr "Zusätzliche Informationen (optional)" -#: ../../mod/sources.php:89 -msgid "Manage remote sources of content for your channel." -msgstr "Quellen von Inhalten Deines Kanals verwalten." +#: ../../mod/admin.php:1351 +msgid "Field definition not found" +msgstr "Feld-Definition nicht gefunden" -#: ../../mod/sources.php:90 ../../mod/sources.php:100 -msgid "New Source" -msgstr "Neue Quelle" +#: ../../mod/admin.php:1357 +msgid "Edit Profile Field" +msgstr "Profilfeld bearbeiten" -#: ../../mod/sources.php:101 ../../mod/sources.php:133 -msgid "" -"Import all or selected content from the following channel into this channel " -"and distribute it according to your channel settings." -msgstr "Importiere alle oder ausgewählte Inhalte des folgenden Kanals in diesen Kanal und verteile sie gemäß der Einstellungen dieses Kanals." +#: ../../mod/thing.php:96 +msgid "Thing updated" +msgstr "Sache aktualisiert" -#: ../../mod/sources.php:102 ../../mod/sources.php:134 -msgid "Only import content with these words (one per line)" -msgstr "Importiere nur Beiträge, die folgende Wörter (eines pro Zeile) enthalten" +#: ../../mod/thing.php:156 +msgid "Object store: failed" +msgstr "Speichern des Objekts fehlgeschlagen" -#: ../../mod/sources.php:102 ../../mod/sources.php:134 -msgid "Leave blank to import all public content" -msgstr "Leer lassen, um alle öffentlichen Beiträge zu importieren" +#: ../../mod/thing.php:160 +msgid "Thing added" +msgstr "Sache hinzugefügt" -#: ../../mod/sources.php:123 ../../mod/sources.php:150 -msgid "Source not found." -msgstr "Quelle nicht gefunden." +#: ../../mod/thing.php:180 +#, php-format +msgid "OBJ: %1$s %2$s %3$s" +msgstr "OBJ: %1$s %2$s %3$s" -#: ../../mod/sources.php:130 -msgid "Edit Source" -msgstr "Quelle bearbeiten" +#: ../../mod/thing.php:232 +msgid "Show Thing" +msgstr "Sache anzeigen" -#: ../../mod/sources.php:131 -msgid "Delete Source" -msgstr "Quelle löschen" +#: ../../mod/thing.php:239 +msgid "item not found." +msgstr "Eintrag nicht gefunden" -#: ../../mod/sources.php:158 -msgid "Source removed" -msgstr "Quelle gelöscht" +#: ../../mod/thing.php:270 +msgid "Edit Thing" +msgstr "Sache bearbeiten" -#: ../../mod/sources.php:160 -msgid "Unable to remove source." -msgstr "Konnte die Quelle nicht löschen." +#: ../../mod/thing.php:272 ../../mod/thing.php:319 +msgid "Select a profile" +msgstr "Wähle ein Profil" -#: ../../mod/pubsites.php:16 -msgid "Public Sites" -msgstr "Öffentliche Server" +#: ../../mod/thing.php:276 ../../mod/thing.php:322 +msgid "Post an activity" +msgstr "Aktivitätsnachricht senden" -#: ../../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 "Die hier aufgeführten Server erlauben Dir, einen Account in der Red-Matrix anzulegen. Alle Server der Matrix sind miteinander verbunden, so dass die Mitgliedschaft auf einem Server eine Verbindung zu beliebigen anderen Servern der Matrix ermöglicht. Es könnte sein, dass einige dieser Server kostenpflichtig sind oder abgestufte, je nach Umfang kostenpflichtige Mitgliedschaften anbieten. Auf den jeweiligen Seiten könnten nähere Details dazu stehen." +#: ../../mod/thing.php:276 ../../mod/thing.php:322 +msgid "Only sends to viewers of the applicable profile" +msgstr "Nur an Betrachter des ausgewählten Profils senden" -#: ../../mod/pubsites.php:25 -msgid "Site URL" -msgstr "Server-URL" +#: ../../mod/thing.php:278 ../../mod/thing.php:324 +msgid "Name of thing e.g. something" +msgstr "Name der Sache, z. B. irgendwas" -#: ../../mod/pubsites.php:25 -msgid "Access Type" -msgstr "Zugangstyp" +#: ../../mod/thing.php:280 ../../mod/thing.php:325 +msgid "URL of thing (optional)" +msgstr "URL der Sache (optional)" -#: ../../mod/pubsites.php:25 -msgid "Registration Policy" -msgstr "Registrierungsrichtlinien" +#: ../../mod/thing.php:282 ../../mod/thing.php:326 +msgid "URL for photo of thing (optional)" +msgstr "URL eines Fotos der Sache (optional)" -#: ../../mod/pubsites.php:25 ../../mod/profiles.php:440 -msgid "Location" -msgstr "Ort" +#: ../../mod/thing.php:317 +msgid "Add Thing to your Profile" +msgstr "Die Sache Deinem Profil hinzufügen" #: ../../mod/import.php:25 #, php-format @@ -7398,17 +7302,235 @@ msgid "" "primary location for files, photos, and media." msgstr "Egal welche Option Du wählst, bitte lege fest, ob dieser Server die neue primäre Adresse dieses Kanals sein soll, oder ob der bisherige Red-Server diese Rolle weiterhin wahrnimmt. Du kannst von beiden Servern aus posten, aber nur einer kann der primäre Ort Deiner Dateien, Fotos und Medien sein." -#: ../../mod/import.php:476 -msgid "Make this hub my primary location" -msgstr "Dieser Red-Server ist mein primärer Server." +#: ../../mod/import.php:476 +msgid "Make this hub my primary location" +msgstr "Dieser Red-Server ist mein primärer Server." + +#: ../../mod/import.php:477 +msgid "Import existing posts if possible" +msgstr "Existierende Beiträge importieren, falls möglich" + +#: ../../mod/invite.php:25 +msgid "Total invitation limit exceeded." +msgstr "Einladungslimit überschritten." + +#: ../../mod/invite.php:49 +#, php-format +msgid "%s : Not a valid email address." +msgstr "%s : Keine gültige Email Adresse." + +#: ../../mod/invite.php:76 +msgid "Please join us on Red" +msgstr "Schließe Dich uns an und werde Teil der Red-Matrix" + +#: ../../mod/invite.php:87 +msgid "Invitation limit exceeded. Please contact your site administrator." +msgstr "Einladungslimit überschritten. Bitte kontaktiere den Administrator Deines Red-Servers." + +#: ../../mod/invite.php:92 +#, php-format +msgid "%s : Message delivery failed." +msgstr "%s : Nachricht konnte nicht zugestellt werden." + +#: ../../mod/invite.php:96 +#, php-format +msgid "%d message sent." +msgid_plural "%d messages sent." +msgstr[0] "%d Nachricht gesendet." +msgstr[1] "%d Nachrichten gesendet." + +#: ../../mod/invite.php:115 +msgid "You have no more invitations available" +msgstr "Du hast keine weiteren verfügbare Einladungen" + +#: ../../mod/invite.php:129 +msgid "Send invitations" +msgstr "Einladungen senden" + +#: ../../mod/invite.php:130 +msgid "Enter email addresses, one per line:" +msgstr "Email-Adressen eintragen, eine pro Zeile:" + +#: ../../mod/invite.php:131 ../../mod/mail.php:228 ../../mod/mail.php:341 +msgid "Your message:" +msgstr "Deine Nachricht:" + +#: ../../mod/invite.php:132 +msgid "Please join my community on RedMatrix." +msgstr "Schließe Dich uns in der RedMatrix an!" + +#: ../../mod/invite.php:134 +msgid "You will need to supply this invitation code: " +msgstr "Gib diesen Invite-Code ein:" + +#: ../../mod/invite.php:135 +msgid "1. Register at any RedMatrix location (they are all inter-connected)" +msgstr "1. Registriere Dich auf irgendeinem RedMatrix-Server (sie sind alle miteinander verbunden)" + +#: ../../mod/invite.php:137 +msgid "2. Enter my RedMatrix network address into the site searchbar." +msgstr "2. Gib meine RedMatrix-Adresse im Suchfeld ein." + +#: ../../mod/invite.php:138 +msgid "or visit " +msgstr "oder besuche" + +#: ../../mod/invite.php:140 +msgid "3. Click [Connect]" +msgstr "3. Klicke auf [Verbinden]" + +#: ../../mod/item.php:150 +msgid "Unable to locate original post." +msgstr "Originalbeitrag nicht gefunden." + +#: ../../mod/item.php:409 +msgid "Empty post discarded." +msgstr "Leeren Beitrag verworfen." + +#: ../../mod/item.php:451 +msgid "Executable content type not permitted to this channel." +msgstr "Ausführbarer Content-Typ ist für diesen Kanal nicht freigegeben." + +#: ../../mod/item.php:888 +msgid "System error. Post not saved." +msgstr "Systemfehler. Beitrag nicht gespeichert." + +#: ../../mod/item.php:1363 +#, php-format +msgid "You have reached your limit of %1$.0f top level posts." +msgstr "Du hast die maximale Anzahl von %1$.0f Beiträgen erreicht." + +#: ../../mod/item.php:1369 +#, php-format +msgid "You have reached your limit of %1$.0f webpages." +msgstr "Du hast die maximale Anzahl von %1$.0f Webseiten erreicht." + +#: ../../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 "[Eingebettete Inhalte – lade die Seite neu, um sie anzuzeigen]" + +#: ../../mod/layouts.php:62 +msgid "Help with this feature" +msgstr "Hilfe zu dieser Funktion" + +#: ../../mod/layouts.php:85 +msgid "Layout Name" +msgstr "Layout-Name" + +#: ../../mod/locs.php:47 ../../mod/locs.php:74 +msgid "Location not found." +msgstr "Klon nicht gefunden." + +#: ../../mod/locs.php:78 +msgid "Primary location cannot be removed." +msgstr "Der primäre Klon kann nicht gelöscht werden." + +#: ../../mod/lockview.php:31 +msgid "Remote privacy information not available." +msgstr "Privatsphäre-Einstellungen anderer Nutzer sind nicht verfügbar." + +#: ../../mod/lockview.php:52 +msgid "Visible to:" +msgstr "Sichtbar für:" + +#: ../../mod/viewconnections.php:58 +msgid "No connections." +msgstr "Keine Verbindungen." + +#: ../../mod/viewconnections.php:71 +#, php-format +msgid "Visit %s's profile [%s]" +msgstr "%ss Profil [%s] besuchen" + +#: ../../mod/viewconnections.php:86 +msgid "View Connnections" +msgstr "Zeige Verbindungen" + +#: ../../mod/lostpass.php:15 +msgid "No valid account found." +msgstr "Kein gültiges Konto gefunden." + +#: ../../mod/lostpass.php:29 +msgid "Password reset request issued. Check your email." +msgstr "Zurücksetzen des Passworts eingeleitet. Schau in Deine E-Mails." + +#: ../../mod/lostpass.php:35 ../../mod/lostpass.php:102 +#, php-format +msgid "Site Member (%s)" +msgstr "Nutzer (%s)" + +#: ../../mod/lostpass.php:40 +#, php-format +msgid "Password reset requested at %s" +msgstr "Passwort-Rücksetzung auf %s angefordert" + +#: ../../mod/lostpass.php:63 +msgid "" +"Request could not be verified. (You may have previously submitted it.) " +"Password reset failed." +msgstr "Die Anfrage konnte nicht verifiziert werden. (Vielleicht hast Du schon einmal auf den Link in der E-Mail geklickt?) Passwort-Rücksetzung fehlgeschlagen." + +#: ../../mod/lostpass.php:85 ../../boot.php:1506 +msgid "Password Reset" +msgstr "Zurücksetzen des Kennworts" + +#: ../../mod/lostpass.php:86 +msgid "Your password has been reset as requested." +msgstr "Dein Passwort wurde wie angefordert neu erstellt." + +#: ../../mod/lostpass.php:87 +msgid "Your new password is" +msgstr "Dein neues Passwort lautet" + +#: ../../mod/lostpass.php:88 +msgid "Save or copy your new password - and then" +msgstr "Speichere oder kopiere Dein neues Passwort – und dann" + +#: ../../mod/lostpass.php:89 +msgid "click here to login" +msgstr "Klicke hier, um dich anzumelden" + +#: ../../mod/lostpass.php:90 +msgid "" +"Your password may be changed from the Settings page after " +"successful login." +msgstr "Dein Passwort kann unter Einstellungen nach einer erfolgreichen Anmeldung geändert werden." + +#: ../../mod/lostpass.php:107 +#, php-format +msgid "Your password has changed at %s" +msgstr "Auf %s wurde Dein Passwort geändert" + +#: ../../mod/lostpass.php:122 +msgid "Forgot your Password?" +msgstr "Kennwort vergessen?" + +#: ../../mod/lostpass.php:123 +msgid "" +"Enter your email address and submit to have your password reset. Then check " +"your email for further instructions." +msgstr "Gib Deine E-Mail-Adresse ein, um Dein Passwort zurücksetzen zu lassen. Du erhältst dann weitere Anweisungen per E-Mail." + +#: ../../mod/lostpass.php:124 +msgid "Email Address" +msgstr "E-Mail Adresse" -#: ../../mod/import.php:477 -msgid "Import existing posts if possible" -msgstr "Existierende Beiträge importieren, falls möglich" +#: ../../mod/lostpass.php:125 +msgid "Reset" +msgstr "Zurücksetzen" -#: ../../mod/zfinger.php:23 -msgid "invalid target signature" -msgstr "Ungültige Signatur des Ziels" +#: ../../mod/magic.php:70 +msgid "Hub not found." +msgstr "Server nicht gefunden." + +#: ../../mod/vote.php:97 +msgid "Total votes" +msgstr "Stimmen gesamt" + +#: ../../mod/vote.php:98 +msgid "Average Rating" +msgstr "Durchschnittliche Bewertung" #: ../../mod/mail.php:33 msgid "Unable to lookup recipient." @@ -7470,6 +7592,10 @@ msgstr "Die Nachricht wurde widerrufen." msgid "Private Conversation" msgstr "Private Unterhaltung" +#: ../../mod/mail.php:329 ../../mod/message.php:72 +msgid "Delete conversation" +msgstr "Unterhaltung löschen" + #: ../../mod/mail.php:331 msgid "" "No secure communications available. You may be able to " @@ -7480,579 +7606,636 @@ msgstr "Keine sichere Kommunikation verfügbar. Eventuell kanns msgid "Send Reply" msgstr "Antwort senden" -#: ../../mod/channel.php:25 ../../mod/chat.php:19 -msgid "You must be logged in to see this page." -msgstr "Du musst angemeldet sein, um diese Seite betrachten zu können." +#: ../../mod/manage.php:136 +#, php-format +msgid "You have created %1$.0f of %2$.0f allowed channels." +msgstr "Du hast %1$.0f von maximal %2$.0f erlaubten Kanälen eingerichtet." -#: ../../mod/channel.php:86 -msgid "Insufficient permissions. Request redirected to profile page." -msgstr "Unzureichende Zugriffsrechte. Die Anfrage wurde zur Profil-Seite umgeleitet." +#: ../../mod/manage.php:144 +msgid "Create a new channel" +msgstr "Neuen Kanal anlegen" -#: ../../mod/profiles.php:18 ../../mod/profiles.php:165 -#: ../../mod/profiles.php:222 ../../mod/profiles.php:575 -msgid "Profile not found." -msgstr "Profil nicht gefunden." +#: ../../mod/manage.php:149 +msgid "Current Channel" +msgstr "Aktueller Kanal" -#: ../../mod/profiles.php:38 -msgid "Profile deleted." -msgstr "Profil gelöscht." +#: ../../mod/manage.php:151 +msgid "Attach to one of your channels by selecting it." +msgstr "Wähle einen Deiner Kanäle aus, um ihn zu verwenden." -#: ../../mod/profiles.php:56 ../../mod/profiles.php:92 -msgid "Profile-" -msgstr "Profil-" +#: ../../mod/manage.php:152 +msgid "Default Channel" +msgstr "Standard Kanal" -#: ../../mod/profiles.php:77 ../../mod/profiles.php:120 -msgid "New profile created." -msgstr "Neues Profil erstellt." +#: ../../mod/manage.php:153 +msgid "Make Default" +msgstr "Zum Standard machen" -#: ../../mod/profiles.php:98 -msgid "Profile unavailable to clone." -msgstr "Profil kann nicht geklont werden." +#: ../../mod/wall_upload.php:34 +msgid "Wall Photos" +msgstr "Wall Fotos" -#: ../../mod/profiles.php:136 -msgid "Profile unavailable to export." -msgstr "Dieses Profil kann nicht exportiert werden." +#: ../../mod/match.php:16 +msgid "Profile Match" +msgstr "Profil-Übereinstimmungen" -#: ../../mod/profiles.php:232 -msgid "Profile Name is required." -msgstr "Profil-Name erforderlich." +#: ../../mod/match.php:24 +msgid "No keywords to match. Please add keywords to your default profile." +msgstr "Keine Schlüsselwörter für den Abgleich gefunden. Bitte füge Schlüsselwörter zu Deinem Standardprofil hinzu." -#: ../../mod/profiles.php:390 -msgid "Marital Status" -msgstr "Familienstand" +#: ../../mod/match.php:61 +msgid "is interested in:" +msgstr "interessiert sich für:" -#: ../../mod/profiles.php:394 -msgid "Romantic Partner" -msgstr "Romantische Partner" +#: ../../mod/match.php:69 +msgid "No matches" +msgstr "Keine Übereinstimmungen" -#: ../../mod/profiles.php:398 -msgid "Likes" -msgstr "Gefällt" +#: ../../mod/menu.php:21 +msgid "Menu updated." +msgstr "Menü aktualisiert." -#: ../../mod/profiles.php:402 -msgid "Dislikes" -msgstr "Gefällt nicht" +#: ../../mod/menu.php:25 +msgid "Unable to update menu." +msgstr "Kann Menü nicht aktualisieren." -#: ../../mod/profiles.php:406 -msgid "Work/Employment" -msgstr "Arbeit/Anstellung" +#: ../../mod/menu.php:30 +msgid "Menu created." +msgstr "Menü erstellt." -#: ../../mod/profiles.php:409 -msgid "Religion" -msgstr "Religion" +#: ../../mod/menu.php:34 +msgid "Unable to create menu." +msgstr "Kann Menü nicht erstellen." -#: ../../mod/profiles.php:413 -msgid "Political Views" -msgstr "Politische Ansichten" +#: ../../mod/menu.php:57 +msgid "Manage Menus" +msgstr "Menüs verwalten" -#: ../../mod/profiles.php:417 -msgid "Gender" -msgstr "Geschlecht" +#: ../../mod/menu.php:60 +msgid "Drop" +msgstr "Löschen" -#: ../../mod/profiles.php:421 -msgid "Sexual Preference" -msgstr "Sexuelle Orientierung" +#: ../../mod/menu.php:62 +msgid "Create a new menu" +msgstr "Neues Menü erstellen" -#: ../../mod/profiles.php:425 -msgid "Homepage" -msgstr "Webseite" +#: ../../mod/menu.php:63 +msgid "Delete this menu" +msgstr "Lösche dieses Menü" -#: ../../mod/profiles.php:429 -msgid "Interests" -msgstr "Hobbys/Interessen" +#: ../../mod/menu.php:64 ../../mod/menu.php:109 +msgid "Edit menu contents" +msgstr "Bearbeite Menü Inhalte" -#: ../../mod/profiles.php:523 -msgid "Profile updated." -msgstr "Profil aktualisiert." +#: ../../mod/menu.php:65 +msgid "Edit this menu" +msgstr "Dieses Menü bearbeiten" -#: ../../mod/profiles.php:600 -msgid "Hide your contact/friend list from viewers of this profile?" -msgstr "Deine Kontaktliste vor Betrachtern dieses Profils verbergen?" +#: ../../mod/menu.php:80 +msgid "New Menu" +msgstr "Neues Menü" -#: ../../mod/profiles.php:642 -msgid "Edit Profile Details" -msgstr "Bearbeite Profil-Details" +#: ../../mod/menu.php:81 ../../mod/menu.php:110 +msgid "Menu name" +msgstr "Menü Name" -#: ../../mod/profiles.php:644 -msgid "View this profile" -msgstr "Dieses Profil ansehen" +#: ../../mod/menu.php:81 ../../mod/menu.php:110 +msgid "Must be unique, only seen by you" +msgstr "Muss eindeutig sein, ist aber nur für Dich sichtbar" -#: ../../mod/profiles.php:646 -msgid "Change Profile Photo" -msgstr "Profilfoto ändern" +#: ../../mod/menu.php:82 ../../mod/menu.php:111 +msgid "Menu title" +msgstr "Menü Titel" -#: ../../mod/profiles.php:647 -msgid "Create a new profile using these settings" -msgstr "Neues Profil anlegen und diese Einstellungen übernehmen" +#: ../../mod/menu.php:82 ../../mod/menu.php:111 +msgid "Menu title as seen by others" +msgstr "Menü Titel wie er von anderen gesehen wird" -#: ../../mod/profiles.php:648 -msgid "Clone this profile" -msgstr "Dieses Profil klonen" +#: ../../mod/menu.php:83 ../../mod/menu.php:112 +msgid "Allow bookmarks" +msgstr "Erlaube Lesezeichen" -#: ../../mod/profiles.php:649 -msgid "Delete this profile" -msgstr "Dieses Profil löschen" +#: ../../mod/menu.php:83 ../../mod/menu.php:112 +msgid "Menu may be used to store saved bookmarks" +msgstr "Im Menü können gespeicherte Lesezeichen abgelegt werden" -#: ../../mod/profiles.php:651 -msgid "Import profile from file" -msgstr "Profil aus einer Datei importieren" +#: ../../mod/menu.php:98 +msgid "Menu deleted." +msgstr "Menü gelöscht." -#: ../../mod/profiles.php:652 -msgid "Export profile to file" -msgstr "Profil in eine Datei exportieren" +#: ../../mod/menu.php:100 +msgid "Menu could not be deleted." +msgstr "Menü konnte nicht gelöscht werden." -#: ../../mod/profiles.php:653 -msgid "Profile Name:" -msgstr "Profilname:" +#: ../../mod/menu.php:106 +msgid "Edit Menu" +msgstr "Menü bearbeiten" -#: ../../mod/profiles.php:654 -msgid "Your Full Name:" -msgstr "Dein voller Name:" +#: ../../mod/menu.php:108 +msgid "Add or remove entries to this menu" +msgstr "Einträge zu diesem Menü hinzufügen oder entfernen" -#: ../../mod/profiles.php:655 -msgid "Title/Description:" -msgstr "Titel/Stellenbeschreibung:" +#: ../../mod/message.php:41 +msgid "Conversation removed." +msgstr "Unterhaltung gelöscht." -#: ../../mod/profiles.php:656 -msgid "Your Gender:" -msgstr "Dein Geschlecht:" +#: ../../mod/message.php:56 +msgid "No messages." +msgstr "Keine Nachrichten." -#: ../../mod/profiles.php:657 -#, php-format -msgid "Birthday (%s):" -msgstr "Geburtstag (%s):" +#: ../../mod/message.php:74 +msgid "D, d M Y - g:i A" +msgstr "D, d. M Y - G:i" + +#: ../../mod/new_channel.php:109 +msgid "Add a Channel" +msgstr "Kanal hinzufügen" + +#: ../../mod/new_channel.php:110 +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 "Ein Kanal ist Deine eigene Sammlung von verbundenen Webseiten. Ein Kanal kann genutzt werden, um ein Social-Network-Profil, ein Blog, eine Gesprächsgruppe oder ein Forum, Promi-Seiten und vieles mehr zu erstellen. Du kannst so viele Kanäle erstellen, wie es der Betreiber Deiner Seite zulässt." + +#: ../../mod/new_channel.php:113 +msgid "Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\" " +msgstr "Beispiele: „Horst Weidinger“, „Lisa und ihr Meerschweinchen“, „Fußball“, „Segelflieger-Forum“ " + +#: ../../mod/new_channel.php:114 +msgid "Choose a short nickname" +msgstr "Wähle einen kurzen Spitznamen" + +#: ../../mod/new_channel.php:115 +msgid "" +"Your nickname will be used to create an easily remembered channel address " +"(like an email address) which you can share with others." +msgstr "Dein Spitzname wird verwendet, um eine leicht zu merkende Kanal-Adresse (ähnlich einer E-Mail-Adresse) zu erzeugen, die Du mit anderen austauschen kannst." + +#: ../../mod/new_channel.php:116 +msgid "Or import an existing channel from another location" +msgstr "Oder importiere einen bestehenden Kanal von einem anderen Server" + +#: ../../mod/new_channel.php:118 +msgid "Channel Type" +msgstr "Kanaltyp" + +#: ../../mod/new_channel.php:119 +msgid "" +"Please choose a channel type (such as social networking or community forum) " +"and privacy requirements so we can select the best permissions for you" +msgstr "Wähle einen Kanaltyp (wie Soziales Netzwerk oder Forum) und Privatsphäre-Vorgaben, so dass wir die passenden Kanal-Zugriffsrechte für Dich setzen können" -#: ../../mod/profiles.php:658 -msgid "Street Address:" -msgstr "Straße und Hausnummer:" +#: ../../mod/home.php:46 +msgid "Red Matrix - "The Network"" +msgstr "RedMatrix – "Das Netzwerk"" -#: ../../mod/profiles.php:659 -msgid "Locality/City:" -msgstr "Wohnort:" +#: ../../mod/home.php:101 +#, php-format +msgid "Welcome to %s" +msgstr "Willkommen auf %s" -#: ../../mod/profiles.php:660 -msgid "Postal/Zip Code:" -msgstr "Postleitzahl:" +#: ../../mod/notifications.php:26 +msgid "Invalid request identifier." +msgstr "Ungültiger Anfrage-Identifikator." -#: ../../mod/profiles.php:661 -msgid "Country:" -msgstr "Land:" +#: ../../mod/notifications.php:35 +msgid "Discard" +msgstr "Verwerfen" -#: ../../mod/profiles.php:662 -msgid "Region/State:" -msgstr "Region/Bundesstaat:" +#: ../../mod/notifications.php:94 ../../mod/notify.php:53 +msgid "No more system notifications." +msgstr "Keine System-Benachrichtigungen mehr." -#: ../../mod/profiles.php:663 -msgid "♥ Marital Status:" -msgstr "♥ Beziehungsstatus:" +#: ../../mod/notifications.php:98 ../../mod/notify.php:57 +msgid "System Notifications" +msgstr "System-Benachrichtigungen" -#: ../../mod/profiles.php:664 -msgid "Who: (if applicable)" -msgstr "Wer: (falls anwendbar)" +#: ../../mod/oexchange.php:23 +msgid "Unable to find your hub." +msgstr "Konnte Deinen Server nicht finden." -#: ../../mod/profiles.php:665 -msgid "Examples: cathy123, Cathy Williams, cathy@example.com" -msgstr "Beispiele: cathy123, Cathy Williams, cathy@example.com" +#: ../../mod/oexchange.php:37 +msgid "Post successful." +msgstr "Veröffentlichung erfolgreich." -#: ../../mod/profiles.php:666 -msgid "Since [date]:" -msgstr "Seit [Datum]:" +#: ../../mod/zfinger.php:23 +msgid "invalid target signature" +msgstr "Ungültige Signatur des Ziels" -#: ../../mod/profiles.php:668 -msgid "Homepage URL:" -msgstr "Homepage URL:" +#: ../../mod/openid.php:26 +msgid "OpenID protocol error. No ID returned." +msgstr "OpenID Protokollfehler. Keine ID zurückgegeben." -#: ../../mod/profiles.php:671 -msgid "Religious Views:" -msgstr "Religiöse Ansichten:" +#: ../../mod/appman.php:28 ../../mod/appman.php:44 +msgid "App installed." +msgstr "App installiert." -#: ../../mod/profiles.php:672 -msgid "Keywords:" -msgstr "Schlüsselwörter:" +#: ../../mod/appman.php:37 +msgid "Malformed app." +msgstr "Fehlerhafte App." -#: ../../mod/profiles.php:675 -msgid "Example: fishing photography software" -msgstr "Beispiel: Angeln Fotografie Software" +#: ../../mod/appman.php:80 +msgid "Embed code" +msgstr "Code einbetten" -#: ../../mod/profiles.php:676 -msgid "Used in directory listings" -msgstr "Wird in Verzeichnis-Auflistungen verwendet" +#: ../../mod/appman.php:86 +msgid "Edit App" +msgstr "App bearbeiten" -#: ../../mod/profiles.php:677 -msgid "Tell us about yourself..." -msgstr "Erzähle uns ein wenig von Dir …" +#: ../../mod/appman.php:86 +msgid "Create App" +msgstr "App erstellen" -#: ../../mod/profiles.php:678 -msgid "Hobbies/Interests" -msgstr "Hobbys/Interessen" +#: ../../mod/appman.php:91 +msgid "Name of app" +msgstr "Name der App" -#: ../../mod/profiles.php:679 -msgid "Contact information and Social Networks" -msgstr "Kontaktinformation und soziale Netzwerke" +#: ../../mod/appman.php:92 +msgid "Location (URL) of app" +msgstr "Ort (URL) der App" -#: ../../mod/profiles.php:680 -msgid "My other channels" -msgstr "Meine anderen Kanäle" +#: ../../mod/appman.php:94 +msgid "Photo icon URL" +msgstr "URL zum Icon" -#: ../../mod/profiles.php:681 -msgid "Musical interests" -msgstr "Musikalische Interessen" +#: ../../mod/appman.php:94 +msgid "80 x 80 pixels - optional" +msgstr "80 x 80 Pixel – optional" -#: ../../mod/profiles.php:682 -msgid "Books, literature" -msgstr "Bücher, Literatur" +#: ../../mod/appman.php:95 +msgid "Version ID" +msgstr "Versions-ID" -#: ../../mod/profiles.php:683 -msgid "Television" -msgstr "Fernsehen" +#: ../../mod/appman.php:96 +msgid "Price of app" +msgstr "Preis der App" -#: ../../mod/profiles.php:684 -msgid "Film/dance/culture/entertainment" -msgstr "Film/Tanz/Kultur/Unterhaltung" +#: ../../mod/appman.php:97 +msgid "Location (URL) to purchase app" +msgstr "Ort (URL), um die App zu kaufen" -#: ../../mod/profiles.php:685 -msgid "Love/romance" -msgstr "Liebe/Romantik" +#: ../../mod/poll.php:64 +msgid "Poll" +msgstr "Umfrage" -#: ../../mod/profiles.php:686 -msgid "Work/employment" -msgstr "Arbeit/Anstellung" +#: ../../mod/poll.php:69 +msgid "View Results" +msgstr "Ergebnisse" -#: ../../mod/profiles.php:687 -msgid "School/education" -msgstr "Schule/Ausbildung" +#: ../../mod/removeaccount.php:30 +msgid "" +"Account removals are not allowed within 48 hours of changing the account " +"password." +msgstr "Das Löschen von Konten innerhalb 48 Stunden nachdem deren Passwort geändert wurde ist nicht erlaubt." -#: ../../mod/profiles.php:693 -msgid "This is your default profile." -msgstr "Das ist Dein Standardprofil" +#: ../../mod/removeaccount.php:57 +msgid "Remove This Account" +msgstr "Dieses Konto löschen" -#: ../../mod/profiles.php:747 -msgid "Edit/Manage Profiles" -msgstr "Profile bearbeiten/verwalten" +#: ../../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 "Hiermit wird dieses Nutzerkonto einschließlich all seiner Kanäle komplett aus dem Netzwerk entfernt. Dieser Vorgang kann nicht rückgängig gemacht werden." -#: ../../mod/profiles.php:748 -msgid "Add profile things" -msgstr "Sachen zum Profil hinzufügen" +#: ../../mod/removeaccount.php:60 +msgid "" +"Remove this account, all its channels and all its channel clones from the " +"network" +msgstr "Dieses Konto, all seine Kanäle sowie alle Kanal-Klone aus dem Netzwerk löschen" -#: ../../mod/profiles.php:749 -msgid "Include desirable objects in your profile" -msgstr "Binde begehrenswerte Dinge in Dein Profil ein" +#: ../../mod/removeaccount.php:60 +msgid "" +"By default only the instances of the channels located on this hub will be " +"removed from the network" +msgstr "Standardmäßig werden nur die Kanalklone auf diesem RedMatrix-Hub aus dem Netzwerk entfernt" -#: ../../mod/bookmarks.php:38 -msgid "Bookmark added" -msgstr "Lesezeichen hinzugefügt" +#: ../../mod/service_limits.php:19 +msgid "No service class restrictions found." +msgstr "Keine Dienstklassenbeschränkungen gefunden." -#: ../../mod/bookmarks.php:60 -msgid "My Bookmarks" -msgstr "Meine Lesezeichen" +#: ../../view/theme/apw/php/config.php:202 +#: ../../view/theme/apw/php/config.php:236 +msgid "Schema Default" +msgstr "Standard-Schema" -#: ../../mod/bookmarks.php:71 -msgid "My Connections Bookmarks" -msgstr "Lesezeichen meiner Kontakte" +#: ../../view/theme/apw/php/config.php:203 +msgid "Sans-Serif" +msgstr "Sans-Serif" -#: ../../mod/common.php:10 -msgid "No channel." -msgstr "Kein Kanal." +#: ../../view/theme/apw/php/config.php:204 +msgid "Monospace" +msgstr "Monospace" -#: ../../mod/common.php:39 -msgid "Common connections" -msgstr "Gemeinsame Verbindungen" +#: ../../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 "Theme-Einstellungen" -#: ../../mod/common.php:44 -msgid "No connections in common." -msgstr "Keine gemeinsamen Verbindungen." +#: ../../view/theme/apw/php/config.php:260 +#: ../../view/theme/redbasic/php/config.php:103 +msgid "Set scheme" +msgstr "Schema" -#: ../../mod/like.php:15 -msgid "Like/Dislike" -msgstr "Mögen/Nicht mögen" +#: ../../view/theme/apw/php/config.php:261 +#: ../../view/theme/redbasic/php/config.php:124 +msgid "Set font-size for posts and comments" +msgstr "Schriftgröße für Beiträge und Kommentare" -#: ../../mod/like.php:20 -msgid "This action is restricted to members." -msgstr "Diese Aktion kann nur von Mitgliedern ausgeführt werden." +#: ../../view/theme/apw/php/config.php:262 +msgid "Set font face" +msgstr "Schriftart" -#: ../../mod/like.php:21 -msgid "" -"Please login with your RedMatrix ID or register as a new RedMatrix member to continue." -msgstr "Bitte melde Dich mit Deiner RedMatrix-ID an oder registriere Dich als neues Mitglied der RedMatrix, um fortzufahren." +#: ../../view/theme/apw/php/config.php:263 +msgid "Set iconset" +msgstr "Iconset" -#: ../../mod/like.php:77 ../../mod/like.php:104 ../../mod/like.php:142 -msgid "Invalid request." -msgstr "Ungültige Anfrage." +#: ../../view/theme/apw/php/config.php:264 +msgid "Set big shadow size, default 15px 15px 15px" +msgstr "Ausmaß der großen Schatten (Default 15px 15px 15px)" -#: ../../mod/like.php:119 -msgid "thing" -msgstr "Sache" +#: ../../view/theme/apw/php/config.php:265 +msgid "Set small shadow size, default 5px 5px 5px" +msgstr "Ausmaß der kleinen Schatten (Default 5px 5px 5px)" -#: ../../mod/like.php:165 -msgid "Channel unavailable." -msgstr "Kanal nicht vorhanden." +#: ../../view/theme/apw/php/config.php:266 +msgid "Set shadow color, default #000" +msgstr "Farbe der Schatten (Default #000)" -#: ../../mod/like.php:204 -msgid "Previous action reversed." -msgstr "Die vorherige Aktion wurde rückgängig gemacht." +#: ../../view/theme/apw/php/config.php:267 +msgid "Set radius size, default 5px" +msgstr "Ecken-Radius (Default 5px)" -#: ../../mod/like.php:417 -msgid "Action completed." -msgstr "Aktion durchgeführt." +#: ../../view/theme/apw/php/config.php:268 +msgid "Set line-height for posts and comments" +msgstr "Zeilenhöhe in Beiträgen und Kommentaren" -#: ../../mod/like.php:418 -msgid "Thank you." -msgstr "Vielen Dank." +#: ../../view/theme/apw/php/config.php:269 +msgid "Set background image" +msgstr "Hintergrundbild" -#: ../../mod/notify.php:53 ../../mod/notifications.php:94 -msgid "No more system notifications." -msgstr "Keine System-Benachrichtigungen mehr." +#: ../../view/theme/apw/php/config.php:270 +msgid "Set background attachment" +msgstr "Hintergrunddatei" -#: ../../mod/notify.php:57 ../../mod/notifications.php:98 -msgid "System Notifications" -msgstr "System-Benachrichtigungen" +#: ../../view/theme/apw/php/config.php:271 +msgid "Set background color" +msgstr "Hintergrundfarbe" -#: ../../mod/api.php:76 ../../mod/api.php:102 -msgid "Authorize application connection" -msgstr "Zugriff für die Anwendung autorisieren" +#: ../../view/theme/apw/php/config.php:272 +msgid "Set section background image" +msgstr "Hintergrundbild für die Section" -#: ../../mod/api.php:77 -msgid "Return to your app and insert this Securty Code:" -msgstr "Trage folgenden Sicherheitscode in der Anwendung ein:" +#: ../../view/theme/apw/php/config.php:273 +msgid "Set section background color" +msgstr "Hintergrundfarbe für die Section" -#: ../../mod/api.php:89 -msgid "Please login to continue." -msgstr "Zum Weitermachen, bitte einloggen." +#: ../../view/theme/apw/php/config.php:274 +msgid "Set color of items - use hex" +msgstr "Farbe für Beiträge – Hex benutzen" -#: ../../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 "Möchtest Du dieser Anwendung erlauben, Deine Nachrichten und Kontakte abzurufen und/oder neue Nachrichten für Dich zu erstellen?" +#: ../../view/theme/apw/php/config.php:275 +msgid "Set color of links - use hex" +msgstr "Farbe für Links – Hex benutzen" -#: ../../mod/chat.php:167 -msgid "Room not found" -msgstr "Chatraum nicht gefunden" +#: ../../view/theme/apw/php/config.php:276 +msgid "Set max-width for items. Default 400px" +msgstr "Maximale Breite von Beiträgen (Default 400px)" -#: ../../mod/chat.php:178 -msgid "Leave Room" -msgstr "Raum verlassen" +#: ../../view/theme/apw/php/config.php:277 +msgid "Set min-width for items. Default 240px" +msgstr "Minimale Breite von Beiträgen (Default 240px)" -#: ../../mod/chat.php:179 -msgid "Delete This Room" -msgstr "Diesen Raum löschen" +#: ../../view/theme/apw/php/config.php:278 +msgid "Set the generic content wrapper width. Default 48%" +msgstr "Breite des \"generic content wrapper\" (Default 48%)" -#: ../../mod/chat.php:180 -msgid "I am away right now" -msgstr "Ich bin gerade nicht da" +#: ../../view/theme/apw/php/config.php:279 +msgid "Set color of fonts - use hex" +msgstr "Schriftfarbe – Hex benutzen" -#: ../../mod/chat.php:181 -msgid "I am online" -msgstr "Ich bin online" +#: ../../view/theme/apw/php/config.php:280 +msgid "Set background-size element" +msgstr "Größe des Hintergrund-Elements" -#: ../../mod/chat.php:183 -msgid "Bookmark this room" -msgstr "Lesezeichen für diesen Raum setzen" +#: ../../view/theme/apw/php/config.php:281 +msgid "Item opacity" +msgstr "Deckkraft der Beiträge" -#: ../../mod/chat.php:207 ../../mod/chat.php:229 -msgid "New Chatroom" -msgstr "Neuer Chatraum" +#: ../../view/theme/apw/php/config.php:282 +msgid "Display post previews only" +msgstr "Nur Beitragsvorschau anzeigen" -#: ../../mod/chat.php:208 -msgid "Chatroom Name" -msgstr "Name des Chatraums" +#: ../../view/theme/apw/php/config.php:283 +msgid "Display side bar on channel page" +msgstr "Zeige die Seitenleiste auf der Kanal-Seite" -#: ../../mod/chat.php:225 -#, php-format -msgid "%1$s's Chatrooms" -msgstr "%1$ss Chaträume" +#: ../../view/theme/apw/php/config.php:284 +msgid "Colour of the navigation bar" +msgstr "Farbe der Navigationsleiste" -#: ../../mod/events.php:91 -msgid "Event title and start time are required." -msgstr "Veranstaltungs- Titel und Startzeit sind erforderlich." +#: ../../view/theme/apw/php/config.php:285 +msgid "Item float" +msgstr "Beitragsfluss" -#: ../../mod/events.php:105 -msgid "Event not found." -msgstr "Termin nicht gefunden." +#: ../../view/theme/apw/php/config.php:286 +msgid "Left offset of the section element" +msgstr "Linker Rand des Section Elements" -#: ../../mod/events.php:369 -msgid "l, F j" -msgstr "l, j. F" +#: ../../view/theme/apw/php/config.php:287 +msgid "Right offset of the section element" +msgstr "Rechter Rand des Section Elements" -#: ../../mod/events.php:391 -msgid "Edit event" -msgstr "Veranstaltung bearbeiten" +#: ../../view/theme/apw/php/config.php:288 +msgid "Section width" +msgstr "Breite der Section" -#: ../../mod/events.php:437 -msgid "Create New Event" -msgstr "Neue Veranstaltung erstellen" +#: ../../view/theme/apw/php/config.php:289 +msgid "Left offset of the aside" +msgstr "Linker Rand des Aside-Elements" -#: ../../mod/events.php:438 -msgid "Previous" -msgstr "Voriges" +#: ../../view/theme/apw/php/config.php:290 +msgid "Right offset of the aside element" +msgstr "Rechter Rand des Aside-Elements" -#: ../../mod/events.php:536 -msgid "hour:minute" -msgstr "Stunde:Minute" +#: ../../view/theme/blogga/php/config.php:47 +#: ../../view/theme/blogga/view/theme/blog/config.php:47 +msgid "None" +msgstr "Kein" -#: ../../mod/events.php:556 -msgid "Event details" -msgstr "Veranstaltungs-Details" +#: ../../view/theme/blogga/php/config.php:70 +#: ../../view/theme/blogga/view/theme/blog/config.php:70 +msgid "Header image" +msgstr "Titelbild" -#: ../../mod/events.php:557 -#, php-format -msgid "Format is %s %s." -msgstr "Format ist %s %s." +#: ../../view/theme/blogga/php/config.php:71 +#: ../../view/theme/blogga/view/theme/blog/config.php:71 +msgid "Header image only on profile pages" +msgstr "Titelbild nur auf Profil-Seiten anzeigen" -#: ../../mod/events.php:558 -msgid "Starting date and Title are required." -msgstr "Startdatum und Titel sind erforderlich." +#: ../../view/theme/redbasic/php/config.php:84 +msgid "Light (Red Matrix default)" +msgstr "Hell (RedMatrix-Voreinstellung)" -#: ../../mod/events.php:562 -msgid "Event Starts:" -msgstr "Veranstaltung startet:" +#: ../../view/theme/redbasic/php/config.php:104 +msgid "Narrow navbar" +msgstr "Schmale Navigationsleiste" -#: ../../mod/events.php:570 -msgid "Finish date/time is not known or not relevant" -msgstr "Ende Datum/Zeit sind unbekannt oder unwichtig" +#: ../../view/theme/redbasic/php/config.php:105 +msgid "Navigation bar background color" +msgstr "Hintergrundfarbe der Navigationsleiste" -#: ../../mod/events.php:572 -msgid "Event Finishes:" -msgstr "Veranstaltung endet:" +#: ../../view/theme/redbasic/php/config.php:106 +msgid "Navigation bar gradient top color" +msgstr "Farbverlauf der Navigationsleiste: Farbe oben" -#: ../../mod/events.php:575 -msgid "Adjust for viewer timezone" -msgstr "An die Zeitzone des Betrachters anpassen" +#: ../../view/theme/redbasic/php/config.php:107 +msgid "Navigation bar gradient bottom color" +msgstr "Farbverlauf der Navigationsleiste: Farbe unten" -#: ../../mod/events.php:577 -msgid "Description:" -msgstr "Beschreibung:" +#: ../../view/theme/redbasic/php/config.php:108 +msgid "Navigation active button gradient top color" +msgstr "Navigations-Button aktiv: Farbe für Farbverlauf oben" -#: ../../mod/events.php:581 -msgid "Title:" -msgstr "Titel:" +#: ../../view/theme/redbasic/php/config.php:109 +msgid "Navigation active button gradient bottom color" +msgstr "Navigations-Button aktiv: Farbe für Farbverlauf unten" -#: ../../mod/events.php:583 -msgid "Share this event" -msgstr "Die Veranstaltung teilen" +#: ../../view/theme/redbasic/php/config.php:110 +msgid "Navigation bar border color " +msgstr "Farbe für den Rand der Navigationsleiste" -#: ../../mod/notifications.php:26 -msgid "Invalid request identifier." -msgstr "Ungültiger Anfrage-Identifikator." +#: ../../view/theme/redbasic/php/config.php:111 +msgid "Navigation bar icon color " +msgstr "Farbe für die Icons der Navigationsleiste" -#: ../../mod/notifications.php:35 -msgid "Discard" -msgstr "Verwerfen" +#: ../../view/theme/redbasic/php/config.php:112 +msgid "Navigation bar active icon color " +msgstr "Farbe für aktive Icons der Navigationsleiste" -#: ../../mod/lostpass.php:15 -msgid "No valid account found." -msgstr "Kein gültiges Konto gefunden." +#: ../../view/theme/redbasic/php/config.php:113 +msgid "link color" +msgstr "Farbe für Links" -#: ../../mod/lostpass.php:29 -msgid "Password reset request issued. Check your email." -msgstr "Zurücksetzen des Passworts eingeleitet. Schau in Deine E-Mails." +#: ../../view/theme/redbasic/php/config.php:114 +msgid "Set font-color for banner" +msgstr "Farbe der Schrift des Banners" -#: ../../mod/lostpass.php:35 ../../mod/lostpass.php:102 -#, php-format -msgid "Site Member (%s)" -msgstr "Nutzer (%s)" +#: ../../view/theme/redbasic/php/config.php:115 +msgid "Set the background color" +msgstr "Hintergrundfarbe" -#: ../../mod/lostpass.php:40 -#, php-format -msgid "Password reset requested at %s" -msgstr "Passwort-Rücksetzung auf %s angefordert" +#: ../../view/theme/redbasic/php/config.php:116 +msgid "Set the background image" +msgstr "Hintergrundbild" -#: ../../mod/lostpass.php:63 -msgid "" -"Request could not be verified. (You may have previously submitted it.) " -"Password reset failed." -msgstr "Die Anfrage konnte nicht verifiziert werden. (Vielleicht hast Du schon einmal auf den Link in der E-Mail geklickt?) Passwort-Rücksetzung fehlgeschlagen." +#: ../../view/theme/redbasic/php/config.php:117 +msgid "Set the background color of items" +msgstr "Hintergrundfarbe für Beiträge" -#: ../../mod/lostpass.php:86 -msgid "Your password has been reset as requested." -msgstr "Dein Passwort wurde wie angefordert neu erstellt." +#: ../../view/theme/redbasic/php/config.php:118 +msgid "Set the background color of comments" +msgstr "Hintergrundfarbe für Kommentare" -#: ../../mod/lostpass.php:87 -msgid "Your new password is" -msgstr "Dein neues Passwort lautet" +#: ../../view/theme/redbasic/php/config.php:119 +msgid "Set the border color of comments" +msgstr "Farbe des Randes von Kommentaren" -#: ../../mod/lostpass.php:88 -msgid "Save or copy your new password - and then" -msgstr "Speichere oder kopiere Dein neues Passwort – und dann" +#: ../../view/theme/redbasic/php/config.php:120 +msgid "Set the indent for comments" +msgstr "Einzug für Kommentare" -#: ../../mod/lostpass.php:89 -msgid "click here to login" -msgstr "Klicke hier, um dich anzumelden" +#: ../../view/theme/redbasic/php/config.php:121 +msgid "Set the basic color for item icons" +msgstr "Grundfarbe für Beitrags-Icons" -#: ../../mod/lostpass.php:90 -msgid "" -"Your password may be changed from the Settings page after " -"successful login." -msgstr "Dein Passwort kann unter Einstellungen nach einer erfolgreichen Anmeldung geändert werden." +#: ../../view/theme/redbasic/php/config.php:122 +msgid "Set the hover color for item icons" +msgstr "Farbe für Beitrags-Icons unter dem Mauszeiger" -#: ../../mod/lostpass.php:107 -#, php-format -msgid "Your password has changed at %s" -msgstr "Auf %s wurde Dein Passwort geändert" +#: ../../view/theme/redbasic/php/config.php:123 +msgid "Set font-size for the entire application" +msgstr "Schriftgröße für die ganze Applikation" -#: ../../mod/lostpass.php:122 -msgid "Forgot your Password?" -msgstr "Kennwort vergessen?" +#: ../../view/theme/redbasic/php/config.php:125 +msgid "Set font-color for posts and comments" +msgstr "Schriftfarbe für Posts und Kommentare" -#: ../../mod/lostpass.php:123 -msgid "" -"Enter your email address and submit to have your password reset. Then check " -"your email for further instructions." -msgstr "Gib Deine E-Mail-Adresse ein, um Dein Passwort zurücksetzen zu lassen. Du erhältst dann weitere Anweisungen per E-Mail." +#: ../../view/theme/redbasic/php/config.php:126 +msgid "Set radius of corners" +msgstr "Ecken-Radius" -#: ../../mod/lostpass.php:124 -msgid "Email Address" -msgstr "E-Mail Adresse" +#: ../../view/theme/redbasic/php/config.php:127 +msgid "Set shadow depth of photos" +msgstr "Schattentiefe von Fotos" -#: ../../mod/lostpass.php:125 -msgid "Reset" -msgstr "Zurücksetzen" +#: ../../view/theme/redbasic/php/config.php:128 +msgid "Set maximum width of conversation regions" +msgstr "Maximalbreite der Unterhaltungsbereiche" -#: ../../mod/layouts.php:62 -msgid "Help with this feature" -msgstr "Hilfe zu dieser Funktion" +#: ../../view/theme/redbasic/php/config.php:129 +msgid "Center conversation regions" +msgstr "Konversationsbereich zentrieren" -#: ../../mod/layouts.php:85 -msgid "Layout Name" -msgstr "Layout-Name" +#: ../../view/theme/redbasic/php/config.php:130 +msgid "Set minimum opacity of nav bar - to hide it" +msgstr "Mindest-Deckkraft der Navigationsleiste ( - versteckt sie)" -#: ../../mod/editblock.php:77 -msgid "Edit Block" -msgstr "Block bearbeiten" +#: ../../view/theme/redbasic/php/config.php:131 +msgid "Set size of conversation author photo" +msgstr "Größe der Avatare von Themenstartern" -#: ../../mod/editblock.php:87 -msgid "Delete block?" -msgstr "Block löschen?" +#: ../../view/theme/redbasic/php/config.php:132 +msgid "Set size of followup author photos" +msgstr "Größe der Avatare von Kommentatoren" -#: ../../mod/editblock.php:153 -msgid "Delete Block" -msgstr "Block löschen" +#: ../../view/theme/redbasic/php/config.php:133 +msgid "Sloppy photo albums" +msgstr "Schräge Fotoalben" -#: ../../mod/achievements.php:34 -msgid "Some blurb about what to do when you're new here" -msgstr "Ein Hinweis, was man tun kann, wenn man neu hier ist" +#: ../../view/theme/redbasic/php/config.php:133 +msgid "Are you a clean desk or a messy desk person?" +msgstr "Bist Du jemand, der einen aufgeräumten Schreibtisch hat, oder eher einen chaotischen?" -#: ../../mod/editlayout.php:72 -msgid "Edit Layout" -msgstr "Layout bearbeiten" +#: ../../boot.php:1294 +#, php-format +msgid "Update %s failed. See error logs." +msgstr "Aktualisierung %s fehlgeschlagen. Details in den Fehlerprotokollen." -#: ../../mod/editlayout.php:82 -msgid "Delete layout?" -msgstr "Layout löschen?" +#: ../../boot.php:1297 +#, php-format +msgid "Update Error at %s" +msgstr "Aktualisierungsfehler auf %s" -#: ../../mod/editlayout.php:146 -msgid "Delete Layout" -msgstr "Layout löschen" +#: ../../boot.php:1471 +msgid "" +"Create an account to access services and applications within the Red Matrix" +msgstr "Erstelle einen Account, um Anwendungen und Dienste innerhalb der Red-Matrix verwenden zu können." -#: ../../mod/follow.php:25 -msgid "Channel added." -msgstr "Kanal hinzugefügt." +#: ../../boot.php:1499 +msgid "Password" +msgstr "Kennwort" -#: ../../mod/locs.php:47 ../../mod/locs.php:74 -msgid "Location not found." -msgstr "Klon nicht gefunden." +#: ../../boot.php:1500 +msgid "Remember me" +msgstr "Angaben speichern" -#: ../../mod/locs.php:78 -msgid "Primary location cannot be removed." -msgstr "Der primäre Klon kann nicht gelöscht werden." +#: ../../boot.php:1505 +msgid "Forgot your password?" +msgstr "Passwort vergessen?" + +#: ../../boot.php:1570 +msgid "permission denied" +msgstr "Zugriff verweigert" + +#: ../../boot.php:1571 +msgid "Got Zot?" +msgstr "Haste schon Zot?" + +#: ../../boot.php:2005 +msgid "toggle mobile" +msgstr "auf/von mobile Ansicht wechseln" diff --git a/view/de/strings.php b/view/de/strings.php index 13834e85f..43be85885 100644 --- a/view/de/strings.php +++ b/view/de/strings.php @@ -5,274 +5,185 @@ function string_plural_select_de($n){ return ($n != 1);; }} ; -$a->strings["Light (Red Matrix default)"] = "Hell (RedMatrix-Voreinstellung)"; -$a->strings["Submit"] = "Bestätigen"; -$a->strings["Theme settings"] = "Theme-Einstellungen"; -$a->strings["Set scheme"] = "Schema"; -$a->strings["Narrow navbar"] = "Schmale Navigationsleiste"; -$a->strings["Navigation bar background color"] = "Hintergrundfarbe der Navigationsleiste"; -$a->strings["Navigation bar gradient top color"] = "Farbverlauf der Navigationsleiste: Farbe oben"; -$a->strings["Navigation bar gradient bottom color"] = "Farbverlauf der Navigationsleiste: Farbe unten"; -$a->strings["Navigation active button gradient top color"] = "Navigations-Button aktiv: Farbe für Farbverlauf oben"; -$a->strings["Navigation active button gradient bottom color"] = "Navigations-Button aktiv: Farbe für Farbverlauf unten"; -$a->strings["Navigation bar border color "] = "Farbe für den Rand der Navigationsleiste"; -$a->strings["Navigation bar icon color "] = "Farbe für die Icons der Navigationsleiste"; -$a->strings["Navigation bar active icon color "] = "Farbe für aktive Icons der Navigationsleiste"; -$a->strings["link color"] = "Farbe für Links"; -$a->strings["Set font-color for banner"] = "Farbe der Schrift des Banners"; -$a->strings["Set the background color"] = "Hintergrundfarbe"; -$a->strings["Set the background image"] = "Hintergrundbild"; -$a->strings["Set the background color of items"] = "Hintergrundfarbe für Beiträge"; -$a->strings["Set the background color of comments"] = "Hintergrundfarbe für Kommentare"; -$a->strings["Set the border color of comments"] = "Farbe des Randes von Kommentaren"; -$a->strings["Set the indent for comments"] = "Einzug für Kommentare"; -$a->strings["Set the basic color for item icons"] = "Grundfarbe für Beitrags-Icons"; -$a->strings["Set the hover color for item icons"] = "Farbe für Beitrags-Icons unter dem Mauszeiger"; -$a->strings["Set font-size for the entire application"] = "Schriftgröße für die ganze Applikation"; -$a->strings["Set font-size for posts and comments"] = "Schriftgröße für Beiträge und Kommentare"; -$a->strings["Set font-color for posts and comments"] = "Schriftfarbe für Posts und Kommentare"; -$a->strings["Set radius of corners"] = "Ecken-Radius"; -$a->strings["Set shadow depth of photos"] = "Schattentiefe von Fotos"; -$a->strings["Set maximum width of conversation regions"] = "Maximalbreite der Unterhaltungsbereiche"; -$a->strings["Center conversation regions"] = "Konversationsbereich zentrieren"; -$a->strings["Set minimum opacity of nav bar - to hide it"] = "Mindest-Deckkraft der Navigationsleiste ( - versteckt sie)"; -$a->strings["Set size of conversation author photo"] = "Größe der Avatare von Themenstartern"; -$a->strings["Set size of followup author photos"] = "Größe der Avatare von Kommentatoren"; -$a->strings["Sloppy photo albums"] = "Schräge Fotoalben"; -$a->strings["Are you a clean desk or a messy desk person?"] = "Bist Du jemand, der einen aufgeräumten Schreibtisch hat, oder eher einen chaotischen?"; -$a->strings["Update %s failed. See error logs."] = "Aktualisierung %s fehlgeschlagen. Details in den Fehlerprotokollen."; -$a->strings["Update Error at %s"] = "Aktualisierungsfehler auf %s"; -$a->strings["Create an account to access services and applications within the Red Matrix"] = "Erstelle einen Account, um Anwendungen und Dienste innerhalb der Red-Matrix verwenden zu können."; -$a->strings["Register"] = "Registrieren"; -$a->strings["Logout"] = "Abmelden"; +$a->strings["Cannot locate DNS info for database server '%s'"] = "Kann die DNS-Informationen für den Datenbank-Server '%s' nicht finden"; +$a->strings["Profile Photos"] = "Profilfotos"; +$a->strings["Site Admin"] = "Hub-Administration"; +$a->strings["Bookmarks"] = "Lesezeichen"; +$a->strings["Address Book"] = "Adressbuch"; $a->strings["Login"] = "Anmelden"; -$a->strings["Email"] = "E-Mail"; -$a->strings["Password"] = "Kennwort"; -$a->strings["Remember me"] = "Angaben speichern"; -$a->strings["Forgot your password?"] = "Passwort vergessen?"; -$a->strings["Password Reset"] = "Zurücksetzen des Kennworts"; -$a->strings["permission denied"] = "Zugriff verweigert"; -$a->strings["Got Zot?"] = "Haste schon Zot?"; -$a->strings["toggle mobile"] = "auf/von mobile Ansicht wechseln"; -$a->strings["Logged out."] = "Ausgeloggt."; -$a->strings["Failed authentication"] = "Authentifizierung fehlgeschlagen"; -$a->strings["Login failed."] = "Login fehlgeschlagen."; -$a->strings["Default"] = "Standard"; -$a->strings["parent"] = "Übergeordnetes Verzeichnis"; -$a->strings["Collection"] = "Sammlung"; -$a->strings["Principal"] = "Prinzipal"; -$a->strings["Addressbook"] = "Adressbuch"; -$a->strings["Calendar"] = "Kalender"; -$a->strings["Schedule Inbox"] = "Posteingang für überwachte Kalender"; -$a->strings["Schedule Outbox"] = "Postausgang für überwachte Kalender"; -$a->strings["Unknown"] = "Unbekannt"; -$a->strings["%1\$s used"] = "%1\$s verwendet"; -$a->strings["%1\$s used of %2\$s (%3\$s%)"] = "%1\$s von %2\$s verwendet (%3\$s%)"; +$a->strings["Channel Manager"] = "Kanal-Manager"; +$a->strings["Matrix"] = "Matrix"; +$a->strings["Settings"] = "Einstellungen"; $a->strings["Files"] = "Dateien"; -$a->strings["Name"] = "Name"; -$a->strings["Type"] = "Typ"; -$a->strings["Size"] = "Größe"; -$a->strings["Last Modified"] = "Zuletzt geändert"; +$a->strings["Webpages"] = "Webseiten"; +$a->strings["Channel Home"] = "Mein Kanal"; +$a->strings["Profile"] = "Profil"; +$a->strings["Photos"] = "Fotos"; +$a->strings["Events"] = "Veranstaltungen"; +$a->strings["Directory"] = "Verzeichnis"; +$a->strings["Help"] = "Hilfe"; +$a->strings["Mail"] = "Mail"; +$a->strings["Mood"] = "Laune"; +$a->strings["Poke"] = "Anstupsen"; +$a->strings["Chat"] = "Chat"; +$a->strings["Search"] = "Suche"; +$a->strings["Probe"] = "Testen"; +$a->strings["Suggest"] = "Empfehlungen"; +$a->strings["Random Channel"] = "Zufälliger Kanal"; +$a->strings["Invite"] = "Einladen"; +$a->strings["Features"] = "Funktionen"; +$a->strings["Language"] = "Sprache"; +$a->strings["Post"] = "Beitrag"; +$a->strings["Profile Photo"] = "Profilfoto"; +$a->strings["Update"] = "Aktualisieren"; +$a->strings["Install"] = "Installieren"; +$a->strings["Purchase"] = "Kaufen"; $a->strings["Edit"] = "Bearbeiten"; $a->strings["Delete"] = "Löschen"; -$a->strings["Total"] = "Summe"; -$a->strings["Create new folder"] = "Neuen Ordner anlegen"; -$a->strings["Create"] = "Erstelle"; -$a->strings["Upload file"] = "Datei hochladen"; -$a->strings["Upload"] = "Hochladen"; +$a->strings["Unknown"] = "Unbekannt"; $a->strings["Permission denied."] = "Zugang verweigert"; -$a->strings["Profile Photos"] = "Profilfotos"; -$a->strings["Image exceeds website size limit of %lu bytes"] = "Bild überschreitet das Limit der Webseite von %lu bytes"; -$a->strings["Image file is empty."] = "Bilddatei ist leer."; -$a->strings["Unable to process image"] = "Kann Bild nicht verarbeiten"; -$a->strings["Photo storage failed."] = "Foto speichern schlug fehl"; -$a->strings["Photo Albums"] = "Fotoalben"; -$a->strings["Upload New Photos"] = "Lade neue Fotos hoch"; -$a->strings["%d invitation available"] = array( - 0 => "%d Einladung verfügbar", - 1 => "%d Einladungen verfügbar", +$a->strings["Item was not found."] = "Beitrag wurde nicht gefunden."; +$a->strings["No source file."] = "Keine Quelldatei."; +$a->strings["Cannot locate file to replace"] = "Kann Datei zum Ersetzen nicht finden"; +$a->strings["Cannot locate file to revise/update"] = "Kann Datei zum Prüfen/Aktualisieren nicht finden"; +$a->strings["File exceeds size limit of %d"] = "Datei überschreitet das Größen-Limit von %d"; +$a->strings["You have reached your limit of %1$.0f Mbytes attachment storage."] = "Die Größe Deiner Datei-Anhänge hat das Maximum von %1$.0f MByte erreicht."; +$a->strings["File upload failed. Possible system limit or action terminated."] = "Datei-Upload fehlgeschlagen. Mögliche Systembegrenzung oder abgebrochener Prozess."; +$a->strings["Stored file could not be verified. Upload failed."] = "Gespeichert Datei konnte nicht verifiziert werden. Upload abgebrochen."; +$a->strings["Path not available."] = "Pfad nicht verfügbar."; +$a->strings["Empty pathname"] = "Leere Pfadangabe"; +$a->strings["duplicate filename or path"] = "doppelter Dateiname oder Pfad"; +$a->strings["Path not found."] = "Pfad nicht gefunden."; +$a->strings["mkdir failed."] = "mkdir fehlgeschlagen."; +$a->strings["database storage failed."] = "Speichern in der Datenbank fehlgeschlagen."; +$a->strings["photo"] = "Foto"; +$a->strings["event"] = "Ereignis"; +$a->strings["channel"] = "Kanal"; +$a->strings["status"] = "Status"; +$a->strings["comment"] = "Kommentar"; +$a->strings["%1\$s likes %2\$s's %3\$s"] = "%1\$s gefällt %2\$ss %3\$s"; +$a->strings["%1\$s doesn't like %2\$s's %3\$s"] = "%1\$s gefällt %2\$ss %3\$s nicht"; +$a->strings["%1\$s is now connected with %2\$s"] = "%1\$s ist jetzt mit %2\$s verbunden"; +$a->strings["%1\$s poked %2\$s"] = "%1\$s stupste %2\$s an"; +$a->strings["poked"] = "stupste"; +$a->strings["__ctx:mood__ %1\$s is %2\$s"] = "%1\$s ist %2\$s"; +$a->strings["Select"] = "Auswählen"; +$a->strings["Private Message"] = "Private Nachricht"; +$a->strings["Message signature validated"] = "Signatur überprüft"; +$a->strings["Message signature incorrect"] = "Signatur nicht korrekt"; +$a->strings["View %s's profile @ %s"] = "%ss Profil auf %s ansehen"; +$a->strings["Categories:"] = "Kategorien:"; +$a->strings["Filed under:"] = "Gespeichert unter:"; +$a->strings[" from %s"] = "von %s"; +$a->strings["last edited: %s"] = "zuletzt bearbeitet: %s"; +$a->strings["Expires: %s"] = "Verfällt: %s"; +$a->strings["View in context"] = "Im Zusammenhang anschauen"; +$a->strings["Please wait"] = "Bitte warten"; +$a->strings["remove"] = "lösche"; +$a->strings["Loading..."] = "Lädt ..."; +$a->strings["Delete Selected Items"] = "Lösche die ausgewählten Elemente"; +$a->strings["View Source"] = "Quelle anzeigen"; +$a->strings["Follow Thread"] = "Unterhaltung folgen"; +$a->strings["View Status"] = "Status ansehen"; +$a->strings["View Profile"] = "Profil ansehen"; +$a->strings["View Photos"] = "Fotos ansehen"; +$a->strings["Matrix Activity"] = "Matrix-Aktivität"; +$a->strings["Connect"] = "Verbinden"; +$a->strings["Edit Contact"] = "Kontakt bearbeiten"; +$a->strings["Send PM"] = "Sende PN"; +$a->strings["%s likes this."] = "%s gefällt das."; +$a->strings["%s doesn't like this."] = "%s gefällt das nicht."; +$a->strings["%2\$d people like this."] = array( + 0 => "%2\$d Person gefällt das.", + 1 => "%2\$d Leuten gefällt das.", ); -$a->strings["Advanced"] = "Fortgeschritten"; -$a->strings["Find Channels"] = "Finde Kanäle"; -$a->strings["Enter name or interest"] = "Name oder Interessen eingeben"; -$a->strings["Connect/Follow"] = "Verbinden/Folgen"; -$a->strings["Examples: Robert Morgenstein, Fishing"] = "Beispiele: Robert Morgenstein, Angeln"; -$a->strings["Find"] = "Finde"; -$a->strings["Channel Suggestions"] = "Kanal-Vorschläge"; -$a->strings["Random Profile"] = "Zufallsprofil"; -$a->strings["Invite Friends"] = "Lade Freunde ein"; -$a->strings["Exammple: name=fred and country=iceland"] = "Beispiel: name=fred and country=deutschland"; -$a->strings["Advanced Find"] = "Erweiterte Suche"; -$a->strings["Saved Folders"] = "Gespeicherte Ordner"; -$a->strings["Everything"] = "Alles"; -$a->strings["Categories"] = "Kategorien"; -$a->strings["%d connection in common"] = array( - 0 => "%d gemeinsame Verbindung", - 1 => "%d gemeinsame Verbindungen", +$a->strings["%2\$d people don't like this."] = array( + 0 => "%2\$d Person gefällt das nicht.", + 1 => "%2\$d Leuten gefällt das nicht.", ); -$a->strings["show more"] = "mehr zeigen"; -$a->strings[" and "] = "und"; -$a->strings["public profile"] = "öffentliches Profil"; -$a->strings["%1\$s changed %2\$s to “%3\$s”"] = "%1\$s hat %2\$s auf “%3\$s” geändert"; -$a->strings["Visit %1\$s's %2\$s"] = "Besuche %1\$s's %2\$s"; -$a->strings["%1\$s has an updated %2\$s, changing %3\$s."] = "%1\$s hat ein aktualisiertes %2\$s, %3\$s wurde verändert."; -$a->strings["Permission denied"] = "Keine Berechtigung"; -$a->strings["(Unknown)"] = "(Unbekannt)"; -$a->strings["Visible to anybody on the internet."] = "Für jeden im Internet sichtbar."; -$a->strings["Visible to you only."] = "Nur für Dich sichtbar."; -$a->strings["Visible to anybody in this network."] = "Für jedes Mitglied der RedMatrix sichtbar."; -$a->strings["Visible to anybody authenticated."] = "Für jeden sichtbar, der angemeldet ist."; -$a->strings["Visible to anybody on %s."] = "Für jeden auf %s sichtbar."; -$a->strings["Visible to all connections."] = "Für alle Verbindungen sichtbar."; -$a->strings["Visible to approved connections."] = "Nur für akzeptierte Verbindungen sichtbar."; -$a->strings["Visible to specific connections."] = "Sichtbar für bestimmte Verbindungen."; -$a->strings["Item not found."] = "Element nicht gefunden."; -$a->strings["Collection not found."] = "Sammlung nicht gefunden"; -$a->strings["Collection is empty."] = "Sammlung ist leer."; -$a->strings["Collection: %s"] = "Sammlung: %s"; -$a->strings["Connection: %s"] = "Verbindung: %s"; -$a->strings["Connection not found."] = "Die Verbindung wurde nicht gefunden."; -$a->strings["Connect"] = "Verbinden"; -$a->strings["New window"] = "Neues Fenster"; -$a->strings["Open the selected location in a different window or browser tab"] = "Öffne die markierte Adresse in einem neuen Browser Fenster oder Tab"; -$a->strings["User '%s' deleted"] = "Benutzer '%s' gelöscht"; -$a->strings["Miscellaneous"] = "Verschiedenes"; -$a->strings["year"] = "Jahr"; -$a->strings["month"] = "Monat"; -$a->strings["day"] = "Tag"; -$a->strings["never"] = "Nie"; -$a->strings["less than a second ago"] = "Vor weniger als einer Sekunde"; -$a->strings["years"] = "Jahre"; -$a->strings["months"] = "Monate"; -$a->strings["week"] = "Woche"; -$a->strings["weeks"] = "Wochen"; -$a->strings["days"] = "Tage"; -$a->strings["hour"] = "Stunde"; -$a->strings["hours"] = "Stunden"; -$a->strings["minute"] = "Minute"; -$a->strings["minutes"] = "Minuten"; -$a->strings["second"] = "Sekunde"; -$a->strings["seconds"] = "Sekunden"; -$a->strings["%1\$d %2\$s ago"] = "vor %1\$d %2\$s"; -$a->strings["%1\$s's birthday"] = "%1\$ss Geburtstag"; -$a->strings["Happy Birthday %1\$s"] = "Alles Gute zum Geburtstag, %1\$s"; -$a->strings["Unable to obtain identity information from database"] = "Kann keine Identitäts-Informationen aus Datenbank beziehen"; -$a->strings["Empty name"] = "Namensfeld leer"; -$a->strings["Name too long"] = "Name ist zu lang"; -$a->strings["No account identifier"] = "Keine Account-Kennung"; -$a->strings["Nickname is required."] = "Spitzname ist erforderlich."; -$a->strings["Reserved nickname. Please choose another."] = "Reservierter Kurzname. Bitte wähle einen anderen."; -$a->strings["Nickname has unsupported characters or is already being used on this site."] = "Der Spitzname enthält nicht-unterstütze Zeichen oder wird bereits auf dieser Seite genutzt."; -$a->strings["Unable to retrieve created identity"] = "Kann die erstellte Identität nicht empfangen"; -$a->strings["Default Profile"] = "Standard-Profil"; -$a->strings["Friends"] = "Freunde"; -$a->strings["Requested channel is not available."] = "Angeforderte Kanal nicht verfügbar."; -$a->strings["Requested profile is not available."] = "Erwünschte Profil ist nicht verfügbar."; -$a->strings["Change profile photo"] = "Profilfoto ändern"; -$a->strings["Profiles"] = "Profile"; -$a->strings["Manage/edit profiles"] = "Profile verwalten/bearbeiten"; -$a->strings["Create New Profile"] = "Neues Profil erstellen"; -$a->strings["Edit Profile"] = "Profile bearbeiten"; -$a->strings["Profile Image"] = "Profilfoto:"; -$a->strings["visible to everybody"] = "sichtbar für jeden"; -$a->strings["Edit visibility"] = "Sichtbarkeit bearbeiten"; -$a->strings["Location:"] = "Ort:"; -$a->strings["Gender:"] = "Geschlecht:"; -$a->strings["Status:"] = "Status:"; -$a->strings["Homepage:"] = "Homepage:"; -$a->strings["Online Now"] = "gerade online"; -$a->strings["g A l F d"] = "l, d. F G \\\\U\\\\h\\\\r"; -$a->strings["F d"] = "d. F"; -$a->strings["[today]"] = "[Heute]"; -$a->strings["Birthday Reminders"] = "Geburtstags Erinnerungen"; -$a->strings["Birthdays this week:"] = "Geburtstage in dieser Woche:"; -$a->strings["[No description]"] = "[Keine Beschreibung]"; -$a->strings["Event Reminders"] = "Veranstaltungs- Erinnerungen"; -$a->strings["Events this week:"] = "Veranstaltungen in dieser Woche:"; -$a->strings["Profile"] = "Profil"; -$a->strings["Full Name:"] = "Voller Name:"; -$a->strings["Like this channel"] = "Dieser Kanal gefällt mir"; -$a->strings["__ctx:noun__ Like"] = array( - 0 => "Gefällt mir", - 1 => "Gefällt mir", +$a->strings["and"] = "und"; +$a->strings[", and %d other people"] = array( + 0 => "", + 1 => ", und %d andere", ); -$a->strings["j F, Y"] = "j. F Y"; -$a->strings["j F"] = "j. F"; -$a->strings["Birthday:"] = "Geburtstag:"; -$a->strings["Age:"] = "Alter:"; -$a->strings["for %1\$d %2\$s"] = "seit %1\$d %2\$s"; -$a->strings["Sexual Preference:"] = "Sexuelle Orientierung:"; -$a->strings["Hometown:"] = "Heimatstadt:"; -$a->strings["Tags:"] = "Schlagworte:"; -$a->strings["Political Views:"] = "Politische Ansichten:"; -$a->strings["Religion:"] = "Religion:"; -$a->strings["About:"] = "Über:"; -$a->strings["Hobbies/Interests:"] = "Hobbys/Interessen:"; -$a->strings["Likes:"] = "Gefällt:"; -$a->strings["Dislikes:"] = "Gefällt nicht:"; -$a->strings["Contact information and Social Networks:"] = "Kontaktinformation und soziale Netzwerke:"; -$a->strings["My other channels:"] = "Meine anderen Kanäle:"; -$a->strings["Musical interests:"] = "Musikalische Interessen:"; -$a->strings["Books, literature:"] = "Bücher, Literatur:"; -$a->strings["Television:"] = "Fernsehen:"; -$a->strings["Film/dance/culture/entertainment:"] = "Film/Tanz/Kultur/Unterhaltung:"; -$a->strings["Love/Romance:"] = "Liebe/Romantik:"; -$a->strings["Work/employment:"] = "Arbeit/Anstellung:"; -$a->strings["School/education:"] = "Schule/Ausbildung:"; -$a->strings["Like this thing"] = "Gefällt mir"; -$a->strings["New Page"] = "Neue Seite"; -$a->strings["View"] = "Ansicht"; +$a->strings["%s like this."] = "%s gefällt das."; +$a->strings["%s don't like this."] = "%s gefällt das nicht."; +$a->strings["Visible to everybody"] = "Sichtbar für jeden"; +$a->strings["Please enter a link URL:"] = "Gib eine URL ein:"; +$a->strings["Please enter a video link/URL:"] = "Gib einen Video-Link/URL ein:"; +$a->strings["Please enter an audio link/URL:"] = "Gib einen Audio-Link/URL ein:"; +$a->strings["Tag term:"] = "Schlagwort:"; +$a->strings["Save to Folder:"] = "Speichern in Ordner:"; +$a->strings["Where are you right now?"] = "Wo bist Du jetzt grade?"; +$a->strings["Expires YYYY-MM-DD HH:MM"] = "Verfällt YYYY-MM-DD HH;MM"; $a->strings["Preview"] = "Vorschau"; -$a->strings["Actions"] = "Aktionen"; -$a->strings["Page Link"] = "Seiten-Link"; -$a->strings["Title"] = "Titel"; -$a->strings["Created"] = "Erstellt"; -$a->strings["Edited"] = "Geändert"; -$a->strings["No recipient provided."] = "Kein Empfänger angegeben"; -$a->strings["[no subject]"] = "[no subject]"; -$a->strings["Unable to determine sender."] = "Kann Absender nicht bestimmen."; -$a->strings["Stored post could not be verified."] = "Gespeicherter Beitrag konnten nicht überprüft werden."; -$a->strings["Tags"] = "Schlagwörter"; -$a->strings["Keywords"] = "Schlüsselwörter"; -$a->strings["have"] = "habe"; -$a->strings["has"] = "hat"; -$a->strings["want"] = "will"; -$a->strings["wants"] = "will"; -$a->strings["like"] = "mag"; -$a->strings["likes"] = "gefällt"; -$a->strings["dislike"] = "verurteile"; -$a->strings["dislikes"] = "missfällt"; -$a->strings["Delete this item?"] = "Dieses Element löschen?"; -$a->strings["Comment"] = "Kommentar"; -$a->strings["[+] show all"] = "[+] Zeige alle"; -$a->strings["[-] show less"] = "[-] zeige weniger"; -$a->strings["[+] expand"] = "[+] aufklappen"; -$a->strings["[-] collapse"] = "[-] einklappen"; -$a->strings["Password too short"] = "Kennwort zu kurz"; -$a->strings["Passwords do not match"] = "Kennwörter stimmen nicht überein"; -$a->strings["everybody"] = "alle"; -$a->strings["Secret Passphrase"] = "geheime Passphrase"; -$a->strings["Passphrase hint"] = "Hinweis zur Passphrase"; -$a->strings["Notice: Permissions have changed but have not yet been submitted."] = "Achtung: Berechtigungen wurden verändert, aber noch nicht gespeichert."; -$a->strings["close all"] = "Alle schließen"; -$a->strings["Nothing new here"] = "Nichts Neues hier"; -$a->strings["timeago.prefixAgo"] = "timeago.prefixAgo"; -$a->strings["timeago.prefixFromNow"] = " "; -$a->strings["ago"] = "her"; -$a->strings["from now"] = "von jetzt"; -$a->strings["less than a minute"] = "weniger als eine Minute"; -$a->strings["about a minute"] = "ungefähr eine Minute"; -$a->strings["%d minutes"] = "%d Minuten"; -$a->strings["about an hour"] = "ungefähr eine Stunde"; -$a->strings["about %d hours"] = "ungefähr %d Stunden"; -$a->strings["a day"] = "ein Tag"; -$a->strings["%d days"] = "%d Tage"; -$a->strings["about a month"] = "ungefähr ein Monat"; -$a->strings["%d months"] = "%d Monate"; -$a->strings["about a year"] = "ungefähr ein Jahr"; -$a->strings["%d years"] = "%d Jahre"; -$a->strings[" "] = " "; -$a->strings["timeago.numbers"] = "timeago.numbers"; +$a->strings["Share"] = "Teilen"; +$a->strings["Page link title"] = "Seitentitel-Link"; +$a->strings["Post as"] = "Posten als"; +$a->strings["Upload photo"] = "Foto hochladen"; +$a->strings["upload photo"] = "Foto hochladen"; +$a->strings["Attach file"] = "Datei anhängen"; +$a->strings["attach file"] = "Datei anfügen"; +$a->strings["Insert web link"] = "Link einfügen"; +$a->strings["web link"] = "Web-Link"; +$a->strings["Insert video link"] = "Video-Link einfügen"; +$a->strings["video link"] = "Video-Link"; +$a->strings["Insert audio link"] = "Audio-Link einfügen"; +$a->strings["audio link"] = "Audio-Link"; +$a->strings["Set your location"] = "Standort"; +$a->strings["set location"] = "Standort"; +$a->strings["Clear browser location"] = "Browser-Standort löschen"; +$a->strings["clear location"] = "Standort löschen"; +$a->strings["Set title"] = "Titel"; +$a->strings["Categories (comma-separated list)"] = "Kategorien (Kommagetrennte Liste)"; +$a->strings["Permission settings"] = "Berechtigungs-Einstellungen"; +$a->strings["permissions"] = "Berechtigungen"; +$a->strings["Public post"] = "Öffentlicher Beitrag"; +$a->strings["Example: bob@example.com, mary@example.com"] = "Beispiel: bob@example.com, mary@example.com"; +$a->strings["Set expiration date"] = "Verfallsdatum"; +$a->strings["Encrypt text"] = "Text verschlüsseln"; +$a->strings["OK"] = "Ok"; +$a->strings["Cancel"] = "Abbrechen"; +$a->strings["Discover"] = "Entdecken"; +$a->strings["Imported public streams"] = "Importierte öffentliche Beiträge"; +$a->strings["Commented Order"] = "Neueste Kommentare"; +$a->strings["Sort by Comment Date"] = "Nach Kommentardatum sortiert"; +$a->strings["Posted Order"] = "Neueste Beiträge"; +$a->strings["Sort by Post Date"] = "Nach Beitragsdatum sortiert"; +$a->strings["Personal"] = "Persönlich"; +$a->strings["Posts that mention or involve you"] = "Beiträge mit Beteiligung Deinerseits"; +$a->strings["New"] = "Neu"; +$a->strings["Activity Stream - by date"] = "Activity Stream – nach Datum sortiert"; +$a->strings["Starred"] = "Markiert"; +$a->strings["Favourite Posts"] = "Markierte Beiträge"; +$a->strings["Spam"] = "Spam"; +$a->strings["Posts flagged as SPAM"] = "Nachrichten, die als SPAM markiert wurden"; +$a->strings["Channel"] = "Kanal"; +$a->strings["Status Messages and Posts"] = "Statusnachrichten und Beiträge"; +$a->strings["About"] = "Über"; +$a->strings["Profile Details"] = "Profil-Details"; +$a->strings["Photo Albums"] = "Fotoalben"; +$a->strings["Files and Storage"] = "Dateien und Speicher"; +$a->strings["Chatrooms"] = "Chaträume"; +$a->strings["Saved Bookmarks"] = "Gespeicherte Lesezeichen"; +$a->strings["Manage Webpages"] = "Webseiten verwalten"; +$a->strings["created a new post"] = "Neuer Beitrag wurde erzeugt"; +$a->strings["commented on %s's post"] = "hat %s's Beitrag kommentiert"; +$a->strings["New Page"] = "Neue Seite"; +$a->strings["View"] = "Ansicht"; +$a->strings["Actions"] = "Aktionen"; +$a->strings["Page Link"] = "Seiten-Link"; +$a->strings["Title"] = "Titel"; +$a->strings["Created"] = "Erstellt"; +$a->strings["Edited"] = "Geändert"; +$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."] = "Das Security-Token des Formulars war nicht korrekt. Das ist wahrscheinlich passiert, weil das Formular zu lange (>3 Stunden) offen war, bevor es abgeschickt wurde."; +$a->strings["l F d, Y \\@ g:i A"] = "l, d. F Y\\\\, H:i"; +$a->strings["Starts:"] = "Beginnt:"; +$a->strings["Finishes:"] = "Endet:"; +$a->strings["Location:"] = "Ort:"; +$a->strings["This event has been added to your calendar."] = "Dieses Ereignis wurde zu Deinem Kalender hinzugefügt"; +$a->strings["Embedded content"] = "Eingebetteter Inhalt"; +$a->strings["Embedding disabled"] = "Einbetten ausgeschaltet"; $a->strings["Can view my normal stream and posts"] = "Kann meine normalen Beiträge sehen"; $a->strings["Can view my default channel profile"] = "Kann mein Standardprofil sehen"; $a->strings["Can view my photo albums"] = "Kann meine Fotoalben betrachten"; @@ -301,9 +212,40 @@ $a->strings["Restricted"] = "Beschränkt"; $a->strings["Private"] = "Privat"; $a->strings["Community Forum"] = "Forum"; $a->strings["Feed Republish"] = "Teilen von Feeds"; +$a->strings["Special Purpose"] = "Für besondere Zwecke"; $a->strings["Celebrity/Soapbox"] = "Mitteilungs-Kanal (keine Kommentare)"; -$a->strings["Other"] = "Anders"; +$a->strings["Group Repository"] = "Gruppenarchiv"; +$a->strings["Other"] = "Andere"; $a->strings["Custom/Expert Mode"] = "Benutzerdefiniert/Expertenmodus"; +$a->strings[" and "] = "und"; +$a->strings["public profile"] = "öffentliches Profil"; +$a->strings["%1\$s changed %2\$s to “%3\$s”"] = "%1\$s hat %2\$s auf “%3\$s” geändert"; +$a->strings["Visit %1\$s's %2\$s"] = "Besuche %1\$s's %2\$s"; +$a->strings["%1\$s has an updated %2\$s, changing %3\$s."] = "%1\$s hat ein aktualisiertes %2\$s, %3\$s wurde verändert."; +$a->strings["Attachments:"] = "Anhänge:"; +$a->strings["Logged out."] = "Ausgeloggt."; +$a->strings["Failed authentication"] = "Authentifizierung fehlgeschlagen"; +$a->strings["Login failed."] = "Login fehlgeschlagen."; +$a->strings["parent"] = "Übergeordnetes Verzeichnis"; +$a->strings["Collection"] = "Ordner"; +$a->strings["Principal"] = "Prinzipal"; +$a->strings["Addressbook"] = "Adressbuch"; +$a->strings["Calendar"] = "Kalender"; +$a->strings["Schedule Inbox"] = "Posteingang für überwachte Kalender"; +$a->strings["Schedule Outbox"] = "Postausgang für überwachte Kalender"; +$a->strings["%1\$s used"] = "%1\$s verwendet"; +$a->strings["%1\$s used of %2\$s (%3\$s%)"] = "%1\$s von %2\$s verwendet (%3\$s%)"; +$a->strings["Name"] = "Name"; +$a->strings["Type"] = "Typ"; +$a->strings["Size"] = "Größe"; +$a->strings["Last Modified"] = "Zuletzt geändert"; +$a->strings["Total"] = "Summe"; +$a->strings["Create new folder"] = "Neuen Ordner anlegen"; +$a->strings["Create"] = "Erstelle"; +$a->strings["Upload file"] = "Datei hochladen"; +$a->strings["Upload"] = "Hochladen"; +$a->strings["%1\$s's bookmarks"] = "%1\$ss Lesezeichen"; +$a->strings["Default"] = "Standard"; $a->strings["Frequently"] = "Häufig"; $a->strings["Hourly"] = "Stündlich"; $a->strings["Twice daily"] = "Zwei Mal am Tag"; @@ -313,72 +255,36 @@ $a->strings["Monthly"] = "Monatlich"; $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\\\\, H:i"; -$a->strings["Starts:"] = "Beginnt:"; -$a->strings["Finishes:"] = "Endet:"; -$a->strings["This event has been added to your calendar."] = "Dieses Ereignis wurde zu Deinem Kalender hinzugefügt"; -$a->strings["Male"] = "Männlich"; -$a->strings["Female"] = "Weiblich"; -$a->strings["Currently Male"] = "Momentan männlich"; -$a->strings["Currently Female"] = "Momentan weiblich"; -$a->strings["Mostly Male"] = "Größtenteils männlich"; -$a->strings["Mostly Female"] = "Größtenteils weiblich"; -$a->strings["Transgender"] = "Transsexuell"; -$a->strings["Intersex"] = "Zwischengeschlechtlich"; -$a->strings["Transsexual"] = "Transsexuell"; -$a->strings["Hermaphrodite"] = "Zwitter"; -$a->strings["Neuter"] = "Geschlechtslos"; -$a->strings["Non-specific"] = "unklar"; -$a->strings["Undecided"] = "Unentschieden"; -$a->strings["Males"] = "Männer"; -$a->strings["Females"] = "Frauen"; -$a->strings["Gay"] = "Schwul"; -$a->strings["Lesbian"] = "Lesbisch"; -$a->strings["No Preference"] = "Keine Bevorzugung"; -$a->strings["Bisexual"] = "Bisexuell"; -$a->strings["Autosexual"] = "Autosexuell"; -$a->strings["Abstinent"] = "Enthaltsam"; -$a->strings["Virgin"] = "Jungfräulich"; -$a->strings["Deviant"] = "Abweichend"; -$a->strings["Fetish"] = "Fetisch"; -$a->strings["Oodles"] = "Unmengen"; -$a->strings["Nonsexual"] = "Sexlos"; -$a->strings["Single"] = "Single"; -$a->strings["Lonely"] = "Einsam"; -$a->strings["Available"] = "Verfügbar"; -$a->strings["Unavailable"] = "Nicht verfügbar"; -$a->strings["Has crush"] = "Verguckt"; -$a->strings["Infatuated"] = "Verknallt"; -$a->strings["Dating"] = "Lerne gerade jemanden kennen"; -$a->strings["Unfaithful"] = "Treulos"; -$a->strings["Sex Addict"] = "Sexabhängig"; -$a->strings["Friends/Benefits"] = "Freunde/Begünstigte"; -$a->strings["Casual"] = "Lose"; -$a->strings["Engaged"] = "Verlobt"; -$a->strings["Married"] = "Verheiratet"; -$a->strings["Imaginarily married"] = "Gewissermaßen verheiratet"; -$a->strings["Partners"] = "Partner"; -$a->strings["Cohabiting"] = "Lebensgemeinschaft"; -$a->strings["Common law"] = "Informelle Ehe"; -$a->strings["Happy"] = "Glücklich"; -$a->strings["Not looking"] = "Nicht Ausschau haltend"; -$a->strings["Swinger"] = "Swinger"; -$a->strings["Betrayed"] = "Betrogen"; -$a->strings["Separated"] = "Getrennt"; -$a->strings["Unstable"] = "Labil"; -$a->strings["Divorced"] = "Geschieden"; -$a->strings["Imaginarily divorced"] = "Gewissermaßen geschieden"; -$a->strings["Widowed"] = "Verwitwet"; -$a->strings["Uncertain"] = "Ungewiss"; -$a->strings["It's complicated"] = "Es ist kompliziert"; -$a->strings["Don't care"] = "Interessiert mich nicht"; -$a->strings["Ask me"] = "Frag mich mal"; +$a->strings["%d invitation available"] = array( + 0 => "%d Einladung verfügbar", + 1 => "%d Einladungen verfügbar", +); +$a->strings["Advanced"] = "Fortgeschritten"; +$a->strings["Find Channels"] = "Finde Kanäle"; +$a->strings["Enter name or interest"] = "Name oder Interessen eingeben"; +$a->strings["Connect/Follow"] = "Verbinden/Folgen"; +$a->strings["Examples: Robert Morgenstein, Fishing"] = "Beispiele: Robert Morgenstein, Angeln"; +$a->strings["Find"] = "Finde"; +$a->strings["Channel Suggestions"] = "Kanal-Vorschläge"; +$a->strings["Random Profile"] = "Zufallsprofil"; +$a->strings["Invite Friends"] = "Lade Freunde ein"; +$a->strings["Exammple: name=fred and country=iceland"] = "Beispiel: name=fred and country=deutschland"; +$a->strings["Advanced Find"] = "Erweiterte Suche"; +$a->strings["Saved Folders"] = "Gespeicherte Ordner"; +$a->strings["Everything"] = "Alles"; +$a->strings["Categories"] = "Kategorien"; +$a->strings["%d connection in common"] = array( + 0 => "%d gemeinsame Verbindung", + 1 => "%d gemeinsame Verbindungen", +); +$a->strings["show more"] = "mehr zeigen"; $a->strings["Not a valid email address"] = "Ungültige E-Mail-Adresse"; $a->strings["Your email domain is not among those allowed on this site"] = "Deine E-Mail-Adresse ist dieser Seite nicht erlaubt"; $a->strings["Your email address is already registered at this site."] = "Deine E-Mail-Adresse ist auf dieser Seite bereits registriert."; @@ -397,84 +303,96 @@ $a->strings["Account verified. Please login."] = "Konto geprüft. Bitte melde Di $a->strings["Click here to upgrade."] = "Klicke hier, um das Upgrade durchzuführen."; $a->strings["This action exceeds the limits set by your subscription plan."] = "Diese Aktion überschreitet die Grenzen Ihres Abonnements."; $a->strings["This action is not available under your subscription plan."] = "Diese Aktion ist in Ihrem Abonnement nicht verfügbar."; -$a->strings["Embedded content"] = "Eingebetteter Inhalt"; -$a->strings["Embedding disabled"] = "Einbetten ausgeschaltet"; -$a->strings["Invalid data packet"] = "Ungültiges Datenpaket"; -$a->strings["Unable to verify channel signature"] = "Konnte die Signatur des Kanals nicht verifizieren"; -$a->strings["Unable to verify site signature for %s"] = "Kann die Signatur der Seite von %s nicht verifizieren"; -$a->strings["view full size"] = "In Vollbildansicht anschauen"; -$a->strings["Cannot locate DNS info for database server '%s'"] = "Kann die DNS-Informationen für den Datenbank-Server '%s' nicht finden"; -$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."] = "Ein gelöschte Gruppe mit diesem Namen wurde gefunden. Existierende Zugangsregeln für Elemente könnten für diese Gruppe angewendet werden, sowie für alle zukünftigen Elemente."; -$a->strings["Default privacy group for new contacts"] = "Standard-Privatsphärengruppe für neue Kontakte"; -$a->strings["All Channels"] = "Alle Kanäle"; -$a->strings["edit"] = "Bearbeiten"; -$a->strings["Collections"] = "Sammlungen"; -$a->strings["Edit collection"] = "Bearbeite Sammlungen"; -$a->strings["Create a new collection"] = "Neue Sammlung erzeugen"; -$a->strings["Channels not in any collection"] = "Kanäle, die nicht in einer Sammlung sind"; -$a->strings["add"] = "hinzufügen"; -$a->strings["Item was not found."] = "Beitrag wurde nicht gefunden."; -$a->strings["No source file."] = "Keine Quelldatei."; -$a->strings["Cannot locate file to replace"] = "Kann Datei zum Ersetzen nicht finden"; -$a->strings["Cannot locate file to revise/update"] = "Kann Datei zum Prüfen/Aktualisieren nicht finden"; -$a->strings["File exceeds size limit of %d"] = "Datei überschreitet das Größen-Limit von %d"; -$a->strings["You have reached your limit of %1$.0f Mbytes attachment storage."] = "Die Größe Deiner Datei-Anhänge hat das Maximum von %1$.0f MByte erreicht."; -$a->strings["File upload failed. Possible system limit or action terminated."] = "Datei-Upload fehlgeschlagen. Mögliche Systembegrenzung oder abgebrochener Prozess."; -$a->strings["Stored file could not be verified. Upload failed."] = "Gespeichert Datei konnte nicht verifiziert werden. Upload abgebrochen."; -$a->strings["Path not available."] = "Pfad nicht verfügbar."; -$a->strings["Empty pathname"] = "Leere Pfadangabe"; -$a->strings["duplicate filename or path"] = "doppelter Dateiname oder Pfad"; -$a->strings["Path not found."] = "Pfad nicht gefunden."; -$a->strings["mkdir failed."] = "mkdir fehlgeschlagen."; -$a->strings["database storage failed."] = "Speichern in der Datenbank fehlgeschlagen."; -$a->strings["Private Message"] = "Private Nachricht"; -$a->strings["Select"] = "Auswählen"; -$a->strings["Save to Folder"] = "In Ordner speichern"; -$a->strings["View all"] = "Alles anzeigen"; -$a->strings["__ctx:noun__ Dislike"] = array( - 0 => "Gefällt nicht", - 1 => "Gefällt nicht", -); -$a->strings["Add Star"] = "Stern hinzufügen"; -$a->strings["Remove Star"] = "Stern entfernen"; -$a->strings["Toggle Star Status"] = "Stern-Status umschalten"; -$a->strings["starred"] = "markiert"; -$a->strings["Message signature validated"] = "Signatur überprüft"; -$a->strings["Message signature incorrect"] = "Signatur nicht korrekt"; -$a->strings["Add Tag"] = "Tag hinzufügen"; -$a->strings["I like this (toggle)"] = "Mir gefällt das (Umschalter)"; -$a->strings["I don't like this (toggle)"] = "Mir gefällt das nicht (Umschalter)"; -$a->strings["Share This"] = "Teilen"; -$a->strings["share"] = "Teilen"; -$a->strings["View %s's profile - %s"] = "Schaue Dir %ss Profil an – %s"; -$a->strings["to"] = "an"; -$a->strings["via"] = "via"; -$a->strings["Wall-to-Wall"] = "Wall-to-Wall"; -$a->strings["via Wall-To-Wall:"] = "via Wall-To-Wall:"; -$a->strings[" from %s"] = "von %s"; -$a->strings["last edited: %s"] = "zuletzt bearbeitet: %s"; -$a->strings["Expires: %s"] = "Verfällt: %s"; -$a->strings["Save Bookmarks"] = "Favoriten speichern"; -$a->strings["Add to Calendar"] = "Zum Kalender hinzufügen"; -$a->strings["__ctx:noun__ Likes"] = "Gefällt mir"; -$a->strings["__ctx:noun__ Dislikes"] = "Gefällt nicht"; -$a->strings["Close"] = "Schließen"; -$a->strings["Please wait"] = "Bitte warten"; -$a->strings["%d comment"] = array( - 0 => "%d Kommentar", - 1 => "%d Kommentare", +$a->strings["Image/photo"] = "Bild/Foto"; +$a->strings["Encrypted content"] = "Verschlüsselter Inhalt"; +$a->strings["Install design element: "] = "Design-Element installieren:"; +$a->strings["QR code"] = "QR-Code"; +$a->strings["%1\$s wrote the following %2\$s %3\$s"] = "%1\$s schrieb den folgenden %2\$s %3\$s"; +$a->strings["post"] = "Beitrag"; +$a->strings["$1 spoiler"] = "$1 Spoiler"; +$a->strings["$1 wrote:"] = "$1 schrieb:"; +$a->strings["Sort Options"] = "Sortieroptionen"; +$a->strings["Alphabetic"] = "alphabetisch"; +$a->strings["Reverse Alphabetic"] = "Entgegengesetzt alphabetisch"; +$a->strings["Newest to Oldest"] = "Neueste zuerst"; +$a->strings["Enable Safe Search"] = "Sichere Suche einschalten"; +$a->strings["Disable Safe Search"] = "Sichere Suche ausschalten"; +$a->strings["Safe Mode"] = "Sicherer Modus"; +$a->strings["Tags"] = "Schlagwörter"; +$a->strings["Keywords"] = "Schlüsselwörter"; +$a->strings["have"] = "habe"; +$a->strings["has"] = "hat"; +$a->strings["want"] = "will"; +$a->strings["wants"] = "will"; +$a->strings["like"] = "mag"; +$a->strings["likes"] = "gefällt"; +$a->strings["dislike"] = "verurteile"; +$a->strings["dislikes"] = "missfällt"; +$a->strings["__ctx:noun__ Like"] = array( + 0 => "Gefällt mir", + 1 => "Gefällt mir", ); -$a->strings["This is you"] = "Das bist Du"; -$a->strings["Bold"] = "Fett"; -$a->strings["Italic"] = "Kursiv"; -$a->strings["Underline"] = "Unterstrichen"; -$a->strings["Quote"] = "Zitat"; -$a->strings["Code"] = "Code"; -$a->strings["Image"] = "Bild"; -$a->strings["Link"] = "Link"; -$a->strings["Video"] = "Video"; -$a->strings["Encrypt text"] = "Text verschlüsseln"; -$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."] = "Das Security-Token des Formulars war nicht korrekt. Das ist wahrscheinlich passiert, weil das Formular zu lange (>3 Stunden) offen war, bevor es abgeschickt wurde."; +$a->strings["Red Matrix Notification"] = "Red Matrix Benachrichtigung"; +$a->strings["redmatrix"] = "redmatrix"; +$a->strings["Thank You,"] = "Danke."; +$a->strings["%s Administrator"] = "der Administrator von %s"; +$a->strings["%s "] = "%s "; +$a->strings["[Red:Notify] New mail received at %s"] = "[Red:Benachrichtigung] Neue Mail auf %s empfangen"; +$a->strings["%1\$s, %2\$s sent you a new private message at %3\$s."] = "%1\$s, %2\$s hat Dir eine private Nachricht auf %3\$s gesendet."; +$a->strings["%1\$s sent you %2\$s."] = "%1\$s hat Dir %2\$s geschickt."; +$a->strings["a private message"] = "eine private Nachricht"; +$a->strings["Please visit %s to view and/or reply to your private messages."] = "Bitte besuche %s, um die private Nachricht anzusehen und/oder darauf zu antworten."; +$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]a %4\$s[/zrl]"] = "%1\$s, %2\$s hat [zrl=%3\$s]a %4\$s[/zrl] kommentiert"; +$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]%4\$s's %5\$s[/zrl]"] = "%1\$s, %2\$s hat [zrl=%3\$s]%4\$ss %5\$s[/zrl] kommentiert"; +$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]your %4\$s[/zrl]"] = "%1\$s, %2\$s hat [zrl=%3\$s]Deinen %4\$s[/zrl] kommentiert"; +$a->strings["[Red:Notify] Comment to conversation #%1\$d by %2\$s"] = "[Red:Benachrichtigung] Kommentar in Unterhaltung #%1\$d von %2\$s"; +$a->strings["%1\$s, %2\$s commented on an item/conversation you have been following."] = "%1\$s, %2\$s hat eine Unterhaltung kommentiert, der Du folgst."; +$a->strings["Please visit %s to view and/or reply to the conversation."] = "Bitte besuche %s, um die Unterhaltung anzusehen und/oder zu kommentieren."; +$a->strings["[Red:Notify] %s posted to your profile wall"] = "[Red:Hinweis] %s schrieb auf Deine Pinnwand"; +$a->strings["%1\$s, %2\$s posted to your profile wall at %3\$s"] = "%1\$s, %2\$s hat auf Deine Pinnwand auf %3\$s geschrieben"; +$a->strings["%1\$s, %2\$s posted to [zrl=%3\$s]your wall[/zrl]"] = "%1\$s, %2\$s hat auf [zrl=%3\$s]Deine Pinnwand[/zrl] geschrieben"; +$a->strings["[Red:Notify] %s tagged you"] = "[Red:Benachrichtigung] %s hat Dich erwähnt"; +$a->strings["%1\$s, %2\$s tagged you at %3\$s"] = "%1\$s, %2\$s hat Dich auf %3\$s erwähnt"; +$a->strings["%1\$s, %2\$s [zrl=%3\$s]tagged you[/zrl]."] = "%1\$s, %2\$s [zrl=%3\$s]hat Dich erwähnt[/zrl]."; +$a->strings["[Red:Notify] %1\$s poked you"] = "[Red:Benachrichtigung] %1\$s hat Dich angestupst"; +$a->strings["%1\$s, %2\$s poked you at %3\$s"] = "%1\$s, %2\$s hat Dich auf %3\$s angestupst"; +$a->strings["%1\$s, %2\$s [zrl=%2\$s]poked you[/zrl]."] = "%1\$s, %2\$s [zrl=%2\$s]hat Dich angestupst[/zrl]."; +$a->strings["[Red:Notify] %s tagged your post"] = "[Red:Benachrichtigung] %s hat Deinen Beitrag getaggt"; +$a->strings["%1\$s, %2\$s tagged your post at %3\$s"] = "%1\$s, %2\$s hat Deinen Beitrag auf %3\$s verschlagwortet"; +$a->strings["%1\$s, %2\$s tagged [zrl=%3\$s]your post[/zrl]"] = "%1\$s, %2\$s hat [zrl=%3\$s]Deinen Beitrag[/zrl] verschlagwortet"; +$a->strings["[Red:Notify] Introduction received"] = "[Red:Benachrichtigung] Vorstellung erhalten"; +$a->strings["%1\$s, you've received an new connection request from '%2\$s' at %3\$s"] = "%1\$s, Du hast eine neue Verbindungsanfrage von '%2\$s' auf %3\$s erhalten"; +$a->strings["%1\$s, you've received [zrl=%2\$s]a new connection request[/zrl] from %3\$s."] = "%1\$s, Du hast [zrl=%2\$s]eine neue Verbindungsanfrage[/zrl] von %3\$s erhalten."; +$a->strings["You may visit their profile at %s"] = "Du kannst Dir das Profil unter %s ansehen"; +$a->strings["Please visit %s to approve or reject the connection request."] = "Bitte besuche %s , um die Verbindungsanfrage anzunehmen oder abzulehnen."; +$a->strings["[Red:Notify] Friend suggestion received"] = "[Red:Benachrichtigung] Freundschaftsvorschlag erhalten"; +$a->strings["%1\$s, you've received a friend suggestion from '%2\$s' at %3\$s"] = "%1\$s, Du hast einen Kontaktvorschlag von „%2\$s“ auf %3\$s erhalten"; +$a->strings["%1\$s, you've received [zrl=%2\$s]a friend suggestion[/zrl] for %3\$s from %4\$s."] = "%1\$s, Du hast [zrl=%2\$s]einen Kontaktvorschlag[/zrl] für %3\$s von %4\$s erhalten."; +$a->strings["Name:"] = "Name:"; +$a->strings["Photo:"] = "Foto:"; +$a->strings["Please visit %s to approve or reject the suggestion."] = "Bitte besuche %s um den Vorschlag zu akzeptieren oder abzulehnen."; +$a->strings["[Red:Notify]"] = "[Red:Benachrichtigung]"; +$a->strings["Missing room name"] = "Der Chatraum hat keinen Namen"; +$a->strings["Duplicate room name"] = "Name des Chatraums bereits vergeben"; +$a->strings["Invalid room specifier."] = "Ungültiger Raumbezeichner."; +$a->strings["Room not found."] = "Chatraum konnte nicht gefunden werden."; +$a->strings["Room is full"] = "Der Raum ist voll"; +$a->strings["Permission denied"] = "Keine Berechtigung"; +$a->strings["(Unknown)"] = "(Unbekannt)"; +$a->strings["Visible to anybody on the internet."] = "Für jeden im Internet sichtbar."; +$a->strings["Visible to you only."] = "Nur für Dich sichtbar."; +$a->strings["Visible to anybody in this network."] = "Für jedes Mitglied der RedMatrix sichtbar."; +$a->strings["Visible to anybody authenticated."] = "Für jeden sichtbar, der angemeldet ist."; +$a->strings["Visible to anybody on %s."] = "Für jeden auf %s sichtbar."; +$a->strings["Visible to all connections."] = "Für alle Verbindungen sichtbar."; +$a->strings["Visible to approved connections."] = "Nur für akzeptierte Verbindungen sichtbar."; +$a->strings["Visible to specific connections."] = "Sichtbar für bestimmte Verbindungen."; +$a->strings["Item not found."] = "Element nicht gefunden."; +$a->strings["Collection not found."] = "Sammlung nicht gefunden"; +$a->strings["Collection is empty."] = "Sammlung ist leer."; +$a->strings["Collection: %s"] = "Sammlung: %s"; +$a->strings["Connection: %s"] = "Verbindung: %s"; +$a->strings["Connection not found."] = "Die Verbindung wurde nicht gefunden."; $a->strings["prev"] = "vorherige"; $a->strings["first"] = "erste"; $a->strings["last"] = "letzte"; @@ -487,10 +405,8 @@ $a->strings["%d Connection"] = array( 1 => "%d Verbindungen", ); $a->strings["View Connections"] = "Verbindungen anzeigen"; -$a->strings["Search"] = "Suche"; $a->strings["Save"] = "Speichern"; $a->strings["poke"] = "anstupsen"; -$a->strings["poked"] = "stupste"; $a->strings["ping"] = "anpingen"; $a->strings["pinged"] = "pingte"; $a->strings["prod"] = "knuffen"; @@ -551,106 +467,236 @@ $a->strings["Select a page layout: "] = "Ein Seiten-Layout auswählen:"; $a->strings["default"] = "Standard"; $a->strings["Page content type: "] = "Content-Typ der Seite:"; $a->strings["Select an alternate language"] = "Wähle eine alternative Sprache"; -$a->strings["photo"] = "Foto"; -$a->strings["event"] = "Ereignis"; -$a->strings["status"] = "Status"; -$a->strings["comment"] = "Kommentar"; $a->strings["activity"] = "Aktivität"; $a->strings["Design"] = "Design"; $a->strings["Blocks"] = "Blöcke"; $a->strings["Menus"] = "Menüs"; $a->strings["Layouts"] = "Layouts"; $a->strings["Pages"] = "Seiten"; -$a->strings["Sort Options"] = "Sortieroptionen"; -$a->strings["Alphabetic"] = "alphabetisch"; -$a->strings["Reverse Alphabetic"] = "Entgegengesetzt alphabetisch"; -$a->strings["Newest to Oldest"] = "Neueste zuerst"; -$a->strings["Enable Safe Search"] = "Sichere Suche einschalten"; -$a->strings["Disable Safe Search"] = "Sichere Suche ausschalten"; -$a->strings["Safe Mode"] = "Sicherer Modus"; -$a->strings["Image/photo"] = "Bild/Foto"; -$a->strings["Encrypted content"] = "Verschlüsselter Inhalt"; -$a->strings["Install design element: "] = "Design-Element installieren:"; -$a->strings["QR code"] = "QR-Code"; -$a->strings["%1\$s wrote the following %2\$s %3\$s"] = "%1\$s schrieb den folgenden %2\$s %3\$s"; -$a->strings["post"] = "Beitrag"; -$a->strings["$1 spoiler"] = "$1 Spoiler"; -$a->strings["$1 wrote:"] = "$1 schrieb:"; -$a->strings["Red Matrix Notification"] = "Red Matrix Benachrichtigung"; -$a->strings["redmatrix"] = "redmatrix"; -$a->strings["Thank You,"] = "Danke."; -$a->strings["%s Administrator"] = "der Administrator von %s"; -$a->strings["%s "] = "%s "; -$a->strings["[Red:Notify] New mail received at %s"] = "[Red:Benachrichtigung] Neue Mail auf %s empfangen"; -$a->strings["%1\$s, %2\$s sent you a new private message at %3\$s."] = "%1\$s, %2\$s hat Dir eine private Nachricht auf %3\$s gesendet."; -$a->strings["%1\$s sent you %2\$s."] = "%1\$s hat Dir %2\$s geschickt."; -$a->strings["a private message"] = "eine private Nachricht"; -$a->strings["Please visit %s to view and/or reply to your private messages."] = "Bitte besuche %s, um die private Nachricht anzusehen und/oder darauf zu antworten."; -$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]a %4\$s[/zrl]"] = "%1\$s, %2\$s hat [zrl=%3\$s]a %4\$s[/zrl] kommentiert"; -$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]%4\$s's %5\$s[/zrl]"] = "%1\$s, %2\$s hat [zrl=%3\$s]%4\$ss %5\$s[/zrl] kommentiert"; -$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]your %4\$s[/zrl]"] = "%1\$s, %2\$s hat [zrl=%3\$s]Deinen %4\$s[/zrl] kommentiert"; -$a->strings["[Red:Notify] Comment to conversation #%1\$d by %2\$s"] = "[Red:Benachrichtigung] Kommentar in Unterhaltung #%1\$d von %2\$s"; -$a->strings["%1\$s, %2\$s commented on an item/conversation you have been following."] = "%1\$s, %2\$s hat eine Unterhaltung kommentiert, der Du folgst."; -$a->strings["Please visit %s to view and/or reply to the conversation."] = "Bitte besuche %s, um die Unterhaltung anzusehen und/oder zu kommentieren."; -$a->strings["[Red:Notify] %s posted to your profile wall"] = "[Red:Hinweis] %s schrieb auf Deine Pinnwand"; -$a->strings["%1\$s, %2\$s posted to your profile wall at %3\$s"] = "%1\$s, %2\$s hat auf Deine Pinnwand auf %3\$s geschrieben"; -$a->strings["%1\$s, %2\$s posted to [zrl=%3\$s]your wall[/zrl]"] = "%1\$s, %2\$s hat auf [zrl=%3\$s]Deine Pinnwand[/zrl] geschrieben"; -$a->strings["[Red:Notify] %s tagged you"] = "[Red:Benachrichtigung] %s hat Dich erwähnt"; -$a->strings["%1\$s, %2\$s tagged you at %3\$s"] = "%1\$s, %2\$s hat Dich auf %3\$s erwähnt"; -$a->strings["%1\$s, %2\$s [zrl=%3\$s]tagged you[/zrl]."] = "%1\$s, %2\$s [zrl=%3\$s]hat Dich erwähnt[/zrl]."; -$a->strings["[Red:Notify] %1\$s poked you"] = "[Red:Benachrichtigung] %1\$s hat Dich angestupst"; -$a->strings["%1\$s, %2\$s poked you at %3\$s"] = "%1\$s, %2\$s hat Dich auf %3\$s angestupst"; -$a->strings["%1\$s, %2\$s [zrl=%2\$s]poked you[/zrl]."] = "%1\$s, %2\$s [zrl=%2\$s]hat Dich angestupst[/zrl]."; -$a->strings["[Red:Notify] %s tagged your post"] = "[Red:Benachrichtigung] %s hat Deinen Beitrag getaggt"; -$a->strings["%1\$s, %2\$s tagged your post at %3\$s"] = "%1\$s, %2\$s hat Deinen Beitrag auf %3\$s verschlagwortet"; -$a->strings["%1\$s, %2\$s tagged [zrl=%3\$s]your post[/zrl]"] = "%1\$s, %2\$s hat [zrl=%3\$s]Deinen Beitrag[/zrl] verschlagwortet"; -$a->strings["[Red:Notify] Introduction received"] = "[Red:Benachrichtigung] Vorstellung erhalten"; -$a->strings["%1\$s, you've received an new connection request from '%2\$s' at %3\$s"] = "%1\$s, Du hast eine neue Verbindungsanfrage von '%2\$s' auf %3\$s erhalten"; -$a->strings["%1\$s, you've received [zrl=%2\$s]a new connection request[/zrl] from %3\$s."] = "%1\$s, Du hast [zrl=%2\$s]eine neue Verbindungsanfrage[/zrl] von %3\$s erhalten."; -$a->strings["You may visit their profile at %s"] = "Du kannst Dir das Profil unter %s ansehen"; -$a->strings["Please visit %s to approve or reject the connection request."] = "Bitte besuche %s , um die Verbindungsanfrage anzunehmen oder abzulehnen."; -$a->strings["[Red:Notify] Friend suggestion received"] = "[Red:Benachrichtigung] Freundschaftsvorschlag erhalten"; -$a->strings["%1\$s, you've received a friend suggestion from '%2\$s' at %3\$s"] = "%1\$s, Du hast einen Kontaktvorschlag von „%2\$s“ auf %3\$s erhalten"; -$a->strings["%1\$s, you've received [zrl=%2\$s]a friend suggestion[/zrl] for %3\$s from %4\$s."] = "%1\$s, Du hast [zrl=%2\$s]einen Kontaktvorschlag[/zrl] für %3\$s von %4\$s erhalten."; -$a->strings["Name:"] = "Name:"; -$a->strings["Photo:"] = "Foto:"; -$a->strings["Please visit %s to approve or reject the suggestion."] = "Bitte besuche %s um den Vorschlag zu akzeptieren oder abzulehnen."; -$a->strings["[Red:Notify]"] = "[Red:Benachrichtigung]"; -$a->strings["%1\$s's bookmarks"] = "%1\$ss Lesezeichen"; +$a->strings["General Features"] = "Allgemeine Funktionen"; +$a->strings["Content Expiration"] = "Verfall von Inhalten"; +$a->strings["Remove posts/comments and/or private messages at a future time"] = "Lösche Beiträge, Kommentare und/oder private Nachrichten automatisch zu einem zukünftigen Datum."; +$a->strings["Multiple Profiles"] = "Mehrfachprofile"; +$a->strings["Ability to create multiple profiles"] = "Mehrfachprofile anlegen können"; +$a->strings["Advanced Profiles"] = "Erweiterte Profile"; +$a->strings["Additional profile sections and selections"] = "Stellt zusätzliche Bereiche und Felder im Profil zur Verfügung"; +$a->strings["Profile Import/Export"] = "Profil-Import/Export"; +$a->strings["Save and load profile details across sites/channels"] = "Speichere Dein Profil, um es in einen anderen Kanal zu importieren"; +$a->strings["Web Pages"] = "Webseiten"; +$a->strings["Provide managed web pages on your channel"] = "Stelle verwaltete Webseiten in Deinem Kanal zur Verfügung"; +$a->strings["Private Notes"] = "Private Notizen"; +$a->strings["Enables a tool to store notes and reminders"] = "Werkzeug zum Speichern von Notizen und Erinnerungen aktivieren"; +$a->strings["Navigation Channel Select"] = "Kanal-Auswahl in der Navigationsleiste"; +$a->strings["Change channels directly from within the navigation dropdown menu"] = "Wechsle direkt über das Navigationsmenü zu anderen Kanälen"; +$a->strings["Extended Identity Sharing"] = "Erweitertes Teilen von Identitäten"; +$a->strings["Share your identity with all websites on the internet. When disabled, identity is only shared with sites in the matrix."] = "Teile Deine Identität mit allen Webseiten im Internet. Ist dies deaktiviert, wird Deine Identität nur mit Red-Servern geteilt."; +$a->strings["Expert Mode"] = "Expertenmodus"; +$a->strings["Enable Expert Mode to provide advanced configuration options"] = "Aktiviere den Expertenmodus, um fortgeschrittene Konfigurationsoptionen zu aktivieren"; +$a->strings["Premium Channel"] = "Premium-Kanal"; +$a->strings["Allows you to set restrictions and terms on those that connect with your channel"] = "Ermöglicht Einschränkungen und Bedingungen für Kontakte dieses Kanals"; +$a->strings["Post Composition Features"] = "Nachbearbeitungsfunktionen"; +$a->strings["Use Markdown"] = "Markdown benutzen"; +$a->strings["Allow use of \"Markdown\" to format posts"] = "Erlaube Markdown zur Formatierung von Beiträgen"; +$a->strings["Post Preview"] = "Voransicht"; +$a->strings["Allow previewing posts and comments before publishing them"] = "Erlaube Voransicht von Beiträgen und Kommentaren vor Veröffentlichung"; +$a->strings["Channel Sources"] = "Kanal-Quellen"; +$a->strings["Automatically import channel content from other channels or feeds"] = "Importiere automatisch Inhalte für diesen Kanal von anderen Kanälen oder Feeds"; +$a->strings["Even More Encryption"] = "Noch mehr Verschlüsselung"; +$a->strings["Allow optional encryption of content end-to-end with a shared secret key"] = "Erlaube optionale Verschlüsselung von Inhalten (Ende-zu-Ende mit geteiltem Sicherheitsschlüssel)"; +$a->strings["Network and Stream Filtering"] = "Netzwerk- und Stream-Filter"; +$a->strings["Search by Date"] = "Suche nach Datum"; +$a->strings["Ability to select posts by date ranges"] = "Möglichkeit, Beiträge nach Zeiträumen auszuwählen"; +$a->strings["Collections Filter"] = "Filter für Sammlung"; +$a->strings["Enable widget to display Network posts only from selected collections"] = "Aktiviere nur Netzwerk-Beiträge von ausgewählten Sammlungen"; +$a->strings["Saved Searches"] = "Gespeicherte Suchanfragen"; +$a->strings["Save search terms for re-use"] = "Suchbegriffe zur Wiederverwendung abspeichern"; +$a->strings["Network Personal Tab"] = "Persönlicher Netzwerkreiter"; +$a->strings["Enable tab to display only Network posts that you've interacted on"] = "Aktiviere Reiter nur für die Netzwerk-Beiträge, mit denen Du interagiert hast"; +$a->strings["Network New Tab"] = "Netzwerkreiter Neu"; +$a->strings["Enable tab to display all new Network activity"] = "Aktiviere Reiter, um alle neuen Netzwerkaktivitäten zu zeigen"; +$a->strings["Affinity Tool"] = "Beziehungs-Tool"; +$a->strings["Filter stream activity by depth of relationships"] = "Filter Aktivitätenstream nach Tiefe der Beziehung"; +$a->strings["Suggest Channels"] = "Kanäle vorschlagen"; +$a->strings["Show channel suggestions"] = "Kanal-Vorschläge anzeigen"; +$a->strings["Post/Comment Tools"] = "Beitrag-/Kommentar-Tools"; +$a->strings["Edit Sent Posts"] = "Bearbeite gesendete Beiträge"; +$a->strings["Edit and correct posts and comments after sending"] = "Bearbeite und korrigiere Beiträge und Kommentare nach dem Senden"; +$a->strings["Tagging"] = "Verschlagworten"; +$a->strings["Ability to tag existing posts"] = "Möglichkeit, um existierende Beiträge zu verschlagworten"; +$a->strings["Post Categories"] = "Beitrags-Kategorien"; +$a->strings["Add categories to your posts"] = "Kategorien für Beiträge"; +$a->strings["Ability to file posts under folders"] = "Möglichkeit, Beiträge in Verzeichnissen zu sammeln"; +$a->strings["Dislike Posts"] = "Gefällt-mir-nicht Beiträge"; +$a->strings["Ability to dislike posts/comments"] = "„Gefällt mir nicht“ ermöglichen"; +$a->strings["Star Posts"] = "Beiträge mit Sternchen versehen"; +$a->strings["Ability to mark special posts with a star indicator"] = "Möglichkeit, spezielle Beiträge mit Sternchen-Symbol zu markieren"; +$a->strings["Tag Cloud"] = "Schlagwort-Wolke"; +$a->strings["Provide a personal tag cloud on your channel page"] = "Persönliche Schlagwort-Wolke auf Deiner Kanal-Seite anzeigen"; +$a->strings["Channel is blocked on this site."] = "Der Kanal ist auf dieser Seite blockiert "; +$a->strings["Channel location missing."] = "Adresse des Kanals fehlt."; +$a->strings["Response from remote channel was incomplete."] = "Antwort des entfernten Kanals war unvollständig."; +$a->strings["Channel was deleted and no longer exists."] = "Kanal wurde gelöscht und existiert nicht mehr."; +$a->strings["Protocol disabled."] = "Protokoll deaktiviert."; +$a->strings["Channel discovery failed."] = "Kanalsuche fehlgeschlagen"; +$a->strings["local account not found."] = "Lokales Konto nicht gefunden."; +$a->strings["Cannot connect to yourself."] = "Du kannst Dich nicht mit Dir selbst verbinden."; +$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."] = "Es hat früher schon einmal eine Sammlung mit diesem Namen existiert, die gelöscht wurde. Es könnten von damals noch Elemente (Beiträge, Dateien etc.) vorhanden sein, die allen jetzigen und zukünftigen Mitgliedern dieser Sammlung den Zugriff erlauben. Wenn das nicht Dein Plan war, erstelle bitte eine neue Sammlung mit einem anderen Namen."; +$a->strings["Default privacy group for new contacts"] = "Standard-Sammlung für neue Kontakte"; +$a->strings["All Channels"] = "Alle Kanäle"; +$a->strings["edit"] = "Bearbeiten"; +$a->strings["Collections"] = "Sammlungen"; +$a->strings["Edit collection"] = "Sammlung bearbeiten"; +$a->strings["Create a new collection"] = "Neue Sammlung erzeugen"; +$a->strings["Channels not in any collection"] = "Kanäle, die nicht in einer Sammlung sind"; +$a->strings["add"] = "hinzufügen"; +$a->strings["Unable to obtain identity information from database"] = "Kann keine Identitäts-Informationen aus Datenbank beziehen"; +$a->strings["Empty name"] = "Namensfeld leer"; +$a->strings["Name too long"] = "Name ist zu lang"; +$a->strings["No account identifier"] = "Keine Account-Kennung"; +$a->strings["Nickname is required."] = "Spitzname ist erforderlich."; +$a->strings["Reserved nickname. Please choose another."] = "Reservierter Kurzname. Bitte wähle einen anderen."; +$a->strings["Nickname has unsupported characters or is already being used on this site."] = "Der Spitzname enthält nicht-unterstütze Zeichen oder wird bereits auf dieser Seite genutzt."; +$a->strings["Unable to retrieve created identity"] = "Kann die erstellte Identität nicht empfangen"; +$a->strings["Default Profile"] = "Standard-Profil"; +$a->strings["Friends"] = "Freunde"; +$a->strings["Requested channel is not available."] = "Angeforderte Kanal nicht verfügbar."; +$a->strings["Requested profile is not available."] = "Erwünschte Profil ist nicht verfügbar."; +$a->strings["Change profile photo"] = "Profilfoto ändern"; +$a->strings["Profiles"] = "Profile"; +$a->strings["Manage/edit profiles"] = "Profile verwalten/bearbeiten"; +$a->strings["Create New Profile"] = "Neues Profil erstellen"; +$a->strings["Edit Profile"] = "Profile bearbeiten"; +$a->strings["Profile Image"] = "Profilfoto:"; +$a->strings["visible to everybody"] = "sichtbar für jeden"; +$a->strings["Edit visibility"] = "Sichtbarkeit bearbeiten"; +$a->strings["Gender:"] = "Geschlecht:"; +$a->strings["Status:"] = "Status:"; +$a->strings["Homepage:"] = "Homepage:"; +$a->strings["Online Now"] = "gerade online"; +$a->strings["g A l F d"] = "l, d. F G \\\\U\\\\h\\\\r"; +$a->strings["F d"] = "d. F"; +$a->strings["[today]"] = "[Heute]"; +$a->strings["Birthday Reminders"] = "Geburtstags Erinnerungen"; +$a->strings["Birthdays this week:"] = "Geburtstage in dieser Woche:"; +$a->strings["[No description]"] = "[Keine Beschreibung]"; +$a->strings["Event Reminders"] = "Veranstaltungs- Erinnerungen"; +$a->strings["Events this week:"] = "Veranstaltungen in dieser Woche:"; +$a->strings["Full Name:"] = "Voller Name:"; +$a->strings["Like this channel"] = "Dieser Kanal gefällt mir"; +$a->strings["j F, Y"] = "j. F Y"; +$a->strings["j F"] = "j. F"; +$a->strings["Birthday:"] = "Geburtstag:"; +$a->strings["Age:"] = "Alter:"; +$a->strings["for %1\$d %2\$s"] = "seit %1\$d %2\$s"; +$a->strings["Sexual Preference:"] = "Sexuelle Orientierung:"; +$a->strings["Hometown:"] = "Heimatstadt:"; +$a->strings["Tags:"] = "Schlagworte:"; +$a->strings["Political Views:"] = "Politische Ansichten:"; +$a->strings["Religion:"] = "Religion:"; +$a->strings["About:"] = "Über:"; +$a->strings["Hobbies/Interests:"] = "Hobbys/Interessen:"; +$a->strings["Likes:"] = "Gefällt:"; +$a->strings["Dislikes:"] = "Gefällt nicht:"; +$a->strings["Contact information and Social Networks:"] = "Kontaktinformation und soziale Netzwerke:"; +$a->strings["My other channels:"] = "Meine anderen Kanäle:"; +$a->strings["Musical interests:"] = "Musikalische Interessen:"; +$a->strings["Books, literature:"] = "Bücher, Literatur:"; +$a->strings["Television:"] = "Fernsehen:"; +$a->strings["Film/dance/culture/entertainment:"] = "Film/Tanz/Kultur/Unterhaltung:"; +$a->strings["Love/Romance:"] = "Liebe/Romantik:"; +$a->strings["Work/employment:"] = "Arbeit/Anstellung:"; +$a->strings["School/education:"] = "Schule/Ausbildung:"; +$a->strings["Like this thing"] = "Gefällt mir"; +$a->strings["Apps"] = "Apps"; +$a->strings["System"] = "System"; +$a->strings["Create Personal App"] = "Persönliche App erstellen"; +$a->strings["Edit Personal App"] = "Persönliche App bearbeiten"; +$a->strings["Ignore/Hide"] = "Ignorieren/Verstecken"; +$a->strings["Suggestions"] = "Vorschläge"; +$a->strings["See more..."] = "Mehr anzeigen …"; +$a->strings["You have %1$.0f of %2$.0f allowed connections."] = "Du bist %1$.0f von maximal %2$.0f erlaubten Verbindungen eingegangen."; +$a->strings["Add New Connection"] = "Neue Verbindung hinzufügen"; +$a->strings["Enter the channel address"] = "Adresse des Kanals eingeben"; +$a->strings["Example: bob@example.com, http://example.com/barbara"] = "Beispiel: bob@beispiel.com, http://beispiel.com/barbara"; +$a->strings["Notes"] = "Notizen"; +$a->strings["Remove term"] = "Eintrag löschen"; +$a->strings["Archives"] = "Archive"; +$a->strings["Refresh"] = "Aktualisieren"; +$a->strings["Me"] = "Ich"; +$a->strings["Best Friends"] = "Beste Freunde"; +$a->strings["Co-workers"] = "Kollegen"; +$a->strings["Former Friends"] = "ehem. Freunde"; +$a->strings["Acquaintances"] = "Bekannte"; +$a->strings["Everybody"] = "Jeder"; +$a->strings["Account settings"] = "Konto-Einstellungen"; +$a->strings["Channel settings"] = "Kanal-Einstellungen"; +$a->strings["Additional features"] = "Zusätzliche Funktionen"; +$a->strings["Feature settings"] = "Funktions-Einstellungen"; +$a->strings["Display settings"] = "Anzeige-Einstellungen"; +$a->strings["Connected apps"] = "Verbundene Apps"; +$a->strings["Export channel"] = "Kanal exportieren"; +$a->strings["Export content"] = "Kanal-Inhalte exportieren"; +$a->strings["Automatic Permissions (Advanced)"] = "Automatische Berechtigungen (Erweitert)"; +$a->strings["Premium Channel Settings"] = "Premium-Kanal-Einstellungen"; +$a->strings["Messages"] = "Nachrichten"; +$a->strings["Check Mail"] = "E-Mails abrufen"; +$a->strings["New Message"] = "Neue Nachricht"; +$a->strings["Chat Rooms"] = "Chaträume"; +$a->strings["Bookmarked Chatrooms"] = "Gespeicherte Chatrooms"; +$a->strings["Suggested Chatrooms"] = "Chatraum-Vorschläge"; +$a->strings["New window"] = "Neues Fenster"; +$a->strings["Open the selected location in a different window or browser tab"] = "Öffne die markierte Adresse in einem neuen Browser Fenster oder Tab"; +$a->strings["User '%s' deleted"] = "Benutzer '%s' gelöscht"; +$a->strings["Miscellaneous"] = "Verschiedenes"; +$a->strings["never"] = "Nie"; +$a->strings["less than a second ago"] = "Vor weniger als einer Sekunde"; +$a->strings["year"] = "Jahr"; +$a->strings["years"] = "Jahre"; +$a->strings["month"] = "Monat"; +$a->strings["months"] = "Monate"; +$a->strings["week"] = "Woche"; +$a->strings["weeks"] = "Wochen"; +$a->strings["day"] = "Tag"; +$a->strings["days"] = "Tage"; +$a->strings["hour"] = "Stunde"; +$a->strings["hours"] = "Stunden"; +$a->strings["minute"] = "Minute"; +$a->strings["minutes"] = "Minuten"; +$a->strings["second"] = "Sekunde"; +$a->strings["seconds"] = "Sekunden"; +$a->strings["%1\$d %2\$s ago"] = "vor %1\$d %2\$s"; +$a->strings["%1\$s's birthday"] = "%1\$ss Geburtstag"; +$a->strings["Happy Birthday %1\$s"] = "Alles Gute zum Geburtstag, %1\$s"; +$a->strings["No recipient provided."] = "Kein Empfänger angegeben"; +$a->strings["[no subject]"] = "[no subject]"; +$a->strings["Unable to determine sender."] = "Kann Absender nicht bestimmen."; +$a->strings["Stored post could not be verified."] = "Gespeicherter Beitrag konnten nicht überprüft werden."; +$a->strings["Logout"] = "Abmelden"; $a->strings["End this session"] = "Beende diese Sitzung"; $a->strings["Home"] = "Home"; $a->strings["Your posts and conversations"] = "Deine Beiträge und Unterhaltungen"; -$a->strings["View Profile"] = "Profil ansehen"; $a->strings["Your profile page"] = "Deine Profilseite"; $a->strings["Edit Profiles"] = "Profile bearbeiten"; $a->strings["Manage/Edit profiles"] = "Profile verwalten"; $a->strings["Edit your profile"] = "Profil bearbeiten"; -$a->strings["Photos"] = "Fotos"; $a->strings["Your photos"] = "Deine Bilder"; $a->strings["Your files"] = "Deine Dateien"; -$a->strings["Chat"] = "Chat"; $a->strings["Your chatrooms"] = "Deine Chaträume"; -$a->strings["Bookmarks"] = "Lesezeichen"; $a->strings["Your bookmarks"] = "Deine Lesezeichen"; -$a->strings["Webpages"] = "Webseiten"; $a->strings["Your webpages"] = "Deine Webseiten"; $a->strings["Sign in"] = "Anmelden"; $a->strings["%s - click to logout"] = "%s - Klick zum Abmelden"; $a->strings["Remote authentication"] = "Über Konto auf anderem Server einloggen"; $a->strings["Click to authenticate to your home hub"] = "Klicke, um Dich über Deinen Heimat-Server zu authentifizieren"; $a->strings["Home Page"] = "Homepage"; +$a->strings["Register"] = "Registrieren"; $a->strings["Create an account"] = "Erzeuge ein Konto"; -$a->strings["Help"] = "Hilfe"; $a->strings["Help and documentation"] = "Hilfe und Dokumentation"; -$a->strings["Apps"] = "Apps"; $a->strings["Applications, utilities, links, games"] = "Anwendungen (Apps), Zubehör, Links, Spiele"; $a->strings["Search site content"] = "Durchsuche Seiten-Inhalt"; -$a->strings["Directory"] = "Verzeichnis"; $a->strings["Channel Locator"] = "Kanal-Verzeichnis"; -$a->strings["Matrix"] = "Matrix"; $a->strings["Your matrix"] = "Deine Matrix"; $a->strings["Mark all matrix notifications seen"] = "Markiere alle Matrix-Benachrichtigungen als angesehen"; -$a->strings["Channel Home"] = "Mein Kanal"; $a->strings["Channel home"] = "Mein Kanal"; $a->strings["Mark all channel notifications seen"] = "Markiere alle Kanal-Benachrichtigungen als angesehen"; $a->strings["Connections"] = "Verbindungen"; @@ -658,249 +704,231 @@ $a->strings["Notices"] = "Benachrichtigungen"; $a->strings["Notifications"] = "Benachrichtigungen"; $a->strings["See all notifications"] = "Alle Benachrichtigungen ansehen"; $a->strings["Mark all system notifications seen"] = "Markiere alle System-Benachrichtigungen als gesehen"; -$a->strings["Mail"] = "Mail"; $a->strings["Private mail"] = "Persönliche Mail"; $a->strings["See all private messages"] = "Alle persönlichen Nachrichten ansehen"; $a->strings["Mark all private messages seen"] = "Markiere alle persönlichen Nachrichten als gesehen"; $a->strings["Inbox"] = "Eingang"; $a->strings["Outbox"] = "Ausgang"; -$a->strings["New Message"] = "Neue Nachricht"; -$a->strings["Events"] = "Veranstaltungen"; $a->strings["Event Calendar"] = "Veranstaltungskalender"; -$a->strings["See all events"] = "Alle Ereignisse ansehen"; -$a->strings["Mark all events seen"] = "Markiere alle Ereignisse als gesehen"; -$a->strings["Channel Manager"] = "Kanal-Manager"; -$a->strings["Manage Your Channels"] = "Verwalte Deine Kanäle"; -$a->strings["Settings"] = "Einstellungen"; -$a->strings["Account/Channel Settings"] = "Konto-/Kanal-Einstellungen"; -$a->strings["Admin"] = "Administration"; -$a->strings["Site Setup and Configuration"] = "Seiten-Einrichtung und -Konfiguration"; -$a->strings["Loading..."] = "Lädt ..."; -$a->strings["Please wait..."] = "Bitte warten..."; -$a->strings["General Features"] = "Allgemeine Funktionen"; -$a->strings["Content Expiration"] = "Verfall von Inhalten"; -$a->strings["Remove posts/comments and/or private messages at a future time"] = "Lösche Beiträge, Kommentare und/oder private Nachrichten automatisch zu einem zukünftigen Datum."; -$a->strings["Multiple Profiles"] = "Mehrfachprofile"; -$a->strings["Ability to create multiple profiles"] = "Mehrfachprofile anlegen können"; -$a->strings["Advanced Profiles"] = "Erweiterte Profile"; -$a->strings["Additional profile sections and selections"] = "Stellt zusätzliche Bereiche und Felder im Profil zur Verfügung"; -$a->strings["Profile Import/Export"] = "Profil-Import/Export"; -$a->strings["Save and load profile details across sites/channels"] = "Speichere Dein Profil, um es in einen anderen Kanal zu importieren"; -$a->strings["Web Pages"] = "Webseiten"; -$a->strings["Provide managed web pages on your channel"] = "Stelle verwaltete Webseiten in Deinem Kanal zur Verfügung"; -$a->strings["Private Notes"] = "Private Notizen"; -$a->strings["Enables a tool to store notes and reminders"] = "Werkzeug zum Speichern von Notizen und Erinnerungen aktivieren"; -$a->strings["Navigation Channel Select"] = "Kanal-Auswahl in der Navigationsleiste"; -$a->strings["Change channels directly from within the navigation dropdown menu"] = "Wechsle direkt über das Navigationsmenü zu anderen Kanälen"; -$a->strings["Extended Identity Sharing"] = "Erweitertes Teilen von Identitäten"; -$a->strings["Share your identity with all websites on the internet. When disabled, identity is only shared with sites in the matrix."] = "Teile Deine Identität mit allen Webseiten im Internet. Ist dies deaktiviert, wird Deine Identität nur mit Red-Servern geteilt."; -$a->strings["Expert Mode"] = "Expertenmodus"; -$a->strings["Enable Expert Mode to provide advanced configuration options"] = "Aktiviere den Expertenmodus, um fortgeschrittene Konfigurationsoptionen zu aktivieren"; -$a->strings["Premium Channel"] = "Premium-Kanal"; -$a->strings["Allows you to set restrictions and terms on those that connect with your channel"] = "Ermöglicht Einschränkungen und Bedingungen für Kontakte dieses Kanals"; -$a->strings["Post Composition Features"] = "Nachbearbeitungsfunktionen"; -$a->strings["Use Markdown"] = "Markdown benutzen"; -$a->strings["Allow use of \"Markdown\" to format posts"] = "Erlaube Markdown zur Formatierung von Beiträgen"; -$a->strings["Post Preview"] = "Voransicht"; -$a->strings["Allow previewing posts and comments before publishing them"] = "Erlaube Voransicht von Beiträgen und Kommentaren vor Veröffentlichung"; -$a->strings["Channel Sources"] = "Kanal-Quellen"; -$a->strings["Automatically import channel content from other channels or feeds"] = "Importiere automatisch Inhalte für diesen Kanal von anderen Kanälen oder Feeds"; -$a->strings["Even More Encryption"] = "Noch mehr Verschlüsselung"; -$a->strings["Allow optional encryption of content end-to-end with a shared secret key"] = "Erlaube optionale Verschlüsselung von Inhalten (Ende-zu-Ende mit geteiltem Sicherheitsschlüssel)"; -$a->strings["Network and Stream Filtering"] = "Netzwerk- und Stream-Filter"; -$a->strings["Search by Date"] = "Suche nach Datum"; -$a->strings["Ability to select posts by date ranges"] = "Möglichkeit, Beiträge nach Zeiträumen auszuwählen"; -$a->strings["Collections Filter"] = "Filter für Sammlung"; -$a->strings["Enable widget to display Network posts only from selected collections"] = "Aktiviere nur Netzwerk-Beiträge von ausgewählten Sammlungen"; -$a->strings["Saved Searches"] = "Gespeicherte Suchanfragen"; -$a->strings["Save search terms for re-use"] = "Suchbegriffe zur Wiederverwendung abspeichern"; -$a->strings["Network Personal Tab"] = "Persönlicher Netzwerkreiter"; -$a->strings["Enable tab to display only Network posts that you've interacted on"] = "Aktiviere Reiter nur für die Netzwerk-Beiträge, mit denen Du interagiert hast"; -$a->strings["Network New Tab"] = "Netzwerkreiter Neu"; -$a->strings["Enable tab to display all new Network activity"] = "Aktiviere Reiter, um alle neuen Netzwerkaktivitäten zu zeigen"; -$a->strings["Affinity Tool"] = "Beziehungs-Tool"; -$a->strings["Filter stream activity by depth of relationships"] = "Filter Aktivitätenstream nach Tiefe der Beziehung"; -$a->strings["Suggest Channels"] = "Kanäle vorschlagen"; -$a->strings["Show channel suggestions"] = "Kanal-Vorschläge anzeigen"; -$a->strings["Post/Comment Tools"] = "Beitrag-/Kommentar-Tools"; -$a->strings["Edit Sent Posts"] = "Bearbeite gesendete Beiträge"; -$a->strings["Edit and correct posts and comments after sending"] = "Bearbeite und korrigiere Beiträge und Kommentare nach dem Senden"; -$a->strings["Tagging"] = "Verschlagworten"; -$a->strings["Ability to tag existing posts"] = "Möglichkeit, um existierende Beiträge zu verschlagworten"; -$a->strings["Post Categories"] = "Beitrags-Kategorien"; -$a->strings["Add categories to your posts"] = "Kategorien für Beiträge"; -$a->strings["Ability to file posts under folders"] = "Möglichkeit, Beiträge in Verzeichnissen zu sammeln"; -$a->strings["Dislike Posts"] = "Gefällt-mir-nicht Beiträge"; -$a->strings["Ability to dislike posts/comments"] = "„Gefällt mir nicht“ ermöglichen"; -$a->strings["Star Posts"] = "Beiträge mit Sternchen versehen"; -$a->strings["Ability to mark special posts with a star indicator"] = "Möglichkeit, spezielle Beiträge mit Sternchen-Symbol zu markieren"; -$a->strings["Tag Cloud"] = "Schlagwort-Wolke"; -$a->strings["Provide a personal tag cloud on your channel page"] = "Persönliche Schlagwort-Wolke auf Deiner Kanal-Seite anzeigen"; -$a->strings["created a new post"] = "Neuer Beitrag wurde erzeugt"; -$a->strings["commented on %s's post"] = "hat %s's Beitrag kommentiert"; -$a->strings["Site Admin"] = "Hub-Administration"; -$a->strings["Address Book"] = "Adressbuch"; -$a->strings["Mood"] = "Laune"; -$a->strings["Poke"] = "Anstupsen"; -$a->strings["Probe"] = "Testen"; -$a->strings["Suggest"] = "Empfehlungen"; -$a->strings["Random Channel"] = "Zufälliger Kanal"; -$a->strings["Invite"] = "Einladen"; -$a->strings["Features"] = "Funktionen"; -$a->strings["Language"] = "Sprache"; -$a->strings["Post"] = "Beitrag"; -$a->strings["Profile Photo"] = "Profilfoto"; -$a->strings["Update"] = "Aktualisieren"; -$a->strings["Install"] = "Installieren"; -$a->strings["Purchase"] = "Kaufen"; -$a->strings["Public Timeline"] = "Öffentliche Zeitleiste"; -$a->strings["Missing room name"] = "Der Chatraum hat keinen Namen"; -$a->strings["Duplicate room name"] = "Name des Chatraums bereits vergeben"; -$a->strings["Invalid room specifier."] = "Ungültiger Raumbezeichner."; -$a->strings["Room not found."] = "Chatraum konnte nicht gefunden werden."; -$a->strings["Room is full"] = "Der Raum ist voll"; -$a->strings["channel"] = "Kanal"; -$a->strings["%1\$s likes %2\$s's %3\$s"] = "%1\$s gefällt %2\$ss %3\$s"; -$a->strings["%1\$s doesn't like %2\$s's %3\$s"] = "%1\$s gefällt %2\$ss %3\$s nicht"; -$a->strings["%1\$s is now connected with %2\$s"] = "%1\$s ist jetzt mit %2\$s verbunden"; -$a->strings["%1\$s poked %2\$s"] = "%1\$s stupste %2\$s an"; -$a->strings["__ctx:mood__ %1\$s is %2\$s"] = "%1\$s ist %2\$s"; -$a->strings["View %s's profile @ %s"] = "%ss Profil auf %s ansehen"; -$a->strings["Categories:"] = "Kategorien:"; -$a->strings["Filed under:"] = "Gespeichert unter:"; -$a->strings["View in context"] = "Im Zusammenhang anschauen"; -$a->strings["remove"] = "lösche"; -$a->strings["Delete Selected Items"] = "Lösche die ausgewählten Elemente"; -$a->strings["View Source"] = "Quelle anzeigen"; -$a->strings["Follow Thread"] = "Unterhaltung folgen"; -$a->strings["View Status"] = "Status ansehen"; -$a->strings["View Photos"] = "Fotos ansehen"; -$a->strings["Matrix Activity"] = "Matrix-Aktivität"; -$a->strings["Edit Contact"] = "Kontakt bearbeiten"; -$a->strings["Send PM"] = "Sende PN"; -$a->strings["%s likes this."] = "%s gefällt das."; -$a->strings["%s doesn't like this."] = "%s gefällt das nicht."; -$a->strings["%2\$d people like this."] = array( - 0 => "%2\$d Person gefällt das.", - 1 => "%2\$d Leuten gefällt das.", -); -$a->strings["%2\$d people don't like this."] = array( - 0 => "%2\$d Person gefällt das nicht.", - 1 => "%2\$d Leuten gefällt das nicht.", -); -$a->strings["and"] = "und"; -$a->strings[", and %d other people"] = array( - 0 => "", - 1 => ", und %d andere", -); -$a->strings["%s like this."] = "%s gefällt das."; -$a->strings["%s don't like this."] = "%s gefällt das nicht."; -$a->strings["Visible to everybody"] = "Sichtbar für jeden"; -$a->strings["Please enter a link URL:"] = "Gib eine URL ein:"; -$a->strings["Please enter a video link/URL:"] = "Gib einen Video-Link/URL ein:"; -$a->strings["Please enter an audio link/URL:"] = "Gib einen Audio-Link/URL ein:"; -$a->strings["Tag term:"] = "Schlagwort:"; -$a->strings["Save to Folder:"] = "Speichern in Ordner:"; -$a->strings["Where are you right now?"] = "Wo bist Du jetzt grade?"; -$a->strings["Expires YYYY-MM-DD HH:MM"] = "Verfällt YYYY-MM-DD HH;MM"; -$a->strings["Share"] = "Teilen"; -$a->strings["Page link title"] = "Seitentitel-Link"; -$a->strings["Post as"] = "Posten als"; -$a->strings["Upload photo"] = "Foto hochladen"; -$a->strings["upload photo"] = "Foto hochladen"; -$a->strings["Attach file"] = "Datei anhängen"; -$a->strings["attach file"] = "Datei anfügen"; -$a->strings["Insert web link"] = "Link einfügen"; -$a->strings["web link"] = "Web-Link"; -$a->strings["Insert video link"] = "Video-Link einfügen"; -$a->strings["video link"] = "Video-Link"; -$a->strings["Insert audio link"] = "Audio-Link einfügen"; -$a->strings["audio link"] = "Audio-Link"; -$a->strings["Set your location"] = "Standort"; -$a->strings["set location"] = "Standort"; -$a->strings["Clear browser location"] = "Browser-Standort löschen"; -$a->strings["clear location"] = "Standort löschen"; -$a->strings["Set title"] = "Titel"; -$a->strings["Categories (comma-separated list)"] = "Kategorien (Kommagetrennte Liste)"; -$a->strings["Permission settings"] = "Berechtigungs-Einstellungen"; -$a->strings["permissions"] = "Berechtigungen"; -$a->strings["Public post"] = "Öffentlicher Beitrag"; -$a->strings["Example: bob@example.com, mary@example.com"] = "Beispiel: bob@example.com, mary@example.com"; -$a->strings["Set expiration date"] = "Verfallsdatum"; -$a->strings["OK"] = "Ok"; -$a->strings["Cancel"] = "Abbrechen"; -$a->strings["Discover"] = "Entdecken"; -$a->strings["Imported public streams"] = "Importierte öffentliche Beiträge"; -$a->strings["Commented Order"] = "Neueste Kommentare"; -$a->strings["Sort by Comment Date"] = "Nach Kommentardatum sortiert"; -$a->strings["Posted Order"] = "Neueste Beiträge"; -$a->strings["Sort by Post Date"] = "Nach Beitragsdatum sortiert"; -$a->strings["Personal"] = "Persönlich"; -$a->strings["Posts that mention or involve you"] = "Beiträge mit Beteiligung Deinerseits"; -$a->strings["New"] = "Neu"; -$a->strings["Activity Stream - by date"] = "Activity Stream – nach Datum sortiert"; -$a->strings["Starred"] = "Markiert"; -$a->strings["Favourite Posts"] = "Markierte Beiträge"; -$a->strings["Spam"] = "Spam"; -$a->strings["Posts flagged as SPAM"] = "Nachrichten, die als SPAM markiert wurden"; -$a->strings["Channel"] = "Kanal"; -$a->strings["Status Messages and Posts"] = "Statusnachrichten und Beiträge"; -$a->strings["About"] = "Über"; -$a->strings["Profile Details"] = "Profil-Details"; -$a->strings["Files and Storage"] = "Dateien und Speicher"; -$a->strings["Chatrooms"] = "Chaträume"; -$a->strings["Saved Bookmarks"] = "Gespeicherte Lesezeichen"; -$a->strings["Manage Webpages"] = "Webseiten verwalten"; -$a->strings["Attachments:"] = "Anhänge:"; +$a->strings["See all events"] = "Alle Ereignisse ansehen"; +$a->strings["Mark all events seen"] = "Markiere alle Ereignisse als gesehen"; +$a->strings["Manage Your Channels"] = "Verwalte Deine Kanäle"; +$a->strings["Account/Channel Settings"] = "Konto-/Kanal-Einstellungen"; +$a->strings["Admin"] = "Administration"; +$a->strings["Site Setup and Configuration"] = "Seiten-Einrichtung und -Konfiguration"; +$a->strings["Please wait..."] = "Bitte warten..."; +$a->strings["view full size"] = "In Vollbildansicht anschauen"; +$a->strings["Invalid data packet"] = "Ungültiges Datenpaket"; +$a->strings["Unable to verify channel signature"] = "Konnte die Signatur des Kanals nicht verifizieren"; +$a->strings["Unable to verify site signature for %s"] = "Kann die Signatur der Seite von %s nicht verifizieren"; $a->strings["Visible to your default audience"] = "Standard-Sichtbarkeit"; $a->strings["Show"] = "Zeigen"; $a->strings["Don't show"] = "Nicht zeigen"; $a->strings["Permissions"] = "Berechtigungen"; -$a->strings["System"] = "System"; -$a->strings["Create Personal App"] = "Persönliche App erstellen"; -$a->strings["Edit Personal App"] = "Persönliche App bearbeiten"; -$a->strings["Ignore/Hide"] = "Ignorieren/Verstecken"; -$a->strings["Suggestions"] = "Vorschläge"; -$a->strings["See more..."] = "Mehr anzeigen …"; -$a->strings["You have %1$.0f of %2$.0f allowed connections."] = "Du bist %1$.0f von maximal %2$.0f erlaubten Verbindungen eingegangen."; -$a->strings["Add New Connection"] = "Neue Verbindung hinzufügen"; -$a->strings["Enter the channel address"] = "Adresse des Kanals eingeben"; -$a->strings["Example: bob@example.com, http://example.com/barbara"] = "Beispiel: bob@beispiel.com, http://beispiel.com/barbara"; -$a->strings["Notes"] = "Notizen"; -$a->strings["Remove term"] = "Eintrag löschen"; -$a->strings["Archives"] = "Archive"; -$a->strings["Refresh"] = "Aktualisieren"; -$a->strings["Me"] = "Ich"; -$a->strings["Best Friends"] = "Beste Freunde"; -$a->strings["Co-workers"] = "Kollegen"; -$a->strings["Former Friends"] = "ehem. Freunde"; -$a->strings["Acquaintances"] = "Bekannte"; -$a->strings["Everybody"] = "Jeder"; -$a->strings["Account settings"] = "Konto-Einstellungen"; -$a->strings["Channel settings"] = "Kanal-Einstellungen"; -$a->strings["Additional features"] = "Zusätzliche Funktionen"; -$a->strings["Feature settings"] = "Funktions-Einstellungen"; -$a->strings["Display settings"] = "Anzeige-Einstellungen"; -$a->strings["Connected apps"] = "Verbundene Apps"; -$a->strings["Export channel"] = "Kanal exportieren"; -$a->strings["Export content"] = "Kanal-Inhalte exportieren"; -$a->strings["Automatic Permissions (Advanced)"] = "Automatische Berechtigungen (Erweitert)"; -$a->strings["Premium Channel Settings"] = "Premium-Kanal-Einstellungen"; -$a->strings["Messages"] = "Nachrichten"; -$a->strings["Check Mail"] = "E-Mails abrufen"; -$a->strings["Chat Rooms"] = "Chaträume"; -$a->strings["Bookmarked Chatrooms"] = "Gespeicherte Chatrooms"; -$a->strings["Suggested Chatrooms"] = "Chatraum-Vorschläge"; -$a->strings["Channel is blocked on this site."] = "Der Kanal ist auf dieser Seite blockiert "; -$a->strings["Channel location missing."] = "Adresse des Kanals fehlt."; -$a->strings["Response from remote channel was incomplete."] = "Antwort des entfernten Kanals war unvollständig."; -$a->strings["Channel was deleted and no longer exists."] = "Kanal wurde gelöscht und existiert nicht mehr."; -$a->strings["Protocol disabled."] = "Protokoll deaktiviert."; -$a->strings["Channel discovery failed."] = "Kanalsuche fehlgeschlagen"; -$a->strings["local account not found."] = "Lokales Konto nicht gefunden."; -$a->strings["Cannot connect to yourself."] = "Du kannst Dich nicht mit Dir selbst verbinden."; -$a->strings["Remote authentication blocked. You are logged into this site locally. Please logout and retry."] = "Fern-Authentifizierung blockiert. Du bist lokal auf diesem Server angemeldet. Bitte melde Dich ab und versuche es erneut."; -$a->strings["Welcome %s. Remote authentication successful."] = "Willkommen %s. Entfernte Authentifizierung erfolgreich."; +$a->strings["Close"] = "Schließen"; +$a->strings["Public Timeline"] = "Öffentliche Zeitleiste"; +$a->strings["Image exceeds website size limit of %lu bytes"] = "Bild überschreitet das Limit der Webseite von %lu bytes"; +$a->strings["Image file is empty."] = "Bilddatei ist leer."; +$a->strings["Unable to process image"] = "Kann Bild nicht verarbeiten"; +$a->strings["Photo storage failed."] = "Foto speichern schlug fehl"; +$a->strings["Upload New Photos"] = "Lade neue Fotos hoch"; +$a->strings["Delete this item?"] = "Dieses Element löschen?"; +$a->strings["Comment"] = "Kommentar"; +$a->strings["[+] show all"] = "[+] Zeige alle"; +$a->strings["[-] show less"] = "[-] zeige weniger"; +$a->strings["[+] expand"] = "[+] aufklappen"; +$a->strings["[-] collapse"] = "[-] einklappen"; +$a->strings["Password too short"] = "Kennwort zu kurz"; +$a->strings["Passwords do not match"] = "Kennwörter stimmen nicht überein"; +$a->strings["everybody"] = "alle"; +$a->strings["Secret Passphrase"] = "geheime Passphrase"; +$a->strings["Passphrase hint"] = "Hinweis zur Passphrase"; +$a->strings["Notice: Permissions have changed but have not yet been submitted."] = "Achtung: Berechtigungen wurden verändert, aber noch nicht gespeichert."; +$a->strings["close all"] = "Alle schließen"; +$a->strings["Nothing new here"] = "Nichts Neues hier"; +$a->strings["timeago.prefixAgo"] = "timeago.prefixAgo"; +$a->strings["timeago.prefixFromNow"] = " "; +$a->strings["ago"] = "her"; +$a->strings["from now"] = "von jetzt"; +$a->strings["less than a minute"] = "weniger als eine Minute"; +$a->strings["about a minute"] = "ungefähr eine Minute"; +$a->strings["%d minutes"] = "%d Minuten"; +$a->strings["about an hour"] = "ungefähr eine Stunde"; +$a->strings["about %d hours"] = "ungefähr %d Stunden"; +$a->strings["a day"] = "ein Tag"; +$a->strings["%d days"] = "%d Tage"; +$a->strings["about a month"] = "ungefähr ein Monat"; +$a->strings["%d months"] = "%d Monate"; +$a->strings["about a year"] = "ungefähr ein Jahr"; +$a->strings["%d years"] = "%d Jahre"; +$a->strings[" "] = " "; +$a->strings["timeago.numbers"] = "timeago.numbers"; +$a->strings["Male"] = "Männlich"; +$a->strings["Female"] = "Weiblich"; +$a->strings["Currently Male"] = "Momentan männlich"; +$a->strings["Currently Female"] = "Momentan weiblich"; +$a->strings["Mostly Male"] = "Größtenteils männlich"; +$a->strings["Mostly Female"] = "Größtenteils weiblich"; +$a->strings["Transgender"] = "Transsexuell"; +$a->strings["Intersex"] = "Zwischengeschlechtlich"; +$a->strings["Transsexual"] = "Transsexuell"; +$a->strings["Hermaphrodite"] = "Zwitter"; +$a->strings["Neuter"] = "Geschlechtslos"; +$a->strings["Non-specific"] = "unklar"; +$a->strings["Undecided"] = "Unentschieden"; +$a->strings["Males"] = "Männer"; +$a->strings["Females"] = "Frauen"; +$a->strings["Gay"] = "Schwul"; +$a->strings["Lesbian"] = "Lesbisch"; +$a->strings["No Preference"] = "Keine Bevorzugung"; +$a->strings["Bisexual"] = "Bisexuell"; +$a->strings["Autosexual"] = "Autosexuell"; +$a->strings["Abstinent"] = "Enthaltsam"; +$a->strings["Virgin"] = "Jungfräulich"; +$a->strings["Deviant"] = "Abweichend"; +$a->strings["Fetish"] = "Fetisch"; +$a->strings["Oodles"] = "Unmengen"; +$a->strings["Nonsexual"] = "Sexlos"; +$a->strings["Single"] = "Single"; +$a->strings["Lonely"] = "Einsam"; +$a->strings["Available"] = "Verfügbar"; +$a->strings["Unavailable"] = "Nicht verfügbar"; +$a->strings["Has crush"] = "Verguckt"; +$a->strings["Infatuated"] = "Verknallt"; +$a->strings["Dating"] = "Lerne gerade jemanden kennen"; +$a->strings["Unfaithful"] = "Treulos"; +$a->strings["Sex Addict"] = "Sexabhängig"; +$a->strings["Friends/Benefits"] = "Freunde/Begünstigte"; +$a->strings["Casual"] = "Lose"; +$a->strings["Engaged"] = "Verlobt"; +$a->strings["Married"] = "Verheiratet"; +$a->strings["Imaginarily married"] = "Gewissermaßen verheiratet"; +$a->strings["Partners"] = "Partner"; +$a->strings["Cohabiting"] = "Lebensgemeinschaft"; +$a->strings["Common law"] = "Informelle Ehe"; +$a->strings["Happy"] = "Glücklich"; +$a->strings["Not looking"] = "Nicht Ausschau haltend"; +$a->strings["Swinger"] = "Swinger"; +$a->strings["Betrayed"] = "Betrogen"; +$a->strings["Separated"] = "Getrennt"; +$a->strings["Unstable"] = "Labil"; +$a->strings["Divorced"] = "Geschieden"; +$a->strings["Imaginarily divorced"] = "Gewissermaßen geschieden"; +$a->strings["Widowed"] = "Verwitwet"; +$a->strings["Uncertain"] = "Ungewiss"; +$a->strings["It's complicated"] = "Es ist kompliziert"; +$a->strings["Don't care"] = "Interessiert mich nicht"; +$a->strings["Ask me"] = "Frag mich mal"; +$a->strings["Save to Folder"] = "In Ordner speichern"; +$a->strings["View all"] = "Alles anzeigen"; +$a->strings["__ctx:noun__ Dislike"] = array( + 0 => "Gefällt nicht", + 1 => "Gefällt nicht", +); +$a->strings["Add Star"] = "Stern hinzufügen"; +$a->strings["Remove Star"] = "Stern entfernen"; +$a->strings["Toggle Star Status"] = "Stern-Status umschalten"; +$a->strings["starred"] = "markiert"; +$a->strings["Add Tag"] = "Tag hinzufügen"; +$a->strings["I like this (toggle)"] = "Mir gefällt das (Umschalter)"; +$a->strings["I don't like this (toggle)"] = "Mir gefällt das nicht (Umschalter)"; +$a->strings["Share This"] = "Teilen"; +$a->strings["share"] = "Teilen"; +$a->strings["View %s's profile - %s"] = "Schaue Dir %ss Profil an – %s"; +$a->strings["to"] = "an"; +$a->strings["via"] = "via"; +$a->strings["Wall-to-Wall"] = "Wall-to-Wall"; +$a->strings["via Wall-To-Wall:"] = "via Wall-To-Wall:"; +$a->strings["Save Bookmarks"] = "Favoriten speichern"; +$a->strings["Add to Calendar"] = "Zum Kalender hinzufügen"; +$a->strings["__ctx:noun__ Likes"] = "Gefällt mir"; +$a->strings["__ctx:noun__ Dislikes"] = "Gefällt nicht"; +$a->strings["%d comment"] = array( + 0 => "%d Kommentar", + 1 => "%d Kommentare", +); +$a->strings["This is you"] = "Das bist Du"; +$a->strings["Submit"] = "Bestätigen"; +$a->strings["Bold"] = "Fett"; +$a->strings["Italic"] = "Kursiv"; +$a->strings["Underline"] = "Unterstrichen"; +$a->strings["Quote"] = "Zitat"; +$a->strings["Code"] = "Code"; +$a->strings["Image"] = "Bild"; +$a->strings["Link"] = "Link"; +$a->strings["Video"] = "Video"; +$a->strings["Set your current mood and tell your friends"] = "Wähle Deine aktuelle Stimmung und teile sie mit Deinen Freunden"; +$a->strings["Page owner information could not be retrieved."] = "Informationen über den Besitzer der Seite konnten nicht gefunden werden."; +$a->strings["Album not found."] = "Album nicht gefunden."; +$a->strings["Delete Album"] = "Album löschen"; +$a->strings["Delete Photo"] = "Foto löschen"; +$a->strings["Public access denied."] = "Öffentlicher Zugang verweigert."; +$a->strings["No photos selected"] = "Keine Fotos ausgewählt"; +$a->strings["Access to this item is restricted."] = "Der Zugriff auf dieses Foto ist eingeschränkt."; +$a->strings["%1$.2f MB of %2$.2f MB photo storage used."] = "%1$.2f MB von %2$.2f MB Foto-Speicher belegt."; +$a->strings["%1$.2f MB photo storage used."] = "%1$.2f MB Foto-Speicher belegt."; +$a->strings["Upload Photos"] = "Fotos hochladen"; +$a->strings["Enter a new album name or select an existing one:"] = "Gib einen neuen Albumnamen ein oder wähle einen bereits existierenden:"; +$a->strings["Do not show a status post for this upload"] = "Keine Statusnachricht für diesen Upload senden"; +$a->strings["Album name could not be decoded"] = "Albumname konnte nicht dekodiert werden"; +$a->strings["Contact Photos"] = "Kontakt-Bilder"; +$a->strings["New album name: "] = "Name des neuen Albums:"; +$a->strings["Show Newest First"] = "Zeige Neueste zuerst"; +$a->strings["Show Oldest First"] = "Zeige Älteste zuerst"; +$a->strings["View Photo"] = "Foto ansehen"; +$a->strings["Edit Album"] = "Album bearbeiten"; +$a->strings["Permission denied. Access to this item may be restricted."] = "Berechtigung verweigert. Der Zugriff ist wahrscheinlich eingeschränkt worden."; +$a->strings["Photo not available"] = "Foto nicht verfügbar"; +$a->strings["Use as profile photo"] = "Als Profilfoto verwenden"; +$a->strings["Private Photo"] = "Privates Foto"; +$a->strings["Previous"] = "Voriges"; +$a->strings["View Full Size"] = "In voller Größe anzeigen"; +$a->strings["Next"] = "Nächste"; +$a->strings["Remove"] = "Entferne"; +$a->strings["Edit photo"] = "Foto bearbeiten"; +$a->strings["Rotate CW (right)"] = "Drehen im UZS (rechts)"; +$a->strings["Rotate CCW (left)"] = "Drehen gegen UZS (links)"; +$a->strings["New album name"] = "Name des neuen Albums:"; +$a->strings["Caption"] = "Bildunterschrift"; +$a->strings["Add a Tag"] = "Schlagwort hinzufügen"; +$a->strings["Example: @bob, @Barbara_Jensen, @jim@example.com"] = "Beispiele: @ben, @Karl_Prester, @lieschen@example.com"; +$a->strings["In This Photo:"] = "Auf diesem Foto:"; +$a->strings["View Album"] = "Album ansehen"; +$a->strings["Recent Photos"] = "Neueste Fotos"; +$a->strings["Menu not found."] = "Menü nicht gefunden"; +$a->strings["Menu element updated."] = "Menü-Element aktualisiert."; +$a->strings["Unable to update menu element."] = "Kann Menü-Element nicht aktualisieren."; +$a->strings["Menu element added."] = "Menü-Bestandteil hinzugefügt."; +$a->strings["Unable to add menu element."] = "Kann Menü-Bestandteil nicht hinzufügen."; +$a->strings["Not found."] = "Nicht gefunden."; +$a->strings["Manage Menu Elements"] = "Menü-Bestandteile verwalten"; +$a->strings["Edit menu"] = "Menü bearbeiten"; +$a->strings["Edit element"] = "Bestandteil bearbeiten"; +$a->strings["Drop element"] = "Bestandteil löschen"; +$a->strings["New element"] = "Neues Bestandteil"; +$a->strings["Edit this menu container"] = "Diesen Menü-Container bearbeiten"; +$a->strings["Add menu element"] = "Menüelement hinzufügen"; +$a->strings["Delete this menu item"] = "Lösche dieses Menü-Bestandteil"; +$a->strings["Edit this menu item"] = "Bearbeite dieses Menü-Bestandteil"; +$a->strings["New Menu Element"] = "Neues Menü-Bestandteil"; +$a->strings["Menu Item Permissions"] = "Zugriffsrechte des Menü-Elements"; +$a->strings["(click to open/close)"] = "(zum öffnen/schließen anklicken)"; +$a->strings["Link text"] = "Link Text"; +$a->strings["URL of link"] = "URL des Links"; +$a->strings["Use Red magic-auth if available"] = "Verwende Red Magic-Auth wenn verfügbar"; +$a->strings["Open link in new window"] = "Öffne Link in neuem Fenster"; +$a->strings["Order in list"] = "Reihenfolge in der Liste"; +$a->strings["Higher numbers will sink to bottom of listing"] = "Größere Nummern werden weiter unten in der Auflistung einsortiert"; +$a->strings["Menu item not found."] = "Menü-Bestandteil nicht gefunden."; +$a->strings["Menu item deleted."] = "Menü-Bestandteil gelöscht."; +$a->strings["Menu item could not be deleted."] = "Menü-Bestandteil kann nicht gelöscht werden."; +$a->strings["Edit Menu Element"] = "Bearbeite Menü-Bestandteil"; +$a->strings["Modify"] = "Ändern"; +$a->strings["Some blurb about what to do when you're new here"] = "Ein Hinweis, was man tun kann, wenn man neu hier ist"; +$a->strings["sent you a private message"] = "eine private Nachricht schicken"; +$a->strings["added your channel"] = "hat deinen Kanal hinzugefügt"; +$a->strings["posted an event"] = "hat eine Veranstaltung veröffentlicht"; +$a->strings["network"] = "Netzwerk"; $a->strings["Name is required"] = "Name ist erforderlich"; $a->strings["Key and Secret are required"] = "Schlüssel und Geheimnis werden benötigt"; $a->strings["Passwords do not match. Password unchanged."] = "Kennwörter stimmen nicht überein. Kennwort nicht verändert."; @@ -992,7 +1020,7 @@ $a->strings["0 or blank prevents expiration"] = "0 oder kein Inhalt verhindern d $a->strings["Maximum Friend Requests/Day:"] = "Maximale Kontaktanfragen pro Tag:"; $a->strings["May reduce spam activity"] = "Kann die Spam-Aktivität verringern"; $a->strings["Default Post Permissions"] = "Standardeinstellungen für Beitrags-Zugriffsrechte"; -$a->strings["(click to open/close)"] = "(zum öffnen/schließen anklicken)"; +$a->strings["Channel permissions category:"] = "Zugriffsrechte-Kategorie des Kanals:"; $a->strings["Maximum private messages per day from unknown people:"] = "Maximale Anzahl privater Nachrichten pro Tag von unbekannten Leuten:"; $a->strings["Useful to reduce spamming"] = "Nützlich, um Spam zu verringern"; $a->strings["Notification Settings"] = "Benachrichtigungs-Einstellungen"; @@ -1015,195 +1043,192 @@ $a->strings["Please enable expert mode (in Setting $a->strings["Miscellaneous Settings"] = "Sonstige Einstellungen"; $a->strings["Personal menu to display in your channel pages"] = "Eigenes Menü zur Anzeige auf den Seiten deines Kanals"; $a->strings["Remove this channel"] = "Diesen Kanal löschen"; -$a->strings["Permission Denied."] = "Zugriff verweigert."; -$a->strings["File not found."] = "Datei nicht gefunden."; -$a->strings["Edit file permissions"] = "Dateiberechtigungen bearbeiten"; -$a->strings["Set/edit permissions"] = "Berechtigungen setzen/ändern"; -$a->strings["Include all files and sub folders"] = "Alle Dateien und Unterverzeichnisse einbinden"; -$a->strings["Return to file list"] = "Zurück zur Dateiliste"; -$a->strings["Copy/paste this code to attach file to a post"] = "Diesen Code kopieren und einfügen, um die Datei an einen Beitrag anzuhängen"; -$a->strings["Copy/paste this URL to link file from a web page"] = "Diese URL verwenden, um von einer Webseite aus auf die Datei zu verlinken"; -$a->strings["Red Matrix - "The Network""] = "RedMatrix – "Das Netzwerk""; -$a->strings["Welcome to %s"] = "Willkommen auf %s"; +$a->strings["Poke/Prod"] = "Anstupsen/Knuffen"; +$a->strings["poke, prod or do other things to somebody"] = "Stupse Leute an oder mache anderes mit ihnen"; +$a->strings["Recipient"] = "Empfänger"; +$a->strings["Choose what you wish to do to recipient"] = "Wähle, was Du mit dem/r Empfänger/in tun willst"; +$a->strings["Make this post private"] = "Diesen Beitrag privat machen"; +$a->strings["Authorize application connection"] = "Zugriff für die Anwendung autorisieren"; +$a->strings["Return to your app and insert this Securty Code:"] = "Trage folgenden Sicherheitscode in der Anwendung ein:"; +$a->strings["Please login to continue."] = "Zum Weitermachen, bitte einloggen."; +$a->strings["Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?"] = "Möchtest Du dieser Anwendung erlauben, Deine Nachrichten und Kontakte abzurufen und/oder neue Nachrichten für Dich zu erstellen?"; +$a->strings["Remote authentication blocked. You are logged into this site locally. Please logout and retry."] = "Fern-Authentifizierung blockiert. Du bist lokal auf diesem Server angemeldet. Bitte melde Dich ab und versuche es erneut."; +$a->strings["Welcome %s. Remote authentication successful."] = "Willkommen %s. Entfernte Authentifizierung erfolgreich."; +$a->strings["Item not available."] = "Element nicht verfügbar."; $a->strings["Fetching URL returns error: %1\$s"] = "Abrufen der URL gab einen Fehler zurück: %1\$s"; -$a->strings["[Embedded content - reload page to view]"] = "[Eingebettete Inhalte – lade die Seite neu, um sie anzuzeigen]"; -$a->strings["Add a Channel"] = "Kanal hinzufügen"; -$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."] = "Ein Kanal ist Deine eigene Sammlung von verbundenen Webseiten. Ein Kanal kann genutzt werden, um ein Social-Network-Profil, ein Blog, eine Gesprächsgruppe oder ein Forum, Promi-Seiten und vieles mehr zu erstellen. Du kannst so viele Kanäle erstellen, wie es der Betreiber Deiner Seite zulässt."; -$a->strings["Channel Name"] = "Name des Kanals"; -$a->strings["Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\" "] = "Beispiele: „Horst Weidinger“, „Lisa und ihr Meerschweinchen“, „Fußball“, „Segelflieger-Forum“ "; -$a->strings["Choose a short nickname"] = "Wähle einen kurzen Spitznamen"; -$a->strings["Your nickname will be used to create an easily remembered channel address (like an email address) which you can share with others."] = "Dein Spitzname wird verwendet, um eine leicht zu merkende Kanal-Adresse (ähnlich einer E-Mail-Adresse) zu erzeugen, die Du mit anderen austauschen kannst."; -$a->strings["Or import an existing channel from another location"] = "Oder importiere einen bestehenden Kanal von einem anderen Server"; -$a->strings["Channel Type"] = "Kanaltyp"; -$a->strings["Please choose a channel type (such as social networking or community forum) and privacy requirements so we can select the best permissions for you"] = "Wähle einen Kanaltyp (wie Soziales Netzwerk oder Forum) und Privatsphäre-Vorgaben, so dass wir die passenden Kanal-Zugriffsrechte für Dich setzen können"; -$a->strings["We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID."] = "Wir haben ein Problem mit der OpenID festgestellt, mit der Du Dich anmelden wolltest. Bitte überprüfe sie noch einmal."; -$a->strings["The error message was:"] = "Die Fehlermeldung war:"; -$a->strings["Authentication failed."] = "Authentifizierung fehlgeschlagen."; -$a->strings["Remote Authentication"] = "Entfernte Authentifizierung"; -$a->strings["Enter your channel address (e.g. channel@example.com)"] = "Deine Kanal-Adresse (z. B. channel@example.com)"; -$a->strings["Authenticate"] = "Authentifizieren"; -$a->strings["Theme settings updated."] = "Theme-Einstellungen aktualisiert."; -$a->strings["Site"] = "Seite"; -$a->strings["Accounts"] = "Konten"; -$a->strings["Channels"] = "Kanäle"; -$a->strings["Plugins"] = "Plug-Ins"; -$a->strings["Themes"] = "Themes"; -$a->strings["Server"] = "Server"; -$a->strings["Profile Config"] = "Profilkonfiguration"; -$a->strings["DB updates"] = "DB-Aktualisierungen"; -$a->strings["Logs"] = "Protokolle"; -$a->strings["Plugin Features"] = "Plug-In Funktionen"; -$a->strings["User registrations waiting for confirmation"] = "Nutzer-Anmeldungen, die auf Bestätigung warten"; -$a->strings["Message queues"] = "Nachrichten-Warteschlangen"; -$a->strings["Administration"] = "Administration"; -$a->strings["Summary"] = "Zusammenfassung"; -$a->strings["Registered users"] = "Registrierte Benutzer"; -$a->strings["Pending registrations"] = "Ausstehende Registrierungen"; -$a->strings["Version"] = "Version"; -$a->strings["Active plugins"] = "Aktive Plug-Ins"; -$a->strings["Site settings updated."] = "Site-Einstellungen aktualisiert."; -$a->strings["No special theme for accessibility"] = "Kein spezielles Accessibility-Theme vorhanden"; -$a->strings["Yes - with approval"] = "Ja - mit Zustimmung"; -$a->strings["My site is not a public server"] = "Meine Server ist kein öffentlicher Server"; -$a->strings["My site has paid access only"] = "Mein Server erlaubt nur bezahlten Zugang"; -$a->strings["My site has free access only"] = "Mein Server erlaubt ausschließlich freien Zugang"; -$a->strings["My site offers free accounts with optional paid upgrades"] = "Mein Server bietet kostenlose Konten mit der Möglichkeit zu bezahlten Upgrades"; -$a->strings["Registration"] = "Registrierung"; -$a->strings["File upload"] = "Dateiupload"; -$a->strings["Policies"] = "Richtlinien"; -$a->strings["Site name"] = "Seitenname"; -$a->strings["Banner/Logo"] = "Banner/Logo"; -$a->strings["Administrator Information"] = "Administrator-Informationen"; -$a->strings["Contact information for site administrators. Displayed on siteinfo page. BBCode can be used here"] = "Kontaktinformationen für Administratoren des Servers. Wird auf der siteinfo-Seite angezeigt. BBCode kann verwendet werden."; -$a->strings["System language"] = "System-Sprache"; -$a->strings["System theme"] = "System-Theme"; -$a->strings["Default system theme - may be over-ridden by user profiles - change theme settings"] = "Standard-System-Theme – kann durch Nutzerprofile überschieben werden – Theme-Einstellungen ändern"; -$a->strings["Mobile system theme"] = "Mobile System-Theme:"; -$a->strings["Theme for mobile devices"] = "Theme für mobile Geräte"; -$a->strings["Accessibility system theme"] = "Accessibility-System-Theme"; -$a->strings["Accessibility theme"] = "Accessibility-Theme"; -$a->strings["Enable Diaspora Protocol"] = "Diaspora-Protokoll aktivieren"; -$a->strings["Communicate with Diaspora and Friendica - experimental"] = "Kommunikation mit Diaspora und Friendica – experimentell"; -$a->strings["Allow Feeds as Connections"] = "Feeds als Verbindungen erlauben"; -$a->strings["(Heavy system resource usage)"] = "(führt zu hoher Systemlast)"; -$a->strings["Maximum image size"] = "Maximale Bildgröße"; -$a->strings["Maximum size in bytes of uploaded images. Default is 0, which means no limits."] = "Maximale Größe hochgeladener Bilder in Bytes. Standard ist 0 (keine Einschränkung)."; -$a->strings["Does this site allow new member registration?"] = "Erlaubt dieser Server die Registrierung neuer Nutzer?"; -$a->strings["Which best describes the types of account offered by this hub?"] = "Was ist die passendste Beschreibung der Konten auf diesem Hub?"; -$a->strings["Register text"] = "Registrierungstext"; -$a->strings["Will be displayed prominently on the registration page."] = "Wird gut sichtbar auf der Registrierungs-Seite angezeigt."; -$a->strings["Accounts abandoned after x days"] = "Konten gelten nach X Tagen als unbenutzt"; -$a->strings["Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit."] = "Verschwende keine Systemressourcen auf das Pollen von externen Seiten, wenn das Konto nicht mehr benutzt wird. Trage hier 0 für kein zeitliches Limit."; -$a->strings["Allowed friend domains"] = "Erlaubte Domains für Kontakte"; -$a->strings["Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains"] = "Liste der Domains, die für Freundschaften erlaubt sind, durch Kommas getrennt. Platzhalter werden akzeptiert. Leer lassen, um alle Domains zu erlauben."; -$a->strings["Allowed email domains"] = "Erlaubte Domains für E-Mails"; -$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"] = "Liste der Domains, die für E-Mail-Adressen bei der Registrierung erlaubt sind, durch Kommas getrennt. Platzhalter werden akzeptiert. Leer lassen, um alle Domains zu erlauben."; -$a->strings["Block public"] = "Öffentlichen Zugriff blockieren"; -$a->strings["Check to block public access to all otherwise public personal pages on this site unless you are currently logged in."] = "Zugriff auf sonst öffentliche persönliche Seiten blockieren, wenn man nicht eingeloggt ist."; -$a->strings["Verify Email Addresses"] = "E-Mail-Adressen überprüfen"; -$a->strings["Check to verify email addresses used in account registration (recommended)."] = "Aktivieren, um die Überprüfung von E-Mail-Adressen bei der Registrierung von Benutzerkonten zu aktivieren (empfohlen)."; -$a->strings["Force publish"] = "Veröffentlichung erzwingen"; -$a->strings["Check to force all profiles on this site to be listed in the site directory."] = "Die Veröffentlichung aller Profile dieses Servers im Verzeichnis erzwingen."; -$a->strings["Disable discovery tab"] = "Den „Entdecken“-Reiter ausblenden"; -$a->strings["Remove the tab in the network view with public content pulled from sources chosen for this site."] = "Entferne den „Entdecken“-Reiter aus der Matrix-Seite, in dem öffentliche Inhalte von anderen RedMatrix-Hubs angezeigt werden können."; -$a->strings["No login on Homepage"] = "Kein Login auf der 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)."] = "Aktivieren, um das Login-Formular auf der Startseite der Seite zu verbergen (z.B. weil es das Layout der Homepage des Seiten-Kanals stört)."; -$a->strings["Proxy user"] = "Proxy Benutzer"; -$a->strings["Proxy URL"] = "Proxy URL"; -$a->strings["Network timeout"] = "Netzwerk-Timeout"; -$a->strings["Value is in seconds. Set to 0 for unlimited (not recommended)."] = "Wert in Sekunden. 0 für unbegrenzt (nicht empfohlen)."; -$a->strings["Delivery interval"] = "Auslieferung Intervall"; -$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."] = "Verzögere im Hintergrund laufende Auslieferungsprozesse um die angegebene Anzahl Sekunden, um die Systemlast zu verringern. Empfehlungen: 4-5 für Shared Hosts, 2-3 für VPS, 0-1 für große dedizierte Server."; -$a->strings["Poll interval"] = "Abfrageintervall"; -$a->strings["Delay background polling processes by this many seconds to reduce system load. If 0, use delivery interval."] = "Verzögere Hintergrundprozesse um diese Anzahl Sekunden, um die Systemlast zu reduzieren. Bei 0 wird das Auslieferungsintervall verwendet."; -$a->strings["Maximum Load Average"] = "Maximales Load Average"; -$a->strings["Maximum system load before delivery and poll processes are deferred - default 50."] = "Maximale Systemlast, bevor Verteil- und Empfangsprozesse verschoben werden – Standard 50"; -$a->strings["No server found"] = "Kein Server gefunden"; -$a->strings["ID"] = "ID"; -$a->strings["for channel"] = "für Kanal"; -$a->strings["on server"] = "auf Server"; -$a->strings["Status"] = "Status"; -$a->strings["Update has been marked successful"] = "Update wurde als erfolgreich markiert"; -$a->strings["Executing %s failed. Check system logs."] = "Ausführen von %s fehlgeschlagen. Überprüfe die Systemprotokolle."; -$a->strings["Update %s was successfully applied."] = "Update %s wurde erfolgreich ausgeführt."; -$a->strings["Update %s did not return a status. Unknown if it succeeded."] = "Update %s lieferte keinen Rückgabewert. Erfolg unbekannt."; -$a->strings["Update function %s could not be found."] = "Update-Funktion %s konnte nicht gefunden werden."; -$a->strings["No failed updates."] = "Keine fehlgeschlagenen Aktualisierungen."; -$a->strings["Failed Updates"] = "Fehlgeschlagene Aktualisierungen"; -$a->strings["Mark success (if update was manually applied)"] = "Als erfolgreich markieren (wenn das Update manuell ausgeführt wurde)"; -$a->strings["Attempt to execute this update step automatically"] = "Versuche, diesen Updateschritt automatisch auszuführen"; -$a->strings["%s user blocked/unblocked"] = array( - 0 => "%s Nutzer blockiert/freigegeben", - 1 => "%s Nutzer blockiert/freigegeben", -); -$a->strings["%s user deleted"] = array( - 0 => "%s Nutzer gelöscht", - 1 => "%s Nutzer gelöscht", -); -$a->strings["Account not found"] = "Konto nicht gefunden"; -$a->strings["User '%s' unblocked"] = "Benutzer '%s' freigegeben"; -$a->strings["User '%s' blocked"] = "Benutzer '%s' blockiert"; -$a->strings["Users"] = "Benutzer"; -$a->strings["select all"] = "Alle auswählen"; -$a->strings["User registrations waiting for confirm"] = "Neuanmeldungen, die auf Deine Bestätigung warten"; -$a->strings["Request date"] = "Antragsdatum"; -$a->strings["No registrations."] = "Keine Registrierungen."; -$a->strings["Approve"] = "Genehmigen"; -$a->strings["Deny"] = "Verweigern"; -$a->strings["Block"] = "Blockieren"; -$a->strings["Unblock"] = "Freigeben"; -$a->strings["Register date"] = "Registrierungs-Datum"; -$a->strings["Last login"] = "Letzte Anmeldung"; -$a->strings["Expires"] = "Verfällt"; -$a->strings["Service Class"] = "Service-Klasse"; -$a->strings["Selected users will be deleted!\\n\\nEverything these users had posted on this site will be permanently deleted!\\n\\nAre you sure?"] = "Die markierten Nutzer werden gelöscht!\\n\\nAlles, was diese Nutzer auf dieser Seite veröffentlicht haben, wird endgültig gelöscht!\\n\\nBist Du sicher?"; -$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?"] = "Der Nutzer {0} wird gelöscht!\\n\\nAlles, was dieser Nutzer auf dieser Seite veröffentlicht hat, wird endgültig gelöscht werden!\\n\\nBist Du sicher?"; -$a->strings["%s channel censored/uncensored"] = array( - 0 => "%s Kanal gesperrt/freigegeben", - 1 => "%s Kanäle gesperrt/freigegeben", -); -$a->strings["%s channel deleted"] = array( - 0 => "%s Kanal gelöscht", - 1 => "%s Kanäle gelöscht", -); -$a->strings["Channel not found"] = "Kanal nicht gefunden"; -$a->strings["Channel '%s' deleted"] = "Kanal '%s' gelöscht"; -$a->strings["Channel '%s' uncensored"] = "Kanal '%s' freigegeben"; -$a->strings["Channel '%s' censored"] = "Kanal '%s' gesperrt"; -$a->strings["Censor"] = "Sperren"; -$a->strings["Uncensor"] = "Freigeben"; -$a->strings["UID"] = "UID"; +$a->strings["Invalid item."] = "Ungültiges Element."; +$a->strings["Channel not found."] = "Kanal nicht gefunden."; +$a->strings["Page not found."] = "Seite nicht gefunden."; +$a->strings["Version %s"] = "Version %s"; +$a->strings["Installed plugins/addons/apps:"] = "Installierte Plugins/Addons/Apps"; +$a->strings["No installed plugins/addons/apps"] = "Keine installierten Plugins/Addons/Apps"; +$a->strings["Red"] = "Red"; +$a->strings["This is a hub of the Red Matrix - a global cooperative network of decentralized privacy enhanced websites."] = "Dieser Hub ist Teil der RedMatrix – eines globalen, kooperativen Netzwerks aus dezentralen Websites, die Rücksicht auf Deine Privatsphäre nehmen."; +$a->strings["Running at web location"] = "Erreichbar unter der Web-Adresse"; +$a->strings["Please visit GetZot.com to learn more about the Red Matrix."] = "Besuche GetZot.com, um mehr über die Red-Matrix zu erfahren."; +$a->strings["Bug reports and issues: please visit"] = "Probleme oder Fehler gefunden? Bitte besuche"; +$a->strings["Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot com"] = "Vorschläge, Lob, usw.: E-Mail an 'redmatrix' at librelist - dot - com"; +$a->strings["Site Administrators"] = "Administratoren"; +$a->strings["Block Name"] = "Block-Name"; +$a->strings["Profile not found."] = "Profil nicht gefunden."; +$a->strings["Profile deleted."] = "Profil gelöscht."; +$a->strings["Profile-"] = "Profil-"; +$a->strings["New profile created."] = "Neues Profil erstellt."; +$a->strings["Profile unavailable to clone."] = "Profil kann nicht geklont werden."; +$a->strings["Profile unavailable to export."] = "Dieses Profil kann nicht exportiert werden."; +$a->strings["Profile Name is required."] = "Profil-Name erforderlich."; +$a->strings["Marital Status"] = "Familienstand"; +$a->strings["Romantic Partner"] = "Romantische Partner"; +$a->strings["Likes"] = "Gefällt"; +$a->strings["Dislikes"] = "Gefällt nicht"; +$a->strings["Work/Employment"] = "Arbeit/Anstellung"; +$a->strings["Religion"] = "Religion"; +$a->strings["Political Views"] = "Politische Ansichten"; +$a->strings["Gender"] = "Geschlecht"; +$a->strings["Sexual Preference"] = "Sexuelle Orientierung"; +$a->strings["Homepage"] = "Webseite"; +$a->strings["Interests"] = "Hobbys/Interessen"; $a->strings["Address"] = "Adresse"; -$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?"] = "Alle ausgewählten Kanäle werden gelöscht!\\n\\nAlles was von diesen Kanälen auf diesem Server geschrieben wurde, wird dauerhaft gelöscht!\\n\\nBist Du sicher?"; -$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?"] = "Der Kanal {0} wird gelöscht!\\n\\nAlles was von diesem Kanal auf diesem Server geschrieben wurde, wird gelöscht!\\n\\nBist Du sicher?"; -$a->strings["Plugin %s disabled."] = "Plug-In %s deaktiviert."; -$a->strings["Plugin %s enabled."] = "Plug-In %s aktiviert."; -$a->strings["Disable"] = "Deaktivieren"; -$a->strings["Enable"] = "Aktivieren"; -$a->strings["Toggle"] = "Umschalten"; -$a->strings["Author: "] = "Autor: "; -$a->strings["Maintainer: "] = "Betreuer:"; -$a->strings["No themes found."] = "Keine Theme gefunden."; -$a->strings["Screenshot"] = "Bildschirmfoto"; -$a->strings["[Experimental]"] = "[Experimentell]"; -$a->strings["[Unsupported]"] = "[Nicht unterstützt]"; -$a->strings["Log settings updated."] = "Protokoll-Einstellungen aktualisiert."; -$a->strings["Clear"] = "Leeren"; -$a->strings["Debugging"] = "Debugging"; -$a->strings["Log file"] = "Protokolldatei"; -$a->strings["Must be writable by web server. Relative to your Red top-level directory."] = "Muss für den Web-Server schreibbar sein. Relativ zum Red-Stammverzeichnis."; -$a->strings["Log level"] = "Protokollstufe"; -$a->strings["New Profile Field"] = "Neues Profilfeld"; -$a->strings["Field nickname"] = "Kurzname für das Feld"; -$a->strings["System name of field"] = "Systemname des Feldes"; -$a->strings["Input type"] = "Art des Inhalts"; -$a->strings["Field Name"] = "Feldname"; -$a->strings["Label on profile pages"] = "Bezeichnung auf Profilseiten"; -$a->strings["Help text"] = "Hilfetext"; -$a->strings["Additional info (optional)"] = "Zusätzliche Informationen (optional)"; -$a->strings["Field definition not found"] = "Feld-Definition nicht gefunden"; -$a->strings["Edit Profile Field"] = "Profilfeld bearbeiten"; -$a->strings["- select -"] = "– auswählen –"; +$a->strings["Location"] = "Ort"; +$a->strings["Profile updated."] = "Profil aktualisiert."; +$a->strings["Hide your contact/friend list from viewers of this profile?"] = "Deine Kontaktliste vor Betrachtern dieses Profils verbergen?"; +$a->strings["Edit Profile Details"] = "Bearbeite Profil-Details"; +$a->strings["View this profile"] = "Dieses Profil ansehen"; +$a->strings["Change Profile Photo"] = "Profilfoto ändern"; +$a->strings["Create a new profile using these settings"] = "Neues Profil anlegen und diese Einstellungen übernehmen"; +$a->strings["Clone this profile"] = "Dieses Profil klonen"; +$a->strings["Delete this profile"] = "Dieses Profil löschen"; +$a->strings["Import profile from file"] = "Profil aus einer Datei importieren"; +$a->strings["Export profile to file"] = "Profil in eine Datei exportieren"; +$a->strings["Profile Name:"] = "Profilname:"; +$a->strings["Your Full Name:"] = "Dein voller Name:"; +$a->strings["Title/Description:"] = "Titel/Stellenbeschreibung:"; +$a->strings["Your Gender:"] = "Dein Geschlecht:"; +$a->strings["Birthday :"] = "Geburtstag:"; +$a->strings["Street Address:"] = "Straße und Hausnummer:"; +$a->strings["Locality/City:"] = "Wohnort:"; +$a->strings["Postal/Zip Code:"] = "Postleitzahl:"; +$a->strings["Country:"] = "Land:"; +$a->strings["Region/State:"] = "Region/Bundesstaat:"; +$a->strings["♥ Marital Status:"] = "♥ Beziehungsstatus:"; +$a->strings["Who: (if applicable)"] = "Wer: (falls anwendbar)"; +$a->strings["Examples: cathy123, Cathy Williams, cathy@example.com"] = "Beispiele: cathy123, Cathy Williams, cathy@example.com"; +$a->strings["Since [date]:"] = "Seit [Datum]:"; +$a->strings["Homepage URL:"] = "Homepage URL:"; +$a->strings["Religious Views:"] = "Religiöse Ansichten:"; +$a->strings["Keywords:"] = "Schlüsselwörter:"; +$a->strings["Example: fishing photography software"] = "Beispiel: Angeln Fotografie Software"; +$a->strings["Used in directory listings"] = "Wird in Verzeichnis-Auflistungen verwendet"; +$a->strings["Tell us about yourself..."] = "Erzähle uns ein wenig von Dir …"; +$a->strings["Hobbies/Interests"] = "Hobbys/Interessen"; +$a->strings["Contact information and Social Networks"] = "Kontaktinformation und soziale Netzwerke"; +$a->strings["My other channels"] = "Meine anderen Kanäle"; +$a->strings["Musical interests"] = "Musikalische Interessen"; +$a->strings["Books, literature"] = "Bücher, Literatur"; +$a->strings["Television"] = "Fernsehen"; +$a->strings["Film/dance/culture/entertainment"] = "Film/Tanz/Kultur/Unterhaltung"; +$a->strings["Love/romance"] = "Liebe/Romantik"; +$a->strings["Work/employment"] = "Arbeit/Anstellung"; +$a->strings["School/education"] = "Schule/Ausbildung"; +$a->strings["This is your default profile."] = "Das ist Dein Standardprofil"; +$a->strings["Age: "] = "Alter:"; +$a->strings["Edit/Manage Profiles"] = "Profile bearbeiten/verwalten"; +$a->strings["Add profile things"] = "Sachen zum Profil hinzufügen"; +$a->strings["Include desirable objects in your profile"] = "Binde begehrenswerte Dinge in Dein Profil ein"; +$a->strings["Invalid profile identifier."] = "Ungültiger Profil-Identifikator"; +$a->strings["Profile Visibility Editor"] = "Profil-Sichtbarkeits-Editor"; +$a->strings["Click on a contact to add or remove."] = "Klicke auf einen Kontakt, um ihn hinzuzufügen oder zu entfernen."; +$a->strings["Visible To"] = "Sichtbar für"; +$a->strings["All Connections"] = "Alle Verbindungen"; +$a->strings["Event can not end before it has started."] = "Termin-Ende liegt vor dem Beginn."; +$a->strings["Event title and start time are required."] = "Veranstaltungs- Titel und Startzeit sind erforderlich."; +$a->strings["Event not found."] = "Termin nicht gefunden."; +$a->strings["l, F j"] = "l, j. F"; +$a->strings["Edit event"] = "Veranstaltung bearbeiten"; +$a->strings["Create New Event"] = "Neue Veranstaltung erstellen"; +$a->strings["Event details"] = "Veranstaltungs-Details"; +$a->strings["Starting date and Title are required."] = "Startdatum und Titel sind erforderlich."; +$a->strings["Event Starts:"] = "Veranstaltung startet:"; +$a->strings["Required"] = "Benötigt"; +$a->strings["Finish date/time is not known or not relevant"] = "Ende Datum/Zeit sind unbekannt oder unwichtig"; +$a->strings["Event Finishes:"] = "Veranstaltung endet:"; +$a->strings["Adjust for viewer timezone"] = "An die Zeitzone des Betrachters anpassen"; +$a->strings["Description:"] = "Beschreibung:"; +$a->strings["Title:"] = "Titel:"; +$a->strings["Share this event"] = "Die Veranstaltung teilen"; +$a->strings["Public Sites"] = "Öffentliche Server"; +$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."] = "Die hier aufgeführten Server erlauben Dir, einen Account in der Red-Matrix anzulegen. Alle Server der Matrix sind miteinander verbunden, so dass die Mitgliedschaft auf einem Server eine Verbindung zu beliebigen anderen Servern der Matrix ermöglicht. Es könnte sein, dass einige dieser Server kostenpflichtig sind oder abgestufte, je nach Umfang kostenpflichtige Mitgliedschaften anbieten. Auf den jeweiligen Seiten könnten nähere Details dazu stehen."; +$a->strings["Site URL"] = "Server-URL"; +$a->strings["Access Type"] = "Zugangstyp"; +$a->strings["Registration Policy"] = "Registrierungsrichtlinien"; +$a->strings["You must be logged in to see this page."] = "Du musst angemeldet sein, um diese Seite betrachten zu können."; +$a->strings["Insufficient permissions. Request redirected to profile page."] = "Unzureichende Zugriffsrechte. Die Anfrage wurde zur Profil-Seite umgeleitet."; +$a->strings["Select a bookmark folder"] = "Lesezeichenordner wählen"; +$a->strings["Save Bookmark"] = "Lesezeichen speichern"; +$a->strings["URL of bookmark"] = "URL des Lesezeichens"; +$a->strings["Description"] = "Beschreibung"; +$a->strings["Or enter new bookmark folder name"] = "Oder gib einen neuen Namen für den Lesezeichenordner ein"; +$a->strings["Room not found"] = "Chatraum nicht gefunden"; +$a->strings["Leave Room"] = "Raum verlassen"; +$a->strings["Delete This Room"] = "Diesen Raum löschen"; +$a->strings["I am away right now"] = "Ich bin gerade nicht da"; +$a->strings["I am online"] = "Ich bin online"; +$a->strings["Bookmark this room"] = "Lesezeichen für diesen Raum setzen"; +$a->strings["New Chatroom"] = "Neuer Chatraum"; +$a->strings["Chatroom Name"] = "Name des Chatraums"; +$a->strings["%1\$s's Chatrooms"] = "%1\$ss Chaträume"; +$a->strings["Maximum daily site registrations exceeded. Please try again tomorrow."] = "Maximale Anzahl täglicher Neuanmeldungen erreicht. Bitte versuche es morgen noch einmal."; +$a->strings["Please indicate acceptance of the Terms of Service. Registration failed."] = "Bitte stimme den Nutzungsbedingungen zu. Registrierung fehlgeschlagen."; +$a->strings["Passwords do not match."] = "Passwörter stimmen nicht überein."; +$a->strings["Registration successful. Please check your email for validation instructions."] = "Registrierung erfolgreich. Eine E-Mail mit weiteren Anweisungen wurde an Dich gesendet."; +$a->strings["Your registration is pending approval by the site owner."] = "Deine Registrierung muss noch vom Betreiber der Seite freigegeben werden."; +$a->strings["Your registration can not be processed."] = "Deine Registrierung konnte nicht verarbeitet werden."; +$a->strings["Registration on this site/hub is by approval only."] = "Anmeldungen auf diesem Server erfordern Zustimmung durch den Administrator"; +$a->strings["Register at another affiliated site/hub"] = "Registrierung auf einem anderen, angeschlossenen Server"; +$a->strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = "Die maximale Anzahl täglicher Registrierungen auf diesem Server wurde überschritten. Bitte versuche es morgen noch einmal."; +$a->strings["Terms of Service"] = "Nutzungsbedingungen"; +$a->strings["I accept the %s for this website"] = "Ich akzeptiere die %s für diese Webseite"; +$a->strings["I am over 13 years of age and accept the %s for this website"] = "Ich bin älter als 13 Jahre und akzeptiere die %s dieser Webseite"; +$a->strings["Registration"] = "Registrierung"; +$a->strings["Membership on this site is by invitation only."] = "Mitgliedschaft auf dieser Seite ist nur nach vorheriger Einladung möglich."; +$a->strings["Please enter your invitation code"] = "Bitte trage Deinen Einladungs-Code ein"; +$a->strings["Your email address"] = "Ihre E-Mail Adresse"; +$a->strings["Choose a password"] = "Passwort"; +$a->strings["Please re-enter your password"] = "Bitte gib Dein Passwort noch einmal ein"; +$a->strings["Away"] = "Abwesend"; +$a->strings["Online"] = "Online"; +$a->strings["Please login."] = "Bitte melde dich an."; +$a->strings["Channel removals are not allowed within 48 hours of changing the account password."] = "Innerhalb von 48 Stunden nach einer Änderung des Passworts können keine Kanäle gelöscht werden."; +$a->strings["Remove This Channel"] = "Diesen Kanal löschen"; +$a->strings["This will completely remove this channel from the network. Once this has been done it is not recoverable."] = "Hiermit wird dieser Kanal komplett aus dem Netzwerk gelöscht. Einmal eingeleitet kann dieser Prozess nicht rückgängig gemacht werden."; +$a->strings["Please enter your password for verification:"] = "Bitte gib zur Bestätigung Dein Passwort ein:"; +$a->strings["Remove this channel and all its clones from the network"] = "Lösche diesen Kanal und all seine Klone aus dem Netzwerk"; +$a->strings["By default only the instance of the channel located on this hub will be removed from the network"] = "Standardmäßig wird der Kanal nur auf diesem Server gelöscht, seine Klone verbleiben im Netzwerk"; +$a->strings["Remove Channel"] = "Kanal löschen"; +$a->strings["No channel."] = "Kein Kanal."; +$a->strings["Common connections"] = "Gemeinsame Verbindungen"; +$a->strings["No connections in common."] = "Keine gemeinsamen Verbindungen."; +$a->strings["We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID."] = "Wir haben ein Problem mit der OpenID festgestellt, mit der Du Dich anmelden wolltest. Bitte überprüfe sie noch einmal."; +$a->strings["The error message was:"] = "Die Fehlermeldung war:"; +$a->strings["Authentication failed."] = "Authentifizierung fehlgeschlagen."; +$a->strings["Remote Authentication"] = "Entfernte Authentifizierung"; +$a->strings["Enter your channel address (e.g. channel@example.com)"] = "Deine Kanal-Adresse (z. B. channel@example.com)"; +$a->strings["Authenticate"] = "Authentifizieren"; +$a->strings["Continue"] = "Fortfahren"; +$a->strings["Premium Channel Setup"] = "Premium-Kanal-Einrichtung"; +$a->strings["Enable premium channel connection restrictions"] = "Einschränkungen für einen Premium-Kanal aktivieren"; +$a->strings["Please enter your restrictions or conditions, such as paypal receipt, usage guidelines, etc."] = "Bitte gib Deine Nutzungsbedingungen ein, z.B. Paypal-Quittung, Richtlinien etc."; +$a->strings["This channel may require additional steps or acknowledgement of the following conditions prior to connecting:"] = "Unter Umständen sind weitere Schritte oder die Bestätigung der folgenden Bedingungen vor dem Verbinden mit diesem Kanal nötig."; +$a->strings["Potential connections will then see the following text before proceeding:"] = "Potentielle Kontakte werden den folgenden Text sehen, bevor fortgefahren wird:"; +$a->strings["By continuing, I certify that I have complied with any instructions provided on this page."] = "Indem ich fortfahre, bestätige ich die Erfüllung aller Anweisungen aus dieser Seite."; +$a->strings["(No specific instructions have been provided by the channel owner.)"] = "(Der Kanal-Besitzer hat keine speziellen Anweisungen hinterlegt.)"; +$a->strings["Restricted or Premium Channel"] = "Eingeschränkter oder Premium-Kanal"; +$a->strings["No such group"] = "Sammlung nicht gefunden"; +$a->strings["Search Results For:"] = "Suchergebnisse für:"; +$a->strings["Collection is empty"] = "Sammlung ist leer"; +$a->strings["Collection: "] = "Sammlung:"; +$a->strings["Connection: "] = "Verbindung:"; +$a->strings["Invalid connection."] = "Ungültige Verbindung."; $a->strings["Could not access contact record."] = "Konnte nicht auf den Kontakteintrag zugreifen."; $a->strings["Could not locate selected profile."] = "Gewähltes Profil nicht gefunden."; $a->strings["Connection updated."] = "Verbindung aktualisiert."; @@ -1216,7 +1241,6 @@ $a->strings["All"] = "Alle"; $a->strings["Suggest new connections"] = "Neue Verbindungen vorschlagen"; $a->strings["New Connections"] = "Neue Verbindungen"; $a->strings["Show pending (new) connections"] = "Zeige ausstehende (neue) Verbindungsanfragen"; -$a->strings["All Connections"] = "Alle Verbindungen"; $a->strings["Show all connections"] = "Zeige alle Verbindungen"; $a->strings["Unblocked"] = "Freigegeben"; $a->strings["Only show unblocked connections"] = "Zeige nur freigegebene Verbindungen"; @@ -1228,141 +1252,7 @@ $a->strings["%1\$s [%2\$s]"] = "%1\$s [%2\$s]"; $a->strings["Edit connection"] = "Verbindung bearbeiten"; $a->strings["Search your connections"] = "Verbindungen durchsuchen"; $a->strings["Finding: "] = "Ergebnisse:"; -$a->strings["Public access denied."] = "Öffentlicher Zugang verweigert."; -$a->strings["Age: "] = "Alter:"; -$a->strings["Gender: "] = "Geschlecht:"; -$a->strings["Status: "] = "Status:"; -$a->strings["Sexual Preference: "] = "Sexuelle Ausrichtung:"; -$a->strings["Homepage: "] = "Webseite:"; -$a->strings["Hometown: "] = "Wohnort:"; -$a->strings["About: "] = "Über:"; -$a->strings["Keywords: "] = "Schlüsselwörter:"; -$a->strings["Not found."] = "Nicht gefunden."; -$a->strings["Page owner information could not be retrieved."] = "Informationen über den Besitzer der Seite konnten nicht gefunden werden."; -$a->strings["Album not found."] = "Album nicht gefunden."; -$a->strings["Delete Album"] = "Album löschen"; -$a->strings["Delete Photo"] = "Foto löschen"; -$a->strings["No photos selected"] = "Keine Fotos ausgewählt"; -$a->strings["Access to this item is restricted."] = "Der Zugriff auf dieses Foto ist eingeschränkt."; -$a->strings["You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage."] = "Du benutzt %1$.2f MBytes Deines %2$.2f MBytes großen Bilder-Speichers."; -$a->strings["You have used %1$.2f Mbytes of photo storage."] = "Du verwendest %1$.2f MBytes Deines Foto-Speichers."; -$a->strings["Upload Photos"] = "Fotos hochladen"; -$a->strings["New album name: "] = "Name des neuen Albums:"; -$a->strings["or existing album name: "] = "Oder bestehender Album-Name:"; -$a->strings["Do not show a status post for this upload"] = "Keine Statusnachricht für diesen Upload senden"; -$a->strings["Album name could not be decoded"] = "Albumname konnte nicht dekodiert werden"; -$a->strings["Contact Photos"] = "Kontakt-Bilder"; -$a->strings["Edit Album"] = "Album bearbeiten"; -$a->strings["Show Newest First"] = "Zeige Neueste zuerst"; -$a->strings["Show Oldest First"] = "Zeige Älteste zuerst"; -$a->strings["View Photo"] = "Foto ansehen"; -$a->strings["Permission denied. Access to this item may be restricted."] = "Berechtigung verweigert. Der Zugriff ist wahrscheinlich eingeschränkt worden."; -$a->strings["Photo not available"] = "Foto nicht verfügbar"; -$a->strings["Use as profile photo"] = "Als Profilfoto verwenden"; -$a->strings["View Full Size"] = "In voller Größe anzeigen"; -$a->strings["Remove"] = "Entferne"; -$a->strings["Edit photo"] = "Foto bearbeiten"; -$a->strings["Rotate CW (right)"] = "Drehen im UZS (rechts)"; -$a->strings["Rotate CCW (left)"] = "Drehen gegen UZS (links)"; -$a->strings["New album name"] = "Name des neuen Albums:"; -$a->strings["Caption"] = "Bildunterschrift"; -$a->strings["Add a Tag"] = "Schlagwort hinzufügen"; -$a->strings["Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"] = "Beispiel: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"; -$a->strings["In This Photo:"] = "Auf diesem Foto:"; -$a->strings["View Album"] = "Album ansehen"; -$a->strings["Recent Photos"] = "Neueste Fotos"; -$a->strings["Menu not found."] = "Menü nicht gefunden"; -$a->strings["Menu element updated."] = "Menü-Element aktualisiert."; -$a->strings["Unable to update menu element."] = "Kann Menü-Element nicht aktualisieren."; -$a->strings["Menu element added."] = "Menü-Bestandteil hinzugefügt."; -$a->strings["Unable to add menu element."] = "Kann Menü-Bestandteil nicht hinzufügen."; -$a->strings["Manage Menu Elements"] = "Menü-Bestandteile verwalten"; -$a->strings["Edit menu"] = "Menü bearbeiten"; -$a->strings["Edit element"] = "Bestandteil bearbeiten"; -$a->strings["Drop element"] = "Bestandteil löschen"; -$a->strings["New element"] = "Neues Bestandteil"; -$a->strings["Edit this menu container"] = "Diesen Menü-Container bearbeiten"; -$a->strings["Add menu element"] = "Menüelement hinzufügen"; -$a->strings["Delete this menu item"] = "Lösche dieses Menü-Bestandteil"; -$a->strings["Edit this menu item"] = "Bearbeite dieses Menü-Bestandteil"; -$a->strings["New Menu Element"] = "Neues Menü-Bestandteil"; -$a->strings["Menu Item Permissions"] = "Zugriffsrechte des Menü-Elements"; -$a->strings["Link text"] = "Link Text"; -$a->strings["URL of link"] = "URL des Links"; -$a->strings["Use Red magic-auth if available"] = "Verwende Red Magic-Auth wenn verfügbar"; -$a->strings["Open link in new window"] = "Öffne Link in neuem Fenster"; -$a->strings["Order in list"] = "Reihenfolge in der Liste"; -$a->strings["Higher numbers will sink to bottom of listing"] = "Größere Nummern werden weiter unten in der Auflistung einsortiert"; -$a->strings["Menu item not found."] = "Menü-Bestandteil nicht gefunden."; -$a->strings["Menu item deleted."] = "Menü-Bestandteil gelöscht."; -$a->strings["Menu item could not be deleted."] = "Menü-Bestandteil kann nicht gelöscht werden."; -$a->strings["Edit Menu Element"] = "Bearbeite Menü-Bestandteil"; -$a->strings["Modify"] = "Ändern"; -$a->strings["%1\$s is following %2\$s's %3\$s"] = "%1\$s folgt nun %2\$ss %3\$s"; -$a->strings["Please login."] = "Bitte melde dich an."; -$a->strings["Set your current mood and tell your friends"] = "Wähle Deine aktuelle Stimmung und teile sie mit Deinen Freunden"; -$a->strings["webpage"] = "Webseite"; -$a->strings["block"] = "Block"; -$a->strings["layout"] = "Layout"; -$a->strings["%s element installed"] = "Element für %s installiert"; -$a->strings["Remote privacy information not available."] = "Privatsphäre-Einstellungen anderer Nutzer sind nicht verfügbar."; -$a->strings["Visible to:"] = "Sichtbar für:"; -$a->strings["Select a bookmark folder"] = "Lesezeichenordner wählen"; -$a->strings["Save Bookmark"] = "Lesezeichen speichern"; -$a->strings["URL of bookmark"] = "URL des Lesezeichens"; -$a->strings["Description"] = "Beschreibung"; -$a->strings["Or enter new bookmark folder name"] = "Oder gib einen neuen Namen für den Lesezeichenordner ein"; -$a->strings["Layout updated."] = "Layout aktualisiert."; -$a->strings["Edit System Page Description"] = "Systemseitenbeschreibung bearbeiten"; -$a->strings["Layout not found."] = "Layout nicht gefunden."; -$a->strings["Module Name:"] = "Modulname:"; -$a->strings["Layout Help"] = "Layout-Hilfe"; -$a->strings["Image uploaded but image cropping failed."] = "Bild hochgeladen, aber das Zurechtschneiden schlug fehl."; -$a->strings["Image resize failed."] = "Bild-Anpassung fehlgeschlagen."; -$a->strings["Shift-reload the page or clear browser cache if the new photo does not display immediately."] = "Leere den Browser Cache oder nutze Umschalten-Neu Laden, falls das neue Foto nicht sofort angezeigt wird."; -$a->strings["Image exceeds size limit of %d"] = "Bild ist größer als das Limit von %d"; -$a->strings["Unable to process image."] = "Kann Bild nicht verarbeiten."; -$a->strings["Photo not available."] = "Foto nicht verfügbar."; -$a->strings["Upload File:"] = "Datei hochladen:"; -$a->strings["Select a profile:"] = "Wähle ein Profil:"; -$a->strings["Upload Profile Photo"] = "Lade neues Profilfoto hoch"; -$a->strings["skip this step"] = "diesen Schritt überspringen"; -$a->strings["select a photo from your photo albums"] = "ein Foto aus meinen Fotoalben"; -$a->strings["Crop Image"] = "Bild zuschneiden"; -$a->strings["Please adjust the image cropping for optimum viewing."] = "Bitte schneide das Bild für eine optimale Anzeige passend zu."; -$a->strings["Done Editing"] = "Bearbeitung fertigstellen"; -$a->strings["Image uploaded successfully."] = "Bild erfolgreich hochgeladen."; -$a->strings["Image upload failed."] = "Hochladen des Bilds fehlgeschlagen."; -$a->strings["Image size reduction [%s] failed."] = "Reduzierung der Bildgröße [%s] fehlgeschlagen."; -$a->strings["network"] = "Netzwerk"; -$a->strings["Menu updated."] = "Menü aktualisiert."; -$a->strings["Unable to update menu."] = "Kann Menü nicht aktualisieren."; -$a->strings["Menu created."] = "Menü erstellt."; -$a->strings["Unable to create menu."] = "Kann Menü nicht erstellen."; -$a->strings["Manage Menus"] = "Menüs verwalten"; -$a->strings["Drop"] = "Löschen"; -$a->strings["Create a new menu"] = "Neues Menü erstellen"; -$a->strings["Delete this menu"] = "Lösche dieses Menü"; -$a->strings["Edit menu contents"] = "Bearbeite Menü Inhalte"; -$a->strings["Edit this menu"] = "Dieses Menü bearbeiten"; -$a->strings["New Menu"] = "Neues Menü"; -$a->strings["Menu name"] = "Menü Name"; -$a->strings["Must be unique, only seen by you"] = "Muss eindeutig sein, ist aber nur für Dich sichtbar"; -$a->strings["Menu title"] = "Menü Titel"; -$a->strings["Menu title as seen by others"] = "Menü Titel wie er von anderen gesehen wird"; -$a->strings["Allow bookmarks"] = "Erlaube Lesezeichen"; -$a->strings["Menu may be used to store saved bookmarks"] = "Im Menü können gespeicherte Lesezeichen abgelegt werden"; -$a->strings["Menu deleted."] = "Menü gelöscht."; -$a->strings["Menu could not be deleted."] = "Menü konnte nicht gelöscht werden."; -$a->strings["Edit Menu"] = "Menü bearbeiten"; -$a->strings["Add or remove entries to this menu"] = "Einträge zu diesem Menü hinzufügen oder entfernen"; -$a->strings["Invalid item."] = "Ungültiges Element."; -$a->strings["Channel not found."] = "Kanal nicht gefunden."; -$a->strings["Page not found."] = "Seite nicht gefunden."; -$a->strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = "%1\$s hat %2\$ss %3\$s mit %4\$s verschlagwortet"; -$a->strings["Wall Photos"] = "Wall Fotos"; -$a->strings["OpenID protocol error. No ID returned."] = "OpenID Protokollfehler. Keine ID zurückgegeben."; -$a->strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "Keine Vorschläge vorhanden. Wenn das ein neuer Server ist, versuche es in 24 Stunden noch einmal."; +$a->strings["Edit post"] = "Bearbeite Beitrag"; $a->strings["is now connected to"] = "ist jetzt verbunden mit"; $a->strings["Could not access address book record."] = "Konnte nicht auf den Adressbuch-Eintrag zugreifen."; $a->strings["Refresh failed - channel is currently unavailable."] = "Aktualisierung fehlgeschlagen – der Kanal ist im Moment nicht erreichbar."; @@ -1383,6 +1273,8 @@ $a->strings["Refresh Permissions"] = "Zugriffsrechte neu laden"; $a->strings["Fetch updated permissions"] = "Aktualisierte Zugriffsrechte abfragen"; $a->strings["Recent Activity"] = "Kürzliche Aktivitäten"; $a->strings["View recent posts and comments"] = "Betrachte die neuesten Beiträge und Kommentare"; +$a->strings["Unblock"] = "Freigeben"; +$a->strings["Block"] = "Blockieren"; $a->strings["Block or Unblock this connection"] = "Verbindung blockieren oder freigeben"; $a->strings["Unignore"] = "Nicht ignorieren"; $a->strings["Ignore"] = "Ignorieren"; @@ -1432,15 +1324,32 @@ $a->strings["Currently blocked"] = "Derzeit blockiert"; $a->strings["Currently ignored"] = "Derzeit ignoriert"; $a->strings["Currently archived"] = "Derzeit archiviert"; $a->strings["Currently pending"] = "Derzeit anstehend"; -$a->strings["Hide this contact from others"] = "Diese Verbindung vor den anderen verbergen."; -$a->strings["Replies/likes to your public posts may still be visible"] = "Antworten/Likes auf deine öffentlichen Beiträge können immer noch sichtbar sein"; -$a->strings["Conversation removed."] = "Unterhaltung gelöscht."; -$a->strings["No messages."] = "Keine Nachrichten."; -$a->strings["Delete conversation"] = "Unterhaltung löschen"; -$a->strings["D, d M Y - g:i A"] = "D, d. M Y - G:i"; -$a->strings["sent you a private message"] = "eine private Nachricht schicken"; -$a->strings["added your channel"] = "hat deinen Kanal hinzugefügt"; -$a->strings["posted an event"] = "hat eine Veranstaltung veröffentlicht"; +$a->strings["Hide this contact from others"] = "Diese Verbindung vor den anderen verbergen."; +$a->strings["Replies/likes to your public posts may still be visible"] = "Antworten/Likes auf deine öffentlichen Beiträge können immer noch sichtbar sein"; +$a->strings["No potential page delegates located."] = "Keine potentiellen Bevollmächtigten für die Seite gefunden."; +$a->strings["Delegate Page Management"] = "Delegiere das Management für diese Seite"; +$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."] = "Bevollmächtigte sind in der Lage, alle Aspekte dieses Kontos/dieser Seite zu verwalten, abgesehen von den Grundeinstellungen des Kontos. Gib niemandem eine Bevollmächtigung für Deinen privaten Account, dem Du nicht absolut vertraust!"; +$a->strings["Existing Page Managers"] = "Vorhandene Seitenmanager"; +$a->strings["Existing Page Delegates"] = "Vorhandene Bevollmächtigte für die Seite"; +$a->strings["Potential Delegates"] = "Potentielle Bevollmächtigte"; +$a->strings["Add"] = "Hinzufügen"; +$a->strings["No entries."] = "Keine Einträge."; +$a->strings["Gender: "] = "Geschlecht:"; +$a->strings["Finding:"] = "Ergebnisse:"; +$a->strings["next page"] = "nächste Seite"; +$a->strings["previous page"] = "vorherige Seite"; +$a->strings["No entries (some entries may be hidden)."] = "Keine Einträge gefunden (einige könnten versteckt sein)."; +$a->strings["Bookmark added"] = "Lesezeichen hinzugefügt"; +$a->strings["My Bookmarks"] = "Meine Lesezeichen"; +$a->strings["My Connections Bookmarks"] = "Lesezeichen meiner Kontakte"; +$a->strings["Status: "] = "Status:"; +$a->strings["Sexual Preference: "] = "Sexuelle Ausrichtung:"; +$a->strings["Homepage: "] = "Webseite:"; +$a->strings["Hometown: "] = "Wohnort:"; +$a->strings["About: "] = "Über:"; +$a->strings["Keywords: "] = "Schlüsselwörter:"; +$a->strings["This site is not a directory server"] = "Diese Website ist kein Verzeichnis-Server"; +$a->strings["RedMatrix - Guests: Username: {your email address}, Password: +++"] = "RedMatrix – Gäste: Username: {Deine E-Mail-Adresse}, Passwort: +++"; $a->strings["Red Matrix Server - Setup"] = "Red Matrix Server - Installation"; $a->strings["Could not connect to database."] = "Kann nicht mit der Datenbank verbinden."; $a->strings["Could not connect to specified site URL. Possible SSL certificate or DNS issue."] = "Konnte die angegebene Webseiten-URL nicht erreichen. Möglicherweise ein Problem mit dem SSL-Zertifikat oder dem DNS."; @@ -1449,7 +1358,6 @@ $a->strings["Your site database has been installed."] = "Die Datenbank Deines Se $a->strings["You may need to import the file \"install/database.sql\" manually using phpmyadmin or mysql."] = "Eventuell musst Du die Datei \"install/database.sql\" per Hand mit phpmyadmin oder mysql importieren."; $a->strings["Please see the file \"install/INSTALL.txt\"."] = "Lies die Datei \"install/INSTALL.txt\"."; $a->strings["System check"] = "Systemprüfung"; -$a->strings["Next"] = "Nächste"; $a->strings["Check again"] = "Bitte nochmal prüfen"; $a->strings["Database connection"] = "Datenbank Verbindung"; $a->strings["In order to install Red Matrix we need to know how to connect to your database."] = "Um die Red-Matrix installieren zu können, müssen wir wissen, wie wir eine Verbindung zu Deiner Datenbank aufbauen können."; @@ -1520,26 +1428,262 @@ $a->strings["The database configuration file \".htconfig.php\" could not be writ $a->strings["Errors encountered creating database tables."] = "Fehler beim Anlegen der Datenbank-Tabellen aufgetreten."; $a->strings["

    What next

    "] = "

    Was als Nächstes

    "; $a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "WICHTIG: Du musst [manuell] einen Cronjob für den Poller einrichten."; -$a->strings["Hub not found."] = "Server nicht gefunden."; -$a->strings["Total invitation limit exceeded."] = "Einladungslimit überschritten."; -$a->strings["%s : Not a valid email address."] = "%s : Keine gültige Email Adresse."; -$a->strings["Please join us on Red"] = "Schließe Dich uns an und werde Teil der Red-Matrix"; -$a->strings["Invitation limit exceeded. Please contact your site administrator."] = "Einladungslimit überschritten. Bitte kontaktiere den Administrator Deines Red-Servers."; -$a->strings["%s : Message delivery failed."] = "%s : Nachricht konnte nicht zugestellt werden."; -$a->strings["%d message sent."] = array( - 0 => "%d Nachricht gesendet.", - 1 => "%d Nachrichten gesendet.", +$a->strings["Item not found"] = "Element nicht gefunden"; +$a->strings["Edit Block"] = "Block bearbeiten"; +$a->strings["Delete block?"] = "Block löschen?"; +$a->strings["Insert YouTube video"] = "YouTube-Video einfügen"; +$a->strings["Insert Vorbis [.ogg] video"] = "Vorbis [.ogg]-Video einfügen"; +$a->strings["Insert Vorbis [.ogg] audio"] = "Vorbis [.ogg]-Audio einfügen"; +$a->strings["Delete Block"] = "Block löschen"; +$a->strings["Layout updated."] = "Layout aktualisiert."; +$a->strings["Edit System Page Description"] = "Systemseitenbeschreibung bearbeiten"; +$a->strings["Layout not found."] = "Layout nicht gefunden."; +$a->strings["Module Name:"] = "Modulname:"; +$a->strings["Layout Help"] = "Layout-Hilfe"; +$a->strings["Edit Layout"] = "Layout bearbeiten"; +$a->strings["Delete layout?"] = "Layout löschen?"; +$a->strings["Delete Layout"] = "Layout löschen"; +$a->strings["Item is not editable"] = "Element kann nicht bearbeitet werden."; +$a->strings["Delete item?"] = "Eintrag löschen?"; +$a->strings["Edit Webpage"] = "Webseite bearbeiten"; +$a->strings["Delete webpage?"] = "Webseite löschen?"; +$a->strings["Delete Webpage"] = "Webseite löschen"; +$a->strings["webpage"] = "Webseite"; +$a->strings["block"] = "Block"; +$a->strings["layout"] = "Layout"; +$a->strings["%s element installed"] = "Element für %s installiert"; +$a->strings["Image uploaded but image cropping failed."] = "Bild hochgeladen, aber das Zurechtschneiden schlug fehl."; +$a->strings["Image resize failed."] = "Bild-Anpassung fehlgeschlagen."; +$a->strings["Shift-reload the page or clear browser cache if the new photo does not display immediately."] = "Leere den Browser Cache oder nutze Umschalten-Neu Laden, falls das neue Foto nicht sofort angezeigt wird."; +$a->strings["Image exceeds size limit of %d"] = "Bild ist größer als das Limit von %d"; +$a->strings["Unable to process image."] = "Kann Bild nicht verarbeiten."; +$a->strings["Photo not available."] = "Foto nicht verfügbar."; +$a->strings["Upload File:"] = "Datei hochladen:"; +$a->strings["Select a profile:"] = "Wähle ein Profil:"; +$a->strings["Upload Profile Photo"] = "Lade neues Profilfoto hoch"; +$a->strings["skip this step"] = "diesen Schritt überspringen"; +$a->strings["select a photo from your photo albums"] = "ein Foto aus meinen Fotoalben"; +$a->strings["Crop Image"] = "Bild zuschneiden"; +$a->strings["Please adjust the image cropping for optimum viewing."] = "Bitte schneide das Bild für eine optimale Anzeige passend zu."; +$a->strings["Done Editing"] = "Bearbeitung fertigstellen"; +$a->strings["Image uploaded successfully."] = "Bild erfolgreich hochgeladen."; +$a->strings["Image upload failed."] = "Hochladen des Bilds fehlgeschlagen."; +$a->strings["Image size reduction [%s] failed."] = "Reduzierung der Bildgröße [%s] fehlgeschlagen."; +$a->strings["Failed to create source. No channel selected."] = "Konnte die Quelle nicht anlegen. Kein Kanal ausgewählt."; +$a->strings["Source created."] = "Quelle erstellt."; +$a->strings["Source updated."] = "Quelle aktualisiert."; +$a->strings["*"] = "*"; +$a->strings["Manage remote sources of content for your channel."] = "Quellen von Inhalten Deines Kanals verwalten."; +$a->strings["New Source"] = "Neue Quelle"; +$a->strings["Import all or selected content from the following channel into this channel and distribute it according to your channel settings."] = "Importiere alle oder ausgewählte Inhalte des folgenden Kanals in diesen Kanal und verteile sie gemäß der Einstellungen dieses Kanals."; +$a->strings["Only import content with these words (one per line)"] = "Importiere nur Beiträge, die folgende Wörter (eines pro Zeile) enthalten"; +$a->strings["Leave blank to import all public content"] = "Leer lassen, um alle öffentlichen Beiträge zu importieren"; +$a->strings["Channel Name"] = "Name des Kanals"; +$a->strings["Source not found."] = "Quelle nicht gefunden."; +$a->strings["Edit Source"] = "Quelle bearbeiten"; +$a->strings["Delete Source"] = "Quelle löschen"; +$a->strings["Source removed"] = "Quelle gelöscht"; +$a->strings["Unable to remove source."] = "Konnte die Quelle nicht löschen."; +$a->strings["- select -"] = "– auswählen –"; +$a->strings["Permission Denied."] = "Zugriff verweigert."; +$a->strings["File not found."] = "Datei nicht gefunden."; +$a->strings["Edit file permissions"] = "Dateiberechtigungen bearbeiten"; +$a->strings["Set/edit permissions"] = "Berechtigungen setzen/ändern"; +$a->strings["Include all files and sub folders"] = "Alle Dateien und Unterverzeichnisse einbinden"; +$a->strings["Return to file list"] = "Zurück zur Dateiliste"; +$a->strings["Copy/paste this code to attach file to a post"] = "Diesen Code kopieren und einfügen, um die Datei an einen Beitrag anzuhängen"; +$a->strings["Copy/paste this URL to link file from a web page"] = "Diese URL verwenden, um von einer Webseite aus auf die Datei zu verlinken"; +$a->strings["Help:"] = "Hilfe:"; +$a->strings["Not Found"] = "Nicht gefunden"; +$a->strings["Channel added."] = "Kanal hinzugefügt."; +$a->strings["%1\$s is following %2\$s's %3\$s"] = "%1\$s folgt nun %2\$ss %3\$s"; +$a->strings["Contact not found."] = "Kontakt nicht gefunden"; +$a->strings["Friend suggestion sent."] = "Freundschaftsempfehlung senden."; +$a->strings["Suggest Friends"] = "Kontakte vorschlagen"; +$a->strings["Suggest a friend for %s"] = "Schlage %s einen Kontakt vor"; +$a->strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "Keine Vorschläge vorhanden. Wenn das ein neuer Server ist, versuche es in 24 Stunden noch einmal."; +$a->strings["Collection created."] = "Sammlung erstellt."; +$a->strings["Could not create collection."] = "Sammlung kann nicht erstellt werden."; +$a->strings["Collection updated."] = "Sammlung aktualisiert."; +$a->strings["Create a collection of channels."] = "Erstelle eine Sammlung von Kanälen."; +$a->strings["Collection Name: "] = "Name der Sammlung:"; +$a->strings["Members are visible to other channels"] = "Mitglieder sind sichtbar für andere Kanäle"; +$a->strings["Collection removed."] = "Sammlung gelöscht."; +$a->strings["Unable to remove collection."] = "Löschen der Sammlung nicht möglich."; +$a->strings["Collection Editor"] = "Sammlung-Editor"; +$a->strings["Members"] = "Mitglieder"; +$a->strings["All Connected Channels"] = "Alle verbundenen Kanäle"; +$a->strings["Click on a channel to add or remove."] = "Wähle einen Kanal zum hinzufügen oder entfernen aus."; +$a->strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = "%1\$s hat %2\$ss %3\$s mit %4\$s verschlagwortet"; +$a->strings["Like/Dislike"] = "Mögen/Nicht mögen"; +$a->strings["This action is restricted to members."] = "Diese Aktion kann nur von Mitgliedern ausgeführt werden."; +$a->strings["Please login with your RedMatrix ID or register as a new RedMatrix member to continue."] = "Bitte melde Dich mit Deiner RedMatrix-ID an oder registriere Dich als neues Mitglied der RedMatrix, um fortzufahren."; +$a->strings["Invalid request."] = "Ungültige Anfrage."; +$a->strings["thing"] = "Sache"; +$a->strings["Channel unavailable."] = "Kanal nicht vorhanden."; +$a->strings["Previous action reversed."] = "Die vorherige Aktion wurde rückgängig gemacht."; +$a->strings["Action completed."] = "Aktion durchgeführt."; +$a->strings["Thank you."] = "Vielen Dank."; +$a->strings["Tag removed"] = "Schlagwort entfernt"; +$a->strings["Remove Item Tag"] = "Schlagwort entfernen"; +$a->strings["Select a tag to remove: "] = "Schlagwort zum Entfernen auswählen:"; +$a->strings["Theme settings updated."] = "Theme-Einstellungen aktualisiert."; +$a->strings["Site"] = "Seite"; +$a->strings["Accounts"] = "Konten"; +$a->strings["Channels"] = "Kanäle"; +$a->strings["Plugins"] = "Plug-Ins"; +$a->strings["Themes"] = "Themes"; +$a->strings["Server"] = "Server"; +$a->strings["Profile Config"] = "Profilkonfiguration"; +$a->strings["DB updates"] = "DB-Aktualisierungen"; +$a->strings["Logs"] = "Protokolle"; +$a->strings["Plugin Features"] = "Plug-In Funktionen"; +$a->strings["User registrations waiting for confirmation"] = "Nutzer-Anmeldungen, die auf Bestätigung warten"; +$a->strings["Message queues"] = "Nachrichten-Warteschlangen"; +$a->strings["Administration"] = "Administration"; +$a->strings["Summary"] = "Zusammenfassung"; +$a->strings["Registered users"] = "Registrierte Benutzer"; +$a->strings["Pending registrations"] = "Ausstehende Registrierungen"; +$a->strings["Version"] = "Version"; +$a->strings["Active plugins"] = "Aktive Plug-Ins"; +$a->strings["Site settings updated."] = "Site-Einstellungen aktualisiert."; +$a->strings["No special theme for accessibility"] = "Kein spezielles Accessibility-Theme vorhanden"; +$a->strings["Yes - with approval"] = "Ja - mit Zustimmung"; +$a->strings["My site is not a public server"] = "Meine Server ist kein öffentlicher Server"; +$a->strings["My site has paid access only"] = "Mein Server erlaubt nur bezahlten Zugang"; +$a->strings["My site has free access only"] = "Mein Server erlaubt ausschließlich freien Zugang"; +$a->strings["My site offers free accounts with optional paid upgrades"] = "Mein Server bietet kostenlose Konten mit der Möglichkeit zu bezahlten Upgrades"; +$a->strings["File upload"] = "Dateiupload"; +$a->strings["Policies"] = "Richtlinien"; +$a->strings["Site name"] = "Seitenname"; +$a->strings["Banner/Logo"] = "Banner/Logo"; +$a->strings["Administrator Information"] = "Administrator-Informationen"; +$a->strings["Contact information for site administrators. Displayed on siteinfo page. BBCode can be used here"] = "Kontaktinformationen für Administratoren des Servers. Wird auf der siteinfo-Seite angezeigt. BBCode kann verwendet werden."; +$a->strings["System language"] = "System-Sprache"; +$a->strings["System theme"] = "System-Theme"; +$a->strings["Default system theme - may be over-ridden by user profiles - change theme settings"] = "Standard-System-Theme – kann durch Nutzerprofile überschieben werden – Theme-Einstellungen ändern"; +$a->strings["Mobile system theme"] = "Mobile System-Theme:"; +$a->strings["Theme for mobile devices"] = "Theme für mobile Geräte"; +$a->strings["Accessibility system theme"] = "Accessibility-System-Theme"; +$a->strings["Accessibility theme"] = "Accessibility-Theme"; +$a->strings["Enable Diaspora Protocol"] = "Diaspora-Protokoll aktivieren"; +$a->strings["Communicate with Diaspora and Friendica - experimental"] = "Kommunikation mit Diaspora und Friendica – experimentell"; +$a->strings["Allow Feeds as Connections"] = "Feeds als Verbindungen erlauben"; +$a->strings["(Heavy system resource usage)"] = "(führt zu hoher Systemlast)"; +$a->strings["Maximum image size"] = "Maximale Bildgröße"; +$a->strings["Maximum size in bytes of uploaded images. Default is 0, which means no limits."] = "Maximale Größe hochgeladener Bilder in Bytes. Standard ist 0 (keine Einschränkung)."; +$a->strings["Does this site allow new member registration?"] = "Erlaubt dieser Server die Registrierung neuer Nutzer?"; +$a->strings["Which best describes the types of account offered by this hub?"] = "Was ist die passendste Beschreibung der Konten auf diesem Hub?"; +$a->strings["Register text"] = "Registrierungstext"; +$a->strings["Will be displayed prominently on the registration page."] = "Wird gut sichtbar auf der Registrierungs-Seite angezeigt."; +$a->strings["Accounts abandoned after x days"] = "Konten gelten nach X Tagen als unbenutzt"; +$a->strings["Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit."] = "Verschwende keine Systemressourcen auf das Pollen von externen Seiten, wenn das Konto nicht mehr benutzt wird. Trage hier 0 für kein zeitliches Limit."; +$a->strings["Allowed friend domains"] = "Erlaubte Domains für Kontakte"; +$a->strings["Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains"] = "Liste der Domains, die für Freundschaften erlaubt sind, durch Kommas getrennt. Platzhalter werden akzeptiert. Leer lassen, um alle Domains zu erlauben."; +$a->strings["Allowed email domains"] = "Erlaubte Domains für E-Mails"; +$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"] = "Liste der Domains, die für E-Mail-Adressen bei der Registrierung erlaubt sind, durch Kommas getrennt. Platzhalter werden akzeptiert. Leer lassen, um alle Domains zu erlauben."; +$a->strings["Block public"] = "Öffentlichen Zugriff blockieren"; +$a->strings["Check to block public access to all otherwise public personal pages on this site unless you are currently logged in."] = "Zugriff auf sonst öffentliche persönliche Seiten blockieren, wenn man nicht eingeloggt ist."; +$a->strings["Verify Email Addresses"] = "E-Mail-Adressen überprüfen"; +$a->strings["Check to verify email addresses used in account registration (recommended)."] = "Aktivieren, um die Überprüfung von E-Mail-Adressen bei der Registrierung von Benutzerkonten zu aktivieren (empfohlen)."; +$a->strings["Force publish"] = "Veröffentlichung erzwingen"; +$a->strings["Check to force all profiles on this site to be listed in the site directory."] = "Die Veröffentlichung aller Profile dieses Servers im Verzeichnis erzwingen."; +$a->strings["Disable discovery tab"] = "Den „Entdecken“-Reiter ausblenden"; +$a->strings["Remove the tab in the network view with public content pulled from sources chosen for this site."] = "Entferne den „Entdecken“-Reiter aus der Matrix-Seite, in dem öffentliche Inhalte von anderen RedMatrix-Hubs angezeigt werden können."; +$a->strings["No login on Homepage"] = "Kein Login auf der 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)."] = "Aktivieren, um das Login-Formular auf der Startseite der Seite zu verbergen (z.B. weil es das Layout der Homepage des Seiten-Kanals stört)."; +$a->strings["Proxy user"] = "Proxy Benutzer"; +$a->strings["Proxy URL"] = "Proxy URL"; +$a->strings["Network timeout"] = "Netzwerk-Timeout"; +$a->strings["Value is in seconds. Set to 0 for unlimited (not recommended)."] = "Wert in Sekunden. 0 für unbegrenzt (nicht empfohlen)."; +$a->strings["Delivery interval"] = "Auslieferung Intervall"; +$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."] = "Verzögere im Hintergrund laufende Auslieferungsprozesse um die angegebene Anzahl Sekunden, um die Systemlast zu verringern. Empfehlungen: 4-5 für Shared Hosts, 2-3 für VPS, 0-1 für große dedizierte Server."; +$a->strings["Poll interval"] = "Abfrageintervall"; +$a->strings["Delay background polling processes by this many seconds to reduce system load. If 0, use delivery interval."] = "Verzögere Hintergrundprozesse um diese Anzahl Sekunden, um die Systemlast zu reduzieren. Bei 0 wird das Auslieferungsintervall verwendet."; +$a->strings["Maximum Load Average"] = "Maximales Load Average"; +$a->strings["Maximum system load before delivery and poll processes are deferred - default 50."] = "Maximale Systemlast, bevor Verteil- und Empfangsprozesse verschoben werden – Standard 50"; +$a->strings["No server found"] = "Kein Server gefunden"; +$a->strings["ID"] = "ID"; +$a->strings["for channel"] = "für Kanal"; +$a->strings["on server"] = "auf Server"; +$a->strings["Status"] = "Status"; +$a->strings["Update has been marked successful"] = "Update wurde als erfolgreich markiert"; +$a->strings["Executing %s failed. Check system logs."] = "Ausführen von %s fehlgeschlagen. Überprüfe die Systemprotokolle."; +$a->strings["Update %s was successfully applied."] = "Update %s wurde erfolgreich ausgeführt."; +$a->strings["Update %s did not return a status. Unknown if it succeeded."] = "Update %s lieferte keinen Rückgabewert. Erfolg unbekannt."; +$a->strings["Update function %s could not be found."] = "Update-Funktion %s konnte nicht gefunden werden."; +$a->strings["No failed updates."] = "Keine fehlgeschlagenen Aktualisierungen."; +$a->strings["Failed Updates"] = "Fehlgeschlagene Aktualisierungen"; +$a->strings["Mark success (if update was manually applied)"] = "Als erfolgreich markieren (wenn das Update manuell ausgeführt wurde)"; +$a->strings["Attempt to execute this update step automatically"] = "Versuche, diesen Updateschritt automatisch auszuführen"; +$a->strings["%s user blocked/unblocked"] = array( + 0 => "%s Nutzer blockiert/freigegeben", + 1 => "%s Nutzer blockiert/freigegeben", ); -$a->strings["You have no more invitations available"] = "Du hast keine weiteren verfügbare Einladungen"; -$a->strings["Send invitations"] = "Einladungen senden"; -$a->strings["Enter email addresses, one per line:"] = "Email-Adressen eintragen, eine pro Zeile:"; -$a->strings["Your message:"] = "Deine Nachricht:"; -$a->strings["Please join my community on RedMatrix."] = "Schließe Dich uns in der RedMatrix an!"; -$a->strings["You will need to supply this invitation code: "] = "Gib diesen Invite-Code ein:"; -$a->strings["1. Register at any RedMatrix location (they are all inter-connected)"] = "1. Registriere Dich auf irgendeinem RedMatrix-Server (sie sind alle miteinander verbunden)"; -$a->strings["2. Enter my RedMatrix network address into the site searchbar."] = "2. Gib meine RedMatrix-Adresse im Suchfeld ein."; -$a->strings["or visit "] = "oder besuche"; -$a->strings["3. Click [Connect]"] = "3. Klicke auf [Verbinden]"; +$a->strings["%s user deleted"] = array( + 0 => "%s Nutzer gelöscht", + 1 => "%s Nutzer gelöscht", +); +$a->strings["Account not found"] = "Konto nicht gefunden"; +$a->strings["User '%s' unblocked"] = "Benutzer '%s' freigegeben"; +$a->strings["User '%s' blocked"] = "Benutzer '%s' blockiert"; +$a->strings["Users"] = "Benutzer"; +$a->strings["select all"] = "Alle auswählen"; +$a->strings["User registrations waiting for confirm"] = "Neuanmeldungen, die auf Deine Bestätigung warten"; +$a->strings["Request date"] = "Antragsdatum"; +$a->strings["No registrations."] = "Keine Registrierungen."; +$a->strings["Approve"] = "Genehmigen"; +$a->strings["Deny"] = "Verweigern"; +$a->strings["Register date"] = "Registrierungs-Datum"; +$a->strings["Last login"] = "Letzte Anmeldung"; +$a->strings["Expires"] = "Verfällt"; +$a->strings["Service Class"] = "Service-Klasse"; +$a->strings["Selected users will be deleted!\\n\\nEverything these users had posted on this site will be permanently deleted!\\n\\nAre you sure?"] = "Die markierten Nutzer werden gelöscht!\\n\\nAlles, was diese Nutzer auf dieser Seite veröffentlicht haben, wird endgültig gelöscht!\\n\\nBist Du sicher?"; +$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?"] = "Der Nutzer {0} wird gelöscht!\\n\\nAlles, was dieser Nutzer auf dieser Seite veröffentlicht hat, wird endgültig gelöscht werden!\\n\\nBist Du sicher?"; +$a->strings["%s channel censored/uncensored"] = array( + 0 => "%s Kanal gesperrt/freigegeben", + 1 => "%s Kanäle gesperrt/freigegeben", +); +$a->strings["%s channel deleted"] = array( + 0 => "%s Kanal gelöscht", + 1 => "%s Kanäle gelöscht", +); +$a->strings["Channel not found"] = "Kanal nicht gefunden"; +$a->strings["Channel '%s' deleted"] = "Kanal '%s' gelöscht"; +$a->strings["Channel '%s' uncensored"] = "Kanal '%s' freigegeben"; +$a->strings["Channel '%s' censored"] = "Kanal '%s' gesperrt"; +$a->strings["Censor"] = "Sperren"; +$a->strings["Uncensor"] = "Freigeben"; +$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?"] = "Alle ausgewählten Kanäle werden gelöscht!\\n\\nAlles was von diesen Kanälen auf diesem Server geschrieben wurde, wird dauerhaft gelöscht!\\n\\nBist Du sicher?"; +$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?"] = "Der Kanal {0} wird gelöscht!\\n\\nAlles was von diesem Kanal auf diesem Server geschrieben wurde, wird gelöscht!\\n\\nBist Du sicher?"; +$a->strings["Plugin %s disabled."] = "Plug-In %s deaktiviert."; +$a->strings["Plugin %s enabled."] = "Plug-In %s aktiviert."; +$a->strings["Disable"] = "Deaktivieren"; +$a->strings["Enable"] = "Aktivieren"; +$a->strings["Toggle"] = "Umschalten"; +$a->strings["Author: "] = "Autor: "; +$a->strings["Maintainer: "] = "Betreuer:"; +$a->strings["No themes found."] = "Keine Theme gefunden."; +$a->strings["Screenshot"] = "Bildschirmfoto"; +$a->strings["[Experimental]"] = "[Experimentell]"; +$a->strings["[Unsupported]"] = "[Nicht unterstützt]"; +$a->strings["Log settings updated."] = "Protokoll-Einstellungen aktualisiert."; +$a->strings["Clear"] = "Leeren"; +$a->strings["Debugging"] = "Debugging"; +$a->strings["Log file"] = "Protokolldatei"; +$a->strings["Must be writable by web server. Relative to your Red top-level directory."] = "Muss für den Web-Server schreibbar sein. Relativ zum Red-Stammverzeichnis."; +$a->strings["Log level"] = "Protokollstufe"; +$a->strings["New Profile Field"] = "Neues Profilfeld"; +$a->strings["Field nickname"] = "Kurzname für das Feld"; +$a->strings["System name of field"] = "Systemname des Feldes"; +$a->strings["Input type"] = "Art des Inhalts"; +$a->strings["Field Name"] = "Feldname"; +$a->strings["Label on profile pages"] = "Bezeichnung auf Profilseiten"; +$a->strings["Help text"] = "Hilfetext"; +$a->strings["Additional info (optional)"] = "Zusätzliche Informationen (optional)"; +$a->strings["Field definition not found"] = "Feld-Definition nicht gefunden"; +$a->strings["Edit Profile Field"] = "Profilfeld bearbeiten"; $a->strings["Thing updated"] = "Sache aktualisiert"; $a->strings["Object store: failed"] = "Speichern des Objekts fehlgeschlagen"; $a->strings["Thing added"] = "Sache hinzugefügt"; @@ -1554,173 +1698,6 @@ $a->strings["Name of thing e.g. something"] = "Name der Sache, z. B. irgendwas"; $a->strings["URL of thing (optional)"] = "URL der Sache (optional)"; $a->strings["URL for photo of thing (optional)"] = "URL eines Fotos der Sache (optional)"; $a->strings["Add Thing to your Profile"] = "Die Sache Deinem Profil hinzufügen"; -$a->strings["Unable to find your hub."] = "Konnte Deinen Server nicht finden."; -$a->strings["Post successful."] = "Veröffentlichung erfolgreich."; -$a->strings["Help:"] = "Hilfe:"; -$a->strings["Not Found"] = "Nicht gefunden"; -$a->strings["No connections."] = "Keine Verbindungen."; -$a->strings["Visit %s's profile [%s]"] = "%ss Profil [%s] besuchen"; -$a->strings["View Connnections"] = "Zeige Verbindungen"; -$a->strings["Account removals are not allowed within 48 hours of changing the account password."] = "Das Löschen von Konten innerhalb 48 Stunden nachdem deren Passwort geändert wurde ist nicht erlaubt."; -$a->strings["Remove This Account"] = "Dieses Konto löschen"; -$a->strings["This will completely remove this account including all its channels from the network. Once this has been done it is not recoverable."] = "Hiermit wird dieses Nutzerkonto einschließlich all seiner Kanäle komplett aus dem Netzwerk entfernt. Dieser Vorgang kann nicht rückgängig gemacht werden."; -$a->strings["Please enter your password for verification:"] = "Bitte gib zur Bestätigung Dein Passwort ein:"; -$a->strings["Remove this account, all its channels and all its channel clones from the network"] = "Dieses Konto, all seine Kanäle sowie alle Kanal-Klone aus dem Netzwerk löschen"; -$a->strings["By default only the instances of the channels located on this hub will be removed from the network"] = "Standardmäßig werden nur die Kanalklone auf diesem RedMatrix-Hub aus dem Netzwerk entfernt"; -$a->strings["Invalid profile identifier."] = "Ungültiger Profil-Identifikator"; -$a->strings["Profile Visibility Editor"] = "Profil-Sichtbarkeits-Editor"; -$a->strings["Click on a contact to add or remove."] = "Klicke auf einen Kontakt, um ihn hinzuzufügen oder zu entfernen."; -$a->strings["Visible To"] = "Sichtbar für"; -$a->strings["Maximum daily site registrations exceeded. Please try again tomorrow."] = "Maximale Anzahl täglicher Neuanmeldungen erreicht. Bitte versuche es morgen noch einmal."; -$a->strings["Please indicate acceptance of the Terms of Service. Registration failed."] = "Bitte stimme den Nutzungsbedingungen zu. Registrierung fehlgeschlagen."; -$a->strings["Passwords do not match."] = "Passwörter stimmen nicht überein."; -$a->strings["Registration successful. Please check your email for validation instructions."] = "Registrierung erfolgreich. Eine E-Mail mit weiteren Anweisungen wurde an Dich gesendet."; -$a->strings["Your registration is pending approval by the site owner."] = "Deine Registrierung muss noch vom Betreiber der Seite freigegeben werden."; -$a->strings["Your registration can not be processed."] = "Deine Registrierung konnte nicht verarbeitet werden."; -$a->strings["Registration on this site/hub is by approval only."] = "Anmeldungen auf diesem Server erfordern Zustimmung durch den Administrator"; -$a->strings["Register at another affiliated site/hub"] = "Registrierung auf einem anderen, angeschlossenen Server"; -$a->strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = "Die maximale Anzahl täglicher Registrierungen auf diesem Server wurde überschritten. Bitte versuche es morgen noch einmal."; -$a->strings["Terms of Service"] = "Nutzungsbedingungen"; -$a->strings["I accept the %s for this website"] = "Ich akzeptiere die %s für diese Webseite"; -$a->strings["I am over 13 years of age and accept the %s for this website"] = "Ich bin älter als 13 Jahre und akzeptiere die %s dieser Webseite"; -$a->strings["Membership on this site is by invitation only."] = "Mitgliedschaft auf dieser Seite ist nur nach vorheriger Einladung möglich."; -$a->strings["Please enter your invitation code"] = "Bitte trage Deinen Einladungs-Code ein"; -$a->strings["Your email address"] = "Ihre E-Mail Adresse"; -$a->strings["Choose a password"] = "Passwort"; -$a->strings["Please re-enter your password"] = "Bitte gib Dein Passwort noch einmal ein"; -$a->strings["No such group"] = "Gruppe existiert nicht"; -$a->strings["Search Results For:"] = "Suchergebnisse für:"; -$a->strings["Collection is empty"] = "Sammlung ist leer"; -$a->strings["Collection: "] = "Sammlung:"; -$a->strings["Connection: "] = "Verbindung:"; -$a->strings["Invalid connection."] = "Ungültige Verbindung."; -$a->strings["No potential page delegates located."] = "Keine potentiellen Bevollmächtigten für die Seite gefunden."; -$a->strings["Delegate Page Management"] = "Delegiere das Management für diese Seite"; -$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."] = "Bevollmächtigte sind in der Lage, alle Aspekte dieses Kontos/dieser Seite zu verwalten, abgesehen von den Grundeinstellungen des Kontos. Gib niemandem eine Bevollmächtigung für Deinen privaten Account, dem Du nicht absolut vertraust!"; -$a->strings["Existing Page Managers"] = "Vorhandene Seitenmanager"; -$a->strings["Existing Page Delegates"] = "Vorhandene Bevollmächtigte für die Seite"; -$a->strings["Potential Delegates"] = "Potentielle Bevollmächtigte"; -$a->strings["Add"] = "Hinzufügen"; -$a->strings["No entries."] = "Keine Einträge."; -$a->strings["Continue"] = "Fortfahren"; -$a->strings["Premium Channel Setup"] = "Premium-Kanal-Einrichtung"; -$a->strings["Enable premium channel connection restrictions"] = "Einschränkungen für einen Premium-Kanal aktivieren"; -$a->strings["Please enter your restrictions or conditions, such as paypal receipt, usage guidelines, etc."] = "Bitte gib Deine Nutzungsbedingungen ein, z.B. Paypal-Quittung, Richtlinien etc."; -$a->strings["This channel may require additional steps or acknowledgement of the following conditions prior to connecting:"] = "Unter Umständen sind weitere Schritte oder die Bestätigung der folgenden Bedingungen vor dem Verbinden mit diesem Kanal nötig."; -$a->strings["Potential connections will then see the following text before proceeding:"] = "Potentielle Kontakte werden den folgenden Text sehen, bevor fortgefahren wird:"; -$a->strings["By continuing, I certify that I have complied with any instructions provided on this page."] = "Indem ich fortfahre, bestätige ich die Erfüllung aller Anweisungen aus dieser Seite."; -$a->strings["(No specific instructions have been provided by the channel owner.)"] = "(Der Kanal-Besitzer hat keine speziellen Anweisungen hinterlegt.)"; -$a->strings["Restricted or Premium Channel"] = "Eingeschränkter oder Premium-Kanal"; -$a->strings["Contact not found."] = "Kontakt nicht gefunden"; -$a->strings["Friend suggestion sent."] = "Freundschaftsempfehlung senden."; -$a->strings["Suggest Friends"] = "Kontakte vorschlagen"; -$a->strings["Suggest a friend for %s"] = "Schlage %s einen Kontakt vor"; -$a->strings["You have created %1$.0f of %2$.0f allowed channels."] = "Du hast %1$.0f von maximal %2$.0f erlaubten Kanälen eingerichtet."; -$a->strings["Create a new channel"] = "Neuen Kanal anlegen"; -$a->strings["Current Channel"] = "Aktueller Kanal"; -$a->strings["Attach to one of your channels by selecting it."] = "Wähle einen Deiner Kanäle aus, um ihn zu verwenden."; -$a->strings["Default Channel"] = "Standard Kanal"; -$a->strings["Make Default"] = "Zum Standard machen"; -$a->strings["Channel removals are not allowed within 48 hours of changing the account password."] = "Innerhalb von 48 Stunden nach einer Änderung des Passworts können keine Kanäle gelöscht werden."; -$a->strings["Remove This Channel"] = "Diesen Kanal löschen"; -$a->strings["This will completely remove this channel from the network. Once this has been done it is not recoverable."] = "Hiermit wird dieser Kanal komplett aus dem Netzwerk gelöscht. Einmal eingeleitet kann dieser Prozess nicht rückgängig gemacht werden."; -$a->strings["Remove this channel and all its clones from the network"] = "Lösche diesen Kanal und all seine Klone aus dem Netzwerk"; -$a->strings["By default only the instance of the channel located on this hub will be removed from the network"] = "Standardmäßig wird der Kanal nur auf diesem Server gelöscht, seine Klone verbleiben im Netzwerk"; -$a->strings["Remove Channel"] = "Kanal löschen"; -$a->strings["Item not found"] = "Element nicht gefunden"; -$a->strings["Item is not editable"] = "Element kann nicht bearbeitet werden."; -$a->strings["Edit post"] = "Bearbeite Beitrag"; -$a->strings["Delete item?"] = "Eintrag löschen?"; -$a->strings["Insert YouTube video"] = "YouTube-Video einfügen"; -$a->strings["Insert Vorbis [.ogg] video"] = "Vorbis [.ogg]-Video einfügen"; -$a->strings["Insert Vorbis [.ogg] audio"] = "Vorbis [.ogg]-Audio einfügen"; -$a->strings["Edit Webpage"] = "Webseite bearbeiten"; -$a->strings["Delete webpage?"] = "Webseite löschen?"; -$a->strings["Delete Webpage"] = "Webseite löschen"; -$a->strings["Poke/Prod"] = "Anstupsen/Knuffen"; -$a->strings["poke, prod or do other things to somebody"] = "Stupse Leute an oder mache anderes mit ihnen"; -$a->strings["Recipient"] = "Empfänger"; -$a->strings["Choose what you wish to do to recipient"] = "Wähle, was Du mit dem/r Empfänger/in tun willst"; -$a->strings["Make this post private"] = "Diesen Beitrag privat machen"; -$a->strings["Block Name"] = "Block-Name"; -$a->strings["Collection created."] = "Sammlung erstellt."; -$a->strings["Could not create collection."] = "Sammlung kann nicht erstellt werden."; -$a->strings["Collection updated."] = "Sammlung aktualisiert."; -$a->strings["Create a collection of channels."] = "Erstelle eine Sammlung von Kanälen."; -$a->strings["Collection Name: "] = "Name der Sammlung:"; -$a->strings["Members are visible to other channels"] = "Mitglieder sind sichtbar für andere Kanäle"; -$a->strings["Collection removed."] = "Sammlung gelöscht."; -$a->strings["Unable to remove collection."] = "Löschen der Sammlung nicht möglich."; -$a->strings["Collection Editor"] = "Sammlung-Editor"; -$a->strings["Members"] = "Mitglieder"; -$a->strings["All Connected Channels"] = "Alle verbundenen Kanäle"; -$a->strings["Click on a channel to add or remove."] = "Wähle einen Kanal zum hinzufügen oder entfernen aus."; -$a->strings["Tag removed"] = "Schlagwort entfernt"; -$a->strings["Remove Item Tag"] = "Schlagwort entfernen"; -$a->strings["Select a tag to remove: "] = "Schlagwort zum Entfernen auswählen:"; -$a->strings["Item not available."] = "Element nicht verfügbar."; -$a->strings["No service class restrictions found."] = "Keine Dienstklassenbeschränkungen gefunden."; -$a->strings["Unable to locate original post."] = "Originalbeitrag nicht gefunden."; -$a->strings["Empty post discarded."] = "Leeren Beitrag verworfen."; -$a->strings["Executable content type not permitted to this channel."] = "Ausführbarer Content-Typ ist für diesen Kanal nicht freigegeben."; -$a->strings["System error. Post not saved."] = "Systemfehler. Beitrag nicht gespeichert."; -$a->strings["You have reached your limit of %1$.0f top level posts."] = "Du hast die maximale Anzahl von %1$.0f Beiträgen erreicht."; -$a->strings["You have reached your limit of %1$.0f webpages."] = "Du hast die maximale Anzahl von %1$.0f Webseiten erreicht."; -$a->strings["RedMatrix - Guests: Username: {your email address}, Password: +++"] = "RedMatrix – Gäste: Username: {Deine E-Mail-Adresse}, Passwort: +++"; -$a->strings["Away"] = "Abwesend"; -$a->strings["Online"] = "Online"; -$a->strings["Finding:"] = "Ergebnisse:"; -$a->strings["next page"] = "nächste Seite"; -$a->strings["previous page"] = "vorherige Seite"; -$a->strings["No entries (some entries may be hidden)."] = "Keine Einträge gefunden (einige könnten versteckt sein)."; -$a->strings["Profile Match"] = "Profil-Übereinstimmungen"; -$a->strings["No keywords to match. Please add keywords to your default profile."] = "Keine Schlüsselwörter für den Abgleich gefunden. Bitte füge Schlüsselwörter zu Deinem Standardprofil hinzu."; -$a->strings["is interested in:"] = "interessiert sich für:"; -$a->strings["No matches"] = "Keine Übereinstimmungen"; -$a->strings["This site is not a directory server"] = "Diese Website ist kein Verzeichnis-Server"; -$a->strings["Version %s"] = "Version %s"; -$a->strings["Installed plugins/addons/apps:"] = "Installierte Plugins/Addons/Apps"; -$a->strings["No installed plugins/addons/apps"] = "Keine installierten Plugins/Addons/Apps"; -$a->strings["Red"] = "Red"; -$a->strings["This is a hub of the Red Matrix - a global cooperative network of decentralized privacy enhanced websites."] = "Dieser Hub ist Teil der RedMatrix – eines globalen, kooperativen Netzwerks aus dezentralen Websites, die Rücksicht auf Deine Privatsphäre nehmen."; -$a->strings["Running at web location"] = "Erreichbar unter der Web-Adresse"; -$a->strings["Please visit GetZot.com to learn more about the Red Matrix."] = "Besuche GetZot.com, um mehr über die Red-Matrix zu erfahren."; -$a->strings["Bug reports and issues: please visit"] = "Probleme oder Fehler gefunden? Bitte besuche"; -$a->strings["Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot com"] = "Vorschläge, Lob, usw.: E-Mail an 'redmatrix' at librelist - dot - com"; -$a->strings["Site Administrators"] = "Administratoren"; -$a->strings["App installed."] = "App installiert."; -$a->strings["Malformed app."] = "Fehlerhafte App."; -$a->strings["Embed code"] = "Code einbetten"; -$a->strings["Edit App"] = "App bearbeiten"; -$a->strings["Create App"] = "App erstellen"; -$a->strings["Name of app"] = "Name der App"; -$a->strings["Required"] = "Benötigt"; -$a->strings["Location (URL) of app"] = "Ort (URL) der App"; -$a->strings["Photo icon URL"] = "URL zum Icon"; -$a->strings["80 x 80 pixels - optional"] = "80 x 80 Pixel – optional"; -$a->strings["Version ID"] = "Versions-ID"; -$a->strings["Price of app"] = "Preis der App"; -$a->strings["Location (URL) to purchase app"] = "Ort (URL), um die App zu kaufen"; -$a->strings["Failed to create source. No channel selected."] = "Konnte die Quelle nicht anlegen. Kein Kanal ausgewählt."; -$a->strings["Source created."] = "Quelle erstellt."; -$a->strings["Source updated."] = "Quelle aktualisiert."; -$a->strings["*"] = "*"; -$a->strings["Manage remote sources of content for your channel."] = "Quellen von Inhalten Deines Kanals verwalten."; -$a->strings["New Source"] = "Neue Quelle"; -$a->strings["Import all or selected content from the following channel into this channel and distribute it according to your channel settings."] = "Importiere alle oder ausgewählte Inhalte des folgenden Kanals in diesen Kanal und verteile sie gemäß der Einstellungen dieses Kanals."; -$a->strings["Only import content with these words (one per line)"] = "Importiere nur Beiträge, die folgende Wörter (eines pro Zeile) enthalten"; -$a->strings["Leave blank to import all public content"] = "Leer lassen, um alle öffentlichen Beiträge zu importieren"; -$a->strings["Source not found."] = "Quelle nicht gefunden."; -$a->strings["Edit Source"] = "Quelle bearbeiten"; -$a->strings["Delete Source"] = "Quelle löschen"; -$a->strings["Source removed"] = "Quelle gelöscht"; -$a->strings["Unable to remove source."] = "Konnte die Quelle nicht löschen."; -$a->strings["Public Sites"] = "Öffentliche Server"; -$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."] = "Die hier aufgeführten Server erlauben Dir, einen Account in der Red-Matrix anzulegen. Alle Server der Matrix sind miteinander verbunden, so dass die Mitgliedschaft auf einem Server eine Verbindung zu beliebigen anderen Servern der Matrix ermöglicht. Es könnte sein, dass einige dieser Server kostenpflichtig sind oder abgestufte, je nach Umfang kostenpflichtige Mitgliedschaften anbieten. Auf den jeweiligen Seiten könnten nähere Details dazu stehen."; -$a->strings["Site URL"] = "Server-URL"; -$a->strings["Access Type"] = "Zugangstyp"; -$a->strings["Registration Policy"] = "Registrierungsrichtlinien"; -$a->strings["Location"] = "Ort"; $a->strings["Your service plan only allows %d channels."] = "Dein Vertrag erlaubt nur %d Kanäle."; $a->strings["Nothing to import."] = "Nichts zu importieren."; $a->strings["Unable to download data from old server"] = "Daten können vom alten Server nicht heruntergeladen werden"; @@ -1740,7 +1717,60 @@ $a->strings["Your old login password"] = "Dein altes Passwort"; $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."] = "Egal welche Option Du wählst, bitte lege fest, ob dieser Server die neue primäre Adresse dieses Kanals sein soll, oder ob der bisherige Red-Server diese Rolle weiterhin wahrnimmt. Du kannst von beiden Servern aus posten, aber nur einer kann der primäre Ort Deiner Dateien, Fotos und Medien sein."; $a->strings["Make this hub my primary location"] = "Dieser Red-Server ist mein primärer Server."; $a->strings["Import existing posts if possible"] = "Existierende Beiträge importieren, falls möglich"; -$a->strings["invalid target signature"] = "Ungültige Signatur des Ziels"; +$a->strings["Total invitation limit exceeded."] = "Einladungslimit überschritten."; +$a->strings["%s : Not a valid email address."] = "%s : Keine gültige Email Adresse."; +$a->strings["Please join us on Red"] = "Schließe Dich uns an und werde Teil der Red-Matrix"; +$a->strings["Invitation limit exceeded. Please contact your site administrator."] = "Einladungslimit überschritten. Bitte kontaktiere den Administrator Deines Red-Servers."; +$a->strings["%s : Message delivery failed."] = "%s : Nachricht konnte nicht zugestellt werden."; +$a->strings["%d message sent."] = array( + 0 => "%d Nachricht gesendet.", + 1 => "%d Nachrichten gesendet.", +); +$a->strings["You have no more invitations available"] = "Du hast keine weiteren verfügbare Einladungen"; +$a->strings["Send invitations"] = "Einladungen senden"; +$a->strings["Enter email addresses, one per line:"] = "Email-Adressen eintragen, eine pro Zeile:"; +$a->strings["Your message:"] = "Deine Nachricht:"; +$a->strings["Please join my community on RedMatrix."] = "Schließe Dich uns in der RedMatrix an!"; +$a->strings["You will need to supply this invitation code: "] = "Gib diesen Invite-Code ein:"; +$a->strings["1. Register at any RedMatrix location (they are all inter-connected)"] = "1. Registriere Dich auf irgendeinem RedMatrix-Server (sie sind alle miteinander verbunden)"; +$a->strings["2. Enter my RedMatrix network address into the site searchbar."] = "2. Gib meine RedMatrix-Adresse im Suchfeld ein."; +$a->strings["or visit "] = "oder besuche"; +$a->strings["3. Click [Connect]"] = "3. Klicke auf [Verbinden]"; +$a->strings["Unable to locate original post."] = "Originalbeitrag nicht gefunden."; +$a->strings["Empty post discarded."] = "Leeren Beitrag verworfen."; +$a->strings["Executable content type not permitted to this channel."] = "Ausführbarer Content-Typ ist für diesen Kanal nicht freigegeben."; +$a->strings["System error. Post not saved."] = "Systemfehler. Beitrag nicht gespeichert."; +$a->strings["You have reached your limit of %1$.0f top level posts."] = "Du hast die maximale Anzahl von %1$.0f Beiträgen erreicht."; +$a->strings["You have reached your limit of %1$.0f webpages."] = "Du hast die maximale Anzahl von %1$.0f Webseiten erreicht."; +$a->strings["[Embedded content - reload page to view]"] = "[Eingebettete Inhalte – lade die Seite neu, um sie anzuzeigen]"; +$a->strings["Help with this feature"] = "Hilfe zu dieser Funktion"; +$a->strings["Layout Name"] = "Layout-Name"; +$a->strings["Location not found."] = "Klon nicht gefunden."; +$a->strings["Primary location cannot be removed."] = "Der primäre Klon kann nicht gelöscht werden."; +$a->strings["Remote privacy information not available."] = "Privatsphäre-Einstellungen anderer Nutzer sind nicht verfügbar."; +$a->strings["Visible to:"] = "Sichtbar für:"; +$a->strings["No connections."] = "Keine Verbindungen."; +$a->strings["Visit %s's profile [%s]"] = "%ss Profil [%s] besuchen"; +$a->strings["View Connnections"] = "Zeige Verbindungen"; +$a->strings["No valid account found."] = "Kein gültiges Konto gefunden."; +$a->strings["Password reset request issued. Check your email."] = "Zurücksetzen des Passworts eingeleitet. Schau in Deine E-Mails."; +$a->strings["Site Member (%s)"] = "Nutzer (%s)"; +$a->strings["Password reset requested at %s"] = "Passwort-Rücksetzung auf %s angefordert"; +$a->strings["Request could not be verified. (You may have previously submitted it.) Password reset failed."] = "Die Anfrage konnte nicht verifiziert werden. (Vielleicht hast Du schon einmal auf den Link in der E-Mail geklickt?) Passwort-Rücksetzung fehlgeschlagen."; +$a->strings["Password Reset"] = "Zurücksetzen des Kennworts"; +$a->strings["Your password has been reset as requested."] = "Dein Passwort wurde wie angefordert neu erstellt."; +$a->strings["Your new password is"] = "Dein neues Passwort lautet"; +$a->strings["Save or copy your new password - and then"] = "Speichere oder kopiere Dein neues Passwort – und dann"; +$a->strings["click here to login"] = "Klicke hier, um dich anzumelden"; +$a->strings["Your password may be changed from the Settings page after successful login."] = "Dein Passwort kann unter Einstellungen nach einer erfolgreichen Anmeldung geändert werden."; +$a->strings["Your password has changed at %s"] = "Auf %s wurde Dein Passwort geändert"; +$a->strings["Forgot your Password?"] = "Kennwort vergessen?"; +$a->strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "Gib Deine E-Mail-Adresse ein, um Dein Passwort zurücksetzen zu lassen. Du erhältst dann weitere Anweisungen per E-Mail."; +$a->strings["Email Address"] = "E-Mail Adresse"; +$a->strings["Reset"] = "Zurücksetzen"; +$a->strings["Hub not found."] = "Server nicht gefunden."; +$a->strings["Total votes"] = "Stimmen gesamt"; +$a->strings["Average Rating"] = "Durchschnittliche Bewertung"; $a->strings["Unable to lookup recipient."] = "Konnte den Empfänger nicht finden."; $a->strings["Unable to communicate with requested channel."] = "Die Kommunikation mit dem ausgewählten Kanal ist fehlgeschlagen."; $a->strings["Cannot verify requested channel."] = "Verifizierung des angeforderten Kanals fehlgeschlagen."; @@ -1756,145 +1786,157 @@ $a->strings["Delete message"] = "Nachricht löschen"; $a->strings["Recall message"] = "Nachricht widerrufen"; $a->strings["Message has been recalled."] = "Die Nachricht wurde widerrufen."; $a->strings["Private Conversation"] = "Private Unterhaltung"; +$a->strings["Delete conversation"] = "Unterhaltung löschen"; $a->strings["No secure communications available. You may be able to respond from the sender's profile page."] = "Keine sichere Kommunikation verfügbar. Eventuell kannst Du auf der Profilseite des Absenders antworten."; $a->strings["Send Reply"] = "Antwort senden"; -$a->strings["You must be logged in to see this page."] = "Du musst angemeldet sein, um diese Seite betrachten zu können."; -$a->strings["Insufficient permissions. Request redirected to profile page."] = "Unzureichende Zugriffsrechte. Die Anfrage wurde zur Profil-Seite umgeleitet."; -$a->strings["Profile not found."] = "Profil nicht gefunden."; -$a->strings["Profile deleted."] = "Profil gelöscht."; -$a->strings["Profile-"] = "Profil-"; -$a->strings["New profile created."] = "Neues Profil erstellt."; -$a->strings["Profile unavailable to clone."] = "Profil kann nicht geklont werden."; -$a->strings["Profile unavailable to export."] = "Dieses Profil kann nicht exportiert werden."; -$a->strings["Profile Name is required."] = "Profil-Name erforderlich."; -$a->strings["Marital Status"] = "Familienstand"; -$a->strings["Romantic Partner"] = "Romantische Partner"; -$a->strings["Likes"] = "Gefällt"; -$a->strings["Dislikes"] = "Gefällt nicht"; -$a->strings["Work/Employment"] = "Arbeit/Anstellung"; -$a->strings["Religion"] = "Religion"; -$a->strings["Political Views"] = "Politische Ansichten"; -$a->strings["Gender"] = "Geschlecht"; -$a->strings["Sexual Preference"] = "Sexuelle Orientierung"; -$a->strings["Homepage"] = "Webseite"; -$a->strings["Interests"] = "Hobbys/Interessen"; -$a->strings["Profile updated."] = "Profil aktualisiert."; -$a->strings["Hide your contact/friend list from viewers of this profile?"] = "Deine Kontaktliste vor Betrachtern dieses Profils verbergen?"; -$a->strings["Edit Profile Details"] = "Bearbeite Profil-Details"; -$a->strings["View this profile"] = "Dieses Profil ansehen"; -$a->strings["Change Profile Photo"] = "Profilfoto ändern"; -$a->strings["Create a new profile using these settings"] = "Neues Profil anlegen und diese Einstellungen übernehmen"; -$a->strings["Clone this profile"] = "Dieses Profil klonen"; -$a->strings["Delete this profile"] = "Dieses Profil löschen"; -$a->strings["Import profile from file"] = "Profil aus einer Datei importieren"; -$a->strings["Export profile to file"] = "Profil in eine Datei exportieren"; -$a->strings["Profile Name:"] = "Profilname:"; -$a->strings["Your Full Name:"] = "Dein voller Name:"; -$a->strings["Title/Description:"] = "Titel/Stellenbeschreibung:"; -$a->strings["Your Gender:"] = "Dein Geschlecht:"; -$a->strings["Birthday (%s):"] = "Geburtstag (%s):"; -$a->strings["Street Address:"] = "Straße und Hausnummer:"; -$a->strings["Locality/City:"] = "Wohnort:"; -$a->strings["Postal/Zip Code:"] = "Postleitzahl:"; -$a->strings["Country:"] = "Land:"; -$a->strings["Region/State:"] = "Region/Bundesstaat:"; -$a->strings["♥ Marital Status:"] = "♥ Beziehungsstatus:"; -$a->strings["Who: (if applicable)"] = "Wer: (falls anwendbar)"; -$a->strings["Examples: cathy123, Cathy Williams, cathy@example.com"] = "Beispiele: cathy123, Cathy Williams, cathy@example.com"; -$a->strings["Since [date]:"] = "Seit [Datum]:"; -$a->strings["Homepage URL:"] = "Homepage URL:"; -$a->strings["Religious Views:"] = "Religiöse Ansichten:"; -$a->strings["Keywords:"] = "Schlüsselwörter:"; -$a->strings["Example: fishing photography software"] = "Beispiel: Angeln Fotografie Software"; -$a->strings["Used in directory listings"] = "Wird in Verzeichnis-Auflistungen verwendet"; -$a->strings["Tell us about yourself..."] = "Erzähle uns ein wenig von Dir …"; -$a->strings["Hobbies/Interests"] = "Hobbys/Interessen"; -$a->strings["Contact information and Social Networks"] = "Kontaktinformation und soziale Netzwerke"; -$a->strings["My other channels"] = "Meine anderen Kanäle"; -$a->strings["Musical interests"] = "Musikalische Interessen"; -$a->strings["Books, literature"] = "Bücher, Literatur"; -$a->strings["Television"] = "Fernsehen"; -$a->strings["Film/dance/culture/entertainment"] = "Film/Tanz/Kultur/Unterhaltung"; -$a->strings["Love/romance"] = "Liebe/Romantik"; -$a->strings["Work/employment"] = "Arbeit/Anstellung"; -$a->strings["School/education"] = "Schule/Ausbildung"; -$a->strings["This is your default profile."] = "Das ist Dein Standardprofil"; -$a->strings["Edit/Manage Profiles"] = "Profile bearbeiten/verwalten"; -$a->strings["Add profile things"] = "Sachen zum Profil hinzufügen"; -$a->strings["Include desirable objects in your profile"] = "Binde begehrenswerte Dinge in Dein Profil ein"; -$a->strings["Bookmark added"] = "Lesezeichen hinzugefügt"; -$a->strings["My Bookmarks"] = "Meine Lesezeichen"; -$a->strings["My Connections Bookmarks"] = "Lesezeichen meiner Kontakte"; -$a->strings["No channel."] = "Kein Kanal."; -$a->strings["Common connections"] = "Gemeinsame Verbindungen"; -$a->strings["No connections in common."] = "Keine gemeinsamen Verbindungen."; -$a->strings["Like/Dislike"] = "Mögen/Nicht mögen"; -$a->strings["This action is restricted to members."] = "Diese Aktion kann nur von Mitgliedern ausgeführt werden."; -$a->strings["Please login with your RedMatrix ID or register as a new RedMatrix member to continue."] = "Bitte melde Dich mit Deiner RedMatrix-ID an oder registriere Dich als neues Mitglied der RedMatrix, um fortzufahren."; -$a->strings["Invalid request."] = "Ungültige Anfrage."; -$a->strings["thing"] = "Sache"; -$a->strings["Channel unavailable."] = "Kanal nicht vorhanden."; -$a->strings["Previous action reversed."] = "Die vorherige Aktion wurde rückgängig gemacht."; -$a->strings["Action completed."] = "Aktion durchgeführt."; -$a->strings["Thank you."] = "Vielen Dank."; -$a->strings["No more system notifications."] = "Keine System-Benachrichtigungen mehr."; -$a->strings["System Notifications"] = "System-Benachrichtigungen"; -$a->strings["Authorize application connection"] = "Zugriff für die Anwendung autorisieren"; -$a->strings["Return to your app and insert this Securty Code:"] = "Trage folgenden Sicherheitscode in der Anwendung ein:"; -$a->strings["Please login to continue."] = "Zum Weitermachen, bitte einloggen."; -$a->strings["Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?"] = "Möchtest Du dieser Anwendung erlauben, Deine Nachrichten und Kontakte abzurufen und/oder neue Nachrichten für Dich zu erstellen?"; -$a->strings["Room not found"] = "Chatraum nicht gefunden"; -$a->strings["Leave Room"] = "Raum verlassen"; -$a->strings["Delete This Room"] = "Diesen Raum löschen"; -$a->strings["I am away right now"] = "Ich bin gerade nicht da"; -$a->strings["I am online"] = "Ich bin online"; -$a->strings["Bookmark this room"] = "Lesezeichen für diesen Raum setzen"; -$a->strings["New Chatroom"] = "Neuer Chatraum"; -$a->strings["Chatroom Name"] = "Name des Chatraums"; -$a->strings["%1\$s's Chatrooms"] = "%1\$ss Chaträume"; -$a->strings["Event title and start time are required."] = "Veranstaltungs- Titel und Startzeit sind erforderlich."; -$a->strings["Event not found."] = "Termin nicht gefunden."; -$a->strings["l, F j"] = "l, j. F"; -$a->strings["Edit event"] = "Veranstaltung bearbeiten"; -$a->strings["Create New Event"] = "Neue Veranstaltung erstellen"; -$a->strings["Previous"] = "Voriges"; -$a->strings["hour:minute"] = "Stunde:Minute"; -$a->strings["Event details"] = "Veranstaltungs-Details"; -$a->strings["Format is %s %s."] = "Format ist %s %s."; -$a->strings["Starting date and Title are required."] = "Startdatum und Titel sind erforderlich."; -$a->strings["Event Starts:"] = "Veranstaltung startet:"; -$a->strings["Finish date/time is not known or not relevant"] = "Ende Datum/Zeit sind unbekannt oder unwichtig"; -$a->strings["Event Finishes:"] = "Veranstaltung endet:"; -$a->strings["Adjust for viewer timezone"] = "An die Zeitzone des Betrachters anpassen"; -$a->strings["Description:"] = "Beschreibung:"; -$a->strings["Title:"] = "Titel:"; -$a->strings["Share this event"] = "Die Veranstaltung teilen"; +$a->strings["You have created %1$.0f of %2$.0f allowed channels."] = "Du hast %1$.0f von maximal %2$.0f erlaubten Kanälen eingerichtet."; +$a->strings["Create a new channel"] = "Neuen Kanal anlegen"; +$a->strings["Current Channel"] = "Aktueller Kanal"; +$a->strings["Attach to one of your channels by selecting it."] = "Wähle einen Deiner Kanäle aus, um ihn zu verwenden."; +$a->strings["Default Channel"] = "Standard Kanal"; +$a->strings["Make Default"] = "Zum Standard machen"; +$a->strings["Wall Photos"] = "Wall Fotos"; +$a->strings["Profile Match"] = "Profil-Übereinstimmungen"; +$a->strings["No keywords to match. Please add keywords to your default profile."] = "Keine Schlüsselwörter für den Abgleich gefunden. Bitte füge Schlüsselwörter zu Deinem Standardprofil hinzu."; +$a->strings["is interested in:"] = "interessiert sich für:"; +$a->strings["No matches"] = "Keine Übereinstimmungen"; +$a->strings["Menu updated."] = "Menü aktualisiert."; +$a->strings["Unable to update menu."] = "Kann Menü nicht aktualisieren."; +$a->strings["Menu created."] = "Menü erstellt."; +$a->strings["Unable to create menu."] = "Kann Menü nicht erstellen."; +$a->strings["Manage Menus"] = "Menüs verwalten"; +$a->strings["Drop"] = "Löschen"; +$a->strings["Create a new menu"] = "Neues Menü erstellen"; +$a->strings["Delete this menu"] = "Lösche dieses Menü"; +$a->strings["Edit menu contents"] = "Bearbeite Menü Inhalte"; +$a->strings["Edit this menu"] = "Dieses Menü bearbeiten"; +$a->strings["New Menu"] = "Neues Menü"; +$a->strings["Menu name"] = "Menü Name"; +$a->strings["Must be unique, only seen by you"] = "Muss eindeutig sein, ist aber nur für Dich sichtbar"; +$a->strings["Menu title"] = "Menü Titel"; +$a->strings["Menu title as seen by others"] = "Menü Titel wie er von anderen gesehen wird"; +$a->strings["Allow bookmarks"] = "Erlaube Lesezeichen"; +$a->strings["Menu may be used to store saved bookmarks"] = "Im Menü können gespeicherte Lesezeichen abgelegt werden"; +$a->strings["Menu deleted."] = "Menü gelöscht."; +$a->strings["Menu could not be deleted."] = "Menü konnte nicht gelöscht werden."; +$a->strings["Edit Menu"] = "Menü bearbeiten"; +$a->strings["Add or remove entries to this menu"] = "Einträge zu diesem Menü hinzufügen oder entfernen"; +$a->strings["Conversation removed."] = "Unterhaltung gelöscht."; +$a->strings["No messages."] = "Keine Nachrichten."; +$a->strings["D, d M Y - g:i A"] = "D, d. M Y - G:i"; +$a->strings["Add a Channel"] = "Kanal hinzufügen"; +$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."] = "Ein Kanal ist Deine eigene Sammlung von verbundenen Webseiten. Ein Kanal kann genutzt werden, um ein Social-Network-Profil, ein Blog, eine Gesprächsgruppe oder ein Forum, Promi-Seiten und vieles mehr zu erstellen. Du kannst so viele Kanäle erstellen, wie es der Betreiber Deiner Seite zulässt."; +$a->strings["Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\" "] = "Beispiele: „Horst Weidinger“, „Lisa und ihr Meerschweinchen“, „Fußball“, „Segelflieger-Forum“ "; +$a->strings["Choose a short nickname"] = "Wähle einen kurzen Spitznamen"; +$a->strings["Your nickname will be used to create an easily remembered channel address (like an email address) which you can share with others."] = "Dein Spitzname wird verwendet, um eine leicht zu merkende Kanal-Adresse (ähnlich einer E-Mail-Adresse) zu erzeugen, die Du mit anderen austauschen kannst."; +$a->strings["Or import an existing channel from another location"] = "Oder importiere einen bestehenden Kanal von einem anderen Server"; +$a->strings["Channel Type"] = "Kanaltyp"; +$a->strings["Please choose a channel type (such as social networking or community forum) and privacy requirements so we can select the best permissions for you"] = "Wähle einen Kanaltyp (wie Soziales Netzwerk oder Forum) und Privatsphäre-Vorgaben, so dass wir die passenden Kanal-Zugriffsrechte für Dich setzen können"; +$a->strings["Red Matrix - "The Network""] = "RedMatrix – "Das Netzwerk""; +$a->strings["Welcome to %s"] = "Willkommen auf %s"; $a->strings["Invalid request identifier."] = "Ungültiger Anfrage-Identifikator."; $a->strings["Discard"] = "Verwerfen"; -$a->strings["No valid account found."] = "Kein gültiges Konto gefunden."; -$a->strings["Password reset request issued. Check your email."] = "Zurücksetzen des Passworts eingeleitet. Schau in Deine E-Mails."; -$a->strings["Site Member (%s)"] = "Nutzer (%s)"; -$a->strings["Password reset requested at %s"] = "Passwort-Rücksetzung auf %s angefordert"; -$a->strings["Request could not be verified. (You may have previously submitted it.) Password reset failed."] = "Die Anfrage konnte nicht verifiziert werden. (Vielleicht hast Du schon einmal auf den Link in der E-Mail geklickt?) Passwort-Rücksetzung fehlgeschlagen."; -$a->strings["Your password has been reset as requested."] = "Dein Passwort wurde wie angefordert neu erstellt."; -$a->strings["Your new password is"] = "Dein neues Passwort lautet"; -$a->strings["Save or copy your new password - and then"] = "Speichere oder kopiere Dein neues Passwort – und dann"; -$a->strings["click here to login"] = "Klicke hier, um dich anzumelden"; -$a->strings["Your password may be changed from the Settings page after successful login."] = "Dein Passwort kann unter Einstellungen nach einer erfolgreichen Anmeldung geändert werden."; -$a->strings["Your password has changed at %s"] = "Auf %s wurde Dein Passwort geändert"; -$a->strings["Forgot your Password?"] = "Kennwort vergessen?"; -$a->strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "Gib Deine E-Mail-Adresse ein, um Dein Passwort zurücksetzen zu lassen. Du erhältst dann weitere Anweisungen per E-Mail."; -$a->strings["Email Address"] = "E-Mail Adresse"; -$a->strings["Reset"] = "Zurücksetzen"; -$a->strings["Help with this feature"] = "Hilfe zu dieser Funktion"; -$a->strings["Layout Name"] = "Layout-Name"; -$a->strings["Edit Block"] = "Block bearbeiten"; -$a->strings["Delete block?"] = "Block löschen?"; -$a->strings["Delete Block"] = "Block löschen"; -$a->strings["Some blurb about what to do when you're new here"] = "Ein Hinweis, was man tun kann, wenn man neu hier ist"; -$a->strings["Edit Layout"] = "Layout bearbeiten"; -$a->strings["Delete layout?"] = "Layout löschen?"; -$a->strings["Delete Layout"] = "Layout löschen"; -$a->strings["Channel added."] = "Kanal hinzugefügt."; -$a->strings["Location not found."] = "Klon nicht gefunden."; -$a->strings["Primary location cannot be removed."] = "Der primäre Klon kann nicht gelöscht werden."; +$a->strings["No more system notifications."] = "Keine System-Benachrichtigungen mehr."; +$a->strings["System Notifications"] = "System-Benachrichtigungen"; +$a->strings["Unable to find your hub."] = "Konnte Deinen Server nicht finden."; +$a->strings["Post successful."] = "Veröffentlichung erfolgreich."; +$a->strings["invalid target signature"] = "Ungültige Signatur des Ziels"; +$a->strings["OpenID protocol error. No ID returned."] = "OpenID Protokollfehler. Keine ID zurückgegeben."; +$a->strings["App installed."] = "App installiert."; +$a->strings["Malformed app."] = "Fehlerhafte App."; +$a->strings["Embed code"] = "Code einbetten"; +$a->strings["Edit App"] = "App bearbeiten"; +$a->strings["Create App"] = "App erstellen"; +$a->strings["Name of app"] = "Name der App"; +$a->strings["Location (URL) of app"] = "Ort (URL) der App"; +$a->strings["Photo icon URL"] = "URL zum Icon"; +$a->strings["80 x 80 pixels - optional"] = "80 x 80 Pixel – optional"; +$a->strings["Version ID"] = "Versions-ID"; +$a->strings["Price of app"] = "Preis der App"; +$a->strings["Location (URL) to purchase app"] = "Ort (URL), um die App zu kaufen"; +$a->strings["Poll"] = "Umfrage"; +$a->strings["View Results"] = "Ergebnisse"; +$a->strings["Account removals are not allowed within 48 hours of changing the account password."] = "Das Löschen von Konten innerhalb 48 Stunden nachdem deren Passwort geändert wurde ist nicht erlaubt."; +$a->strings["Remove This Account"] = "Dieses Konto löschen"; +$a->strings["This will completely remove this account including all its channels from the network. Once this has been done it is not recoverable."] = "Hiermit wird dieses Nutzerkonto einschließlich all seiner Kanäle komplett aus dem Netzwerk entfernt. Dieser Vorgang kann nicht rückgängig gemacht werden."; +$a->strings["Remove this account, all its channels and all its channel clones from the network"] = "Dieses Konto, all seine Kanäle sowie alle Kanal-Klone aus dem Netzwerk löschen"; +$a->strings["By default only the instances of the channels located on this hub will be removed from the network"] = "Standardmäßig werden nur die Kanalklone auf diesem RedMatrix-Hub aus dem Netzwerk entfernt"; +$a->strings["No service class restrictions found."] = "Keine Dienstklassenbeschränkungen gefunden."; +$a->strings["Schema Default"] = "Standard-Schema"; +$a->strings["Sans-Serif"] = "Sans-Serif"; +$a->strings["Monospace"] = "Monospace"; +$a->strings["Theme settings"] = "Theme-Einstellungen"; +$a->strings["Set scheme"] = "Schema"; +$a->strings["Set font-size for posts and comments"] = "Schriftgröße für Beiträge und Kommentare"; +$a->strings["Set font face"] = "Schriftart"; +$a->strings["Set iconset"] = "Iconset"; +$a->strings["Set big shadow size, default 15px 15px 15px"] = "Ausmaß der großen Schatten (Default 15px 15px 15px)"; +$a->strings["Set small shadow size, default 5px 5px 5px"] = "Ausmaß der kleinen Schatten (Default 5px 5px 5px)"; +$a->strings["Set shadow color, default #000"] = "Farbe der Schatten (Default #000)"; +$a->strings["Set radius size, default 5px"] = "Ecken-Radius (Default 5px)"; +$a->strings["Set line-height for posts and comments"] = "Zeilenhöhe in Beiträgen und Kommentaren"; +$a->strings["Set background image"] = "Hintergrundbild"; +$a->strings["Set background attachment"] = "Hintergrunddatei"; +$a->strings["Set background color"] = "Hintergrundfarbe"; +$a->strings["Set section background image"] = "Hintergrundbild für die Section"; +$a->strings["Set section background color"] = "Hintergrundfarbe für die Section"; +$a->strings["Set color of items - use hex"] = "Farbe für Beiträge – Hex benutzen"; +$a->strings["Set color of links - use hex"] = "Farbe für Links – Hex benutzen"; +$a->strings["Set max-width for items. Default 400px"] = "Maximale Breite von Beiträgen (Default 400px)"; +$a->strings["Set min-width for items. Default 240px"] = "Minimale Breite von Beiträgen (Default 240px)"; +$a->strings["Set the generic content wrapper width. Default 48%"] = "Breite des \"generic content wrapper\" (Default 48%)"; +$a->strings["Set color of fonts - use hex"] = "Schriftfarbe – Hex benutzen"; +$a->strings["Set background-size element"] = "Größe des Hintergrund-Elements"; +$a->strings["Item opacity"] = "Deckkraft der Beiträge"; +$a->strings["Display post previews only"] = "Nur Beitragsvorschau anzeigen"; +$a->strings["Display side bar on channel page"] = "Zeige die Seitenleiste auf der Kanal-Seite"; +$a->strings["Colour of the navigation bar"] = "Farbe der Navigationsleiste"; +$a->strings["Item float"] = "Beitragsfluss"; +$a->strings["Left offset of the section element"] = "Linker Rand des Section Elements"; +$a->strings["Right offset of the section element"] = "Rechter Rand des Section Elements"; +$a->strings["Section width"] = "Breite der Section"; +$a->strings["Left offset of the aside"] = "Linker Rand des Aside-Elements"; +$a->strings["Right offset of the aside element"] = "Rechter Rand des Aside-Elements"; +$a->strings["None"] = "Kein"; +$a->strings["Header image"] = "Titelbild"; +$a->strings["Header image only on profile pages"] = "Titelbild nur auf Profil-Seiten anzeigen"; +$a->strings["Light (Red Matrix default)"] = "Hell (RedMatrix-Voreinstellung)"; +$a->strings["Narrow navbar"] = "Schmale Navigationsleiste"; +$a->strings["Navigation bar background color"] = "Hintergrundfarbe der Navigationsleiste"; +$a->strings["Navigation bar gradient top color"] = "Farbverlauf der Navigationsleiste: Farbe oben"; +$a->strings["Navigation bar gradient bottom color"] = "Farbverlauf der Navigationsleiste: Farbe unten"; +$a->strings["Navigation active button gradient top color"] = "Navigations-Button aktiv: Farbe für Farbverlauf oben"; +$a->strings["Navigation active button gradient bottom color"] = "Navigations-Button aktiv: Farbe für Farbverlauf unten"; +$a->strings["Navigation bar border color "] = "Farbe für den Rand der Navigationsleiste"; +$a->strings["Navigation bar icon color "] = "Farbe für die Icons der Navigationsleiste"; +$a->strings["Navigation bar active icon color "] = "Farbe für aktive Icons der Navigationsleiste"; +$a->strings["link color"] = "Farbe für Links"; +$a->strings["Set font-color for banner"] = "Farbe der Schrift des Banners"; +$a->strings["Set the background color"] = "Hintergrundfarbe"; +$a->strings["Set the background image"] = "Hintergrundbild"; +$a->strings["Set the background color of items"] = "Hintergrundfarbe für Beiträge"; +$a->strings["Set the background color of comments"] = "Hintergrundfarbe für Kommentare"; +$a->strings["Set the border color of comments"] = "Farbe des Randes von Kommentaren"; +$a->strings["Set the indent for comments"] = "Einzug für Kommentare"; +$a->strings["Set the basic color for item icons"] = "Grundfarbe für Beitrags-Icons"; +$a->strings["Set the hover color for item icons"] = "Farbe für Beitrags-Icons unter dem Mauszeiger"; +$a->strings["Set font-size for the entire application"] = "Schriftgröße für die ganze Applikation"; +$a->strings["Set font-color for posts and comments"] = "Schriftfarbe für Posts und Kommentare"; +$a->strings["Set radius of corners"] = "Ecken-Radius"; +$a->strings["Set shadow depth of photos"] = "Schattentiefe von Fotos"; +$a->strings["Set maximum width of conversation regions"] = "Maximalbreite der Unterhaltungsbereiche"; +$a->strings["Center conversation regions"] = "Konversationsbereich zentrieren"; +$a->strings["Set minimum opacity of nav bar - to hide it"] = "Mindest-Deckkraft der Navigationsleiste ( - versteckt sie)"; +$a->strings["Set size of conversation author photo"] = "Größe der Avatare von Themenstartern"; +$a->strings["Set size of followup author photos"] = "Größe der Avatare von Kommentatoren"; +$a->strings["Sloppy photo albums"] = "Schräge Fotoalben"; +$a->strings["Are you a clean desk or a messy desk person?"] = "Bist Du jemand, der einen aufgeräumten Schreibtisch hat, oder eher einen chaotischen?"; +$a->strings["Update %s failed. See error logs."] = "Aktualisierung %s fehlgeschlagen. Details in den Fehlerprotokollen."; +$a->strings["Update Error at %s"] = "Aktualisierungsfehler auf %s"; +$a->strings["Create an account to access services and applications within the Red Matrix"] = "Erstelle einen Account, um Anwendungen und Dienste innerhalb der Red-Matrix verwenden zu können."; +$a->strings["Password"] = "Kennwort"; +$a->strings["Remember me"] = "Angaben speichern"; +$a->strings["Forgot your password?"] = "Passwort vergessen?"; +$a->strings["permission denied"] = "Zugriff verweigert"; +$a->strings["Got Zot?"] = "Haste schon Zot?"; +$a->strings["toggle mobile"] = "auf/von mobile Ansicht wechseln"; -- cgit v1.2.3 From add493ef4dfaa84d4bb2a8eccfbc20df2c300618 Mon Sep 17 00:00:00 2001 From: zottel Date: Fri, 7 Nov 2014 22:46:39 +0100 Subject: update to German help files --- doc/de/main.bb | 5 +++-- doc/de/registration.bb | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/doc/de/main.bb b/doc/de/main.bb index a3582e17c..d458847ec 100644 --- a/doc/de/main.bb +++ b/doc/de/main.bb @@ -7,10 +7,10 @@ Die Red-Matrix ist eine dezentrale Kommunikations- und Publishing-Plattform. Sie [zrl=[baseurl]/help/features]Features der Red-Matrix[/zrl] Die Red-Matrix funktioniert schon heute als ein globales verteiltes Netzwerk und beweist täglich ihre Vielseitigkeit und Skalierbarkeit auf kleinen Privatservern wie auch auf riesigen Sites. -Kommunikationsplattformen für Familien (auf Wunsch auch ohne Verbindung zum restlichen Red-Netzwerk), verteilte Online-Communities, Support-Foren, Homepages. Oder auch professionelle Inhalte-Anbieter mit kommerziellen Premium-Kanälen und eingeschränktem Zugriff – was immer Du willst, die Red-Matrix unterstützt Dich in Deinem kreativen Schaffen. +Kommunikationsplattformen für Familien, verteilte Online-Communities, Support-Foren, Blogs und Homepages. Oder auch professionelle Inhalte-Anbieter mit kommerziellen Premium-Kanälen und eingeschränktem Zugriff – was immer Du willst, die Red-Matrix unterstützt Dich in Deinem kreativen Schaffen. [zrl=[baseurl]/help/what_is_zot]Got Zot? Hast Du schon Zot? Wenn nicht wird es Zeit.[/zrl] -Zot ist das großartige neue Kommunikationsprotokoll, das extra für die Red-Matrix entwickelt wurde. Als Teilnehmer bist Du dank „Nomadischer Identität“ nicht länger an einen Hoster gebunden. Ziehe einfach auf einen anderen Server um und behalte dabei alle Deine Kontakte, oder klone Deinen Kanal und lasse ihn auf mehreren Servern gleichzeitig laufen – sollte einer davon plötzlich geschlossen werden, ist das kein Problem für Dich. Und bist Du erst Teil der Red-Matrix, musst Du Dich nie wieder mehrfach anmelden, selbst wenn Du Seiten auf einem andere Red-Server betrachtest. Zot ist, was die Red-Matrix besonders macht. +Zot ist das großartige neue Kommunikationsprotokoll, das extra für die Red-Matrix entwickelt wurde. Als Mitglied bist Du dank „Nomadischer Identität“ nicht länger an einen einzigen Server oder Anbieter gebunden. Ziehe einfach auf einen anderen Server um und behalte dabei alle Deine Kontakte, oder klone Deinen Kanal und lasse ihn auf mehreren Servern gleichzeitig laufen – sollte einer davon plötzlich geschlossen werden, ist das kein Problem für Dich. Und bist Du erst Teil der Red-Matrix, musst Du Dich nie wieder mehrfach anmelden, selbst wenn Du Seiten auf einem andere Red-Server betrachtest. Zot ist, was die Red-Matrix besonders macht. [size=large][b]Erste Schritte[/b][/size] [zrl=[baseurl]/help/Privacy]Datenschutz[/zrl] @@ -18,6 +18,7 @@ Zot ist das großartige neue Kommunikationsprotokoll, das extra für die Red-Mat [zrl=[baseurl]/help/accounts_profiles_channels_basics]Du in der Red-Matrix: Konten, Profile und Kanäle kurz erklärt[/zrl] [zrl=[baseurl]/help/profiles]Profile[/zrl] [zrl=[baseurl]/help/channels]Kanäle[/zrl] +[zrl=[baseurl]/help/roles]Zugriffsrechte-Kategorien und Kanaltypen[/zrl] [zrl=[baseurl]/help/first-post]Dein erster Beitrag[/zrl] [zrl=[baseurl]/help/connecting_to_channels]Sich mit anderen Kanälen verbinden[/zrl] [zrl=[baseurl]/help/permissions]Zugriffsrechte und Verschlüsselung: Du hast alles unter Kontrolle[/zrl] diff --git a/doc/de/registration.bb b/doc/de/registration.bb index fa331e561..c7aaac55e 100644 --- a/doc/de/registration.bb +++ b/doc/de/registration.bb @@ -12,7 +12,7 @@ Gib ein Passwort Deiner Wahl ein und wiederhole es in der zweiten Box, um sicher [b]Nutzungsbedingungen[/b] -Klicke auf den Link, um die Nutzungsbedingungen dieses Servers zu lesen. Wenn Du sie gelesen hast, setze den Haken im Registrierungsformular, um sie zu akzeptieren. +Klicke auf den Link, um die [zrl=[baseurl]/help/TermsOfService]Nutzungsbedingungen[/zrl] dieses Servers zu lesen. Wenn Du sie gelesen hast, setze den Haken im Registrierungsformular, um sie zu akzeptieren. [b]Registrieren[/b] -- cgit v1.2.3 From b29a968be8df52cd7c9b6d5bebb618534788337c Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Sat, 8 Nov 2014 00:17:53 +0000 Subject: Document reinstalling, or saying don't do that without explicitly stating don't do that. --- doc/faq_admins.bb | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/doc/faq_admins.bb b/doc/faq_admins.bb index e4541035b..ec4f8d969 100644 --- a/doc/faq_admins.bb +++ b/doc/faq_admins.bb @@ -38,11 +38,19 @@ valid SSL certificate rather than disabling port 443. [b]What do I need to do when moving my hub to a different server[/b] 1) Git clone on the new server. Repeat the process for any custom themes, and addons. -2) Copy .htconfig.php +2) Rsync .htconfig.php 3) Rsync everything in store/ -4) Rsync everything in custom/ (this will only exist if you have custom modules) +4) Rsync everything in mod/site/ and view/site (these will only exist if you have custom modules) 5) Dump and restore DB. +[*] +[b]How do I reinstall an existing hub on the same server?[/b] + +1) [code]git reset --hard HEAD[/code] will reset all files to their upstream defaults. This will not reset any local files that do not also exist upstream. Eg, if you have local changes to mod/channel.php, this will reset them - but will not reset any changes in mod/site/channel.php +2) If you absolutely must reinstall - for example, if you need to upgrade operating system - follow the steps for moving to a different server, but instead of using rsync, backup and restore some other way. + +Do not reinstall a hub with a fresh database and fresh .htconfig.php unless as a very last resort. Creating a temporary account and ask for help via a support channel for non-trivial reinstalls is preferable to reinstalling fresh. + [*] [b]How do I set the default homepage for logged out viewers?[/b] -- cgit v1.2.3 From 1a8fc73b57b7139f2ee9ecff1b1f9c1ae972329d Mon Sep 17 00:00:00 2001 From: Stefan Parviainen Date: Sat, 8 Nov 2014 20:06:08 +0100 Subject: Fix highlighting of login button --- view/tpl/nav.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index bc9d0ba37..d7d6d9d08 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -47,10 +47,10 @@
    - - +
    {{/if}} -- cgit v1.2.3 From adb5cec0d26bc7273a5e514721a1fa2f9124c49a Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 8 Nov 2014 13:14:08 -0800 Subject: add acl loading fix to menu-item edits --- version.inc | 2 +- view/tpl/mitemedit.tpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/version.inc b/version.inc index b0f79cf5f..efaa3c1ee 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2014-11-07.852 +2014-11-08.853 diff --git a/view/tpl/mitemedit.tpl b/view/tpl/mitemedit.tpl index 482005e44..f398cf02c 100644 --- a/view/tpl/mitemedit.tpl +++ b/view/tpl/mitemedit.tpl @@ -26,7 +26,7 @@
    - +
    -- cgit v1.2.3 From 28f3d7be5a104bc1f1e1eff2e22fd19b4ab3a2d1 Mon Sep 17 00:00:00 2001 From: Stefan Parviainen Date: Sun, 9 Nov 2014 00:18:26 +0100 Subject: New layout for directory --- mod/directory.php | 56 ++++++++++++-- mod/dirprofile.php | 184 -------------------------------------------- view/css/mod_directory.css | 31 +++++++- view/tpl/direntry.tpl | 23 +++++- view/tpl/direntry_large.tpl | 43 ----------- 5 files changed, 96 insertions(+), 241 deletions(-) delete mode 100644 mod/dirprofile.php delete mode 100755 view/tpl/direntry_large.tpl diff --git a/mod/directory.php b/mod/directory.php index 3d7632ec0..1571efcf5 100644 --- a/mod/directory.php +++ b/mod/directory.php @@ -122,6 +122,10 @@ function directory_content(&$a) { $pdesc = (($rr['description']) ? $rr['description'] . '
    ' : ''); $connect_link = ((local_user()) ? z_root() . '/follow?f=&url=' . urlencode($rr['address']) : ''); + // Checking status is disabled ATM until someone checks the performance impact more carefully + //$online = remote_online_status($rr['address']); + $online = ''; + if(in_array($rr['hash'],$contacts)) $connect_link = ''; @@ -142,8 +146,6 @@ function directory_content(&$a) { if(($years = age($rr['birthday'],'UTC','')) != 0) $details .= '
    ' . t('Age: ') . $years ; } - if(strlen($rr['gender'])) - $details .= '
    ' . t('Gender: ') . $rr['gender']; $page_type = ''; @@ -155,13 +157,48 @@ function directory_content(&$a) { || (x($profile,'country') == 1)) $location = t('Location:'); - $gender = ((x($profile,'gender') == 1) ? t('Gender:') : False); + $gender = ((x($profile,'gender') == 1) ? t('Gender: ') . $profile['gender']: False); - $marital = ((x($profile,'marital') == 1) ? t('Status:') : False); + $marital = ((x($profile,'marital') == 1) ? t('Status: ') . $profile['marital']: False); - $homepage = ((x($profile,'homepage') == 1) ? t('Homepage:') : False); - - $about = ((x($profile,'about') == 1) ? t('About:') : False); + $homepage = ((x($profile,'homepage') == 1) ? t('Homepage: ') : False); + $homepageurl = ((x($profile,'homepage') == 1) ? $profile['homepage'] : ''); + + $hometown = ((x($profile,'hometown') == 1) ? t('Hometown: ') . $profile['hometown'] : False); + + $about = ((x($profile,'about') == 1) ? t('About: ') . $profile['about'] : False); + + $keywords = ((x($profile,'keywords')) ? $profile['keywords'] : ''); + +logger('keywords: '.$keywords); + if($keywords) { + $keywords = str_replace(',',' ', $keywords); + $keywords = str_replace(' ',' ', $keywords); + $karr = explode(' ', $keywords); + $out = ''; + if($karr) { + if(local_user()) { + $r = q("select keywords from profile where uid = %d and is_default = 1 limit 1", + intval(local_user()) + ); + if($r) { + $keywords = str_replace(',',' ', $r[0]['keywords']); + $keywords = str_replace(' ',' ', $keywords); + $marr = explode(' ', $keywords); + } + } + foreach($karr as $k) { + if(strlen($out)) + $out .= ', '; + if($marr && in_arrayi($k,$marr)) + $out .= '' . $k . ''; + else + $out .= $k; + } + } + + } +logger('out: '.$out); $entry = array( @@ -179,9 +216,14 @@ function directory_content(&$a) { 'pdesc' => $pdesc, 'marital' => $marital, 'homepage' => $homepage, + 'homepageurl' => $homepageurl, + 'hometown' => $hometown, 'about' => $about, 'conn_label' => t('Connect'), 'connect' => $connect_link, + 'online' => $online, + 'kw' => (($out) ? t('Keywords: ') : ''), + 'keywords' => $out, ); $arr = array('contact' => $rr, 'entry' => $entry); diff --git a/mod/dirprofile.php b/mod/dirprofile.php deleted file mode 100644 index e9b12ada7..000000000 --- a/mod/dirprofile.php +++ /dev/null @@ -1,184 +0,0 @@ -' : ''); - - $qrlink = zid($rr['url']); - $connect_link = ((local_user()) ? z_root() . '/follow?f=&url=' . urlencode($rr['address']) : ''); - - $online = remote_online_status($rr['address']); - - - if(in_array($rr['hash'],$contacts)) - $connect_link = ''; - - $details = ''; - if(strlen($rr['locale'])) - $details .= $rr['locale']; - if(strlen($rr['region'])) { - if(strlen($rr['locale'])) - $details .= ', '; - $details .= $rr['region']; - } - if(strlen($rr['country'])) { - if(strlen($details)) - $details .= ', '; - $details .= $rr['country']; - } - if(strlen($rr['birthday'])) { - if(($years = age($rr['birthday'],'UTC','')) != 0) - $details .= '
    ' . t('Age: ') . $years ; - } - if(strlen($rr['gender'])) - $details .= '
    ' . t('Gender: ') . $rr['gender']; - - $page_type = ''; - - $profile = $rr; - - if ((x($profile,'locale') == 1) - || (x($profile,'region') == 1) - || (x($profile,'postcode') == 1) - || (x($profile,'country') == 1)) - $location = t('Location:'); - - - $marital = ((x($profile,'marital') == 1) ? t('Status: ') . $profile['marital'] : False); - $sexual = ((x($profile,'sexual') == 1) ? t('Sexual Preference: ') . $profile['sexual'] : False); - - $homepage = ((x($profile,'homepage') == 1) ? t('Homepage: ') . linkify($profile['homepage']) : False); - $hometown = ((x($profile,'hometown') == 1) ? t('Hometown: ') . $profile['hometown'] : False); - - $about = ((x($profile,'about') == 1) ? t('About: ') . bbcode($profile['about']) : False); - - $keywords = ((x($profile,'keywords')) ? $profile['keywords'] : ''); - if($keywords) { - $keywords = str_replace(',',' ', $keywords); - $keywords = str_replace(' ',' ', $keywords); - $karr = explode(' ', $keywords); - $out = ''; - if($karr) { - if(local_user()) { - $r = q("select keywords from profile where uid = %d and is_default = 1 limit 1", - intval(local_user()) - ); - if($r) { - $keywords = str_replace(',',' ', $r[0]['keywords']); - $keywords = str_replace(' ',' ', $keywords); - $marr = explode(' ', $keywords); - } - } - foreach($karr as $k) { - if(strlen($out)) - $out .= ', '; - if($marr && in_arrayi($k,$marr)) - $out .= '' . $k . ''; - else - $out .= $k; - } - } - - } - $entry = replace_macros(get_markup_template('direntry_large.tpl'), array( - '$id' => ++$t, - '$profile_link' => $profile_link, - '$qrlink' => $qrlink, - '$photo' => $rr['photo_l'], - '$alttext' => $rr['name'] . ' ' . $rr['address'], - '$name' => $rr['name'], - '$online' => (($online) ? t('Online Now') : ''), - '$details' => $pdesc . $details, - '$profile' => $profile, - '$address' => $rr['address'], - '$location' => $location, - '$gender' => $gender, - '$pdesc' => $pdesc, - '$marital' => $marital, - '$homepage' => $homepage, - '$hometown' => $hometown, - '$about' => $about, - '$kw' => (($out) ? t('Keywords: ') : ''), - '$keywords' => $out, - '$conn_label' => t('Connect'), - '$connect' => $connect_link, - )); - - - echo $entry; - killme(); - - } - } - else { - info( t("Not found.") . EOL); - } - } - } - } - - - - -} \ No newline at end of file diff --git a/view/css/mod_directory.css b/view/css/mod_directory.css index bc8054937..98b99ef50 100644 --- a/view/css/mod_directory.css +++ b/view/css/mod_directory.css @@ -8,15 +8,17 @@ .directory-photo { margin-left: 25px; } +.directory-photo-img { + margin-left: auto; + margin-right: auto; + display:block; +} .directory-details { text-align: center; margin-left: 5px; margin-right: 5px; } .directory-item { - float: left; - width: 225px; - height: 260px; overflow: hidden; margin: 2px; } @@ -42,3 +44,26 @@ div.dirtagblock.widget { float: left; width: 225px; } + +.contact-photo { + float: left; + margin-right: 16px; +} + +.contact-name { + font-size: larger; +} + +.contact-info { + display: block; + overflow: hidden; +} + +.directory-item { + margin: 16px; +} +.directory-connect { + display:block; + margin-left:auto; + margin-right: auto; +} diff --git a/view/tpl/direntry.tpl b/view/tpl/direntry.tpl index a6252bb9a..691905ecd 100755 --- a/view/tpl/direntry.tpl +++ b/view/tpl/direntry.tpl @@ -3,12 +3,27 @@
    {{$entry.alttext}} -
    -
    - -
    {{$entry.name}}
    {{if $entry.connect}}
    {{$entry.conn_label}}
    {{/if}} + + + +
    +
    {{$entry.name}}{{if $entry.online}} {{/if}}
    +
    {{$entry.details}}
    +{{if $entry.hometown}} +
    {{$entry.hometown}}
    +{{/if}} +{{if $entry.about}} +
    {{$entry.about}}
    +{{/if}} +{{if $entry.homepage}} +
    {{$entry.homepage}}{{$entry.homepageurl}}
    +{{/if}} +{{if $entry.kw}} +
    {{$entry.kw}} {{$entry.keywords}}
    +{{/if}} +
    diff --git a/view/tpl/direntry_large.tpl b/view/tpl/direntry_large.tpl deleted file mode 100755 index da6ea1a44..000000000 --- a/view/tpl/direntry_large.tpl +++ /dev/null @@ -1,43 +0,0 @@ -
    -
    - -
    -
    - {{$alttext}} -
    -
    - QR -
    -
    - -
    - - -
    {{$name}}{{if $online}} {{/if}}
    -{{if $connect}} -
    {{$conn_label}}
    -{{/if}} - -
    {{$address}}
    - -
    {{$details}}
    -{{if $marital}} -
    {{$marital}}
    -{{/if}} -{{if $sexual}} -
    {{$sexual}}
    -{{/if}} -{{if $homepage}} -
    {{$homepage}}
    -{{/if}} -{{if $hometown}} -
    {{$hometown}}
    -{{/if}} -{{if $about}} -
    {{$about}}
    -{{/if}} -{{if $kw}} -
    {{$kw}} {{$keywords}}
    -{{/if}} -
    -
    -- cgit v1.2.3 From 24bdf58d2bd564c22c44a39f369a50df918c8c38 Mon Sep 17 00:00:00 2001 From: Stefan Parviainen Date: Sun, 9 Nov 2014 09:37:06 +0100 Subject: Use consistent terminology for channel directory --- include/nav.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/nav.php b/include/nav.php index f1f89db20..4c3da2195 100644 --- a/include/nav.php +++ b/include/nav.php @@ -173,7 +173,7 @@ EOT; $nav['search'] = array('search', t('Search'), "", t('Search site content')); - $nav['directory'] = array('directory', t('Directory'), "", t('Channel Locator')); + $nav['directory'] = array('directory', t('Directory'), "", t('Channel Directory')); /** -- cgit v1.2.3 From 50b9cc6f3938ffd7b64665f19449c606b6288c54 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 9 Nov 2014 16:11:03 -0800 Subject: directory listing shows phantom keywords --- mod/directory.php | 4 +++- version.inc | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/mod/directory.php b/mod/directory.php index 1571efcf5..88c240e58 100644 --- a/mod/directory.php +++ b/mod/directory.php @@ -170,12 +170,14 @@ function directory_content(&$a) { $keywords = ((x($profile,'keywords')) ? $profile['keywords'] : ''); + $out = ''; + logger('keywords: '.$keywords); if($keywords) { $keywords = str_replace(',',' ', $keywords); $keywords = str_replace(' ',' ', $keywords); $karr = explode(' ', $keywords); - $out = ''; +// $out = ''; if($karr) { if(local_user()) { $r = q("select keywords from profile where uid = %d and is_default = 1 limit 1", diff --git a/version.inc b/version.inc index efaa3c1ee..2859cdc11 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2014-11-08.853 +2014-11-09.854 -- cgit v1.2.3 From d5d1f655d97b389e6b2cae1c753e1377455b1721 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 9 Nov 2014 16:11:56 -0800 Subject: remove extraneous logging --- mod/directory.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/mod/directory.php b/mod/directory.php index 88c240e58..09ff2ae09 100644 --- a/mod/directory.php +++ b/mod/directory.php @@ -172,12 +172,11 @@ function directory_content(&$a) { $out = ''; -logger('keywords: '.$keywords); if($keywords) { $keywords = str_replace(',',' ', $keywords); $keywords = str_replace(' ',' ', $keywords); $karr = explode(' ', $keywords); -// $out = ''; + if($karr) { if(local_user()) { $r = q("select keywords from profile where uid = %d and is_default = 1 limit 1", @@ -200,8 +199,6 @@ logger('keywords: '.$keywords); } } -logger('out: '.$out); - $entry = array( 'id' => ++$t, -- cgit v1.2.3 From 2e695d1da2383214995b850b7d539dfb08eb546e Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 9 Nov 2014 17:39:54 -0800 Subject: menu page cleanup --- mod/menu.php | 32 +++++++++++++++++--------------- view/css/mod_menu.css | 3 +++ view/tpl/menulist.tpl | 2 +- 3 files changed, 21 insertions(+), 16 deletions(-) create mode 100644 view/css/mod_menu.css diff --git a/mod/menu.php b/mod/menu.php index a2d0c2385..a43ebfee6 100644 --- a/mod/menu.php +++ b/mod/menu.php @@ -52,25 +52,27 @@ function menu_content(&$a) { if(argc() == 1) { // list menus $x = menu_list(local_user()); + if($x) { + for($y = 0; $y < count($x); $y ++) { + $x[$y]['bookmark'] = (($x[$y]['menu_flags'] & MENU_BOOKMARK) ? true : false); + } + } - $o = replace_macros(get_markup_template('menulist.tpl'),array( - '$title' => t('Manage Menus'), - '$menus' => $x, - '$edit' => t('Edit'), - '$drop' => t('Drop'), - '$new' => t('New'), - '$hintnew' => t('Create a new menu'), - '$hintdrop' => t('Delete this menu'), - '$hintcontent' => t('Edit menu contents'), - '$hintedit' => t('Edit this menu') - )); + $o = replace_macros(get_markup_template('menulist.tpl'),array( + '$title' => t('Manage Menus'), + '$menus' => $x, + '$edit' => t('Edit'), + '$drop' => t('Drop'), + '$new' => t('New'), + '$bmark' => t('Bookmarks allowed'), + '$hintnew' => t('Create a new menu'), + '$hintdrop' => t('Delete this menu'), + '$hintcontent' => t('Edit menu contents'), + '$hintedit' => t('Edit this menu') + )); return $o; - - - - } diff --git a/view/css/mod_menu.css b/view/css/mod_menu.css new file mode 100644 index 000000000..6123ea56b --- /dev/null +++ b/view/css/mod_menu.css @@ -0,0 +1,3 @@ +#menulist > li { + margin-top: 15px; +} \ No newline at end of file diff --git a/view/tpl/menulist.tpl b/view/tpl/menulist.tpl index 2feb75d90..bb862fef0 100644 --- a/view/tpl/menulist.tpl +++ b/view/tpl/menulist.tpl @@ -9,7 +9,7 @@ {{if $menus }} {{/if}} -- cgit v1.2.3 From 3b74e3c1e10ebe3cc8880b3b4ede57f919cb3d10 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 9 Nov 2014 19:24:14 -0800 Subject: add defaults to database tables --- install/database-w-defaults-v1131.diff | 1914 ++++++++++++++++++++++++++++++++ install/database.sql | 743 +++++++++---- 2 files changed, 2467 insertions(+), 190 deletions(-) create mode 100644 install/database-w-defaults-v1131.diff diff --git a/install/database-w-defaults-v1131.diff b/install/database-w-defaults-v1131.diff new file mode 100644 index 000000000..c8870f9c4 --- /dev/null +++ b/install/database-w-defaults-v1131.diff @@ -0,0 +1,1914 @@ +*** database.sql Mon Sep 8 20:28:00 2014 +--- database-w-defaults.sql Sun Nov 9 19:20:32 2014 +*************** +*** 1,15 **** +! SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO"; +! +! /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; +! /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; +! /*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; +! /*!40101 SET NAMES utf8 */; + + + CREATE TABLE IF NOT EXISTS `abook` ( + `abook_id` int(10) unsigned NOT NULL AUTO_INCREMENT, +! `abook_account` int(10) unsigned NOT NULL, +! `abook_channel` int(10) unsigned NOT NULL, + `abook_xchan` char(255) NOT NULL DEFAULT '', + `abook_my_perms` int(11) NOT NULL DEFAULT '0', + `abook_their_perms` int(11) NOT NULL DEFAULT '0', +--- 1,13 ---- +! -- -------------------------------------------------------- + ++ -- ++ -- Table structure for table `abook` ++ -- + + CREATE TABLE IF NOT EXISTS `abook` ( + `abook_id` int(10) unsigned NOT NULL AUTO_INCREMENT, +! `abook_account` int(10) unsigned NOT NULL DEFAULT '0', +! `abook_channel` int(10) unsigned NOT NULL DEFAULT '0', + `abook_xchan` char(255) NOT NULL DEFAULT '', + `abook_my_perms` int(11) NOT NULL DEFAULT '0', + `abook_their_perms` int(11) NOT NULL DEFAULT '0', +*************** +*** 37,42 **** +--- 35,46 ---- + KEY `abook_rating` (`abook_rating`) + ) ENGINE=MyISAM DEFAULT CHARSET=utf8; + ++ -- -------------------------------------------------------- ++ ++ -- ++ -- Table structure for table `account` ++ -- ++ + CREATE TABLE IF NOT EXISTS `account` ( + `account_id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `account_parent` int(10) unsigned NOT NULL DEFAULT '0', +*************** +*** 70,79 **** + KEY `account_password_changed` (`account_password_changed`) + ) ENGINE=MyISAM DEFAULT CHARSET=utf8; + + CREATE TABLE IF NOT EXISTS `addon` ( + `id` int(11) NOT NULL AUTO_INCREMENT, +! `name` char(255) NOT NULL, +! `version` char(255) NOT NULL, + `installed` tinyint(1) NOT NULL DEFAULT '0', + `hidden` tinyint(1) NOT NULL DEFAULT '0', + `timestamp` bigint(20) NOT NULL DEFAULT '0', +--- 74,89 ---- + KEY `account_password_changed` (`account_password_changed`) + ) ENGINE=MyISAM DEFAULT CHARSET=utf8; + ++ -- -------------------------------------------------------- ++ ++ -- ++ -- Table structure for table `addon` ++ -- ++ + CREATE TABLE IF NOT EXISTS `addon` ( + `id` int(11) NOT NULL AUTO_INCREMENT, +! `name` char(255) NOT NULL DEFAULT '', +! `version` char(255) NOT NULL DEFAULT '', + `installed` tinyint(1) NOT NULL DEFAULT '0', + `hidden` tinyint(1) NOT NULL DEFAULT '0', + `timestamp` bigint(20) NOT NULL DEFAULT '0', +*************** +*** 84,89 **** +--- 94,104 ---- + KEY `installed` (`installed`) + ) ENGINE=MyISAM DEFAULT CHARSET=utf8; + ++ -- -------------------------------------------------------- ++ ++ -- ++ -- Table structure for table `app` ++ -- + + CREATE TABLE IF NOT EXISTS `app` ( + `id` int(11) NOT NULL AUTO_INCREMENT, +*************** +*** 108,115 **** + KEY `app_version` (`app_version`), + KEY `app_channel` (`app_channel`), + KEY `app_price` (`app_price`) +! ) ENGINE=MyISAM DEFAULT CHARSET=utf8; + + + CREATE TABLE IF NOT EXISTS `attach` ( + `id` int(10) unsigned NOT NULL AUTO_INCREMENT, +--- 123,135 ---- + KEY `app_version` (`app_version`), + KEY `app_channel` (`app_channel`), + KEY `app_price` (`app_price`) +! ) ENGINE=MyISAM DEFAULT CHARSET=utf8; +! +! -- -------------------------------------------------------- + ++ -- ++ -- Table structure for table `attach` ++ -- + + CREATE TABLE IF NOT EXISTS `attach` ( + `id` int(10) unsigned NOT NULL AUTO_INCREMENT, +*************** +*** 145,166 **** + KEY `creator` (`creator`) + ) ENGINE=MyISAM DEFAULT CHARSET=utf8; + + CREATE TABLE IF NOT EXISTS `auth_codes` ( +! `id` varchar(40) NOT NULL, +! `client_id` varchar(20) NOT NULL, +! `redirect_uri` varchar(200) NOT NULL, +! `expires` int(11) NOT NULL, +! `scope` varchar(250) NOT NULL, + PRIMARY KEY (`id`) + ) ENGINE=MyISAM DEFAULT CHARSET=utf8; + + CREATE TABLE IF NOT EXISTS `cache` ( +! `k` char(255) NOT NULL, + `v` text NOT NULL, +! `updated` datetime NOT NULL, + PRIMARY KEY (`k`) + ) ENGINE=MyISAM DEFAULT CHARSET=utf8; + + CREATE TABLE IF NOT EXISTS `channel` ( + `channel_id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `channel_account_id` int(10) unsigned NOT NULL DEFAULT '0', +--- 165,204 ---- + KEY `creator` (`creator`) + ) ENGINE=MyISAM DEFAULT CHARSET=utf8; + ++ -- -------------------------------------------------------- ++ ++ -- ++ -- Table structure for table `auth_codes` ++ -- ++ + CREATE TABLE IF NOT EXISTS `auth_codes` ( +! `id` varchar(40) NOT NULL DEFAULT '', +! `client_id` varchar(20) NOT NULL DEFAULT '', +! `redirect_uri` varchar(200) NOT NULL DEFAULT '', +! `expires` int(11) NOT NULL DEFAULT '0', +! `scope` varchar(250) NOT NULL DEFAULT '', + PRIMARY KEY (`id`) + ) ENGINE=MyISAM DEFAULT CHARSET=utf8; + ++ -- -------------------------------------------------------- ++ ++ -- ++ -- Table structure for table `cache` ++ -- ++ + CREATE TABLE IF NOT EXISTS `cache` ( +! `k` char(255) NOT NULL DEFAULT '', + `v` text NOT NULL, +! `updated` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', + PRIMARY KEY (`k`) + ) ENGINE=MyISAM DEFAULT CHARSET=utf8; + ++ -- -------------------------------------------------------- ++ ++ -- ++ -- Table structure for table `channel` ++ -- ++ + CREATE TABLE IF NOT EXISTS `channel` ( + `channel_id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `channel_account_id` int(10) unsigned NOT NULL DEFAULT '0', +*************** +*** 189,212 **** + `channel_allow_gid` mediumtext NOT NULL, + `channel_deny_cid` mediumtext NOT NULL, + `channel_deny_gid` mediumtext NOT NULL, +! `channel_r_stream` int(10) unsigned NOT NULL DEFAULT '128', +! `channel_r_profile` int(10) unsigned NOT NULL DEFAULT '128', +! `channel_r_photos` int(10) unsigned NOT NULL DEFAULT '128', +! `channel_r_abook` int(10) unsigned NOT NULL DEFAULT '128', +! `channel_w_stream` int(10) unsigned NOT NULL DEFAULT '128', +! `channel_w_wall` int(10) unsigned NOT NULL DEFAULT '128', +! `channel_w_tagwall` int(10) unsigned NOT NULL DEFAULT '128', +! `channel_w_comment` int(10) unsigned NOT NULL DEFAULT '128', +! `channel_w_mail` int(10) unsigned NOT NULL DEFAULT '128', +! `channel_w_photos` int(10) unsigned NOT NULL DEFAULT '128', +! `channel_w_chat` int(10) unsigned NOT NULL DEFAULT '128', + `channel_a_delegate` int(10) unsigned NOT NULL DEFAULT '0', +! `channel_r_storage` int(10) unsigned NOT NULL DEFAULT '128', +! `channel_w_storage` int(10) unsigned NOT NULL DEFAULT '128', +! `channel_r_pages` int(10) unsigned NOT NULL DEFAULT '128', +! `channel_w_pages` int(10) unsigned NOT NULL DEFAULT '128', +! `channel_a_republish` int(10) unsigned NOT NULL DEFAULT '128', +! `channel_w_like` int(10) unsigned NOT NULL DEFAULT '128', + PRIMARY KEY (`channel_id`), + UNIQUE KEY `channel_address_unique` (`channel_address`), + KEY `channel_account_id` (`channel_account_id`), +--- 227,250 ---- + `channel_allow_gid` mediumtext NOT NULL, + `channel_deny_cid` mediumtext NOT NULL, + `channel_deny_gid` mediumtext NOT NULL, +! `channel_r_stream` int(10) unsigned NOT NULL DEFAULT '0', +! `channel_r_profile` int(10) unsigned NOT NULL DEFAULT '0', +! `channel_r_photos` int(10) unsigned NOT NULL DEFAULT '0', +! `channel_r_abook` int(10) unsigned NOT NULL DEFAULT '0', +! `channel_w_stream` int(10) unsigned NOT NULL DEFAULT '0', +! `channel_w_wall` int(10) unsigned NOT NULL DEFAULT '0', +! `channel_w_tagwall` int(10) unsigned NOT NULL DEFAULT '0', +! `channel_w_comment` int(10) unsigned NOT NULL DEFAULT '0', +! `channel_w_mail` int(10) unsigned NOT NULL DEFAULT '0', +! `channel_w_photos` int(10) unsigned NOT NULL DEFAULT '0', +! `channel_w_chat` int(10) unsigned NOT NULL DEFAULT '0', + `channel_a_delegate` int(10) unsigned NOT NULL DEFAULT '0', +! `channel_r_storage` int(10) unsigned NOT NULL DEFAULT '0', +! `channel_w_storage` int(10) unsigned NOT NULL DEFAULT '0', +! `channel_r_pages` int(10) unsigned NOT NULL DEFAULT '0', +! `channel_w_pages` int(10) unsigned NOT NULL DEFAULT '0', +! `channel_a_republish` int(10) unsigned NOT NULL DEFAULT '0', +! `channel_w_like` int(10) unsigned NOT NULL DEFAULT '0', + PRIMARY KEY (`channel_id`), + UNIQUE KEY `channel_address_unique` (`channel_address`), + KEY `channel_account_id` (`channel_account_id`), +*************** +*** 241,250 **** + KEY `channel_w_pages` (`channel_w_pages`), + KEY `channel_deleted` (`channel_deleted`), + KEY `channel_a_republish` (`channel_a_republish`), +! KEY `channel_w_like` (`channel_w_like`), +! KEY `channel_dirdate` (`channel_dirdate`) + ) ENGINE=MyISAM DEFAULT CHARSET=utf8; + + CREATE TABLE IF NOT EXISTS `chat` ( + `chat_id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `chat_room` int(10) unsigned NOT NULL DEFAULT '0', +--- 279,294 ---- + KEY `channel_w_pages` (`channel_w_pages`), + KEY `channel_deleted` (`channel_deleted`), + KEY `channel_a_republish` (`channel_a_republish`), +! KEY `channel_dirdate` (`channel_dirdate`), +! KEY `channel_w_like` (`channel_w_like`) + ) ENGINE=MyISAM DEFAULT CHARSET=utf8; + ++ -- -------------------------------------------------------- ++ ++ -- ++ -- Table structure for table `chat` ++ -- ++ + CREATE TABLE IF NOT EXISTS `chat` ( + `chat_id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `chat_room` int(10) unsigned NOT NULL DEFAULT '0', +*************** +*** 255,275 **** + KEY `chat_room` (`chat_room`), + KEY `chat_xchan` (`chat_xchan`), + KEY `created` (`created`) +! ) ENGINE=MyISAM DEFAULT CHARSET=utf8; + + CREATE TABLE IF NOT EXISTS `chatpresence` ( + `cp_id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `cp_room` int(10) unsigned NOT NULL DEFAULT '0', + `cp_xchan` char(255) NOT NULL DEFAULT '', + `cp_last` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', +! `cp_status` char(255) NOT NULL, + `cp_client` char(128) NOT NULL DEFAULT '', + PRIMARY KEY (`cp_id`), + KEY `cp_room` (`cp_room`), + KEY `cp_xchan` (`cp_xchan`), + KEY `cp_last` (`cp_last`), + KEY `cp_status` (`cp_status`) +! ) ENGINE=MyISAM DEFAULT CHARSET=utf8; + + CREATE TABLE IF NOT EXISTS `chatroom` ( + `cr_id` int(10) unsigned NOT NULL AUTO_INCREMENT, +--- 299,331 ---- + KEY `chat_room` (`chat_room`), + KEY `chat_xchan` (`chat_xchan`), + KEY `created` (`created`) +! ) ENGINE=MyISAM DEFAULT CHARSET=utf8; +! +! -- -------------------------------------------------------- +! +! -- +! -- Table structure for table `chatpresence` +! -- + + CREATE TABLE IF NOT EXISTS `chatpresence` ( + `cp_id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `cp_room` int(10) unsigned NOT NULL DEFAULT '0', + `cp_xchan` char(255) NOT NULL DEFAULT '', + `cp_last` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', +! `cp_status` char(255) NOT NULL DEFAULT '', + `cp_client` char(128) NOT NULL DEFAULT '', + PRIMARY KEY (`cp_id`), + KEY `cp_room` (`cp_room`), + KEY `cp_xchan` (`cp_xchan`), + KEY `cp_last` (`cp_last`), + KEY `cp_status` (`cp_status`) +! ) ENGINE=MyISAM DEFAULT CHARSET=utf8; +! +! -- -------------------------------------------------------- +! +! -- +! -- Table structure for table `chatroom` +! -- + + CREATE TABLE IF NOT EXISTS `chatroom` ( + `cr_id` int(10) unsigned NOT NULL AUTO_INCREMENT, +*************** +*** 290,322 **** + KEY `cr_created` (`cr_created`), + KEY `cr_edited` (`cr_edited`), + KEY `cr_expire` (`cr_expire`) +! ) ENGINE=MyISAM DEFAULT CHARSET=utf8; + + CREATE TABLE IF NOT EXISTS `clients` ( +! `client_id` varchar(20) NOT NULL, +! `pw` varchar(20) NOT NULL, +! `redirect_uri` varchar(200) NOT NULL, + `name` text, + `icon` text, + `uid` int(11) NOT NULL DEFAULT '0', + PRIMARY KEY (`client_id`) + ) ENGINE=MyISAM DEFAULT CHARSET=utf8; + + CREATE TABLE IF NOT EXISTS `config` ( + `id` int(10) unsigned NOT NULL AUTO_INCREMENT, +! `cat` char(255) CHARACTER SET ascii NOT NULL, +! `k` char(255) CHARACTER SET ascii NOT NULL, + `v` text NOT NULL, + PRIMARY KEY (`id`), + 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, +--- 346,396 ---- + KEY `cr_created` (`cr_created`), + KEY `cr_edited` (`cr_edited`), + KEY `cr_expire` (`cr_expire`) +! ) ENGINE=MyISAM DEFAULT CHARSET=utf8; +! +! -- -------------------------------------------------------- +! +! -- +! -- Table structure for table `clients` +! -- + + CREATE TABLE IF NOT EXISTS `clients` ( +! `client_id` varchar(20) NOT NULL DEFAULT '', +! `pw` varchar(20) NOT NULL DEFAULT '', +! `redirect_uri` varchar(200) NOT NULL DEFAULT '', + `name` text, + `icon` text, + `uid` int(11) NOT NULL DEFAULT '0', + PRIMARY KEY (`client_id`) + ) ENGINE=MyISAM DEFAULT CHARSET=utf8; + ++ -- -------------------------------------------------------- ++ ++ -- ++ -- Table structure for table `config` ++ -- ++ + CREATE TABLE IF NOT EXISTS `config` ( + `id` int(10) unsigned NOT NULL AUTO_INCREMENT, +! `cat` char(255) CHARACTER SET ascii NOT NULL DEFAULT '', +! `k` char(255) CHARACTER SET ascii NOT NULL DEFAULT '', + `v` text NOT NULL, + PRIMARY KEY (`id`), + UNIQUE KEY `access` (`cat`,`k`) + ) ENGINE=MyISAM DEFAULT CHARSET=utf8; + ++ -- -------------------------------------------------------- ++ ++ -- ++ -- Table structure for table `conv` ++ -- ++ + CREATE TABLE IF NOT EXISTS `conv` ( + `id` int(10) unsigned NOT NULL AUTO_INCREMENT, +! `guid` char(255) NOT NULL DEFAULT '', + `recips` mediumtext NOT NULL, +! `uid` int(11) NOT NULL DEFAULT '0', +! `creator` char(255) NOT NULL DEFAULT '', + `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, +*************** +*** 325,344 **** + 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', +! `uid` int(11) NOT NULL, + `event_xchan` char(255) NOT NULL DEFAULT '', + `event_hash` char(255) NOT NULL DEFAULT '', +! `created` datetime NOT NULL, +! `edited` datetime NOT NULL, +! `start` datetime NOT NULL, +! `finish` datetime NOT NULL, + `summary` text NOT NULL, + `description` text NOT NULL, + `location` text NOT NULL, +! `type` char(255) NOT NULL, + `nofinish` tinyint(1) NOT NULL DEFAULT '0', + `adjust` tinyint(1) NOT NULL DEFAULT '1', + `ignore` tinyint(1) NOT NULL DEFAULT '0', +--- 399,424 ---- + KEY `updated` (`updated`) + ) ENGINE=MyISAM DEFAULT CHARSET=utf8; + ++ -- -------------------------------------------------------- ++ ++ -- ++ -- Table structure for table `event` ++ -- ++ + CREATE TABLE IF NOT EXISTS `event` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `aid` int(10) unsigned NOT NULL DEFAULT '0', +! `uid` int(11) NOT NULL DEFAULT '0', + `event_xchan` char(255) NOT NULL DEFAULT '', + `event_hash` char(255) NOT NULL DEFAULT '', +! `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', +! `edited` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', +! `start` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', +! `finish` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', + `summary` text NOT NULL, + `description` text NOT NULL, + `location` text NOT NULL, +! `type` char(255) NOT NULL DEFAULT '', + `nofinish` tinyint(1) NOT NULL DEFAULT '0', + `adjust` tinyint(1) NOT NULL DEFAULT '1', + `ignore` tinyint(1) NOT NULL DEFAULT '0', +*************** +*** 357,363 **** + KEY `aid` (`aid`), + KEY `event_hash` (`event_hash`), + KEY `event_xchan` (`event_xchan`) +! ) ENGINE=MyISAM DEFAULT CHARSET=utf8; + + CREATE TABLE IF NOT EXISTS `fcontact` ( + `id` int(10) unsigned NOT NULL AUTO_INCREMENT, +--- 437,449 ---- + KEY `aid` (`aid`), + KEY `event_hash` (`event_hash`), + KEY `event_xchan` (`event_xchan`) +! ) ENGINE=MyISAM DEFAULT CHARSET=utf8; +! +! -- -------------------------------------------------------- +! +! -- +! -- Table structure for table `fcontact` +! -- + + CREATE TABLE IF NOT EXISTS `fcontact` ( + `id` int(10) unsigned NOT NULL AUTO_INCREMENT, +*************** +*** 381,386 **** +--- 467,478 ---- + KEY `network` (`network`) + ) ENGINE=MyISAM DEFAULT CHARSET=utf8; + ++ -- -------------------------------------------------------- ++ ++ -- ++ -- Table structure for table `ffinder` ++ -- ++ + CREATE TABLE IF NOT EXISTS `ffinder` ( + `id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `uid` int(10) unsigned NOT NULL, +*************** +*** 392,427 **** + KEY `fid` (`fid`) + ) ENGINE=MyISAM DEFAULT CHARSET=utf8; + + CREATE TABLE IF NOT EXISTS `fserver` ( + `id` int(11) NOT NULL AUTO_INCREMENT, +! `server` char(255) NOT NULL, +! `posturl` char(255) NOT NULL, + `key` text NOT NULL, + PRIMARY KEY (`id`), + KEY `server` (`server`), + KEY `posturl` (`posturl`) + ) ENGINE=MyISAM DEFAULT CHARSET=utf8; + + CREATE TABLE IF NOT EXISTS `fsuggest` ( + `id` int(11) NOT NULL AUTO_INCREMENT, +! `uid` int(11) NOT NULL, +! `cid` int(11) NOT NULL, +! `name` char(255) NOT NULL, +! `url` char(255) NOT NULL, +! `request` char(255) NOT NULL, +! `photo` char(255) NOT NULL, + `note` text NOT NULL, +! `created` datetime NOT NULL, + PRIMARY KEY (`id`) + ) ENGINE=MyISAM DEFAULT CHARSET=utf8; + + CREATE TABLE IF NOT EXISTS `groups` ( + `id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `hash` char(255) NOT NULL DEFAULT '', +! `uid` int(10) unsigned NOT NULL, + `visible` tinyint(1) NOT NULL DEFAULT '0', + `deleted` tinyint(1) NOT NULL DEFAULT '0', +! `name` char(255) NOT NULL, + PRIMARY KEY (`id`), + KEY `uid` (`uid`), + KEY `visible` (`visible`), +--- 484,537 ---- + KEY `fid` (`fid`) + ) ENGINE=MyISAM DEFAULT CHARSET=utf8; + ++ -- -------------------------------------------------------- ++ ++ -- ++ -- Table structure for table `fserver` ++ -- ++ + CREATE TABLE IF NOT EXISTS `fserver` ( + `id` int(11) NOT NULL AUTO_INCREMENT, +! `server` char(255) NOT NULL DEFAULT '', +! `posturl` char(255) NOT NULL DEFAULT '', + `key` text NOT NULL, + PRIMARY KEY (`id`), + KEY `server` (`server`), + KEY `posturl` (`posturl`) + ) ENGINE=MyISAM DEFAULT CHARSET=utf8; + ++ -- -------------------------------------------------------- ++ ++ -- ++ -- Table structure for table `fsuggest` ++ -- ++ + CREATE TABLE IF NOT EXISTS `fsuggest` ( + `id` int(11) NOT NULL AUTO_INCREMENT, +! `uid` int(11) NOT NULL DEFAULT '0', +! `cid` int(11) NOT NULL DEFAULT '0', +! `name` char(255) NOT NULL DEFAULT '', +! `url` char(255) NOT NULL DEFAULT '', +! `request` char(255) NOT NULL DEFAULT '', +! `photo` char(255) NOT NULL DEFAULT '', + `note` text NOT NULL, +! `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', + PRIMARY KEY (`id`) + ) ENGINE=MyISAM DEFAULT CHARSET=utf8; + ++ -- -------------------------------------------------------- ++ ++ -- ++ -- Table structure for table `groups` ++ -- ++ + CREATE TABLE IF NOT EXISTS `groups` ( + `id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `hash` char(255) NOT NULL DEFAULT '', +! `uid` int(10) unsigned NOT NULL DEFAULT '0', + `visible` tinyint(1) NOT NULL DEFAULT '0', + `deleted` tinyint(1) NOT NULL DEFAULT '0', +! `name` char(255) NOT NULL DEFAULT '', + PRIMARY KEY (`id`), + KEY `uid` (`uid`), + KEY `visible` (`visible`), +*************** +*** 429,438 **** + KEY `hash` (`hash`) + ) ENGINE=MyISAM DEFAULT CHARSET=utf8; + + CREATE TABLE IF NOT EXISTS `group_member` ( + `id` int(10) unsigned NOT NULL AUTO_INCREMENT, +! `uid` int(10) unsigned NOT NULL, +! `gid` int(10) unsigned NOT NULL, + `xchan` char(255) NOT NULL DEFAULT '', + PRIMARY KEY (`id`), + KEY `uid` (`uid`), +--- 539,554 ---- + KEY `hash` (`hash`) + ) ENGINE=MyISAM DEFAULT CHARSET=utf8; + ++ -- -------------------------------------------------------- ++ ++ -- ++ -- Table structure for table `group_member` ++ -- ++ + CREATE TABLE IF NOT EXISTS `group_member` ( + `id` int(10) unsigned NOT NULL AUTO_INCREMENT, +! `uid` int(10) unsigned NOT NULL DEFAULT '0', +! `gid` int(10) unsigned NOT NULL DEFAULT '0', + `xchan` char(255) NOT NULL DEFAULT '', + PRIMARY KEY (`id`), + KEY `uid` (`uid`), +*************** +*** 440,460 **** + KEY `xchan` (`xchan`) + ) ENGINE=MyISAM DEFAULT CHARSET=utf8; + + CREATE TABLE IF NOT EXISTS `hook` ( + `id` int(11) NOT NULL AUTO_INCREMENT, +! `hook` char(255) NOT NULL, +! `file` char(255) NOT NULL, +! `function` char(255) NOT NULL, + `priority` int(11) unsigned NOT NULL DEFAULT '0', + PRIMARY KEY (`id`), + KEY `hook` (`hook`) + ) ENGINE=MyISAM DEFAULT CHARSET=utf8; + + CREATE TABLE IF NOT EXISTS `hubloc` ( + `hubloc_id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `hubloc_guid` char(255) NOT NULL DEFAULT '', + `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', +--- 556,588 ---- + KEY `xchan` (`xchan`) + ) ENGINE=MyISAM DEFAULT CHARSET=utf8; + ++ -- -------------------------------------------------------- ++ ++ -- ++ -- Table structure for table `hook` ++ -- ++ + CREATE TABLE IF NOT EXISTS `hook` ( + `id` int(11) NOT NULL AUTO_INCREMENT, +! `hook` char(255) NOT NULL DEFAULT '', +! `file` char(255) NOT NULL DEFAULT '', +! `function` char(255) NOT NULL DEFAULT '', + `priority` int(11) unsigned NOT NULL DEFAULT '0', + PRIMARY KEY (`id`), + KEY `hook` (`hook`) + ) ENGINE=MyISAM DEFAULT CHARSET=utf8; + ++ -- -------------------------------------------------------- ++ ++ -- ++ -- Table structure for table `hubloc` ++ -- ++ + CREATE TABLE IF NOT EXISTS `hubloc` ( + `hubloc_id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `hubloc_guid` char(255) NOT NULL DEFAULT '', + `hubloc_guid_sig` text NOT NULL, +! `hubloc_hash` char(255) NOT NULL DEFAULT '', + `hubloc_addr` char(255) NOT NULL DEFAULT '', + `hubloc_network` char(32) NOT NULL DEFAULT '', + `hubloc_flags` int(10) unsigned NOT NULL DEFAULT '0', +*************** +*** 474,493 **** + 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`) + ) ENGINE=MyISAM DEFAULT CHARSET=utf8; + + CREATE TABLE IF NOT EXISTS `issue` ( + `issue_id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `issue_created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', + `issue_updated` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', +! `issue_assigned` char(255) NOT NULL, +! `issue_priority` int(11) NOT NULL, +! `issue_status` int(11) NOT NULL, +! `issue_component` char(255) NOT NULL, + PRIMARY KEY (`issue_id`), + KEY `issue_created` (`issue_created`), + KEY `issue_updated` (`issue_updated`), +--- 602,627 ---- + KEY `hubloc_connect` (`hubloc_connect`), + KEY `hubloc_host` (`hubloc_host`), + KEY `hubloc_addr` (`hubloc_addr`), + KEY `hubloc_updated` (`hubloc_updated`), + KEY `hubloc_connected` (`hubloc_connected`), +! KEY `hubloc_status` (`hubloc_status`), +! KEY `hubloc_network` (`hubloc_network`) + ) ENGINE=MyISAM DEFAULT CHARSET=utf8; + ++ -- -------------------------------------------------------- ++ ++ -- ++ -- Table structure for table `issue` ++ -- ++ + CREATE TABLE IF NOT EXISTS `issue` ( + `issue_id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `issue_created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', + `issue_updated` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', +! `issue_assigned` char(255) NOT NULL DEFAULT '', +! `issue_priority` int(11) NOT NULL DEFAULT '0', +! `issue_status` int(11) NOT NULL DEFAULT '0', +! `issue_component` char(255) NOT NULL DEFAULT '', + PRIMARY KEY (`issue_id`), + KEY `issue_created` (`issue_created`), + KEY `issue_updated` (`issue_updated`), +*************** +*** 497,502 **** +--- 631,642 ---- + KEY `issue_component` (`issue_component`) + ) ENGINE=MyISAM DEFAULT CHARSET=utf8; + ++ -- -------------------------------------------------------- ++ ++ -- ++ -- Table structure for table `item` ++ -- ++ + CREATE TABLE IF NOT EXISTS `item` ( + `id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `mid` char(255) CHARACTER SET ascii NOT NULL DEFAULT '', +*************** +*** 516,549 **** + `author_xchan` char(255) NOT NULL DEFAULT '', + `source_xchan` char(255) NOT NULL DEFAULT '', + `mimetype` char(255) NOT NULL DEFAULT '', +! `title` text NOT NULL DEFAULT '', +! `body` mediumtext NOT NULL DEFAULT '', + `app` char(255) NOT NULL DEFAULT '', + `lang` char(64) NOT NULL DEFAULT '', + `revision` int(10) unsigned NOT NULL DEFAULT '0', + `verb` char(255) NOT NULL DEFAULT '', + `obj_type` char(255) NOT NULL DEFAULT '', +! `object` text NOT NULL DEFAULT '', + `tgt_type` char(255) NOT NULL DEFAULT '', +! `target` text NOT NULL DEFAULT '', + `layout_mid` char(255) NOT NULL DEFAULT '', +! `postopts` text NOT NULL DEFAULT '', +! `route` text NOT NULL DEFAULT '', + `llink` char(255) NOT NULL DEFAULT '', + `plink` char(255) NOT NULL DEFAULT '', + `resource_id` char(255) NOT NULL DEFAULT '', + `resource_type` char(16) NOT NULL DEFAULT '', +! `attach` mediumtext NOT NULL DEFAULT '', +! `sig` text NOT NULL DEFAULT '', +! `diaspora_meta` mediumtext NOT NULL DEFAULT '', + `location` char(255) NOT NULL DEFAULT '', + `coord` char(255) NOT NULL DEFAULT '', + `public_policy` char(255) NOT NULL DEFAULT '', + `comment_policy` char(255) NOT NULL DEFAULT '', +! `allow_cid` mediumtext NOT NULL DEFAULT '', +! `allow_gid` mediumtext NOT NULL DEFAULT '', +! `deny_cid` mediumtext NOT NULL DEFAULT '', +! `deny_gid` mediumtext NOT NULL DEFAULT '', + `item_restrict` int(11) NOT NULL DEFAULT '0', + `item_flags` int(11) NOT NULL DEFAULT '0', + `item_private` tinyint(4) NOT NULL DEFAULT '0', +--- 656,689 ---- + `author_xchan` char(255) NOT NULL DEFAULT '', + `source_xchan` char(255) NOT NULL DEFAULT '', + `mimetype` char(255) NOT NULL DEFAULT '', +! `title` text NOT NULL, +! `body` mediumtext NOT NULL, + `app` char(255) NOT NULL DEFAULT '', + `lang` char(64) NOT NULL DEFAULT '', + `revision` int(10) unsigned NOT NULL DEFAULT '0', + `verb` char(255) NOT NULL DEFAULT '', + `obj_type` char(255) NOT NULL DEFAULT '', +! `object` text NOT NULL, + `tgt_type` char(255) NOT NULL DEFAULT '', +! `target` text NOT NULL, + `layout_mid` char(255) NOT NULL DEFAULT '', +! `postopts` text NOT NULL, +! `route` text NOT NULL, + `llink` char(255) NOT NULL DEFAULT '', + `plink` char(255) NOT NULL DEFAULT '', + `resource_id` char(255) NOT NULL DEFAULT '', + `resource_type` char(16) NOT NULL DEFAULT '', +! `attach` mediumtext NOT NULL, +! `sig` text NOT NULL, +! `diaspora_meta` mediumtext NOT NULL, + `location` char(255) NOT NULL DEFAULT '', + `coord` char(255) NOT NULL DEFAULT '', + `public_policy` char(255) NOT NULL DEFAULT '', + `comment_policy` char(255) NOT NULL DEFAULT '', +! `allow_cid` mediumtext NOT NULL, +! `allow_gid` mediumtext NOT NULL, +! `deny_cid` mediumtext NOT NULL, +! `deny_gid` mediumtext NOT NULL, + `item_restrict` int(11) NOT NULL DEFAULT '0', + `item_flags` int(11) NOT NULL DEFAULT '0', + `item_private` tinyint(4) NOT NULL DEFAULT '0', +*************** +*** 555,562 **** + 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`), +--- 695,700 ---- +*************** +*** 573,581 **** + KEY `mid` (`mid`), + KEY `parent_mid` (`parent_mid`), + KEY `uid_mid` (`mid`,`uid`), +- KEY `public_policy` (`public_policy`), + KEY `comment_policy` (`comment_policy`), + KEY `layout_mid` (`layout_mid`), + FULLTEXT KEY `title` (`title`), + FULLTEXT KEY `body` (`body`), + FULLTEXT KEY `allow_cid` (`allow_cid`), +--- 711,721 ---- + KEY `mid` (`mid`), + KEY `parent_mid` (`parent_mid`), + KEY `uid_mid` (`mid`,`uid`), + KEY `comment_policy` (`comment_policy`), + KEY `layout_mid` (`layout_mid`), ++ KEY `public_policy` (`public_policy`), ++ KEY `comments_closed` (`comments_closed`), ++ KEY `changed` (`changed`), + FULLTEXT KEY `title` (`title`), + FULLTEXT KEY `body` (`body`), + FULLTEXT KEY `allow_cid` (`allow_cid`), +*************** +*** 584,595 **** + FULLTEXT KEY `deny_gid` (`deny_gid`) + ) ENGINE=MyISAM DEFAULT CHARSET=utf8; + + CREATE TABLE IF NOT EXISTS `item_id` ( + `id` int(10) unsigned NOT NULL AUTO_INCREMENT, +! `iid` int(11) NOT NULL, +! `uid` int(11) NOT NULL, +! `sid` char(255) NOT NULL, +! `service` char(255) NOT NULL, + PRIMARY KEY (`id`), + KEY `uid` (`uid`), + KEY `sid` (`sid`), +--- 724,741 ---- + FULLTEXT KEY `deny_gid` (`deny_gid`) + ) ENGINE=MyISAM DEFAULT CHARSET=utf8; + ++ -- -------------------------------------------------------- ++ ++ -- ++ -- Table structure for table `item_id` ++ -- ++ + CREATE TABLE IF NOT EXISTS `item_id` ( + `id` int(10) unsigned NOT NULL AUTO_INCREMENT, +! `iid` int(11) NOT NULL DEFAULT '0', +! `uid` int(11) NOT NULL DEFAULT '0', +! `sid` char(255) NOT NULL DEFAULT '', +! `service` char(255) NOT NULL DEFAULT '', + PRIMARY KEY (`id`), + KEY `uid` (`uid`), + KEY `sid` (`sid`), +*************** +*** 597,621 **** + KEY `iid` (`iid`) + ) ENGINE=MyISAM DEFAULT CHARSET=utf8; + + CREATE TABLE IF NOT EXISTS `likes` ( + `id` int(10) unsigned NOT NULL AUTO_INCREMENT, +! `channel_id` int(11) unsigned NOT NULL DEFAULT '0', + `liker` char(128) NOT NULL DEFAULT '', + `likee` char(128) NOT NULL DEFAULT '', +! `iid` int(10) unsigned NOT NULL DEFAULT '0', + `verb` char(255) NOT NULL DEFAULT '', + `target_type` char(255) NOT NULL DEFAULT '', + `target_id` char(128) NOT NULL DEFAULT '', + `target` mediumtext NOT NULL, + PRIMARY KEY (`id`), +- KEY `channel_id` (`channel_id`), + KEY `liker` (`liker`), + KEY `likee` (`likee`), + KEY `iid` (`iid`), + KEY `verb` (`verb`), + KEY `target_type` (`target_type`), + KEY `target_id` (`target_id`) +! ) ENGINE=MyISAM DEFAULT CHARSET=utf8; + + CREATE TABLE IF NOT EXISTS `mail` ( + `id` int(10) unsigned NOT NULL AUTO_INCREMENT, +--- 743,779 ---- + KEY `iid` (`iid`) + ) ENGINE=MyISAM DEFAULT CHARSET=utf8; + ++ -- -------------------------------------------------------- ++ ++ -- ++ -- Table structure for table `likes` ++ -- ++ + CREATE TABLE IF NOT EXISTS `likes` ( + `id` int(10) unsigned NOT NULL AUTO_INCREMENT, +! `channel_id` int(10) unsigned NOT NULL DEFAULT '0', + `liker` char(128) NOT NULL DEFAULT '', + `likee` char(128) NOT NULL DEFAULT '', +! `iid` int(11) unsigned NOT NULL DEFAULT '0', + `verb` char(255) NOT NULL DEFAULT '', + `target_type` char(255) NOT NULL DEFAULT '', + `target_id` char(128) NOT NULL DEFAULT '', + `target` mediumtext NOT NULL, + PRIMARY KEY (`id`), + KEY `liker` (`liker`), + KEY `likee` (`likee`), + KEY `iid` (`iid`), + KEY `verb` (`verb`), + KEY `target_type` (`target_type`), ++ KEY `channel_id` (`channel_id`), + KEY `target_id` (`target_id`) +! ) ENGINE=MyISAM DEFAULT CHARSET=utf8; +! +! -- -------------------------------------------------------- +! +! -- +! -- Table structure for table `mail` +! -- + + CREATE TABLE IF NOT EXISTS `mail` ( + `id` int(10) unsigned NOT NULL AUTO_INCREMENT, +*************** +*** 624,639 **** + `from_xchan` char(255) NOT NULL DEFAULT '', + `to_xchan` char(255) NOT NULL DEFAULT '', + `account_id` int(10) unsigned NOT NULL DEFAULT '0', +! `channel_id` int(10) unsigned NOT NULL, + `title` text NOT NULL, + `body` mediumtext NOT NULL, + `attach` mediumtext NOT NULL, +! `mid` char(255) NOT NULL, +! `parent_mid` char(255) NOT NULL, + `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`), +--- 782,796 ---- + `from_xchan` char(255) NOT NULL DEFAULT '', + `to_xchan` char(255) NOT NULL DEFAULT '', + `account_id` int(10) unsigned NOT NULL DEFAULT '0', +! `channel_id` int(10) unsigned NOT NULL DEFAULT '0', + `title` text NOT NULL, + `body` mediumtext NOT NULL, + `attach` mediumtext NOT NULL, +! `mid` char(255) NOT NULL DEFAULT '', +! `parent_mid` char(255) NOT NULL DEFAULT '', + `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 `created` (`created`), + KEY `mail_flags` (`mail_flags`), + KEY `account_id` (`account_id`), +*************** +*** 642,659 **** + KEY `to_xchan` (`to_xchan`), + KEY `mid` (`mid`), + KEY `parent_mid` (`parent_mid`), +! KEY `expires` (`expires`) + ) ENGINE=MyISAM DEFAULT CHARSET=utf8; + + CREATE TABLE IF NOT EXISTS `manage` ( + `id` int(11) NOT NULL AUTO_INCREMENT, +! `uid` int(11) NOT NULL, + `xchan` char(255) NOT NULL DEFAULT '', + PRIMARY KEY (`id`), + KEY `uid` (`uid`), + KEY `xchan` (`xchan`) + ) ENGINE=MyISAM DEFAULT CHARSET=utf8; + + CREATE TABLE IF NOT EXISTS `menu` ( + `menu_id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `menu_channel_id` int(10) unsigned NOT NULL DEFAULT '0', +--- 799,829 ---- + KEY `to_xchan` (`to_xchan`), + KEY `mid` (`mid`), + KEY `parent_mid` (`parent_mid`), +! KEY `expires` (`expires`), +! KEY `convid` (`convid`) + ) ENGINE=MyISAM DEFAULT CHARSET=utf8; + ++ -- -------------------------------------------------------- ++ ++ -- ++ -- Table structure for table `manage` ++ -- ++ + CREATE TABLE IF NOT EXISTS `manage` ( + `id` int(11) NOT NULL AUTO_INCREMENT, +! `uid` int(11) NOT NULL DEFAULT '0', + `xchan` char(255) NOT NULL DEFAULT '', + PRIMARY KEY (`id`), + KEY `uid` (`uid`), + KEY `xchan` (`xchan`) + ) ENGINE=MyISAM DEFAULT CHARSET=utf8; + ++ -- -------------------------------------------------------- ++ ++ -- ++ -- Table structure for table `menu` ++ -- ++ + CREATE TABLE IF NOT EXISTS `menu` ( + `menu_id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `menu_channel_id` int(10) unsigned NOT NULL DEFAULT '0', +*************** +*** 666,671 **** +--- 836,847 ---- + KEY `menu_flags` (`menu_flags`) + ) ENGINE=MyISAM DEFAULT CHARSET=utf8; + ++ -- -------------------------------------------------------- ++ ++ -- ++ -- Table structure for table `menu_item` ++ -- ++ + CREATE TABLE IF NOT EXISTS `menu_item` ( + `mitem_id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `mitem_link` char(255) NOT NULL DEFAULT '', +*************** +*** 675,681 **** + `allow_gid` mediumtext NOT NULL, + `deny_cid` mediumtext NOT NULL, + `deny_gid` mediumtext NOT NULL, +! `mitem_channel_id` int(10) unsigned NOT NULL, + `mitem_menu_id` int(10) unsigned NOT NULL DEFAULT '0', + `mitem_order` int(11) NOT NULL DEFAULT '0', + PRIMARY KEY (`mitem_id`), +--- 851,857 ---- + `allow_gid` mediumtext NOT NULL, + `deny_cid` mediumtext NOT NULL, + `deny_gid` mediumtext NOT NULL, +! `mitem_channel_id` int(10) unsigned NOT NULL DEFAULT '0', + `mitem_menu_id` int(10) unsigned NOT NULL DEFAULT '0', + `mitem_order` int(11) NOT NULL DEFAULT '0', + PRIMARY KEY (`mitem_id`), +*************** +*** 684,705 **** + KEY `mitem_flags` (`mitem_flags`) + ) ENGINE=MyISAM DEFAULT CHARSET=utf8; + + CREATE TABLE IF NOT EXISTS `notify` ( + `id` int(11) NOT NULL AUTO_INCREMENT, +! `hash` char(64) NOT NULL, +! `name` char(255) NOT NULL, +! `url` char(255) NOT NULL, +! `photo` char(255) NOT NULL, +! `date` datetime NOT NULL, + `msg` mediumtext NOT NULL, +! `aid` int(11) NOT NULL, +! `uid` int(11) NOT NULL, +! `link` char(255) NOT NULL, + `parent` char(255) NOT NULL DEFAULT '', + `seen` tinyint(1) NOT NULL DEFAULT '0', +! `type` int(11) NOT NULL, +! `verb` char(255) NOT NULL, +! `otype` char(16) NOT NULL, + PRIMARY KEY (`id`), + KEY `type` (`type`), + KEY `seen` (`seen`), +--- 860,887 ---- + KEY `mitem_flags` (`mitem_flags`) + ) ENGINE=MyISAM DEFAULT CHARSET=utf8; + ++ -- -------------------------------------------------------- ++ ++ -- ++ -- Table structure for table `notify` ++ -- ++ + CREATE TABLE IF NOT EXISTS `notify` ( + `id` int(11) NOT NULL AUTO_INCREMENT, +! `hash` char(64) NOT NULL DEFAULT '', +! `name` char(255) NOT NULL DEFAULT '', +! `url` char(255) NOT NULL DEFAULT '', +! `photo` char(255) NOT NULL DEFAULT '', +! `date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', + `msg` mediumtext NOT NULL, +! `aid` int(11) NOT NULL DEFAULT '0', +! `uid` int(11) NOT NULL DEFAULT '0', +! `link` char(255) NOT NULL DEFAULT '', + `parent` char(255) NOT NULL DEFAULT '', + `seen` tinyint(1) NOT NULL DEFAULT '0', +! `type` int(11) NOT NULL DEFAULT '0', +! `verb` char(255) NOT NULL DEFAULT '', +! `otype` char(16) NOT NULL DEFAULT '', + PRIMARY KEY (`id`), + KEY `type` (`type`), + KEY `seen` (`seen`), +*************** +*** 712,717 **** +--- 894,905 ---- + KEY `aid` (`aid`) + ) ENGINE=MyISAM DEFAULT CHARSET=utf8; + ++ -- -------------------------------------------------------- ++ ++ -- ++ -- Table structure for table `obj` ++ -- ++ + CREATE TABLE IF NOT EXISTS `obj` ( + `obj_id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `obj_page` char(64) NOT NULL DEFAULT '', +*************** +*** 731,736 **** +--- 919,930 ---- + KEY `obj_obj` (`obj_obj`) + ) ENGINE=MyISAM DEFAULT CHARSET=utf8; + ++ -- -------------------------------------------------------- ++ ++ -- ++ -- Table structure for table `outq` ++ -- ++ + CREATE TABLE IF NOT EXISTS `outq` ( + `outq_hash` char(255) NOT NULL, + `outq_account` int(10) unsigned NOT NULL DEFAULT '0', +*************** +*** 753,786 **** + KEY `outq_delivered` (`outq_delivered`) + ) ENGINE=MyISAM DEFAULT CHARSET=utf8; + + CREATE TABLE IF NOT EXISTS `pconfig` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `uid` int(11) NOT NULL DEFAULT '0', +! `cat` char(255) CHARACTER SET ascii NOT NULL, +! `k` char(255) CHARACTER SET ascii NOT NULL, + `v` mediumtext NOT NULL, + PRIMARY KEY (`id`), + UNIQUE KEY `access` (`uid`,`cat`,`k`) + ) ENGINE=MyISAM DEFAULT CHARSET=utf8; + + CREATE TABLE IF NOT EXISTS `photo` ( + `id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `aid` int(10) unsigned NOT NULL DEFAULT '0', +! `uid` int(10) unsigned NOT NULL, + `xchan` char(255) NOT NULL DEFAULT '', +! `resource_id` char(255) NOT NULL, +! `created` datetime NOT NULL, +! `edited` datetime NOT NULL, +! `title` char(255) NOT NULL, + `description` text NOT NULL, +! `album` char(255) NOT NULL, +! `filename` char(255) NOT NULL, + `type` char(128) NOT NULL DEFAULT 'image/jpeg', +! `height` smallint(6) NOT NULL, +! `width` smallint(6) NOT NULL, + `size` int(10) unsigned NOT NULL DEFAULT '0', + `data` mediumblob NOT NULL, +! `scale` tinyint(3) NOT NULL, + `profile` tinyint(1) NOT NULL DEFAULT '0', + `photo_flags` int(10) unsigned NOT NULL DEFAULT '0', + `allow_cid` mediumtext NOT NULL, +--- 947,992 ---- + KEY `outq_delivered` (`outq_delivered`) + ) ENGINE=MyISAM DEFAULT CHARSET=utf8; + ++ -- -------------------------------------------------------- ++ ++ -- ++ -- Table structure for table `pconfig` ++ -- ++ + CREATE TABLE IF NOT EXISTS `pconfig` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `uid` int(11) NOT NULL DEFAULT '0', +! `cat` char(255) CHARACTER SET ascii NOT NULL DEFAULT '', +! `k` char(255) CHARACTER SET ascii NOT NULL DEFAULT '', + `v` mediumtext NOT NULL, + PRIMARY KEY (`id`), + UNIQUE KEY `access` (`uid`,`cat`,`k`) + ) ENGINE=MyISAM DEFAULT CHARSET=utf8; + ++ -- -------------------------------------------------------- ++ ++ -- ++ -- Table structure for table `photo` ++ -- ++ + CREATE TABLE IF NOT EXISTS `photo` ( + `id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `aid` int(10) unsigned NOT NULL DEFAULT '0', +! `uid` int(10) unsigned NOT NULL DEFAULT '0', + `xchan` char(255) NOT NULL DEFAULT '', +! `resource_id` char(255) NOT NULL DEFAULT '', +! `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', +! `edited` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', +! `title` char(255) NOT NULL DEFAULT '', + `description` text NOT NULL, +! `album` char(255) NOT NULL DEFAULT '', +! `filename` char(255) NOT NULL DEFAULT '', + `type` char(128) NOT NULL DEFAULT 'image/jpeg', +! `height` smallint(6) NOT NULL DEFAULT '0', +! `width` smallint(6) NOT NULL DEFAULT '0', + `size` int(10) unsigned NOT NULL DEFAULT '0', + `data` mediumblob NOT NULL, +! `scale` tinyint(3) NOT NULL DEFAULT '0', + `profile` tinyint(1) NOT NULL DEFAULT '0', + `photo_flags` int(10) unsigned NOT NULL DEFAULT '0', + `allow_cid` mediumtext NOT NULL, +*************** +*** 800,805 **** +--- 1006,1017 ---- + KEY `resource_id` (`resource_id`) + ) ENGINE=MyISAM DEFAULT CHARSET=utf8; + ++ -- -------------------------------------------------------- ++ ++ -- ++ -- Table structure for table `poll` ++ -- ++ + CREATE TABLE IF NOT EXISTS `poll` ( + `poll_id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `poll_channel` int(10) unsigned NOT NULL DEFAULT '0', +*************** +*** 812,817 **** +--- 1024,1035 ---- + KEY `poll_votes` (`poll_votes`) + ) ENGINE=MyISAM DEFAULT CHARSET=utf8; + ++ -- -------------------------------------------------------- ++ ++ -- ++ -- Table structure for table `poll_elm` ++ -- ++ + CREATE TABLE IF NOT EXISTS `poll_elm` ( + `pelm_id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `pelm_poll` int(10) unsigned NOT NULL DEFAULT '0', +*************** +*** 823,838 **** + KEY `pelm_result` (`pelm_result`) + ) ENGINE=MyISAM DEFAULT CHARSET=utf8; + + CREATE TABLE IF NOT EXISTS `profdef` ( + `id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `field_name` char(255) NOT NULL DEFAULT '', + `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; + + CREATE TABLE IF NOT EXISTS `profext` ( + `id` int(10) unsigned NOT NULL AUTO_INCREMENT, +--- 1041,1068 ---- + KEY `pelm_result` (`pelm_result`) + ) ENGINE=MyISAM DEFAULT CHARSET=utf8; + ++ -- -------------------------------------------------------- ++ ++ -- ++ -- Table structure for table `profdef` ++ -- ++ + CREATE TABLE IF NOT EXISTS `profdef` ( + `id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `field_name` char(255) NOT NULL DEFAULT '', + `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, + PRIMARY KEY (`id`), + KEY `field_name` (`field_name`) +! ) ENGINE=MyISAM DEFAULT CHARSET=utf8; +! +! -- -------------------------------------------------------- +! +! -- +! -- Table structure for table `profext` +! -- + + CREATE TABLE IF NOT EXISTS `profext` ( + `id` int(10) unsigned NOT NULL AUTO_INCREMENT, +*************** +*** 844,882 **** + KEY `channel_id` (`channel_id`), + KEY `hash` (`hash`), + KEY `k` (`k`) +! ) ENGINE=MyISAM DEFAULT CHARSET=utf8; + + CREATE TABLE IF NOT EXISTS `profile` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `profile_guid` char(64) NOT NULL DEFAULT '', + `aid` int(10) unsigned NOT NULL DEFAULT '0', +! `uid` int(11) NOT NULL, +! `profile_name` char(255) NOT NULL, + `is_default` tinyint(1) NOT NULL DEFAULT '0', + `hide_friends` tinyint(1) NOT NULL DEFAULT '0', +! `name` char(255) NOT NULL, +! `pdesc` char(255) NOT NULL, + `chandesc` text NOT NULL, + `dob` char(32) NOT NULL DEFAULT '0000-00-00', + `dob_tz` char(255) NOT NULL DEFAULT 'UTC', +! `address` char(255) NOT NULL, +! `locality` char(255) NOT NULL, +! `region` char(255) NOT NULL, +! `postal_code` char(32) NOT NULL, +! `country_name` char(255) NOT NULL, +! `hometown` char(255) NOT NULL, +! `gender` char(32) NOT NULL, +! `marital` char(255) NOT NULL, + `with` text NOT NULL, + `howlong` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', +! `sexual` char(255) NOT NULL, +! `politic` char(255) NOT NULL, +! `religion` char(255) NOT NULL, + `keywords` text NOT NULL, + `likes` text NOT NULL, + `dislikes` text NOT NULL, + `about` text NOT NULL, +! `summary` char(255) NOT NULL, + `music` text NOT NULL, + `book` text NOT NULL, + `tv` text NOT NULL, +--- 1074,1118 ---- + KEY `channel_id` (`channel_id`), + KEY `hash` (`hash`), + KEY `k` (`k`) +! ) ENGINE=MyISAM DEFAULT CHARSET=utf8; +! +! -- -------------------------------------------------------- +! +! -- +! -- Table structure for table `profile` +! -- + + CREATE TABLE IF NOT EXISTS `profile` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `profile_guid` char(64) NOT NULL DEFAULT '', + `aid` int(10) unsigned NOT NULL DEFAULT '0', +! `uid` int(11) NOT NULL DEFAULT '0', +! `profile_name` char(255) NOT NULL DEFAULT '', + `is_default` tinyint(1) NOT NULL DEFAULT '0', + `hide_friends` tinyint(1) NOT NULL DEFAULT '0', +! `name` char(255) NOT NULL DEFAULT '', +! `pdesc` char(255) NOT NULL DEFAULT '', + `chandesc` text NOT NULL, + `dob` char(32) NOT NULL DEFAULT '0000-00-00', + `dob_tz` char(255) NOT NULL DEFAULT 'UTC', +! `address` char(255) NOT NULL DEFAULT '', +! `locality` char(255) NOT NULL DEFAULT '', +! `region` char(255) NOT NULL DEFAULT '', +! `postal_code` char(32) NOT NULL DEFAULT '', +! `country_name` char(255) NOT NULL DEFAULT '', +! `hometown` char(255) NOT NULL DEFAULT '', +! `gender` char(32) NOT NULL DEFAULT '', +! `marital` char(255) NOT NULL DEFAULT '', + `with` text NOT NULL, + `howlong` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', +! `sexual` char(255) NOT NULL DEFAULT '', +! `politic` char(255) NOT NULL DEFAULT '', +! `religion` char(255) NOT NULL DEFAULT '', + `keywords` text NOT NULL, + `likes` text NOT NULL, + `dislikes` text NOT NULL, + `about` text NOT NULL, +! `summary` char(255) NOT NULL DEFAULT '', + `music` text NOT NULL, + `book` text NOT NULL, + `tv` text NOT NULL, +*************** +*** 887,895 **** + `education` text NOT NULL, + `contact` text NOT NULL, + `channels` text NOT NULL, +! `homepage` char(255) NOT NULL, +! `photo` char(255) NOT NULL, +! `thumb` char(255) NOT NULL, + `publish` tinyint(1) NOT NULL DEFAULT '0', + PRIMARY KEY (`id`), + UNIQUE KEY `guid` (`profile_guid`,`uid`), +--- 1123,1131 ---- + `education` text NOT NULL, + `contact` text NOT NULL, + `channels` text NOT NULL, +! `homepage` char(255) NOT NULL DEFAULT '', +! `photo` char(255) NOT NULL DEFAULT '', +! `thumb` char(255) NOT NULL DEFAULT '', + `publish` tinyint(1) NOT NULL DEFAULT '0', + PRIMARY KEY (`id`), + UNIQUE KEY `guid` (`profile_guid`,`uid`), +*************** +*** 908,920 **** + KEY `profile_guid` (`profile_guid`) + ) ENGINE=MyISAM DEFAULT CHARSET=utf8; + + CREATE TABLE IF NOT EXISTS `profile_check` ( + `id` int(10) unsigned NOT NULL AUTO_INCREMENT, +! `uid` int(10) unsigned NOT NULL, + `cid` int(10) unsigned NOT NULL DEFAULT '0', +! `dfrn_id` char(255) NOT NULL, +! `sec` char(255) NOT NULL, +! `expire` int(11) NOT NULL, + PRIMARY KEY (`id`), + KEY `uid` (`uid`), + KEY `cid` (`cid`), +--- 1144,1162 ---- + KEY `profile_guid` (`profile_guid`) + ) ENGINE=MyISAM DEFAULT CHARSET=utf8; + ++ -- -------------------------------------------------------- ++ ++ -- ++ -- Table structure for table `profile_check` ++ -- ++ + CREATE TABLE IF NOT EXISTS `profile_check` ( + `id` int(10) unsigned NOT NULL AUTO_INCREMENT, +! `uid` int(10) unsigned NOT NULL DEFAULT '0', + `cid` int(10) unsigned NOT NULL DEFAULT '0', +! `dfrn_id` char(255) NOT NULL DEFAULT '', +! `sec` char(255) NOT NULL DEFAULT '', +! `expire` int(11) NOT NULL DEFAULT '0', + PRIMARY KEY (`id`), + KEY `uid` (`uid`), + KEY `cid` (`cid`), +*************** +*** 923,951 **** + KEY `expire` (`expire`) + ) ENGINE=MyISAM DEFAULT CHARSET=utf8; + + CREATE TABLE IF NOT EXISTS `register` ( + `id` int(10) unsigned NOT NULL AUTO_INCREMENT, +! `hash` char(255) NOT NULL, +! `created` datetime NOT NULL, +! `uid` int(10) unsigned NOT NULL, +! `password` char(255) NOT NULL, +! `language` char(16) NOT NULL, + PRIMARY KEY (`id`), + KEY `hash` (`hash`), + KEY `created` (`created`), + KEY `uid` (`uid`) +! ) ENGINE=MyISAM DEFAULT CHARSET=utf8; + + CREATE TABLE IF NOT EXISTS `session` ( + `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT, +! `sid` char(255) NOT NULL, + `data` text NOT NULL, +! `expire` bigint(20) unsigned NOT NULL, + PRIMARY KEY (`id`), + KEY `sid` (`sid`), + KEY `expire` (`expire`) + ) ENGINE=MyISAM DEFAULT CHARSET=utf8; + + CREATE TABLE IF NOT EXISTS `shares` ( + `share_id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `share_type` int(11) NOT NULL DEFAULT '0', +--- 1165,1211 ---- + KEY `expire` (`expire`) + ) ENGINE=MyISAM DEFAULT CHARSET=utf8; + ++ -- -------------------------------------------------------- ++ ++ -- ++ -- Table structure for table `register` ++ -- ++ + CREATE TABLE IF NOT EXISTS `register` ( + `id` int(10) unsigned NOT NULL AUTO_INCREMENT, +! `hash` char(255) NOT NULL DEFAULT '', +! `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', +! `uid` int(10) unsigned NOT NULL DEFAULT '0', +! `password` char(255) NOT NULL DEFAULT '', +! `language` char(16) NOT NULL DEFAULT '', + PRIMARY KEY (`id`), + KEY `hash` (`hash`), + KEY `created` (`created`), + KEY `uid` (`uid`) +! ) ENGINE=MyISAM DEFAULT CHARSET=utf8; +! +! -- -------------------------------------------------------- +! +! -- +! -- Table structure for table `session` +! -- + + CREATE TABLE IF NOT EXISTS `session` ( + `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT, +! `sid` char(255) NOT NULL DEFAULT '', + `data` text NOT NULL, +! `expire` bigint(20) unsigned NOT NULL DEFAULT '0', + PRIMARY KEY (`id`), + KEY `sid` (`sid`), + KEY `expire` (`expire`) + ) ENGINE=MyISAM DEFAULT CHARSET=utf8; + ++ -- -------------------------------------------------------- ++ ++ -- ++ -- Table structure for table `shares` ++ -- ++ + CREATE TABLE IF NOT EXISTS `shares` ( + `share_id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `share_type` int(11) NOT NULL DEFAULT '0', +*************** +*** 957,974 **** + 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', +--- 1217,1246 ---- + KEY `share_xchan` (`share_xchan`) + ) ENGINE=MyISAM DEFAULT CHARSET=utf8; + ++ -- -------------------------------------------------------- ++ ++ -- ++ -- Table structure for table `sign` ++ -- ++ + 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 DEFAULT '', + PRIMARY KEY (`id`), + KEY `iid` (`iid`), + KEY `retract_iid` (`retract_iid`) + ) ENGINE=MyISAM DEFAULT CHARSET=utf8; + ++ -- -------------------------------------------------------- ++ ++ -- ++ -- Table structure for table `site` ++ -- ++ + CREATE TABLE IF NOT EXISTS `site` ( + `site_url` char(255) NOT NULL, + `site_access` int(11) NOT NULL DEFAULT '0', +*************** +*** 988,996 **** +--- 1260,1275 ---- + KEY `site_register` (`site_register`), + KEY `site_access` (`site_access`), + KEY `site_sellpage` (`site_sellpage`), ++ KEY `site_pull` (`site_pull`), + KEY `site_realm` (`site_realm`) + ) ENGINE=MyISAM DEFAULT CHARSET=utf8; + ++ -- -------------------------------------------------------- ++ ++ -- ++ -- Table structure for table `source` ++ -- ++ + CREATE TABLE IF NOT EXISTS `source` ( + `src_id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `src_channel_id` int(10) unsigned NOT NULL DEFAULT '0', +*************** +*** 1003,1014 **** + KEY `src_xchan` (`src_xchan`) + ) ENGINE=MyISAM DEFAULT CHARSET=utf8; + + CREATE TABLE IF NOT EXISTS `spam` ( + `id` int(11) NOT NULL AUTO_INCREMENT, +! `uid` int(11) NOT NULL, + `spam` int(11) NOT NULL DEFAULT '0', + `ham` int(11) NOT NULL DEFAULT '0', +! `term` char(255) NOT NULL, + `date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', + PRIMARY KEY (`id`), + KEY `uid` (`uid`), +--- 1282,1299 ---- + KEY `src_xchan` (`src_xchan`) + ) ENGINE=MyISAM DEFAULT CHARSET=utf8; + ++ -- -------------------------------------------------------- ++ ++ -- ++ -- Table structure for table `spam` ++ -- ++ + CREATE TABLE IF NOT EXISTS `spam` ( + `id` int(11) NOT NULL AUTO_INCREMENT, +! `uid` int(11) NOT NULL DEFAULT '0', + `spam` int(11) NOT NULL DEFAULT '0', + `ham` int(11) NOT NULL DEFAULT '0', +! `term` char(255) NOT NULL DEFAULT '', + `date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', + PRIMARY KEY (`id`), + KEY `uid` (`uid`), +*************** +*** 1017,1041 **** + KEY `term` (`term`) + ) ENGINE=MyISAM DEFAULT CHARSET=utf8; + + CREATE TABLE IF NOT EXISTS `sys_perms` ( + `id` int(10) unsigned NOT NULL AUTO_INCREMENT, +! `cat` char(255) NOT NULL, +! `k` char(255) NOT NULL, + `v` mediumtext NOT NULL, +! `public_perm` tinyint(1) unsigned NOT NULL, + PRIMARY KEY (`id`) + ) ENGINE=MyISAM DEFAULT CHARSET=utf8; + + CREATE TABLE IF NOT EXISTS `term` ( + `tid` int(10) unsigned NOT NULL AUTO_INCREMENT, + `aid` int(10) unsigned NOT NULL DEFAULT '0', + `uid` int(10) unsigned NOT NULL DEFAULT '0', +! `oid` int(10) unsigned NOT NULL, +! `otype` tinyint(3) unsigned NOT NULL, +! `type` tinyint(3) unsigned NOT NULL, +! `term` char(255) NOT NULL, +! `url` char(255) NOT NULL, +! `imgurl` char(255) NOT NULL, + `term_hash` char(255) NOT NULL DEFAULT '', + `parent_hash` char(255) NOT NULL DEFAULT '', + PRIMARY KEY (`tid`), +--- 1302,1338 ---- + KEY `term` (`term`) + ) ENGINE=MyISAM DEFAULT CHARSET=utf8; + ++ -- -------------------------------------------------------- ++ ++ -- ++ -- Table structure for table `sys_perms` ++ -- ++ + CREATE TABLE IF NOT EXISTS `sys_perms` ( + `id` int(10) unsigned NOT NULL AUTO_INCREMENT, +! `cat` char(255) NOT NULL DEFAULT '', +! `k` char(255) NOT NULL DEFAULT '', + `v` mediumtext NOT NULL, +! `public_perm` tinyint(1) unsigned NOT NULL DEFAULT '0', + PRIMARY KEY (`id`) + ) ENGINE=MyISAM DEFAULT CHARSET=utf8; + ++ -- -------------------------------------------------------- ++ ++ -- ++ -- Table structure for table `term` ++ -- ++ + CREATE TABLE IF NOT EXISTS `term` ( + `tid` int(10) unsigned NOT NULL AUTO_INCREMENT, + `aid` int(10) unsigned NOT NULL DEFAULT '0', + `uid` int(10) unsigned NOT NULL DEFAULT '0', +! `oid` int(10) unsigned NOT NULL DEFAULT '0', +! `otype` tinyint(3) unsigned NOT NULL DEFAULT '0', +! `type` tinyint(3) unsigned NOT NULL DEFAULT '0', +! `term` char(255) NOT NULL DEFAULT '', +! `url` char(255) NOT NULL DEFAULT '', +! `imgurl` char(255) NOT NULL DEFAULT '', + `term_hash` char(255) NOT NULL DEFAULT '', + `parent_hash` char(255) NOT NULL DEFAULT '', + PRIMARY KEY (`tid`), +*************** +*** 1050,1071 **** + KEY `parent_hash` (`parent_hash`) + ) ENGINE=MyISAM DEFAULT CHARSET=utf8; + + CREATE TABLE IF NOT EXISTS `tokens` ( +! `id` varchar(40) NOT NULL, + `secret` text NOT NULL, +! `client_id` varchar(20) NOT NULL, +! `expires` bigint(20) unsigned NOT NULL, +! `scope` varchar(200) NOT NULL, +! `uid` int(11) NOT NULL, + PRIMARY KEY (`id`), + KEY `client_id` (`client_id`), + KEY `expires` (`expires`), + KEY `uid` (`uid`) + ) ENGINE=MyISAM DEFAULT CHARSET=utf8; + + CREATE TABLE IF NOT EXISTS `updates` ( + `ud_id` int(10) unsigned NOT NULL AUTO_INCREMENT, +! `ud_hash` char(128) NOT NULL, + `ud_guid` char(255) NOT NULL DEFAULT '', + `ud_date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', + `ud_last` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', +--- 1347,1380 ---- + KEY `parent_hash` (`parent_hash`) + ) ENGINE=MyISAM DEFAULT CHARSET=utf8; + ++ -- -------------------------------------------------------- ++ ++ -- ++ -- Table structure for table `tokens` ++ -- ++ + CREATE TABLE IF NOT EXISTS `tokens` ( +! `id` varchar(40) NOT NULL DEFAULT '', + `secret` text NOT NULL, +! `client_id` varchar(20) NOT NULL DEFAULT '', +! `expires` bigint(20) unsigned NOT NULL DEFAULT '0', +! `scope` varchar(200) NOT NULL DEFAULT '', +! `uid` int(11) NOT NULL DEFAULT '0', + PRIMARY KEY (`id`), + KEY `client_id` (`client_id`), + KEY `expires` (`expires`), + KEY `uid` (`uid`) + ) ENGINE=MyISAM DEFAULT CHARSET=utf8; + ++ -- -------------------------------------------------------- ++ ++ -- ++ -- Table structure for table `updates` ++ -- ++ + CREATE TABLE IF NOT EXISTS `updates` ( + `ud_id` int(10) unsigned NOT NULL AUTO_INCREMENT, +! `ud_hash` char(128) NOT NULL DEFAULT '', + `ud_guid` char(255) NOT NULL DEFAULT '', + `ud_date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', + `ud_last` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', +*************** +*** 1080,1085 **** +--- 1389,1400 ---- + KEY `ud_last` (`ud_last`) + ) ENGINE=MyISAM DEFAULT CHARSET=utf8; + ++ -- -------------------------------------------------------- ++ ++ -- ++ -- Table structure for table `verify` ++ -- ++ + CREATE TABLE IF NOT EXISTS `verify` ( + `id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `channel` int(10) unsigned NOT NULL DEFAULT '0', +*************** +*** 1095,1100 **** +--- 1410,1421 ---- + KEY `created` (`created`) + ) ENGINE=MyISAM DEFAULT CHARSET=utf8; + ++ -- -------------------------------------------------------- ++ ++ -- ++ -- Table structure for table `vote` ++ -- ++ + CREATE TABLE IF NOT EXISTS `vote` ( + `vote_id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `vote_poll` int(11) NOT NULL DEFAULT '0', +*************** +*** 1107,1112 **** +--- 1428,1439 ---- + KEY `vote_element` (`vote_element`) + ) ENGINE=MyISAM DEFAULT CHARSET=utf8; + ++ -- -------------------------------------------------------- ++ ++ -- ++ -- Table structure for table `xchan` ++ -- ++ + CREATE TABLE IF NOT EXISTS `xchan` ( + `xchan_hash` char(255) NOT NULL, + `xchan_guid` char(255) NOT NULL DEFAULT '', +*************** +*** 1139,1144 **** +--- 1466,1477 ---- + KEY `xchan_follow` (`xchan_follow`) + ) ENGINE=MyISAM DEFAULT CHARSET=utf8; + ++ -- -------------------------------------------------------- ++ ++ -- ++ -- Table structure for table `xchat` ++ -- ++ + CREATE TABLE IF NOT EXISTS `xchat` ( + `xchat_id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `xchat_url` char(255) NOT NULL DEFAULT '', +*************** +*** 1150,1162 **** + KEY `xchat_desc` (`xchat_desc`), + KEY `xchat_xchan` (`xchat_xchan`), + KEY `xchat_edited` (`xchat_edited`) +! ) ENGINE=MyISAM DEFAULT CHARSET=utf8; + + CREATE TABLE IF NOT EXISTS `xconfig` ( + `id` int(10) unsigned NOT NULL AUTO_INCREMENT, +! `xchan` char(255) NOT NULL, +! `cat` char(255) NOT NULL, +! `k` char(255) NOT NULL, + `v` mediumtext NOT NULL, + PRIMARY KEY (`id`), + KEY `xchan` (`xchan`), +--- 1483,1501 ---- + KEY `xchat_desc` (`xchat_desc`), + KEY `xchat_xchan` (`xchat_xchan`), + KEY `xchat_edited` (`xchat_edited`) +! ) ENGINE=MyISAM DEFAULT CHARSET=utf8; +! +! -- -------------------------------------------------------- +! +! -- +! -- Table structure for table `xconfig` +! -- + + CREATE TABLE IF NOT EXISTS `xconfig` ( + `id` int(10) unsigned NOT NULL AUTO_INCREMENT, +! `xchan` char(255) NOT NULL DEFAULT '', +! `cat` char(255) NOT NULL DEFAULT '', +! `k` char(255) NOT NULL DEFAULT '', + `v` mediumtext NOT NULL, + PRIMARY KEY (`id`), + KEY `xchan` (`xchan`), +*************** +*** 1164,1169 **** +--- 1503,1514 ---- + KEY `k` (`k`) + ) ENGINE=MyISAM DEFAULT CHARSET=utf8; + ++ -- -------------------------------------------------------- ++ ++ -- ++ -- Table structure for table `xign` ++ -- ++ + CREATE TABLE IF NOT EXISTS `xign` ( + `id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `uid` int(11) NOT NULL DEFAULT '0', +*************** +*** 1173,1178 **** +--- 1518,1529 ---- + KEY `xchan` (`xchan`) + ) ENGINE=MyISAM DEFAULT CHARSET=utf8; + ++ -- -------------------------------------------------------- ++ ++ -- ++ -- Table structure for table `xlink` ++ -- ++ + CREATE TABLE IF NOT EXISTS `xlink` ( + `xlink_id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `xlink_xchan` char(255) NOT NULL DEFAULT '', +*************** +*** 1186,1191 **** +--- 1537,1548 ---- + KEY `xlink_rating` (`xlink_rating`) + ) ENGINE=MyISAM DEFAULT CHARSET=utf8; + ++ -- -------------------------------------------------------- ++ ++ -- ++ -- Table structure for table `xprof` ++ -- ++ + CREATE TABLE IF NOT EXISTS `xprof` ( + `xprof_hash` char(255) NOT NULL, + `xprof_age` tinyint(3) unsigned NOT NULL DEFAULT '0', +*************** +*** 1216,1224 **** + KEY `xprof_hometown` (`xprof_hometown`) + ) ENGINE=MyISAM DEFAULT CHARSET=utf8; + + CREATE TABLE IF NOT EXISTS `xtag` ( + `xtag_id` int(10) unsigned NOT NULL AUTO_INCREMENT, +! `xtag_hash` char(255) NOT NULL, + `xtag_term` char(255) NOT NULL DEFAULT '', + `xtag_flags` int(11) NOT NULL DEFAULT '0', + PRIMARY KEY (`xtag_id`), +--- 1573,1587 ---- + KEY `xprof_hometown` (`xprof_hometown`) + ) ENGINE=MyISAM DEFAULT CHARSET=utf8; + ++ -- -------------------------------------------------------- ++ ++ -- ++ -- Table structure for table `xtag` ++ -- ++ + CREATE TABLE IF NOT EXISTS `xtag` ( + `xtag_id` int(10) unsigned NOT NULL AUTO_INCREMENT, +! `xtag_hash` char(255) NOT NULL DEFAULT '', + `xtag_term` char(255) NOT NULL DEFAULT '', + `xtag_flags` int(11) NOT NULL DEFAULT '0', + PRIMARY KEY (`xtag_id`), diff --git a/install/database.sql b/install/database.sql index a49bd377c..ce3f07a89 100644 --- a/install/database.sql +++ b/install/database.sql @@ -1,15 +1,13 @@ -SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO"; - -/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; -/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; -/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; -/*!40101 SET NAMES utf8 */; +-- -------------------------------------------------------- +-- +-- Table structure for table `abook` +-- CREATE TABLE IF NOT EXISTS `abook` ( `abook_id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `abook_account` int(10) unsigned NOT NULL, - `abook_channel` int(10) unsigned NOT NULL, + `abook_account` int(10) unsigned NOT NULL DEFAULT '0', + `abook_channel` int(10) unsigned NOT NULL DEFAULT '0', `abook_xchan` char(255) NOT NULL DEFAULT '', `abook_my_perms` int(11) NOT NULL DEFAULT '0', `abook_their_perms` int(11) NOT NULL DEFAULT '0', @@ -37,6 +35,12 @@ CREATE TABLE IF NOT EXISTS `abook` ( KEY `abook_rating` (`abook_rating`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; +-- -------------------------------------------------------- + +-- +-- Table structure for table `account` +-- + CREATE TABLE IF NOT EXISTS `account` ( `account_id` int(10) unsigned NOT NULL AUTO_INCREMENT, `account_parent` int(10) unsigned NOT NULL DEFAULT '0', @@ -70,10 +74,16 @@ CREATE TABLE IF NOT EXISTS `account` ( KEY `account_password_changed` (`account_password_changed`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; +-- -------------------------------------------------------- + +-- +-- Table structure for table `addon` +-- + CREATE TABLE IF NOT EXISTS `addon` ( `id` int(11) NOT NULL AUTO_INCREMENT, - `name` char(255) NOT NULL, - `version` char(255) NOT NULL, + `name` char(255) NOT NULL DEFAULT '', + `version` char(255) NOT NULL DEFAULT '', `installed` tinyint(1) NOT NULL DEFAULT '0', `hidden` tinyint(1) NOT NULL DEFAULT '0', `timestamp` bigint(20) NOT NULL DEFAULT '0', @@ -84,6 +94,11 @@ CREATE TABLE IF NOT EXISTS `addon` ( KEY `installed` (`installed`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; +-- -------------------------------------------------------- + +-- +-- Table structure for table `app` +-- CREATE TABLE IF NOT EXISTS `app` ( `id` int(11) NOT NULL AUTO_INCREMENT, @@ -108,8 +123,13 @@ CREATE TABLE IF NOT EXISTS `app` ( KEY `app_version` (`app_version`), KEY `app_channel` (`app_channel`), KEY `app_price` (`app_price`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8; +) ENGINE=MyISAM DEFAULT CHARSET=utf8; + +-- -------------------------------------------------------- +-- +-- Table structure for table `attach` +-- CREATE TABLE IF NOT EXISTS `attach` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, @@ -145,22 +165,40 @@ CREATE TABLE IF NOT EXISTS `attach` ( KEY `creator` (`creator`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; +-- -------------------------------------------------------- + +-- +-- Table structure for table `auth_codes` +-- + CREATE TABLE IF NOT EXISTS `auth_codes` ( - `id` varchar(40) NOT NULL, - `client_id` varchar(20) NOT NULL, - `redirect_uri` varchar(200) NOT NULL, - `expires` int(11) NOT NULL, - `scope` varchar(250) NOT NULL, + `id` varchar(40) NOT NULL DEFAULT '', + `client_id` varchar(20) NOT NULL DEFAULT '', + `redirect_uri` varchar(200) NOT NULL DEFAULT '', + `expires` int(11) NOT NULL DEFAULT '0', + `scope` varchar(250) NOT NULL DEFAULT '', PRIMARY KEY (`id`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; +-- -------------------------------------------------------- + +-- +-- Table structure for table `cache` +-- + CREATE TABLE IF NOT EXISTS `cache` ( - `k` char(255) NOT NULL, + `k` char(255) NOT NULL DEFAULT '', `v` text NOT NULL, - `updated` datetime NOT NULL, + `updated` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', PRIMARY KEY (`k`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; +-- -------------------------------------------------------- + +-- +-- Table structure for table `channel` +-- + CREATE TABLE IF NOT EXISTS `channel` ( `channel_id` int(10) unsigned NOT NULL AUTO_INCREMENT, `channel_account_id` int(10) unsigned NOT NULL DEFAULT '0', @@ -189,24 +227,24 @@ CREATE TABLE IF NOT EXISTS `channel` ( `channel_allow_gid` mediumtext NOT NULL, `channel_deny_cid` mediumtext NOT NULL, `channel_deny_gid` mediumtext NOT NULL, - `channel_r_stream` int(10) unsigned NOT NULL DEFAULT '128', - `channel_r_profile` int(10) unsigned NOT NULL DEFAULT '128', - `channel_r_photos` int(10) unsigned NOT NULL DEFAULT '128', - `channel_r_abook` int(10) unsigned NOT NULL DEFAULT '128', - `channel_w_stream` int(10) unsigned NOT NULL DEFAULT '128', - `channel_w_wall` int(10) unsigned NOT NULL DEFAULT '128', - `channel_w_tagwall` int(10) unsigned NOT NULL DEFAULT '128', - `channel_w_comment` int(10) unsigned NOT NULL DEFAULT '128', - `channel_w_mail` int(10) unsigned NOT NULL DEFAULT '128', - `channel_w_photos` int(10) unsigned NOT NULL DEFAULT '128', - `channel_w_chat` int(10) unsigned NOT NULL DEFAULT '128', + `channel_r_stream` int(10) unsigned NOT NULL DEFAULT '0', + `channel_r_profile` int(10) unsigned NOT NULL DEFAULT '0', + `channel_r_photos` int(10) unsigned NOT NULL DEFAULT '0', + `channel_r_abook` int(10) unsigned NOT NULL DEFAULT '0', + `channel_w_stream` int(10) unsigned NOT NULL DEFAULT '0', + `channel_w_wall` int(10) unsigned NOT NULL DEFAULT '0', + `channel_w_tagwall` int(10) unsigned NOT NULL DEFAULT '0', + `channel_w_comment` int(10) unsigned NOT NULL DEFAULT '0', + `channel_w_mail` int(10) unsigned NOT NULL DEFAULT '0', + `channel_w_photos` int(10) unsigned NOT NULL DEFAULT '0', + `channel_w_chat` int(10) unsigned NOT NULL DEFAULT '0', `channel_a_delegate` int(10) unsigned NOT NULL DEFAULT '0', - `channel_r_storage` int(10) unsigned NOT NULL DEFAULT '128', - `channel_w_storage` int(10) unsigned NOT NULL DEFAULT '128', - `channel_r_pages` int(10) unsigned NOT NULL DEFAULT '128', - `channel_w_pages` int(10) unsigned NOT NULL DEFAULT '128', - `channel_a_republish` int(10) unsigned NOT NULL DEFAULT '128', - `channel_w_like` int(10) unsigned NOT NULL DEFAULT '128', + `channel_r_storage` int(10) unsigned NOT NULL DEFAULT '0', + `channel_w_storage` int(10) unsigned NOT NULL DEFAULT '0', + `channel_r_pages` int(10) unsigned NOT NULL DEFAULT '0', + `channel_w_pages` int(10) unsigned NOT NULL DEFAULT '0', + `channel_a_republish` int(10) unsigned NOT NULL DEFAULT '0', + `channel_w_like` int(10) unsigned NOT NULL DEFAULT '0', PRIMARY KEY (`channel_id`), UNIQUE KEY `channel_address_unique` (`channel_address`), KEY `channel_account_id` (`channel_account_id`), @@ -241,10 +279,16 @@ CREATE TABLE IF NOT EXISTS `channel` ( KEY `channel_w_pages` (`channel_w_pages`), KEY `channel_deleted` (`channel_deleted`), KEY `channel_a_republish` (`channel_a_republish`), - KEY `channel_w_like` (`channel_w_like`), - KEY `channel_dirdate` (`channel_dirdate`) + KEY `channel_dirdate` (`channel_dirdate`), + KEY `channel_w_like` (`channel_w_like`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; +-- -------------------------------------------------------- + +-- +-- Table structure for table `chat` +-- + CREATE TABLE IF NOT EXISTS `chat` ( `chat_id` int(10) unsigned NOT NULL AUTO_INCREMENT, `chat_room` int(10) unsigned NOT NULL DEFAULT '0', @@ -255,21 +299,33 @@ CREATE TABLE IF NOT EXISTS `chat` ( KEY `chat_room` (`chat_room`), KEY `chat_xchan` (`chat_xchan`), KEY `created` (`created`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8; +) ENGINE=MyISAM DEFAULT CHARSET=utf8; + +-- -------------------------------------------------------- + +-- +-- Table structure for table `chatpresence` +-- CREATE TABLE IF NOT EXISTS `chatpresence` ( `cp_id` int(10) unsigned NOT NULL AUTO_INCREMENT, `cp_room` int(10) unsigned NOT NULL DEFAULT '0', `cp_xchan` char(255) NOT NULL DEFAULT '', `cp_last` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', - `cp_status` char(255) NOT NULL, + `cp_status` char(255) NOT NULL DEFAULT '', `cp_client` char(128) NOT NULL DEFAULT '', PRIMARY KEY (`cp_id`), KEY `cp_room` (`cp_room`), KEY `cp_xchan` (`cp_xchan`), KEY `cp_last` (`cp_last`), KEY `cp_status` (`cp_status`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8; +) ENGINE=MyISAM DEFAULT CHARSET=utf8; + +-- -------------------------------------------------------- + +-- +-- Table structure for table `chatroom` +-- CREATE TABLE IF NOT EXISTS `chatroom` ( `cr_id` int(10) unsigned NOT NULL AUTO_INCREMENT, @@ -290,33 +346,51 @@ CREATE TABLE IF NOT EXISTS `chatroom` ( KEY `cr_created` (`cr_created`), KEY `cr_edited` (`cr_edited`), KEY `cr_expire` (`cr_expire`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8; +) ENGINE=MyISAM DEFAULT CHARSET=utf8; + +-- -------------------------------------------------------- + +-- +-- Table structure for table `clients` +-- CREATE TABLE IF NOT EXISTS `clients` ( - `client_id` varchar(20) NOT NULL, - `pw` varchar(20) NOT NULL, - `redirect_uri` varchar(200) NOT NULL, + `client_id` varchar(20) NOT NULL DEFAULT '', + `pw` varchar(20) NOT NULL DEFAULT '', + `redirect_uri` varchar(200) NOT NULL DEFAULT '', `name` text, `icon` text, `uid` int(11) NOT NULL DEFAULT '0', PRIMARY KEY (`client_id`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; +-- -------------------------------------------------------- + +-- +-- Table structure for table `config` +-- + CREATE TABLE IF NOT EXISTS `config` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `cat` char(255) CHARACTER SET ascii NOT NULL, - `k` char(255) CHARACTER SET ascii NOT NULL, + `cat` char(255) CHARACTER SET ascii NOT NULL DEFAULT '', + `k` char(255) CHARACTER SET ascii NOT NULL DEFAULT '', `v` text NOT NULL, PRIMARY KEY (`id`), UNIQUE KEY `access` (`cat`,`k`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; +-- -------------------------------------------------------- + +-- +-- Table structure for table `conv` +-- + CREATE TABLE IF NOT EXISTS `conv` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `guid` char(255) NOT NULL, + `guid` char(255) NOT NULL DEFAULT '', `recips` mediumtext NOT NULL, - `uid` int(11) NOT NULL, - `creator` char(255) NOT NULL, + `uid` int(11) NOT NULL DEFAULT '0', + `creator` char(255) NOT NULL DEFAULT '', `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, @@ -325,20 +399,26 @@ CREATE TABLE IF NOT EXISTS `conv` ( KEY `updated` (`updated`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; +-- -------------------------------------------------------- + +-- +-- Table structure for table `event` +-- + CREATE TABLE IF NOT EXISTS `event` ( `id` int(11) NOT NULL AUTO_INCREMENT, `aid` int(10) unsigned NOT NULL DEFAULT '0', - `uid` int(11) NOT NULL, + `uid` int(11) NOT NULL DEFAULT '0', `event_xchan` char(255) NOT NULL DEFAULT '', `event_hash` char(255) NOT NULL DEFAULT '', - `created` datetime NOT NULL, - `edited` datetime NOT NULL, - `start` datetime NOT NULL, - `finish` datetime NOT NULL, + `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', + `edited` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', + `start` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', + `finish` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', `summary` text NOT NULL, `description` text NOT NULL, `location` text NOT NULL, - `type` char(255) NOT NULL, + `type` char(255) NOT NULL DEFAULT '', `nofinish` tinyint(1) NOT NULL DEFAULT '0', `adjust` tinyint(1) NOT NULL DEFAULT '1', `ignore` tinyint(1) NOT NULL DEFAULT '0', @@ -357,7 +437,13 @@ CREATE TABLE IF NOT EXISTS `event` ( KEY `aid` (`aid`), KEY `event_hash` (`event_hash`), KEY `event_xchan` (`event_xchan`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8; +) ENGINE=MyISAM DEFAULT CHARSET=utf8; + +-- -------------------------------------------------------- + +-- +-- Table structure for table `fcontact` +-- CREATE TABLE IF NOT EXISTS `fcontact` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, @@ -381,6 +467,12 @@ CREATE TABLE IF NOT EXISTS `fcontact` ( KEY `network` (`network`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; +-- -------------------------------------------------------- + +-- +-- Table structure for table `ffinder` +-- + CREATE TABLE IF NOT EXISTS `ffinder` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, `uid` int(10) unsigned NOT NULL, @@ -392,36 +484,54 @@ CREATE TABLE IF NOT EXISTS `ffinder` ( KEY `fid` (`fid`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; +-- -------------------------------------------------------- + +-- +-- Table structure for table `fserver` +-- + CREATE TABLE IF NOT EXISTS `fserver` ( `id` int(11) NOT NULL AUTO_INCREMENT, - `server` char(255) NOT NULL, - `posturl` char(255) NOT NULL, + `server` char(255) NOT NULL DEFAULT '', + `posturl` char(255) NOT NULL DEFAULT '', `key` text NOT NULL, PRIMARY KEY (`id`), KEY `server` (`server`), KEY `posturl` (`posturl`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; +-- -------------------------------------------------------- + +-- +-- Table structure for table `fsuggest` +-- + CREATE TABLE IF NOT EXISTS `fsuggest` ( `id` int(11) NOT NULL AUTO_INCREMENT, - `uid` int(11) NOT NULL, - `cid` int(11) NOT NULL, - `name` char(255) NOT NULL, - `url` char(255) NOT NULL, - `request` char(255) NOT NULL, - `photo` char(255) NOT NULL, + `uid` int(11) NOT NULL DEFAULT '0', + `cid` int(11) NOT NULL DEFAULT '0', + `name` char(255) NOT NULL DEFAULT '', + `url` char(255) NOT NULL DEFAULT '', + `request` char(255) NOT NULL DEFAULT '', + `photo` char(255) NOT NULL DEFAULT '', `note` text NOT NULL, - `created` datetime NOT NULL, + `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', PRIMARY KEY (`id`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; +-- -------------------------------------------------------- + +-- +-- Table structure for table `groups` +-- + CREATE TABLE IF NOT EXISTS `groups` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, `hash` char(255) NOT NULL DEFAULT '', - `uid` int(10) unsigned NOT NULL, + `uid` int(10) unsigned NOT NULL DEFAULT '0', `visible` tinyint(1) NOT NULL DEFAULT '0', `deleted` tinyint(1) NOT NULL DEFAULT '0', - `name` char(255) NOT NULL, + `name` char(255) NOT NULL DEFAULT '', PRIMARY KEY (`id`), KEY `uid` (`uid`), KEY `visible` (`visible`), @@ -429,10 +539,16 @@ CREATE TABLE IF NOT EXISTS `groups` ( KEY `hash` (`hash`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; +-- -------------------------------------------------------- + +-- +-- Table structure for table `group_member` +-- + CREATE TABLE IF NOT EXISTS `group_member` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `uid` int(10) unsigned NOT NULL, - `gid` int(10) unsigned NOT NULL, + `uid` int(10) unsigned NOT NULL DEFAULT '0', + `gid` int(10) unsigned NOT NULL DEFAULT '0', `xchan` char(255) NOT NULL DEFAULT '', PRIMARY KEY (`id`), KEY `uid` (`uid`), @@ -440,21 +556,33 @@ CREATE TABLE IF NOT EXISTS `group_member` ( KEY `xchan` (`xchan`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; +-- -------------------------------------------------------- + +-- +-- Table structure for table `hook` +-- + CREATE TABLE IF NOT EXISTS `hook` ( `id` int(11) NOT NULL AUTO_INCREMENT, - `hook` char(255) NOT NULL, - `file` char(255) NOT NULL, - `function` char(255) NOT NULL, + `hook` char(255) NOT NULL DEFAULT '', + `file` char(255) NOT NULL DEFAULT '', + `function` char(255) NOT NULL DEFAULT '', `priority` int(11) unsigned NOT NULL DEFAULT '0', PRIMARY KEY (`id`), KEY `hook` (`hook`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; +-- -------------------------------------------------------- + +-- +-- Table structure for table `hubloc` +-- + CREATE TABLE IF NOT EXISTS `hubloc` ( `hubloc_id` int(10) unsigned NOT NULL AUTO_INCREMENT, `hubloc_guid` char(255) NOT NULL DEFAULT '', `hubloc_guid_sig` text NOT NULL, - `hubloc_hash` char(255) NOT NULL, + `hubloc_hash` char(255) NOT NULL DEFAULT '', `hubloc_addr` char(255) NOT NULL DEFAULT '', `hubloc_network` char(32) NOT NULL DEFAULT '', `hubloc_flags` int(10) unsigned NOT NULL DEFAULT '0', @@ -474,20 +602,26 @@ 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`) + KEY `hubloc_status` (`hubloc_status`), + KEY `hubloc_network` (`hubloc_network`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; +-- -------------------------------------------------------- + +-- +-- Table structure for table `issue` +-- + CREATE TABLE IF NOT EXISTS `issue` ( `issue_id` int(10) unsigned NOT NULL AUTO_INCREMENT, `issue_created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', `issue_updated` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', - `issue_assigned` char(255) NOT NULL, - `issue_priority` int(11) NOT NULL, - `issue_status` int(11) NOT NULL, - `issue_component` char(255) NOT NULL, + `issue_assigned` char(255) NOT NULL DEFAULT '', + `issue_priority` int(11) NOT NULL DEFAULT '0', + `issue_status` int(11) NOT NULL DEFAULT '0', + `issue_component` char(255) NOT NULL DEFAULT '', PRIMARY KEY (`issue_id`), KEY `issue_created` (`issue_created`), KEY `issue_updated` (`issue_updated`), @@ -497,6 +631,12 @@ CREATE TABLE IF NOT EXISTS `issue` ( KEY `issue_component` (`issue_component`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; +-- -------------------------------------------------------- + +-- +-- Table structure for table `item` +-- + CREATE TABLE IF NOT EXISTS `item` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, `mid` char(255) CHARACTER SET ascii NOT NULL DEFAULT '', @@ -516,34 +656,34 @@ CREATE TABLE IF NOT EXISTS `item` ( `author_xchan` char(255) NOT NULL DEFAULT '', `source_xchan` char(255) NOT NULL DEFAULT '', `mimetype` char(255) NOT NULL DEFAULT '', - `title` text NOT NULL DEFAULT '', - `body` mediumtext NOT NULL DEFAULT '', + `title` text NOT NULL, + `body` mediumtext NOT NULL, `app` char(255) NOT NULL DEFAULT '', `lang` char(64) NOT NULL DEFAULT '', `revision` int(10) unsigned NOT NULL DEFAULT '0', `verb` char(255) NOT NULL DEFAULT '', `obj_type` char(255) NOT NULL DEFAULT '', - `object` text NOT NULL DEFAULT '', + `object` text NOT NULL, `tgt_type` char(255) NOT NULL DEFAULT '', - `target` text NOT NULL DEFAULT '', + `target` text NOT NULL, `layout_mid` char(255) NOT NULL DEFAULT '', - `postopts` text NOT NULL DEFAULT '', - `route` text NOT NULL DEFAULT '', + `postopts` text NOT NULL, + `route` text NOT NULL, `llink` char(255) NOT NULL DEFAULT '', `plink` char(255) NOT NULL DEFAULT '', `resource_id` char(255) NOT NULL DEFAULT '', `resource_type` char(16) NOT NULL DEFAULT '', - `attach` mediumtext NOT NULL DEFAULT '', - `sig` text NOT NULL DEFAULT '', - `diaspora_meta` mediumtext NOT NULL DEFAULT '', + `attach` mediumtext NOT NULL, + `sig` text NOT NULL, + `diaspora_meta` mediumtext NOT NULL, `location` char(255) NOT NULL DEFAULT '', `coord` char(255) NOT NULL DEFAULT '', `public_policy` char(255) NOT NULL DEFAULT '', `comment_policy` char(255) NOT NULL DEFAULT '', - `allow_cid` mediumtext NOT NULL DEFAULT '', - `allow_gid` mediumtext NOT NULL DEFAULT '', - `deny_cid` mediumtext NOT NULL DEFAULT '', - `deny_gid` mediumtext NOT NULL DEFAULT '', + `allow_cid` mediumtext NOT NULL, + `allow_gid` mediumtext NOT NULL, + `deny_cid` mediumtext NOT NULL, + `deny_gid` mediumtext NOT NULL, `item_restrict` int(11) NOT NULL DEFAULT '0', `item_flags` int(11) NOT NULL DEFAULT '0', `item_private` tinyint(4) NOT NULL DEFAULT '0', @@ -555,8 +695,6 @@ 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`), @@ -573,9 +711,11 @@ CREATE TABLE IF NOT EXISTS `item` ( KEY `mid` (`mid`), KEY `parent_mid` (`parent_mid`), KEY `uid_mid` (`mid`,`uid`), - KEY `public_policy` (`public_policy`), KEY `comment_policy` (`comment_policy`), KEY `layout_mid` (`layout_mid`), + KEY `public_policy` (`public_policy`), + KEY `comments_closed` (`comments_closed`), + KEY `changed` (`changed`), FULLTEXT KEY `title` (`title`), FULLTEXT KEY `body` (`body`), FULLTEXT KEY `allow_cid` (`allow_cid`), @@ -584,12 +724,18 @@ CREATE TABLE IF NOT EXISTS `item` ( FULLTEXT KEY `deny_gid` (`deny_gid`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; +-- -------------------------------------------------------- + +-- +-- Table structure for table `item_id` +-- + CREATE TABLE IF NOT EXISTS `item_id` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `iid` int(11) NOT NULL, - `uid` int(11) NOT NULL, - `sid` char(255) NOT NULL, - `service` char(255) NOT NULL, + `iid` int(11) NOT NULL DEFAULT '0', + `uid` int(11) NOT NULL DEFAULT '0', + `sid` char(255) NOT NULL DEFAULT '', + `service` char(255) NOT NULL DEFAULT '', PRIMARY KEY (`id`), KEY `uid` (`uid`), KEY `sid` (`sid`), @@ -597,25 +743,37 @@ CREATE TABLE IF NOT EXISTS `item_id` ( KEY `iid` (`iid`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; +-- -------------------------------------------------------- + +-- +-- Table structure for table `likes` +-- + CREATE TABLE IF NOT EXISTS `likes` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `channel_id` int(11) unsigned NOT NULL DEFAULT '0', + `channel_id` int(10) unsigned NOT NULL DEFAULT '0', `liker` char(128) NOT NULL DEFAULT '', `likee` char(128) NOT NULL DEFAULT '', - `iid` int(10) unsigned NOT NULL DEFAULT '0', + `iid` int(11) unsigned NOT NULL DEFAULT '0', `verb` char(255) NOT NULL DEFAULT '', `target_type` char(255) NOT NULL DEFAULT '', `target_id` char(128) NOT NULL DEFAULT '', `target` mediumtext NOT NULL, PRIMARY KEY (`id`), - KEY `channel_id` (`channel_id`), KEY `liker` (`liker`), KEY `likee` (`likee`), KEY `iid` (`iid`), KEY `verb` (`verb`), KEY `target_type` (`target_type`), + KEY `channel_id` (`channel_id`), KEY `target_id` (`target_id`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8; +) ENGINE=MyISAM DEFAULT CHARSET=utf8; + +-- -------------------------------------------------------- + +-- +-- Table structure for table `mail` +-- CREATE TABLE IF NOT EXISTS `mail` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, @@ -624,16 +782,15 @@ CREATE TABLE IF NOT EXISTS `mail` ( `from_xchan` char(255) NOT NULL DEFAULT '', `to_xchan` char(255) NOT NULL DEFAULT '', `account_id` int(10) unsigned NOT NULL DEFAULT '0', - `channel_id` int(10) unsigned NOT NULL, + `channel_id` int(10) unsigned NOT NULL DEFAULT '0', `title` text NOT NULL, `body` mediumtext NOT NULL, `attach` mediumtext NOT NULL, - `mid` char(255) NOT NULL, - `parent_mid` char(255) NOT NULL, + `mid` char(255) NOT NULL DEFAULT '', + `parent_mid` char(255) NOT NULL DEFAULT '', `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`), @@ -642,18 +799,31 @@ CREATE TABLE IF NOT EXISTS `mail` ( KEY `to_xchan` (`to_xchan`), KEY `mid` (`mid`), KEY `parent_mid` (`parent_mid`), - KEY `expires` (`expires`) + KEY `expires` (`expires`), + KEY `convid` (`convid`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; +-- -------------------------------------------------------- + +-- +-- Table structure for table `manage` +-- + CREATE TABLE IF NOT EXISTS `manage` ( `id` int(11) NOT NULL AUTO_INCREMENT, - `uid` int(11) NOT NULL, + `uid` int(11) NOT NULL DEFAULT '0', `xchan` char(255) NOT NULL DEFAULT '', PRIMARY KEY (`id`), KEY `uid` (`uid`), KEY `xchan` (`xchan`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; +-- -------------------------------------------------------- + +-- +-- Table structure for table `menu` +-- + CREATE TABLE IF NOT EXISTS `menu` ( `menu_id` int(10) unsigned NOT NULL AUTO_INCREMENT, `menu_channel_id` int(10) unsigned NOT NULL DEFAULT '0', @@ -666,6 +836,12 @@ CREATE TABLE IF NOT EXISTS `menu` ( KEY `menu_flags` (`menu_flags`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; +-- -------------------------------------------------------- + +-- +-- Table structure for table `menu_item` +-- + CREATE TABLE IF NOT EXISTS `menu_item` ( `mitem_id` int(10) unsigned NOT NULL AUTO_INCREMENT, `mitem_link` char(255) NOT NULL DEFAULT '', @@ -675,7 +851,7 @@ CREATE TABLE IF NOT EXISTS `menu_item` ( `allow_gid` mediumtext NOT NULL, `deny_cid` mediumtext NOT NULL, `deny_gid` mediumtext NOT NULL, - `mitem_channel_id` int(10) unsigned NOT NULL, + `mitem_channel_id` int(10) unsigned NOT NULL DEFAULT '0', `mitem_menu_id` int(10) unsigned NOT NULL DEFAULT '0', `mitem_order` int(11) NOT NULL DEFAULT '0', PRIMARY KEY (`mitem_id`), @@ -684,22 +860,28 @@ CREATE TABLE IF NOT EXISTS `menu_item` ( KEY `mitem_flags` (`mitem_flags`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; +-- -------------------------------------------------------- + +-- +-- Table structure for table `notify` +-- + CREATE TABLE IF NOT EXISTS `notify` ( `id` int(11) NOT NULL AUTO_INCREMENT, - `hash` char(64) NOT NULL, - `name` char(255) NOT NULL, - `url` char(255) NOT NULL, - `photo` char(255) NOT NULL, - `date` datetime NOT NULL, + `hash` char(64) NOT NULL DEFAULT '', + `name` char(255) NOT NULL DEFAULT '', + `url` char(255) NOT NULL DEFAULT '', + `photo` char(255) NOT NULL DEFAULT '', + `date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', `msg` mediumtext NOT NULL, - `aid` int(11) NOT NULL, - `uid` int(11) NOT NULL, - `link` char(255) NOT NULL, + `aid` int(11) NOT NULL DEFAULT '0', + `uid` int(11) NOT NULL DEFAULT '0', + `link` char(255) NOT NULL DEFAULT '', `parent` char(255) NOT NULL DEFAULT '', `seen` tinyint(1) NOT NULL DEFAULT '0', - `type` int(11) NOT NULL, - `verb` char(255) NOT NULL, - `otype` char(16) NOT NULL, + `type` int(11) NOT NULL DEFAULT '0', + `verb` char(255) NOT NULL DEFAULT '', + `otype` char(16) NOT NULL DEFAULT '', PRIMARY KEY (`id`), KEY `type` (`type`), KEY `seen` (`seen`), @@ -712,6 +894,12 @@ CREATE TABLE IF NOT EXISTS `notify` ( KEY `aid` (`aid`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; +-- -------------------------------------------------------- + +-- +-- Table structure for table `obj` +-- + CREATE TABLE IF NOT EXISTS `obj` ( `obj_id` int(10) unsigned NOT NULL AUTO_INCREMENT, `obj_page` char(64) NOT NULL DEFAULT '', @@ -731,6 +919,12 @@ CREATE TABLE IF NOT EXISTS `obj` ( KEY `obj_obj` (`obj_obj`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; +-- -------------------------------------------------------- + +-- +-- Table structure for table `outq` +-- + CREATE TABLE IF NOT EXISTS `outq` ( `outq_hash` char(255) NOT NULL, `outq_account` int(10) unsigned NOT NULL DEFAULT '0', @@ -753,34 +947,46 @@ CREATE TABLE IF NOT EXISTS `outq` ( KEY `outq_delivered` (`outq_delivered`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; +-- -------------------------------------------------------- + +-- +-- Table structure for table `pconfig` +-- + CREATE TABLE IF NOT EXISTS `pconfig` ( `id` int(11) NOT NULL AUTO_INCREMENT, `uid` int(11) NOT NULL DEFAULT '0', - `cat` char(255) CHARACTER SET ascii NOT NULL, - `k` char(255) CHARACTER SET ascii NOT NULL, + `cat` char(255) CHARACTER SET ascii NOT NULL DEFAULT '', + `k` char(255) CHARACTER SET ascii NOT NULL DEFAULT '', `v` mediumtext NOT NULL, PRIMARY KEY (`id`), UNIQUE KEY `access` (`uid`,`cat`,`k`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; +-- -------------------------------------------------------- + +-- +-- Table structure for table `photo` +-- + CREATE TABLE IF NOT EXISTS `photo` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, `aid` int(10) unsigned NOT NULL DEFAULT '0', - `uid` int(10) unsigned NOT NULL, + `uid` int(10) unsigned NOT NULL DEFAULT '0', `xchan` char(255) NOT NULL DEFAULT '', - `resource_id` char(255) NOT NULL, - `created` datetime NOT NULL, - `edited` datetime NOT NULL, - `title` char(255) NOT NULL, + `resource_id` char(255) NOT NULL DEFAULT '', + `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', + `edited` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', + `title` char(255) NOT NULL DEFAULT '', `description` text NOT NULL, - `album` char(255) NOT NULL, - `filename` char(255) NOT NULL, + `album` char(255) NOT NULL DEFAULT '', + `filename` char(255) NOT NULL DEFAULT '', `type` char(128) NOT NULL DEFAULT 'image/jpeg', - `height` smallint(6) NOT NULL, - `width` smallint(6) NOT NULL, + `height` smallint(6) NOT NULL DEFAULT '0', + `width` smallint(6) NOT NULL DEFAULT '0', `size` int(10) unsigned NOT NULL DEFAULT '0', `data` mediumblob NOT NULL, - `scale` tinyint(3) NOT NULL, + `scale` tinyint(3) NOT NULL DEFAULT '0', `profile` tinyint(1) NOT NULL DEFAULT '0', `photo_flags` int(10) unsigned NOT NULL DEFAULT '0', `allow_cid` mediumtext NOT NULL, @@ -800,6 +1006,12 @@ CREATE TABLE IF NOT EXISTS `photo` ( KEY `resource_id` (`resource_id`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; +-- -------------------------------------------------------- + +-- +-- Table structure for table `poll` +-- + CREATE TABLE IF NOT EXISTS `poll` ( `poll_id` int(10) unsigned NOT NULL AUTO_INCREMENT, `poll_channel` int(10) unsigned NOT NULL DEFAULT '0', @@ -812,6 +1024,12 @@ CREATE TABLE IF NOT EXISTS `poll` ( KEY `poll_votes` (`poll_votes`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; +-- -------------------------------------------------------- + +-- +-- Table structure for table `poll_elm` +-- + CREATE TABLE IF NOT EXISTS `poll_elm` ( `pelm_id` int(10) unsigned NOT NULL AUTO_INCREMENT, `pelm_poll` int(10) unsigned NOT NULL DEFAULT '0', @@ -823,16 +1041,28 @@ CREATE TABLE IF NOT EXISTS `poll_elm` ( KEY `pelm_result` (`pelm_result`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; +-- -------------------------------------------------------- + +-- +-- Table structure for table `profdef` +-- + CREATE TABLE IF NOT EXISTS `profdef` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, `field_name` char(255) NOT NULL DEFAULT '', `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 '', + `field_inputs` mediumtext NOT NULL, PRIMARY KEY (`id`), KEY `field_name` (`field_name`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8; +) ENGINE=MyISAM DEFAULT CHARSET=utf8; + +-- -------------------------------------------------------- + +-- +-- Table structure for table `profext` +-- CREATE TABLE IF NOT EXISTS `profext` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, @@ -844,39 +1074,45 @@ CREATE TABLE IF NOT EXISTS `profext` ( KEY `channel_id` (`channel_id`), KEY `hash` (`hash`), KEY `k` (`k`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8; +) ENGINE=MyISAM DEFAULT CHARSET=utf8; + +-- -------------------------------------------------------- + +-- +-- Table structure for table `profile` +-- CREATE TABLE IF NOT EXISTS `profile` ( `id` int(11) NOT NULL AUTO_INCREMENT, `profile_guid` char(64) NOT NULL DEFAULT '', `aid` int(10) unsigned NOT NULL DEFAULT '0', - `uid` int(11) NOT NULL, - `profile_name` char(255) NOT NULL, + `uid` int(11) NOT NULL DEFAULT '0', + `profile_name` char(255) NOT NULL DEFAULT '', `is_default` tinyint(1) NOT NULL DEFAULT '0', `hide_friends` tinyint(1) NOT NULL DEFAULT '0', - `name` char(255) NOT NULL, - `pdesc` char(255) NOT NULL, + `name` char(255) NOT NULL DEFAULT '', + `pdesc` char(255) NOT NULL DEFAULT '', `chandesc` text NOT NULL, `dob` char(32) NOT NULL DEFAULT '0000-00-00', `dob_tz` char(255) NOT NULL DEFAULT 'UTC', - `address` char(255) NOT NULL, - `locality` char(255) NOT NULL, - `region` char(255) NOT NULL, - `postal_code` char(32) NOT NULL, - `country_name` char(255) NOT NULL, - `hometown` char(255) NOT NULL, - `gender` char(32) NOT NULL, - `marital` char(255) NOT NULL, + `address` char(255) NOT NULL DEFAULT '', + `locality` char(255) NOT NULL DEFAULT '', + `region` char(255) NOT NULL DEFAULT '', + `postal_code` char(32) NOT NULL DEFAULT '', + `country_name` char(255) NOT NULL DEFAULT '', + `hometown` char(255) NOT NULL DEFAULT '', + `gender` char(32) NOT NULL DEFAULT '', + `marital` char(255) NOT NULL DEFAULT '', `with` text NOT NULL, `howlong` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', - `sexual` char(255) NOT NULL, - `politic` char(255) NOT NULL, - `religion` char(255) NOT NULL, + `sexual` char(255) NOT NULL DEFAULT '', + `politic` char(255) NOT NULL DEFAULT '', + `religion` char(255) NOT NULL DEFAULT '', `keywords` text NOT NULL, `likes` text NOT NULL, `dislikes` text NOT NULL, `about` text NOT NULL, - `summary` char(255) NOT NULL, + `summary` char(255) NOT NULL DEFAULT '', `music` text NOT NULL, `book` text NOT NULL, `tv` text NOT NULL, @@ -887,9 +1123,9 @@ CREATE TABLE IF NOT EXISTS `profile` ( `education` text NOT NULL, `contact` text NOT NULL, `channels` text NOT NULL, - `homepage` char(255) NOT NULL, - `photo` char(255) NOT NULL, - `thumb` char(255) NOT NULL, + `homepage` char(255) NOT NULL DEFAULT '', + `photo` char(255) NOT NULL DEFAULT '', + `thumb` char(255) NOT NULL DEFAULT '', `publish` tinyint(1) NOT NULL DEFAULT '0', PRIMARY KEY (`id`), UNIQUE KEY `guid` (`profile_guid`,`uid`), @@ -908,13 +1144,19 @@ CREATE TABLE IF NOT EXISTS `profile` ( KEY `profile_guid` (`profile_guid`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; +-- -------------------------------------------------------- + +-- +-- Table structure for table `profile_check` +-- + CREATE TABLE IF NOT EXISTS `profile_check` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `uid` int(10) unsigned NOT NULL, + `uid` int(10) unsigned NOT NULL DEFAULT '0', `cid` int(10) unsigned NOT NULL DEFAULT '0', - `dfrn_id` char(255) NOT NULL, - `sec` char(255) NOT NULL, - `expire` int(11) NOT NULL, + `dfrn_id` char(255) NOT NULL DEFAULT '', + `sec` char(255) NOT NULL DEFAULT '', + `expire` int(11) NOT NULL DEFAULT '0', PRIMARY KEY (`id`), KEY `uid` (`uid`), KEY `cid` (`cid`), @@ -923,29 +1165,47 @@ CREATE TABLE IF NOT EXISTS `profile_check` ( KEY `expire` (`expire`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; +-- -------------------------------------------------------- + +-- +-- Table structure for table `register` +-- + CREATE TABLE IF NOT EXISTS `register` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `hash` char(255) NOT NULL, - `created` datetime NOT NULL, - `uid` int(10) unsigned NOT NULL, - `password` char(255) NOT NULL, - `language` char(16) NOT NULL, + `hash` char(255) NOT NULL DEFAULT '', + `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', + `uid` int(10) unsigned NOT NULL DEFAULT '0', + `password` char(255) NOT NULL DEFAULT '', + `language` char(16) NOT NULL DEFAULT '', PRIMARY KEY (`id`), KEY `hash` (`hash`), KEY `created` (`created`), KEY `uid` (`uid`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8; +) ENGINE=MyISAM DEFAULT CHARSET=utf8; + +-- -------------------------------------------------------- + +-- +-- Table structure for table `session` +-- CREATE TABLE IF NOT EXISTS `session` ( `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT, - `sid` char(255) NOT NULL, + `sid` char(255) NOT NULL DEFAULT '', `data` text NOT NULL, - `expire` bigint(20) unsigned NOT NULL, + `expire` bigint(20) unsigned NOT NULL DEFAULT '0', PRIMARY KEY (`id`), KEY `sid` (`sid`), KEY `expire` (`expire`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; +-- -------------------------------------------------------- + +-- +-- Table structure for table `shares` +-- + CREATE TABLE IF NOT EXISTS `shares` ( `share_id` int(10) unsigned NOT NULL AUTO_INCREMENT, `share_type` int(11) NOT NULL DEFAULT '0', @@ -957,18 +1217,30 @@ CREATE TABLE IF NOT EXISTS `shares` ( KEY `share_xchan` (`share_xchan`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; +-- -------------------------------------------------------- + +-- +-- Table structure for table `sign` +-- + 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, + `signer` char(255) NOT NULL DEFAULT '', PRIMARY KEY (`id`), KEY `iid` (`iid`), KEY `retract_iid` (`retract_iid`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; +-- -------------------------------------------------------- + +-- +-- Table structure for table `site` +-- + CREATE TABLE IF NOT EXISTS `site` ( `site_url` char(255) NOT NULL, `site_access` int(11) NOT NULL DEFAULT '0', @@ -988,9 +1260,16 @@ CREATE TABLE IF NOT EXISTS `site` ( KEY `site_register` (`site_register`), KEY `site_access` (`site_access`), KEY `site_sellpage` (`site_sellpage`), + KEY `site_pull` (`site_pull`), KEY `site_realm` (`site_realm`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; +-- -------------------------------------------------------- + +-- +-- Table structure for table `source` +-- + CREATE TABLE IF NOT EXISTS `source` ( `src_id` int(10) unsigned NOT NULL AUTO_INCREMENT, `src_channel_id` int(10) unsigned NOT NULL DEFAULT '0', @@ -1003,12 +1282,18 @@ CREATE TABLE IF NOT EXISTS `source` ( KEY `src_xchan` (`src_xchan`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; +-- -------------------------------------------------------- + +-- +-- Table structure for table `spam` +-- + CREATE TABLE IF NOT EXISTS `spam` ( `id` int(11) NOT NULL AUTO_INCREMENT, - `uid` int(11) NOT NULL, + `uid` int(11) NOT NULL DEFAULT '0', `spam` int(11) NOT NULL DEFAULT '0', `ham` int(11) NOT NULL DEFAULT '0', - `term` char(255) NOT NULL, + `term` char(255) NOT NULL DEFAULT '', `date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', PRIMARY KEY (`id`), KEY `uid` (`uid`), @@ -1017,25 +1302,37 @@ CREATE TABLE IF NOT EXISTS `spam` ( KEY `term` (`term`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; +-- -------------------------------------------------------- + +-- +-- Table structure for table `sys_perms` +-- + CREATE TABLE IF NOT EXISTS `sys_perms` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `cat` char(255) NOT NULL, - `k` char(255) NOT NULL, + `cat` char(255) NOT NULL DEFAULT '', + `k` char(255) NOT NULL DEFAULT '', `v` mediumtext NOT NULL, - `public_perm` tinyint(1) unsigned NOT NULL, + `public_perm` tinyint(1) unsigned NOT NULL DEFAULT '0', PRIMARY KEY (`id`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; +-- -------------------------------------------------------- + +-- +-- Table structure for table `term` +-- + CREATE TABLE IF NOT EXISTS `term` ( `tid` int(10) unsigned NOT NULL AUTO_INCREMENT, `aid` int(10) unsigned NOT NULL DEFAULT '0', `uid` int(10) unsigned NOT NULL DEFAULT '0', - `oid` int(10) unsigned NOT NULL, - `otype` tinyint(3) unsigned NOT NULL, - `type` tinyint(3) unsigned NOT NULL, - `term` char(255) NOT NULL, - `url` char(255) NOT NULL, - `imgurl` char(255) NOT NULL, + `oid` int(10) unsigned NOT NULL DEFAULT '0', + `otype` tinyint(3) unsigned NOT NULL DEFAULT '0', + `type` tinyint(3) unsigned NOT NULL DEFAULT '0', + `term` char(255) NOT NULL DEFAULT '', + `url` char(255) NOT NULL DEFAULT '', + `imgurl` char(255) NOT NULL DEFAULT '', `term_hash` char(255) NOT NULL DEFAULT '', `parent_hash` char(255) NOT NULL DEFAULT '', PRIMARY KEY (`tid`), @@ -1050,22 +1347,34 @@ CREATE TABLE IF NOT EXISTS `term` ( KEY `parent_hash` (`parent_hash`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; +-- -------------------------------------------------------- + +-- +-- Table structure for table `tokens` +-- + CREATE TABLE IF NOT EXISTS `tokens` ( - `id` varchar(40) NOT NULL, + `id` varchar(40) NOT NULL DEFAULT '', `secret` text NOT NULL, - `client_id` varchar(20) NOT NULL, - `expires` bigint(20) unsigned NOT NULL, - `scope` varchar(200) NOT NULL, - `uid` int(11) NOT NULL, + `client_id` varchar(20) NOT NULL DEFAULT '', + `expires` bigint(20) unsigned NOT NULL DEFAULT '0', + `scope` varchar(200) NOT NULL DEFAULT '', + `uid` int(11) NOT NULL DEFAULT '0', PRIMARY KEY (`id`), KEY `client_id` (`client_id`), KEY `expires` (`expires`), KEY `uid` (`uid`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; +-- -------------------------------------------------------- + +-- +-- Table structure for table `updates` +-- + CREATE TABLE IF NOT EXISTS `updates` ( `ud_id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `ud_hash` char(128) NOT NULL, + `ud_hash` char(128) NOT NULL DEFAULT '', `ud_guid` char(255) NOT NULL DEFAULT '', `ud_date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', `ud_last` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', @@ -1080,6 +1389,12 @@ CREATE TABLE IF NOT EXISTS `updates` ( KEY `ud_last` (`ud_last`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; +-- -------------------------------------------------------- + +-- +-- Table structure for table `verify` +-- + CREATE TABLE IF NOT EXISTS `verify` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, `channel` int(10) unsigned NOT NULL DEFAULT '0', @@ -1095,6 +1410,12 @@ CREATE TABLE IF NOT EXISTS `verify` ( KEY `created` (`created`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; +-- -------------------------------------------------------- + +-- +-- Table structure for table `vote` +-- + CREATE TABLE IF NOT EXISTS `vote` ( `vote_id` int(10) unsigned NOT NULL AUTO_INCREMENT, `vote_poll` int(11) NOT NULL DEFAULT '0', @@ -1107,6 +1428,12 @@ CREATE TABLE IF NOT EXISTS `vote` ( KEY `vote_element` (`vote_element`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; +-- -------------------------------------------------------- + +-- +-- Table structure for table `xchan` +-- + CREATE TABLE IF NOT EXISTS `xchan` ( `xchan_hash` char(255) NOT NULL, `xchan_guid` char(255) NOT NULL DEFAULT '', @@ -1139,6 +1466,12 @@ CREATE TABLE IF NOT EXISTS `xchan` ( KEY `xchan_follow` (`xchan_follow`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; +-- -------------------------------------------------------- + +-- +-- Table structure for table `xchat` +-- + CREATE TABLE IF NOT EXISTS `xchat` ( `xchat_id` int(10) unsigned NOT NULL AUTO_INCREMENT, `xchat_url` char(255) NOT NULL DEFAULT '', @@ -1150,13 +1483,19 @@ CREATE TABLE IF NOT EXISTS `xchat` ( KEY `xchat_desc` (`xchat_desc`), KEY `xchat_xchan` (`xchat_xchan`), KEY `xchat_edited` (`xchat_edited`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8; +) ENGINE=MyISAM DEFAULT CHARSET=utf8; + +-- -------------------------------------------------------- + +-- +-- Table structure for table `xconfig` +-- CREATE TABLE IF NOT EXISTS `xconfig` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `xchan` char(255) NOT NULL, - `cat` char(255) NOT NULL, - `k` char(255) NOT NULL, + `xchan` char(255) NOT NULL DEFAULT '', + `cat` char(255) NOT NULL DEFAULT '', + `k` char(255) NOT NULL DEFAULT '', `v` mediumtext NOT NULL, PRIMARY KEY (`id`), KEY `xchan` (`xchan`), @@ -1164,6 +1503,12 @@ CREATE TABLE IF NOT EXISTS `xconfig` ( KEY `k` (`k`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; +-- -------------------------------------------------------- + +-- +-- Table structure for table `xign` +-- + CREATE TABLE IF NOT EXISTS `xign` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, `uid` int(11) NOT NULL DEFAULT '0', @@ -1173,6 +1518,12 @@ CREATE TABLE IF NOT EXISTS `xign` ( KEY `xchan` (`xchan`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; +-- -------------------------------------------------------- + +-- +-- Table structure for table `xlink` +-- + CREATE TABLE IF NOT EXISTS `xlink` ( `xlink_id` int(10) unsigned NOT NULL AUTO_INCREMENT, `xlink_xchan` char(255) NOT NULL DEFAULT '', @@ -1186,6 +1537,12 @@ CREATE TABLE IF NOT EXISTS `xlink` ( KEY `xlink_rating` (`xlink_rating`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; +-- -------------------------------------------------------- + +-- +-- Table structure for table `xprof` +-- + CREATE TABLE IF NOT EXISTS `xprof` ( `xprof_hash` char(255) NOT NULL, `xprof_age` tinyint(3) unsigned NOT NULL DEFAULT '0', @@ -1216,9 +1573,15 @@ CREATE TABLE IF NOT EXISTS `xprof` ( KEY `xprof_hometown` (`xprof_hometown`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; +-- -------------------------------------------------------- + +-- +-- Table structure for table `xtag` +-- + CREATE TABLE IF NOT EXISTS `xtag` ( `xtag_id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `xtag_hash` char(255) NOT NULL, + `xtag_hash` char(255) NOT NULL DEFAULT '', `xtag_term` char(255) NOT NULL DEFAULT '', `xtag_flags` int(11) NOT NULL DEFAULT '0', PRIMARY KEY (`xtag_id`), -- cgit v1.2.3 From e7b634f81d5c5cd85210cce7ed69ffb27470c66c Mon Sep 17 00:00:00 2001 From: zottel Date: Mon, 10 Nov 2014 12:25:35 +0100 Subject: set channel_w_stream to 0 for forum roles --- include/permissions.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/permissions.php b/include/permissions.php index 186ba32d8..119ecc865 100644 --- a/include/permissions.php +++ b/include/permissions.php @@ -549,7 +549,7 @@ function get_role_perms($role) { $ret['channel_r_profile'] = PERMS_PUBLIC; $ret['channel_r_photos'] = PERMS_PUBLIC; $ret['channel_r_abook'] = PERMS_PUBLIC; - $ret['channel_w_stream'] = PERMS_CONTACTS; + $ret['channel_w_stream'] = 0; $ret['channel_w_wall'] = PERMS_CONTACTS; $ret['channel_w_tagwall'] = PERMS_CONTACTS; $ret['channel_w_comment'] = PERMS_CONTACTS; @@ -581,7 +581,7 @@ function get_role_perms($role) { $ret['channel_r_profile'] = PERMS_PUBLIC; $ret['channel_r_photos'] = PERMS_PUBLIC; $ret['channel_r_abook'] = PERMS_PUBLIC; - $ret['channel_w_stream'] = PERMS_CONTACTS; + $ret['channel_w_stream'] = 0; $ret['channel_w_wall'] = PERMS_CONTACTS; $ret['channel_w_tagwall'] = PERMS_SPECIFIC; $ret['channel_w_comment'] = PERMS_CONTACTS; @@ -614,7 +614,7 @@ function get_role_perms($role) { $ret['channel_r_profile'] = PERMS_CONTACTS; $ret['channel_r_photos'] = PERMS_CONTACTS; $ret['channel_r_abook'] = PERMS_CONTACTS; - $ret['channel_w_stream'] = PERMS_CONTACTS; + $ret['channel_w_stream'] = 0; $ret['channel_w_wall'] = PERMS_CONTACTS; $ret['channel_w_tagwall'] = 0; $ret['channel_w_comment'] = PERMS_CONTACTS; -- cgit v1.2.3 From 9ddf49c6616aded15a4d1615500e91ea0c4096a1 Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Mon, 10 Nov 2014 19:34:39 +0000 Subject: Add a new theme flag - library. Not directly available to be used itself but installed as a lib for other themes. Like SDL, or GTK. Get rid of mobility - it's better done with Comanche and schemas. Describe themes instead of restricting them. Mobile themes can be used as the desktop theme and vice-versa. This deals with the problem of "but my device is something inbetween". Presently not exposed to members. --- mod/admin.php | 53 +++++++++++++++++++++++-------------------------- view/tpl/admin_site.tpl | 1 - 2 files changed, 25 insertions(+), 29 deletions(-) diff --git a/mod/admin.php b/mod/admin.php index 06f44c89b..da76337d8 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -238,7 +238,6 @@ function admin_page_site_post(&$a){ $language = ((x($_POST,'language')) ? notags(trim($_POST['language'])) : ''); $theme = ((x($_POST,'theme')) ? notags(trim($_POST['theme'])) : ''); $theme_mobile = ((x($_POST,'theme_mobile')) ? notags(trim($_POST['theme_mobile'])) : ''); - $theme_accessibility = ((x($_POST,'theme_accessibility')) ? notags(trim($_POST['theme_accessibility'])) : ''); // $site_channel = ((x($_POST,'site_channel')) ? notags(trim($_POST['site_channel'])) : ''); $maximagesize = ((x($_POST,'maximagesize')) ? intval(trim($_POST['maximagesize'])) : 0); @@ -298,12 +297,6 @@ function admin_page_site_post(&$a){ } else { set_config('system','mobile_theme', $theme_mobile); } - if ( $theme_accessibility === '---' ) { - del_config('system','accessibility_theme'); - } else { - set_config('system','accessibility_theme', $theme_accessibility); - } - // set_config('system','site_channel', $site_channel); set_config('system','maximagesize', $maximagesize); @@ -357,27 +350,32 @@ function admin_page_site(&$a) { } /* Installed themes */ - $theme_choices = array(); - $theme_choices_mobile = array(); - $theme_choices_mobile["---"] = t("No special theme for mobile devices"); - $theme_choices_accessibility = array(); - $theme_choices_accessibility["---"] =t("No special theme for accessibility"); - $files = glob('view/theme/*'); - if($files) { - foreach($files as $file) { - $f = basename($file); - $theme_name = ((file_exists($file . '/experimental')) ? sprintf("%s - Experimental", $f) : $f); - if (file_exists($file . '/mobile')) { - $theme_choices_mobile[$f] = $theme_name; - } - if (file_exists($file . '/accessibility')) { - $theme_choices_accessibility[$f] = $theme_name; + $theme_choices_mobile["---"] = t("Default"); + $theme_choices = array(); + $files = glob('view/theme/*'); + if($files) { + foreach($files as $file) { + $vars = ''; + $f = basename($file); + if (file_exists($file . '/library')) + continue; + if (file_exists($file . '/mobile')) + $vars = t('mobile'); + if (file_exists($file . '/experimental')) + $vars .= t('experimental'); + if (file_exists($file . '/unsupported')) + $vars .= t('unsupported'); + if ($vars) { + $theme_choices[$f] = $f . ' (' . $vars . ')'; + $theme_choices_mobile[$f] = $f . ' (' . $vars . ')'; } - $theme_choices[$f] = $theme_name; - } - } - - + else { + $theme_choices[$f] = $f; + $theme_choices_mobile[$f] = $f; + } + } + } + /* Banner */ $banner = get_config('system','banner'); if($banner == false) @@ -425,7 +423,6 @@ function admin_page_site(&$a) { '$language' => array('language', t("System language"), get_config('system','language'), "", $lang_choices), '$theme' => array('theme', t("System theme"), get_config('system','theme'), t("Default system theme - may be over-ridden by user profiles - change theme settings"), $theme_choices), '$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_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)')), diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl index 8c62cb80f..0003ddfc0 100755 --- a/view/tpl/admin_site.tpl +++ b/view/tpl/admin_site.tpl @@ -46,7 +46,6 @@ {{include file="field_select.tpl" field=$language}} {{include file="field_select.tpl" field=$theme}} {{include file="field_select.tpl" field=$theme_mobile}} - {{include file="field_select.tpl" field=$theme_accessibility}} {{include file="field_checkbox.tpl" field=$no_login_on_homepage}} -- cgit v1.2.3 From 0b4575a40b5412f0497c50560b0510a304599086 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 10 Nov 2014 14:23:06 -0800 Subject: class is a reserved word --- mod/ping.php | 8 ++++---- version.inc | 2 +- view/js/main.js | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mod/ping.php b/mod/ping.php index 98584cb14..e52c162ec 100644 --- a/mod/ping.php +++ b/mod/ping.php @@ -222,7 +222,7 @@ function ping_init(&$a) { 'url' => $zz['url'], 'photo' => $zz['photo'], 'when' => relative_date($zz['date']), - 'class' => (($zz['seen']) ? 'notify-seen' : 'notify-unseen'), + 'hclass' => (($zz['seen']) ? 'notify-seen' : 'notify-unseen'), 'message' => strip_tags(bbcode($zz['msg'])) ); } @@ -251,7 +251,7 @@ function ping_init(&$a) { 'url' => $zz['xchan_url'], 'photo' => $zz['xchan_photo_s'], 'when' => relative_date($zz['created']), - 'class' => (($zz['mail_flags'] & MAIL_SEEN) ? 'notify-seen' : 'notify-unseen'), + 'hclass' => (($zz['mail_flags'] & MAIL_SEEN) ? 'notify-seen' : 'notify-unseen'), 'message' => t('sent you a private message'), ); } @@ -302,7 +302,7 @@ function ping_init(&$a) { 'url' => $rr['xchan_url'], 'photo' => $rr['xchan_photo_s'], 'when' => relative_date($rr['abook_created']), - 'class' => ('notify-unseen'), + 'hclass' => ('notify-unseen'), 'message' => t('added your channel') ); } @@ -343,7 +343,7 @@ function ping_init(&$a) { 'url' => $rr['xchan_url'], 'photo' => $rr['xchan_photo_s'], 'when' => $when, - 'class' => ('notify-unseen'), + 'hclass' => ('notify-unseen'), 'message' => t('posted an event') ); } diff --git a/version.inc b/version.inc index 2859cdc11..7bd986426 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2014-11-09.854 +2014-11-10.855 diff --git a/view/js/main.js b/view/js/main.js index beedb7f01..a55b8fbb1 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -749,7 +749,7 @@ function updateConvItems(mode,data) { $("#nav-" + notifyType + "-menu").html(notifications_all + notifications_mark); $(data.notify).each(function() { - html = notifications_tpl.format(this.notify_link,this.photo,this.name,this.message,this.when,this.class); + html = notifications_tpl.format(this.notify_link,this.photo,this.name,this.message,this.when,this.hclass); $("#nav-" + notifyType + "-menu").append(html); }); $(".dropdown-menu img[data-src]").each(function(i, el){ -- cgit v1.2.3 From 62094652333514e92f9f00699e14b9f49680bb64 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 10 Nov 2014 15:21:04 -0800 Subject: add public forum identification to libzot. No attempt is made to identify other types of forums or weird custom channel permissions. If the channel is auto-accept and taggable, it's a public forum. --- boot.php | 1 + include/zot.php | 8 ++++++-- mod/zfinger.php | 16 ++++++++++++++++ 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/boot.php b/boot.php index f8c91dfbb..4b1c008cd 100755 --- a/boot.php +++ b/boot.php @@ -414,6 +414,7 @@ define ( 'XCHAN_FLAGS_ORPHAN', 0x0002); define ( 'XCHAN_FLAGS_CENSORED', 0x0004); define ( 'XCHAN_FLAGS_SELFCENSORED', 0x0008); define ( 'XCHAN_FLAGS_SYSTEM', 0x0010); +define ( 'XCHAN_FLAGS_PUBFORUM', 0x0020); define ( 'XCHAN_FLAGS_DELETED', 0x1000); /* * Traficlights for Administration of HubLoc diff --git a/include/zot.php b/include/zot.php index bdc1f607f..ac68c0035 100644 --- a/include/zot.php +++ b/include/zot.php @@ -699,10 +699,14 @@ function import_xchan($arr,$ud_flags = UPDATE_FLAGS_UPDATED, $ud_arr = null) { $dirmode = get_config('system','directory_mode'); - if((($arr['site']['directory_mode'] === 'standalone') || ($dirmode & DIRECTORY_MODE_STANDALONE)) -&& ($arr['site']['url'] != z_root())) + if((($arr['site']['directory_mode'] === 'standalone') || ($dirmode & DIRECTORY_MODE_STANDALONE)) && ($arr['site']['url'] != z_root())) $arr['searchable'] = false; + $public_forum = (($r[0]['xchan_flags'] & XCHAN_FLAGS_PUBFORUM) ? true : false); + $pubforum_changed = ((intval($public_forum) != intval($arr['public_forum'])) ? true : false); + if($pubforum_changed) + $new_flags = $r[0]['xchan_flags'] ^ XCHAN_FLAGS_PUBFORUM; + $hidden = (1 - intval($arr['searchable'])); // Be careful - XCHAN_FLAGS_HIDDEN should evaluate to 1 diff --git a/mod/zfinger.php b/mod/zfinger.php index 666f141ec..c2aebc675 100644 --- a/mod/zfinger.php +++ b/mod/zfinger.php @@ -108,6 +108,21 @@ function zfinger_init(&$a) { if($deleted || $censored) $searchable = false; + $public_forum = false; + + $role = get_pconfig($e['channel_id'],'system','permissions_role'); + if($role === 'forum') { + $public_forum = true; + } + else { + // check if it has characteristics of a public forum based on custom permissions. + $t = q("select abook_my_perms from abook where abook_channel = %d and (abook_flags & %d) limit 1", + intval($e['channel_id']), + intval(ABOOK_FLAG_SELF) + ); + if($t && ($t[0]['abook_my_perms'] & PERMS_W_TAGWALL)) + $public_forum = true; + } // This is for birthdays and keywords, but must check access permissions @@ -174,6 +189,7 @@ function zfinger_init(&$a) { $ret['target_sig'] = $zsig; $ret['searchable'] = $searchable; $ret['adult_content'] = $adult_channel; + $ret['public_forum'] = $public_forum; if($deleted) $ret['deleted'] = $deleted; -- cgit v1.2.3 From 56199027768a07d7f1f980df08fb9c5dc7b1278e Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 10 Nov 2014 17:44:02 -0800 Subject: indicate public forums in directory results (there will be some [possibly considerable] lag time before existing forums are correctly tagged). --- include/zot.php | 9 +++++---- mod/directory.php | 3 +++ mod/dirsearch.php | 2 ++ view/tpl/direntry.tpl | 6 ++++++ 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/include/zot.php b/include/zot.php index ac68c0035..2954408b9 100644 --- a/include/zot.php +++ b/include/zot.php @@ -702,10 +702,6 @@ function import_xchan($arr,$ud_flags = UPDATE_FLAGS_UPDATED, $ud_arr = null) { if((($arr['site']['directory_mode'] === 'standalone') || ($dirmode & DIRECTORY_MODE_STANDALONE)) && ($arr['site']['url'] != z_root())) $arr['searchable'] = false; - $public_forum = (($r[0]['xchan_flags'] & XCHAN_FLAGS_PUBFORUM) ? true : false); - $pubforum_changed = ((intval($public_forum) != intval($arr['public_forum'])) ? true : false); - if($pubforum_changed) - $new_flags = $r[0]['xchan_flags'] ^ XCHAN_FLAGS_PUBFORUM; $hidden = (1 - intval($arr['searchable'])); @@ -725,6 +721,11 @@ function import_xchan($arr,$ud_flags = UPDATE_FLAGS_UPDATED, $ud_arr = null) { if($deleted_changed) $new_flags = $new_flags ^ XCHAN_FLAGS_DELETED; + $public_forum = (($r[0]['xchan_flags'] & XCHAN_FLAGS_PUBFORUM) ? true : false); + $pubforum_changed = ((intval($public_forum) != intval($arr['public_forum'])) ? true : false); + if($pubforum_changed) + $new_flags = $r[0]['xchan_flags'] ^ XCHAN_FLAGS_PUBFORUM; + if(($r[0]['xchan_name_date'] != $arr['name_updated']) || ($r[0]['xchan_connurl'] != $arr['connections_url']) || ($r[0]['xchan_flags'] != $new_flags) diff --git a/mod/directory.php b/mod/directory.php index 09ff2ae09..10e90b145 100644 --- a/mod/directory.php +++ b/mod/directory.php @@ -203,6 +203,7 @@ function directory_content(&$a) { $entry = array( 'id' => ++$t, 'profile_link' => $profile_link, + 'public_forum' => $rr['public_forum'], 'photo' => $rr['photo'], 'hash' => $rr['hash'], 'alttext' => $rr['name'] . ' ' . $rr['address'], @@ -210,6 +211,7 @@ function directory_content(&$a) { 'details' => $pdesc . $details, 'profile' => $profile, 'address' => $rr['address'], + 'nickname' => substr($rr['address'],0,strpos($rr['address'],'@')), 'location' => $location, 'gender' => $gender, 'pdesc' => $pdesc, @@ -219,6 +221,7 @@ function directory_content(&$a) { 'hometown' => $hometown, 'about' => $about, 'conn_label' => t('Connect'), + 'forum_label' => t('Public Forum:'), 'connect' => $connect_link, 'online' => $online, 'kw' => (($out) ? t('Keywords: ') : ''), diff --git a/mod/dirsearch.php b/mod/dirsearch.php index d8f611e6a..516b5cc73 100644 --- a/mod/dirsearch.php +++ b/mod/dirsearch.php @@ -226,6 +226,8 @@ function dirsearch_content(&$a) { $entry['name'] = $rr['xchan_name']; $entry['hash'] = $rr['xchan_hash']; + $entry['public_forum'] = (($rr['xchan_flags'] & XCHAN_FLAGS_PUBFORUM) ? true : false); + $entry['url'] = $rr['xchan_url']; $entry['photo_l'] = $rr['xchan_photo_l']; $entry['photo'] = $rr['xchan_photo_m']; diff --git a/view/tpl/direntry.tpl b/view/tpl/direntry.tpl index 691905ecd..879a168c9 100755 --- a/view/tpl/direntry.tpl +++ b/view/tpl/direntry.tpl @@ -12,6 +12,12 @@
    {{$entry.name}}{{if $entry.online}} {{/if}}
    +{{if $entry.public_forum}} +
    +{{$entry.forum_label}} @{{$entry.nickname}}+ +
    +{{/if}} +
    {{$entry.details}}
    {{if $entry.hometown}}
    {{$entry.hometown}}
    -- cgit v1.2.3 From d432f4ccd5696565dbc6e726d6d06eb77fd35f77 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 10 Nov 2014 19:20:23 -0800 Subject: issue #683 - don't linkify homepage field without validating --- include/identity.php | 2 ++ mod/profiles.php | 2 ++ view/tpl/profile_vcard.tpl | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/include/identity.php b/include/identity.php index b9ee00623..c8b5a3679 100644 --- a/include/identity.php +++ b/include/identity.php @@ -890,6 +890,8 @@ function profile_sidebar($profile, $block = 0, $show_connect = true) { || (x($profile,'country_name') == 1)) $location = t('Location:'); + $profile['homepage'] = linkify($profile['homepage']); + $gender = ((x($profile,'gender') == 1) ? t('Gender:') : False); $marital = ((x($profile,'marital') == 1) ? t('Status:') : False); $homepage = ((x($profile,'homepage') == 1) ? t('Homepage:') : False); diff --git a/mod/profiles.php b/mod/profiles.php index 14f24c5cf..86de72629 100644 --- a/mod/profiles.php +++ b/mod/profiles.php @@ -514,6 +514,8 @@ function profiles_post(&$a) { } if($is_default) { + // reload the info for the sidebar widget - why does this not work? + profile_load($a,$channel['channel_address']); proc_run('php','include/directory.php',local_user()); } } diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl index 3c83cd685..6904c2fec 100755 --- a/view/tpl/profile_vcard.tpl +++ b/view/tpl/profile_vcard.tpl @@ -41,7 +41,7 @@ {{if $marital}}
    ♥{{$marital}}
    {{$profile.marital}}
    {{/if}} - {{if $homepage}}
    {{$homepage}}
    {{$profile.homepage}}
    {{/if}} + {{if $homepage}}
    {{$homepage}}
    {{$profile.homepage}}
    {{/if}} {{if $diaspora}} {{include file="diaspora_vcard.tpl"}} -- cgit v1.2.3 From 325b269b224615a9c584e0ec631a11d68bb24eb8 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 11 Nov 2014 01:05:29 -0800 Subject: the code is a bit crufty, but this should fix issue #687 --- include/datetime.php | 13 ++++++++++--- mod/profiles.php | 16 ++++++++++++++++ version.inc | 2 +- 3 files changed, 27 insertions(+), 4 deletions(-) diff --git a/include/datetime.php b/include/datetime.php index 00bac8ad1..47c63e51d 100644 --- a/include/datetime.php +++ b/include/datetime.php @@ -134,10 +134,17 @@ function dob($dob) { if(! $f) $f = 'ymd'; - if ($dob && $dob != '0000-00-00') - $o = datesel($f,mktime(0,0,0,0,0,1900),mktime(),mktime(0,0,0,$month,$day,$year),'dob'); + if($dob === '0000-00-00') + $value = ''; else - $o = datesel($f,mktime(0,0,0,0,0,1900),mktime(),false,'dob'); + $value = (($year) ? datetime_convert('UTC','UTC',$dob,'Y-m-d') : datetime_convert('UTC','UTC',$dob,'m-d')); + + $o = ''; + +// if ($dob && $dob != '0000-00-00') +// $o = datesel($f,mktime(0,0,0,0,0,1900),mktime(),mktime(0,0,0,$month,$day,$year),'dob'); +// else +// $o = datesel($f,mktime(0,0,0,0,0,1900),mktime(),false,'dob'); return $o; } diff --git a/mod/profiles.php b/mod/profiles.php index 86de72629..bea006384 100644 --- a/mod/profiles.php +++ b/mod/profiles.php @@ -234,6 +234,22 @@ function profiles_post(&$a) { } $dob = $_POST['dob'] ? escape_tags(trim($_POST['dob'])) : '0000-00-00'; // FIXME: Needs to be validated? + + $y = substr($dob,0,4); + if((! ctype_digit($y)) || ($y < 1900)) + $ignore_year = true; + else + $ignore_year = false; + + if($dob != '0000-00-00') { + if(strpos($dob,'0000-') === 0) { + $ignore_year = true; + $dob = substr($dob,5); + } + $dob = datetime_convert('UTC','UTC',(($ignore_year) ? '1900-' . $dob : $dob),(($ignore_year) ? 'm-d' : 'Y-m-d')); + if($ignore_year) + $dob = '0000-' . $dob; + } $name = escape_tags(trim($_POST['name'])); diff --git a/version.inc b/version.inc index 7bd986426..6c86bf1e2 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2014-11-10.855 +2014-11-11.856 -- cgit v1.2.3 From f72035ec93c51356e9f6810fe62b4f77be09bebf Mon Sep 17 00:00:00 2001 From: marijus Date: Tue, 11 Nov 2014 21:09:05 +0100 Subject: tie the narrow nav-pills to .widget instead of aside --- view/css/widgets.css | 5 +++++ view/theme/redbasic/css/style.css | 4 ---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/view/css/widgets.css b/view/css/widgets.css index d481a09d1..b5a99d5ae 100644 --- a/view/css/widgets.css +++ b/view/css/widgets.css @@ -7,6 +7,11 @@ margin-top: 0px; } + +.widget .nav-pills > li > a { + padding: 6px 10px; +} + /* suggest */ .suggest-widget-more { diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 06f24eedd..f3bf546ea 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -2169,10 +2169,6 @@ aside .nav > li > a:hover, aside .nav > li > a:focus { background-color: $navaside_bghover; } -aside .nav-pills > li > a { - padding: 6px 10px; -} - .dropdown-menu img { border-radius: $radiuspx; } -- cgit v1.2.3 From d145ef2021da845e257681f1dc93d274d814e90f Mon Sep 17 00:00:00 2001 From: marijus Date: Tue, 11 Nov 2014 23:09:55 +0100 Subject: some work on directory widgets --- view/css/widgets.css | 27 +++++--------------------- view/theme/redbasic/css/style.css | 13 ------------- view/tpl/dir_sort_links.tpl | 8 +++++--- view/tpl/peoplefind.tpl | 41 +++++++++++++++++++++++---------------- view/tpl/safesearch.tpl | 4 +++- view/tpl/searchbox.tpl | 2 +- 6 files changed, 38 insertions(+), 57 deletions(-) diff --git a/view/css/widgets.css b/view/css/widgets.css index b5a99d5ae..a24f5fb29 100644 --- a/view/css/widgets.css +++ b/view/css/widgets.css @@ -12,6 +12,11 @@ padding: 6px 10px; } +.widget-input { + border-top-right-radius: 0px; + border-bottom-right-radius: 0px; +} + /* suggest */ .suggest-widget-more { @@ -28,13 +33,6 @@ margin-top: 15px; } -/* search */ - -#search-text { - border-top-right-radius: 0px; - border-bottom-right-radius: 0px; -} - /* notes */ #note-text { @@ -51,21 +49,6 @@ } -/* peoplefind */ - -#peoplefind-sidebar .btn { - margin: 10px 0 10px 0; -} - -#side-peoplefind-url { - margin-top: 5px; -} - -#side-peoplefind-url { - font-size: 1em; -} - - /* fileas */ diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index f3bf546ea..ea8aa3365 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -2019,10 +2019,6 @@ img.mail-list-sender-photo { -moz-border-radius: $radiuspx; } -#saved-search-ul { - list-style-type: none; -} - .fileas-ul { list-style-type: none; } @@ -2032,15 +2028,6 @@ img.mail-list-sender-photo { border-radius: $radiuspx; -moz-border-radius: $radiuspx; } -/* -.categories-ul { - list-style-type: none; -} - -#sidebar-group-list ul, #posted-date-selector { - list-style-type: none; -} -*/ .profile-thing-list img, .thing-show img, .thing-edit-links a { margin-top: 8px; diff --git a/view/tpl/dir_sort_links.tpl b/view/tpl/dir_sort_links.tpl index d78aec1f5..f6d8c3454 100644 --- a/view/tpl/dir_sort_links.tpl +++ b/view/tpl/dir_sort_links.tpl @@ -1,6 +1,8 @@ diff --git a/view/tpl/peoplefind.tpl b/view/tpl/peoplefind.tpl index 55bf1575f..6ec37539b 100755 --- a/view/tpl/peoplefind.tpl +++ b/view/tpl/peoplefind.tpl @@ -1,22 +1,29 @@

    {{$findpeople}}

    -
    {{$desc}}
    - - -
    - {{if $advanced_search}} - {{$advanced_search}} -
    - diff --git a/view/tpl/safesearch.tpl b/view/tpl/safesearch.tpl index e0b2ab538..58ce22741 100644 --- a/view/tpl/safesearch.tpl +++ b/view/tpl/safesearch.tpl @@ -1,4 +1,6 @@

    {{$safemode}}

    -{{$toggle}} +
    diff --git a/view/tpl/searchbox.tpl b/view/tpl/searchbox.tpl index 02b2d4a50..f4301f0f5 100644 --- a/view/tpl/searchbox.tpl +++ b/view/tpl/searchbox.tpl @@ -1,7 +1,7 @@
    - +
    {{if $savedsearch}} -- cgit v1.2.3 From 3fa003b5a889e2565eb64a950afabf5f6e4b3fe8 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 11 Nov 2014 15:13:18 -0800 Subject: add some subtle delineation to directory entries, remove forced link on homepage element (SECURITY) --- mod/directory.php | 2 +- view/css/mod_directory.css | 3 +++ view/tpl/direntry.tpl | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/mod/directory.php b/mod/directory.php index 10e90b145..b7c965289 100644 --- a/mod/directory.php +++ b/mod/directory.php @@ -217,7 +217,7 @@ function directory_content(&$a) { 'pdesc' => $pdesc, 'marital' => $marital, 'homepage' => $homepage, - 'homepageurl' => $homepageurl, + 'homepageurl' => linkify($homepageurl), 'hometown' => $hometown, 'about' => $about, 'conn_label' => t('Connect'), diff --git a/view/css/mod_directory.css b/view/css/mod_directory.css index 98b99ef50..849e8e485 100644 --- a/view/css/mod_directory.css +++ b/view/css/mod_directory.css @@ -21,6 +21,8 @@ .directory-item { overflow: hidden; margin: 2px; + border-bottom: 2px solid #f1f1f1; + padding-bottom: 3px; } #directory-search-wrapper { @@ -63,6 +65,7 @@ div.dirtagblock.widget { margin: 16px; } .directory-connect { + margin-top: 3px; display:block; margin-left:auto; margin-right: auto; diff --git a/view/tpl/direntry.tpl b/view/tpl/direntry.tpl index 879a168c9..2da920ab1 100755 --- a/view/tpl/direntry.tpl +++ b/view/tpl/direntry.tpl @@ -26,7 +26,7 @@
    {{$entry.about}}
    {{/if}} {{if $entry.homepage}} -
    {{$entry.homepage}}{{$entry.homepageurl}}
    +
    {{$entry.homepage}}{{$entry.homepageurl}}
    {{/if}} {{if $entry.kw}}
    {{$entry.kw}} {{$entry.keywords}}
    -- cgit v1.2.3 From f2d5f23d584944e4c553fb296b8f649b9be2f0c2 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 11 Nov 2014 15:50:27 -0800 Subject: Nothing here, move along. --- mod/directory.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mod/directory.php b/mod/directory.php index b7c965289..256f7ca9a 100644 --- a/mod/directory.php +++ b/mod/directory.php @@ -2,7 +2,7 @@ require_once('include/dir_fns.php'); require_once('include/widgets.php'); - +require_once('include/bbcode.php'); function directory_init(&$a) { $a->set_pager_itemspage(60); @@ -166,7 +166,7 @@ function directory_content(&$a) { $hometown = ((x($profile,'hometown') == 1) ? t('Hometown: ') . $profile['hometown'] : False); - $about = ((x($profile,'about') == 1) ? t('About: ') . $profile['about'] : False); + $about = ((x($profile,'about') == 1) ? t('About: ') . bbcode($profile['about']) : False); $keywords = ((x($profile,'keywords')) ? $profile['keywords'] : ''); -- cgit v1.2.3 From 09b09dedbc3157e1859f4a777aeab54fadabfb43 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 11 Nov 2014 16:06:16 -0800 Subject: Most directory searches are POST. get_query_args() only handles GET so that had to be fixed or page 2 of directory search results wouldn't match the search. --- include/text.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/include/text.php b/include/text.php index fca23ca22..4aa412355 100644 --- a/include/text.php +++ b/include/text.php @@ -2046,7 +2046,7 @@ function normalise_openid($s) { // used in ajax endless scroll request to find out all the args that the master page was viewing. // This was using $_REQUEST, but $_REQUEST also contains all your cookies. So we're restricting it -// to $_GET. If this is used in a post handler, that decision may need to be considered. +// to $_GET and $_POST. function extra_query_args() { $s = ''; @@ -2058,5 +2058,13 @@ function extra_query_args() { } } } + if(count($_POST)) { + foreach($_POST as $k => $v) { + // these are request vars we don't want to duplicate + if(! in_array($k, array('q','f','zid','page','PHPSESSID'))) { + $s .= '&' . $k . '=' . $v; + } + } + } return $s; } -- cgit v1.2.3 From 06e5d0798c67e8314429e475523a6a30e50bfb8e Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 11 Nov 2014 16:09:45 -0800 Subject: and urlencode that. --- include/text.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/text.php b/include/text.php index 4aa412355..7cb54edd3 100644 --- a/include/text.php +++ b/include/text.php @@ -2054,7 +2054,7 @@ function extra_query_args() { foreach($_GET as $k => $v) { // these are request vars we don't want to duplicate if(! in_array($k, array('q','f','zid','page','PHPSESSID'))) { - $s .= '&' . $k . '=' . $v; + $s .= '&' . $k . '=' . urlencode($v); } } } @@ -2062,7 +2062,7 @@ function extra_query_args() { foreach($_POST as $k => $v) { // these are request vars we don't want to duplicate if(! in_array($k, array('q','f','zid','page','PHPSESSID'))) { - $s .= '&' . $k . '=' . $v; + $s .= '&' . $k . '=' . urlencode($v); } } } -- cgit v1.2.3 From 570577a99089ff5bb48c5c67a612bdd874721e95 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 11 Nov 2014 18:05:50 -0800 Subject: a couple of places where we need to look for a sys channel euid. --- include/text.php | 7 +++++++ mod/item.php | 28 ++++++++++++++++++---------- 2 files changed, 25 insertions(+), 10 deletions(-) diff --git a/include/text.php b/include/text.php index 7cb54edd3..ba1f9e5a3 100644 --- a/include/text.php +++ b/include/text.php @@ -2021,7 +2021,14 @@ function json_decode_plus($s) { function design_tools() { + $channel = get_app()->get_channel(); + + if(array_key_exists('sys',$_REQUEST) && $_REQUEST['sys'] == 1 && is_site_admin()) { + require_once('include/identity.php'); + $channel = get_sys_channel(); + } + $who = $channel['channel_address']; return replace_macros(get_markup_template('design_tools.tpl'), array( diff --git a/mod/item.php b/mod/item.php index e7d886b00..9688dbfe1 100644 --- a/mod/item.php +++ b/mod/item.php @@ -32,9 +32,17 @@ function item_post(&$a) { require_once('include/security.php'); $uid = local_user(); - $channel = null; + if(array_key_exists('sys',$_REQUEST) && $_REQUEST['sys'] == 1 && is_site_admin()) { + require_once('include/identity.php'); + $sys = get_sys_channel(); + if($sys && intval($sys['channel_id'])) { + $uid = intval($sys['channel_id']); + $channel = $sys; + } + } + if(x($_REQUEST,'dropitems')) { require_once('include/items.php'); $arr_drop = explode(',',$_REQUEST['dropitems']); @@ -87,8 +95,8 @@ function item_post(&$a) { /* * Check service class limits */ - if (local_user() && !(x($_REQUEST,'parent')) && !(x($_REQUEST,'post_id'))) { - $ret = item_check_service_class(local_user(),x($_REQUEST,'webpage')); + if ($uid && !(x($_REQUEST,'parent')) && !(x($_REQUEST,'post_id'))) { + $ret = item_check_service_class($uid,x($_REQUEST,'webpage')); if (!$ret['success']) { notice( t($ret['message']) . EOL) ; if(x($_REQUEST,'return')) @@ -129,11 +137,11 @@ function item_post(&$a) { intval($parent) ); } - elseif($parent_mid && local_user()) { + elseif($parent_mid && $uid) { // This is coming from an API source, and we are logged in $r = q("SELECT * FROM `item` WHERE `mid` = '%s' AND `uid` = %d LIMIT 1", dbesc($parent_mid), - intval(local_user()) + intval($uid) ); } // if this isn't the real parent of the conversation, find it @@ -223,7 +231,7 @@ function item_post(&$a) { if(! $channel) { - if(local_user() && local_user() == $profile_uid) { + if($uid && $uid == $profile_uid) { $channel = $a->get_channel(); } else { @@ -446,7 +454,7 @@ function item_post(&$a) { intval($profile_uid) ); if($z && ($z[0]['account_roles'] & ACCOUNT_ROLE_ALLOWCODE)) { - if(local_user() && (get_account_id() == $z[0]['account_id'])) { + if($uid && (get_account_id() == $z[0]['account_id'])) { $execflag = true; } else { @@ -461,7 +469,7 @@ function item_post(&$a) { if($mimetype === 'text/bbcode') { - if(local_user() && local_user() == $profile_uid && feature_enabled(local_user(),'markdown')) { + if($uid && $uid == $profile_uid && feature_enabled($uid,'markdown')) { require_once('include/bb2diaspora.php'); $body = diaspora2bb(escape_tags($body),true); } @@ -594,7 +602,7 @@ function item_post(&$a) { if($fullnametagged) continue; - $success = handle_tag($a, $body, $access_tag, $str_tags, (local_user()) ? local_user() : $profile_uid , $tag); + $success = handle_tag($a, $body, $access_tag, $str_tags, ($uid) ? $uid : $profile_uid , $tag); logger('handle_tag: ' . print_r($success,tue), LOGGER_DATA); if(($access_tag) && (! $parent_item)) { logger('access_tag: ' . $tag . ' ' . print_r($access_tag,true), LOGGER_DATA); @@ -797,7 +805,7 @@ function item_post(&$a) { $datarray['body'] = z_input_filter($datarray['uid'],$datarray['body'],$datarray['mimetype']); - if(local_user()) { + if($uid) { if($channel['channel_hash'] === $datarray['author_xchan']) { $datarray['sig'] = base64url_encode(rsa_sign($datarray['body'],$channel['channel_prvkey'])); $datarray['item_flags'] = $datarray['item_flags'] | ITEM_VERIFIED; -- cgit v1.2.3 From 37742be6af5aee1a5be8ba878379d9e21b39377d Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 11 Nov 2014 18:57:59 -0800 Subject: some more work on sys publishing --- mod/item.php | 21 ++++++++++----------- mod/webpages.php | 52 ++++++++++++++++++++++++++++++---------------------- 2 files changed, 40 insertions(+), 33 deletions(-) diff --git a/mod/item.php b/mod/item.php index 9688dbfe1..fdfc43bf2 100644 --- a/mod/item.php +++ b/mod/item.php @@ -33,14 +33,15 @@ function item_post(&$a) { $uid = local_user(); $channel = null; + $observer = null; - if(array_key_exists('sys',$_REQUEST) && $_REQUEST['sys'] == 1 && is_site_admin()) { - require_once('include/identity.php'); - $sys = get_sys_channel(); - if($sys && intval($sys['channel_id'])) { - $uid = intval($sys['channel_id']); - $channel = $sys; - } + $profile_uid = ((x($_REQUEST,'profile_uid')) ? intval($_REQUEST['profile_uid']) : 0); + require_once('include/identity.php'); + $sys = get_sys_channel(); + if($sys && $profile_uid && ($sys['channel_id'] == $profile_uid) && is_site_admin()) { + $uid = intval($sys['channel_id']); + $channel = $sys; + $observer = $sys; } if(x($_REQUEST,'dropitems')) { @@ -78,7 +79,6 @@ function item_post(&$a) { $message_id = ((x($_REQUEST,'message_id') && $api_source) ? strip_tags($_REQUEST['message_id']) : ''); $created = ((x($_REQUEST,'created')) ? datetime_convert('UTC','UTC',$_REQUEST['created']) : datetime_convert()); - $profile_uid = ((x($_REQUEST,'profile_uid')) ? intval($_REQUEST['profile_uid']) : 0); $post_id = ((x($_REQUEST,'post_id')) ? intval($_REQUEST['post_id']) : 0); $app = ((x($_REQUEST,'source')) ? strip_tags($_REQUEST['source']) : ''); $return_path = ((x($_REQUEST,'return')) ? $_REQUEST['return'] : ''); @@ -176,9 +176,8 @@ function item_post(&$a) { } - - $observer = $a->get_observer(); - + if(! $observer) + $observer = $a->get_observer(); if($parent) { logger('mod_item: item_post parent=' . $parent); diff --git a/mod/webpages.php b/mod/webpages.php index a5cfd00e6..e7aef5fb0 100644 --- a/mod/webpages.php +++ b/mod/webpages.php @@ -10,28 +10,37 @@ function webpages_content(&$a) { return; } + + $uid = 0; + $owner = 0; + $channel = null; + $observer = $a->get_observer(); + $profile = 0; $channel = $a->get_channel(); - if((local_user()) && (argc() > 2) && (argv(2) === 'view')) { - $which = $channel['channel_address']; - $profile = argv(1); + if($which === 'sys' && is_site_admin()) { + require_once('include/identity.php'); + $sys = get_sys_channel(); + if($sys && intval($sys['channel_id'])) { + $uid = $owner = intval($sys['channel_id']); + $channel = $sys; + $observer = $sys; + } } profile_load($a,$which,$profile); - - // Figure out who the page owner is. - $r = q("select channel_id from channel where channel_address = '%s'", - dbesc($which) - ); - if($r) { - $owner = intval($r[0]['channel_id']); + if(! $owner) { + // Figure out who the page owner is. + $r = q("select channel_id from channel where channel_address = '%s'", + dbesc($which) + ); + if($r) { + $owner = intval($r[0]['channel_id']); + } } - // Get the observer, check their permissions - - $observer = $a->get_observer(); $ob_hash = (($observer) ? $observer['xchan_hash'] : ''); $perms = get_all_perms($owner,$ob_hash); @@ -41,11 +50,6 @@ function webpages_content(&$a) { return; } -// if(local_user() && local_user() == $owner) { -// $a->set_widget('design',design_tools()); -// } - - if(feature_enabled($owner,'expert')) { $mimetype = (($_REQUEST['mimetype']) ? $_REQUEST['mimetype'] : get_pconfig($owner,'system','page_mimetype')); if(! $mimetype) @@ -60,14 +64,18 @@ function webpages_content(&$a) { $layout = 'choose'; -// 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. + // 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 owner's. + // This lets you post pages at other people's channels. + require_once ('include/conversation.php'); require_once('include/acl_selectors.php'); - if(local_user() && local_user() == $a->profile_uid) { + if((! $channel) && ($uid) && ($uid == $a->profile_uid)) { $channel = $a->get_channel(); + } + if($channel) { $channel_acl = array( 'allow_cid' => $channel['channel_allow_cid'], 'allow_gid' => $channel['channel_allow_gid'], @@ -88,7 +96,7 @@ function webpages_content(&$a) { 'nickname' => $a->profile['channel_address'], 'lockstate' => (($group || $cid || $channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'), 'bang' => (($group || $cid) ? '!' : ''), - 'acl' => ((local_user() && local_user() == $owner) ? populate_acl($channel_acl,false) : ''), + 'acl' => (($uid && $uid == $owner) ? populate_acl($channel_acl,false) : ''), 'visitor' => true, 'profile_uid' => intval($owner), 'mimetype' => $mimetype, -- cgit v1.2.3 From b5af6679857eeafcb360d7dec69acf11af034c1d Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 11 Nov 2014 19:29:30 -0800 Subject: slow progress on sys publishing, making sure all the data we need is in the places we need it but validate it anyway --- boot.php | 4 ++-- include/text.php | 2 +- include/widgets.php | 2 +- mod/webpages.php | 27 +++++++++++++++++++++------ 4 files changed, 25 insertions(+), 10 deletions(-) diff --git a/boot.php b/boot.php index 4b1c008cd..fb059f8b0 100755 --- a/boot.php +++ b/boot.php @@ -677,8 +677,8 @@ class App { public $css_sources = array(); public $js_sources = array(); public $theme_info = array(); - - public $nav_sel; + public $is_sys = false; + public $nav_sel; public $category; diff --git a/include/text.php b/include/text.php index ba1f9e5a3..686dee4a2 100644 --- a/include/text.php +++ b/include/text.php @@ -2024,7 +2024,7 @@ function design_tools() { $channel = get_app()->get_channel(); - if(array_key_exists('sys',$_REQUEST) && $_REQUEST['sys'] == 1 && is_site_admin()) { + if(get_app()->is_sys && is_site_admin()) { require_once('include/identity.php'); $channel = get_sys_channel(); } diff --git a/include/widgets.php b/include/widgets.php index dcad3eff6..cb5dc6846 100644 --- a/include/widgets.php +++ b/include/widgets.php @@ -585,7 +585,7 @@ function widget_design_tools($arr) { // otherwise local_user() is sufficient for permissions. if($a->profile['profile_uid']) - if($a->profile['profile_uid'] != local_user()) + if(($a->profile['profile_uid'] != local_user()) && (! $a->is_sys)) return ''; if(! local_user()) diff --git a/mod/webpages.php b/mod/webpages.php index e7aef5fb0..d80a9a86e 100644 --- a/mod/webpages.php +++ b/mod/webpages.php @@ -1,16 +1,33 @@ 1 && argv(1) === 'sys' && is_site_admin()) { + require_once('include/identity.php'); + $sys = get_sys_channel(); + if($sys && intval($sys['channel_id'])) { + $a->is_sys = true; + } + } if(argc() > 1) $which = argv(1); - else { + else + return; + + profile_load($a,$which,$profile); + +} + + +function webpages_content(&$a) { + + if(! $a->profile) { notice( t('Requested profile is not available.') . EOL ); $a->error = 404; return; } - $uid = 0; $owner = 0; $channel = null; @@ -19,7 +36,7 @@ function webpages_content(&$a) { $profile = 0; $channel = $a->get_channel(); - if($which === 'sys' && is_site_admin()) { + if($a->is_sys && is_site_admin()) { require_once('include/identity.php'); $sys = get_sys_channel(); if($sys && intval($sys['channel_id'])) { @@ -29,8 +46,6 @@ function webpages_content(&$a) { } } - profile_load($a,$which,$profile); - if(! $owner) { // Figure out who the page owner is. $r = q("select channel_id from channel where channel_address = '%s'", -- cgit v1.2.3 From 4b9ec6645b79f4da1ad5e7dd20a04ca6ca4a3e4a Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 11 Nov 2014 20:44:43 -0800 Subject: cleanup --- include/conversation.php | 8 +++-- include/text.php | 3 ++ mod/webpages.php | 82 ++++++++++++++++++++++++++--------------------- view/tpl/design_tools.tpl | 2 +- 4 files changed, 55 insertions(+), 40 deletions(-) diff --git a/include/conversation.php b/include/conversation.php index a531de9ba..c2258c20a 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1493,8 +1493,12 @@ function network_tabs() { function profile_tabs($a, $is_owner=False, $nickname=Null){ - //echo "
    "; var_dump($a->user); killme();
-		
+
+	// Don't provide any profile tabs if we're running as the sys channel
+	
+	if($a->is_sys)
+		return;
+	
 	$channel = $a->get_channel();
 
 	if (is_null($nickname))
diff --git a/include/text.php b/include/text.php
index 686dee4a2..d816fdb0a 100644
--- a/include/text.php
+++ b/include/text.php
@@ -2023,10 +2023,12 @@ function json_decode_plus($s) {
 function design_tools() {
 
 	$channel  = get_app()->get_channel();
+	$sys = false;
 
 	if(get_app()->is_sys && is_site_admin()) {
 		require_once('include/identity.php');
 		$channel = get_sys_channel();
+		$sys = true;
 	}
 
 	$who = $channel['channel_address'];
@@ -2034,6 +2036,7 @@ function design_tools() {
 	return replace_macros(get_markup_template('design_tools.tpl'), array(
 		'$title' => t('Design'),
 		'$who' => $who,
+		'$sys' => $sys,
 		'$blocks' => t('Blocks'),
 		'$menus' => t('Menus'),
 		'$layout' => t('Layouts'),
diff --git a/mod/webpages.php b/mod/webpages.php
index d80a9a86e..aca7559f9 100644
--- a/mod/webpages.php
+++ b/mod/webpages.php
@@ -1,9 +1,12 @@
  1 && argv(1) === 'sys' && is_site_admin()) {
-		require_once('include/identity.php');
 		$sys = get_sys_channel();
 		if($sys && intval($sys['channel_id'])) {
 			$a->is_sys = true;
@@ -15,7 +18,7 @@ function webpages_init(&$a) {
 	else
 		return;
 
-	profile_load($a,$which,$profile);
+	profile_load($a,$which);
 
 }
 
@@ -28,16 +31,16 @@ function webpages_content(&$a) {
 		return;
 	}
 
+	$which = argv(1);
+
 	$uid = 0;
 	$owner = 0;
 	$channel = null;
 	$observer = $a->get_observer();
 
-	$profile = 0;
 	$channel = $a->get_channel();
 
 	if($a->is_sys && is_site_admin()) {
-		require_once('include/identity.php');
 		$sys = get_sys_channel();
 		if($sys && intval($sys['channel_id'])) {
 			$uid = $owner = intval($sys['channel_id']);
@@ -83,8 +86,6 @@ function webpages_content(&$a) {
 	// Nickname is set to the observers xchan, and profile_uid to the owner's.  
 	// This lets you post pages at other people's channels.
 
-	require_once ('include/conversation.php');
-	require_once('include/acl_selectors.php');
 
 
 	if((! $channel) && ($uid) && ($uid == $a->profile_uid)) {
@@ -101,21 +102,20 @@ function webpages_content(&$a) {
 	else
 		$channel_acl = array();
 
-	require_once('include/conversation.php');
-	$o = profile_tabs($a,true);
 
+	$o = profile_tabs($a,true);
 
 	$x = array(
-		'webpage' => ITEM_WEBPAGE,
-		'is_owner' => true,
-		'nickname' => $a->profile['channel_address'],
-		'lockstate' => (($group || $cid || $channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'),
-		'bang' => (($group || $cid) ? '!' : ''),
-		'acl' => (($uid && $uid == $owner) ? populate_acl($channel_acl,false) : ''),
-		'visitor' => true,
+		'webpage'     => ITEM_WEBPAGE,
+		'is_owner'    => true,
+		'nickname'    => $a->profile['channel_address'],
+		'lockstate'   => (($channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'),
+		'bang'        => '',
+		'acl'         => (($uid && $uid == $owner) ? populate_acl($channel_acl,false) : ''),
+		'visitor'     => true,
 		'profile_uid' => intval($owner),
-		'mimetype' => $mimetype,
-		'layout' => $layout,
+		'mimetype'    => $mimetype,
+		'layout'      => $layout,
 	);
 	
 	if($_REQUEST['title'])
@@ -127,10 +127,12 @@ function webpages_content(&$a) {
 
 	$o .= status_editor($a,$x);
 
-	// Get a list of webpages.  We can't display all them because endless scroll makes that unusable, so just list titles and an edit link.
+	// Get a list of webpages.  We can't display all them because endless scroll makes that unusable, 
+	// so just list titles and an edit link.
 	//TODO - this should be replaced with pagelist_widget
 
-	$r = q("select * from item_id left join item on item_id.iid = item.id where item_id.uid = %d and service = 'WEBPAGE' order by item.created desc",
+	$r = q("select * from item_id left join item on item_id.iid = item.id 
+		where item_id.uid = %d and service = 'WEBPAGE' order by item.created desc",
 		intval($owner)
 	);
 
@@ -140,30 +142,36 @@ function webpages_content(&$a) {
 		$pages = array();
 		foreach($r as $rr) {
 			unobscure($rr);
-			$pages[$rr['iid']][] = array('url' => $rr['iid'],'pagetitle' => $rr['sid'],'title' => $rr['title'],'created' => datetime_convert('UTC',date_default_timezone_get(),$rr['created']),'edited' => datetime_convert('UTC',date_default_timezone_get(),$rr['edited']));
+			$pages[$rr['iid']][] = array(
+				'url'       => $rr['iid'],
+				'pagetitle' => $rr['sid'],
+				'title'     => $rr['title'],
+				'created'   => datetime_convert('UTC',date_default_timezone_get(),$rr['created']),
+				'edited'    => datetime_convert('UTC',date_default_timezone_get(),$rr['edited'])
+			);
 		}
 	}
 
 
-//Build the base URL for edit links
-		$url = z_root() . "/editwebpage/" . $which;
-// This isn't pretty, but it works.  Until I figure out what to do with the UI, it's Good Enough(TM).
-	return $o . replace_macros(get_markup_template("webpagelist.tpl"), array(
-    		'$listtitle' => t('Webpages'),
-		'$baseurl' => $url,
-		'$edit' => t('Edit'),
-		'$pages' => $pages,
-		'$channel' => $which,
-		'$view' => t('View'),
-		'$preview' => t('Preview'),
-		'$actions_txt' => t('Actions'),
+	//Build the base URL for edit links
+	$url = z_root() . '/editwebpage/' . $which;
+	
+	$o .= replace_macros(get_markup_template('webpagelist.tpl'), array(
+    	'$listtitle'    => t('Webpages'),
+		'$baseurl'      => $url,
+		'$edit'         => t('Edit'),
+		'$pages'        => $pages,
+		'$channel'      => $which,
+		'$view'         => t('View'),
+		'$preview'      => t('Preview'),
+		'$actions_txt'  => t('Actions'),
 		'$pagelink_txt' => t('Page Link'),
-		'$title_txt' => t('Title'),
-		'$created_txt' => t('Created'),
-		'$edited_txt' => t('Edited')
+		'$title_txt'    => t('Title'),
+		'$created_txt'  => t('Created'),
+		'$edited_txt'   => t('Edited')
 
-));
+	));
 
-	$o .= '
    '; + return $o; } diff --git a/view/tpl/design_tools.tpl b/view/tpl/design_tools.tpl index 80a538231..53d90be74 100644 --- a/view/tpl/design_tools.tpl +++ b/view/tpl/design_tools.tpl @@ -2,7 +2,7 @@

    {{$title}}

    -- cgit v1.2.3 From 9be4fcce551f32b19af0ba8cbbc71c6e3ef66632 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 11 Nov 2014 22:55:24 -0800 Subject: uid not set in webpages.php, start on editwebpage.php --- mod/editwebpage.php | 108 ++++++++++++++++++++++++++++++++++------------------ mod/webpages.php | 2 +- 2 files changed, 72 insertions(+), 38 deletions(-) diff --git a/mod/editwebpage.php b/mod/editwebpage.php index 41b5bb3e7..7b5f9f602 100644 --- a/mod/editwebpage.php +++ b/mod/editwebpage.php @@ -1,26 +1,74 @@ 1 && argv(1) === 'sys' && is_site_admin()) { + $sys = get_sys_channel(); + if($sys && intval($sys['channel_id'])) { + $a->is_sys = true; + } + } + + if(argc() > 1) + $which = argv(1); + else + return; + + profile_load($a,$which); + +} -require_once('acl_selectors.php'); function editwebpage_content(&$a) { - // We first need to figure out who owns the webpage, grab it from an argument + if(! $a->profile) { + notice( t('Requested profile is not available.') . EOL ); + $a->error = 404; + return; + } $which = argv(1); - // $a->get_channel() and stuff don't work here, so we've got to find the owner for ourselves. - - $r = q("select channel_id from channel where channel_address = '%s'", - dbesc($which) - ); - if($r) { - $owner = intval($r[0]['channel_id']); - //logger('owner: ' . print_r($owner,true)); + $uid = local_user(); + $owner = 0; + $channel = null; + $observer = $a->get_observer(); + + $channel = $a->get_channel(); + + if($a->is_sys && is_site_admin()) { + $sys = get_sys_channel(); + if($sys && intval($sys['channel_id'])) { + $uid = $owner = intval($sys['channel_id']); + $channel = $sys; + $observer = $sys; + } } - $is_owner = ((local_user() && local_user() == $owner) ? true : false); + if(! $owner) { + // Figure out who the page owner is. + $r = q("select channel_id from channel where channel_address = '%s'", + dbesc($which) + ); + if($r) { + $owner = intval($r[0]['channel_id']); + } + } + + $ob_hash = (($observer) ? $observer['xchan_hash'] : ''); + + $perms = get_all_perms($owner,$ob_hash); + + if(! $perms['write_pages']) { + notice( t('Permission denied.') . EOL); + return; + } + + + $is_owner = (($uid && $uid == $owner) ? true : false); $o = ''; @@ -33,9 +81,6 @@ function editwebpage_content(&$a) { return; } - // Now we've got a post and an owner, let's find out if we're allowed to edit it - - $observer = $a->get_observer(); $ob_hash = (($observer) ? $observer['xchan_hash'] : ''); $perms = get_all_perms($owner,$ob_hash); @@ -45,14 +90,13 @@ function editwebpage_content(&$a) { return; } + // We've already figured out which item we want and whose copy we need, + // so we don't need anything fancy here - - // We've already figured out which item we want and whose copy we need, so we don't need anything fancy here $itm = q("SELECT * FROM `item` WHERE `id` = %d and uid = %s LIMIT 1", intval($post_id), intval($owner) - ); - + ); if($itm[0]['item_flags'] & ITEM_OBSCURED) { $key = get_config('system','prvkey'); @@ -63,23 +107,17 @@ function editwebpage_content(&$a) { } $item_id = q("select * from item_id where service = 'WEBPAGE' and iid = %d limit 1", - $itm[0]['id'] + intval($itm[0]['id']) ); if($item_id) $page_title = $item_id[0]['sid']; - - - $plaintext = true; -// if(feature_enabled($itm[0]['uid'],'richtext')) -// $plaintext = false; - $mimetype = $itm[0]['mimetype']; if($mimetype === 'application/x-php') { - if((! local_user()) || (local_user() != $itm[0]['uid'])) { + if((! $uid) || ($uid != $itm[0]['uid'])) { notice( t('Permission denied.') . EOL); return; } @@ -101,7 +139,6 @@ function editwebpage_content(&$a) { else $layoutselect = layout_select($itm[0]['uid'],$itm[0]['layout_mid']); - $o .= replace_macros(get_markup_template('edpost_head.tpl'), array( '$title' => t('Edit Webpage') )); @@ -112,7 +149,7 @@ function editwebpage_content(&$a) { '$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'), '$ispublic' => ' ', // t('Visible to everybody'), '$geotag' => $geotag, - '$nickname' => $a->user['nickname'], + '$nickname' => $channel['channel_address'], '$confirmdelete' => t('Delete webpage?') )); @@ -124,12 +161,9 @@ function editwebpage_content(&$a) { call_hooks('jot_tool', $jotplugins); call_hooks('jot_networks', $jotnets); - - $channel = $a->get_channel(); - - //$tpl = replace_macros($tpl,array('$jotplugins' => $jotplugins)); -//FIXME A return path with $_SESSION doesn't always work for observer - it may WSoD instead of loading a sensible page. So, send folk to the webpage list. + // FIXME A return path with $_SESSION doesn't always work for observer - it may WSoD + // instead of loading a sensible page. So, send folk to the webpage list. $rp = 'webpages/' . $which; @@ -171,16 +205,16 @@ function editwebpage_content(&$a) { 'lockstate' => (((strlen($itm[0]['allow_cid'])) || (strlen($itm[0]['allow_gid'])) || (strlen($itm[0]['deny_cid'])) || (strlen($itm[0]['deny_gid']))) ? 'lock' : 'unlock'), '$bang' => '', '$profile_uid' => (intval($owner)), - '$preview' => ((feature_enabled(local_user(),'preview')) ? t('Preview') : ''), + '$preview' => ((feature_enabled($uid,'preview')) ? t('Preview') : ''), '$jotplugins' => $jotplugins, - '$sourceapp' => t($a->sourcename), + '$sourceapp' => $a->sourcename, '$defexpire' => '', '$feature_expire' => false, '$expires' => t('Set expiration date'), )); - $ob = get_observer_hash(); + $ob = (($observer) ? $observer['xchan_hash'] : ''); if(($itm[0]['author_xchan'] === $ob) || ($itm[0]['owner_xchan'] === $ob)) $o .= '

    ' . t('Delete Webpage') . '
    '; diff --git a/mod/webpages.php b/mod/webpages.php index aca7559f9..baddebec8 100644 --- a/mod/webpages.php +++ b/mod/webpages.php @@ -33,7 +33,7 @@ function webpages_content(&$a) { $which = argv(1); - $uid = 0; + $uid = local_user(); $owner = 0; $channel = null; $observer = $a->get_observer(); -- cgit v1.2.3 From ada2e43ea27feab8be956c01bf3ef13c8ce49049 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 12 Nov 2014 00:48:09 -0800 Subject: extend sys support to layouts --- mod/editlayout.php | 219 ++++++++++++++++++++++++++++++---------------------- mod/editwebpage.php | 4 +- mod/layouts.php | 119 +++++++++++++++++++--------- version.inc | 2 +- 4 files changed, 212 insertions(+), 132 deletions(-) diff --git a/mod/editlayout.php b/mod/editlayout.php index 89cae2b0c..27e6ef410 100644 --- a/mod/editlayout.php +++ b/mod/editlayout.php @@ -1,34 +1,79 @@ 1 && argv(1) === 'sys' && is_site_admin()) { + $sys = get_sys_channel(); + if($sys && intval($sys['channel_id'])) { + $a->is_sys = true; + } + } + + if(argc() > 1) + $which = argv(1); + else + return; + + profile_load($a,$which); + +} function editlayout_content(&$a) { -// We first need to figure out who owns the webpage, grab it from an argument - $which = argv(1); -// $a->get_channel() and stuff don't work here, so we've got to find the owner for ourselves. - $r = q("select channel_id from channel where channel_address = '%s'", - dbesc($which) + if(! $a->profile) { + notice( t('Requested profile is not available.') . EOL ); + $a->error = 404; + return; + } + + $which = argv(1); + + $uid = local_user(); + $owner = 0; + $channel = null; + $observer = $a->get_observer(); + + $channel = $a->get_channel(); + + if($a->is_sys && is_site_admin()) { + $sys = get_sys_channel(); + if($sys && intval($sys['channel_id'])) { + $uid = $owner = intval($sys['channel_id']); + $channel = $sys; + $observer = $sys; + } + } + + if(! $owner) { + // Figure out who the page owner is. + $r = q("select channel_id from channel where channel_address = '%s'", + dbesc($which) ); - if($r) { - $owner = intval($r[0]['channel_id']); - //logger('owner: ' . print_r($owner,true)); - } + if($r) { + $owner = intval($r[0]['channel_id']); + } + } + $ob_hash = (($observer) ? $observer['xchan_hash'] : ''); + + $perms = get_all_perms($owner,$ob_hash); + + if(! $perms['write_pages']) { + notice( t('Permission denied.') . EOL); + return; + } - - - if((local_user()) && (argc() > 2) && (argv(2) === 'view')) { - $which = $channel['channel_address']; - } + $is_owner = (($uid && $uid == $owner) ? true : false); $o = ''; -// Figure out which post we're editing + // Figure out which post we're editing $post_id = ((argc() > 2) ? intval(argv(2)) : 0); @@ -37,48 +82,41 @@ function editlayout_content(&$a) { return; } -// Now we've got a post and an owner, let's find out if we're allowed to edit it + // Now we've got a post and an owner, let's find out if we're allowed to edit it - $observer = $a->get_observer(); - $ob_hash = (($observer) ? $observer['xchan_hash'] : ''); + $ob_hash = (($observer) ? $observer['xchan_hash'] : ''); - $perms = get_all_perms($owner,$ob_hash); - - if(! $perms['write_pages']) { - notice( t('Permission denied.') . EOL); - return; - } + $perms = get_all_perms($owner,$ob_hash); + if(! $perms['write_pages']) { + notice( t('Permission denied.') . EOL); + return; + } -// We've already figured out which item we want and whose copy we need, so we don't need anything fancy here - $itm = q("SELECT * FROM `item` WHERE `id` = %d and uid = %s LIMIT 1", - intval($post_id), - intval($owner) - ); + $itm = q("SELECT * FROM `item` WHERE `id` = %d and uid = %s LIMIT 1", + intval($post_id), + intval($owner) + ); $item_id = q("select * from item_id where service = 'PDL' and iid = %d limit 1", - $itm[0]['id'] + intval($itm[0]['id']) ); if($item_id) $layout_title = $item_id[0]['sid']; $plaintext = true; -// You may or may not be a local user. This won't work, -// if(feature_enabled(local_user(),'richtext')) -// $plaintext = false; $o .= replace_macros(get_markup_template('edpost_head.tpl'), array( '$title' => t('Edit Layout') )); - $a->page['htmlhead'] .= replace_macros(get_markup_template('jot-header.tpl'), array( - '$baseurl' => $a->get_baseurl(), - '$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'), - '$ispublic' => ' ', // t('Visible to everybody'), - '$geotag' => $geotag, - '$nickname' => $a->user['nickname'], + '$baseurl' => $a->get_baseurl(), + '$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'), + '$ispublic' => ' ', // t('Visible to everybody'), + '$geotag' => $geotag, + '$nickname' => $channel['channel_address'], '$confirmdelete' => t('Delete layout?') )); @@ -91,71 +129,68 @@ function editlayout_content(&$a) { call_hooks('jot_tool', $jotplugins); call_hooks('jot_networks', $jotnets); - $channel = $a->get_channel(); - - //$tpl = replace_macros($tpl,array('$jotplugins' => $jotplugins)); -//FIXME A return path with $_SESSION doesn't always work for observer - it may WSoD instead of loading a sensible page. So, send folk to the webpage list. + // FIXME A return path with $_SESSION doesn't always work for observer - it may WSoD + // instead of loading a sensible page. So, send folk to the webpage list. $rp = '/layouts/' . $which; $o .= replace_macros($tpl,array( - '$return_path' => $rp, - '$action' => 'item', - '$webpage' => ITEM_PDL, - '$share' => t('Edit'), - '$upload' => t('Upload photo'), - '$attach' => t('Attach file'), - '$weblink' => t('Insert web link'), - '$youtube' => t('Insert YouTube video'), - '$video' => t('Insert Vorbis [.ogg] video'), - '$audio' => t('Insert Vorbis [.ogg] audio'), - '$setloc' => t('Set your location'), - '$noloc' => t('Clear browser location'), - '$wait' => t('Please wait'), - '$permset' => t('Permission settings'), - '$ptyp' => $itm[0]['type'], - '$content' => undo_post_tagging($itm[0]['body']), - '$post_id' => $post_id, - '$baseurl' => $a->get_baseurl(), - '$defloc' => $channel['channel_location'], - '$visitor' => false, - '$public' => t('Public post'), - '$jotnets' => $jotnets, - '$title' => htmlspecialchars($itm[0]['title'],ENT_COMPAT,'UTF-8'), - '$placeholdertitle' => t('Set title'), - '$pagetitle' => $layout_title, - '$category' => '', + '$return_path' => $rp, + '$action' => 'item', + '$webpage' => ITEM_PDL, + '$share' => t('Edit'), + '$upload' => t('Upload photo'), + '$attach' => t('Attach file'), + '$weblink' => t('Insert web link'), + '$youtube' => t('Insert YouTube video'), + '$video' => t('Insert Vorbis [.ogg] video'), + '$audio' => t('Insert Vorbis [.ogg] audio'), + '$setloc' => t('Set your location'), + '$noloc' => t('Clear browser location'), + '$wait' => t('Please wait'), + '$permset' => t('Permission settings'), + '$ptyp' => $itm[0]['type'], + '$content' => undo_post_tagging($itm[0]['body']), + '$post_id' => $post_id, + '$baseurl' => $a->get_baseurl(), + '$defloc' => $channel['channel_location'], + '$visitor' => false, + '$public' => t('Public post'), + '$jotnets' => $jotnets, + '$title' => htmlspecialchars($itm[0]['title'],ENT_COMPAT,'UTF-8'), + '$placeholdertitle' => t('Set title'), + '$pagetitle' => $layout_title, + '$category' => '', '$placeholdercategory' => t('Categories (comma-separated list)'), - '$emtitle' => t('Example: bob@example.com, mary@example.com'), - '$lockstate' => $lockstate, - '$acl' => '', - '$bang' => '', - '$profile_uid' => (intval($owner)), - '$preview' => ((feature_enabled(local_user(),'preview')) ? t('Preview') : ''), - '$jotplugins' => $jotplugins, - '$sourceapp' => t($a->sourcename), - '$defexpire' => '', - '$feature_expire' => false, - '$expires' => t('Set expiration date'), + '$emtitle' => t('Example: bob@example.com, mary@example.com'), + '$lockstate' => $lockstate, + '$acl' => '', + '$bang' => '', + '$profile_uid' => (intval($owner)), + '$preview' => ((feature_enabled($uid,'preview')) ? t('Preview') : ''), + '$jotplugins' => $jotplugins, + '$sourceapp' => t($a->sourcename), + '$defexpire' => '', + '$feature_expire' => false, + '$expires' => t('Set expiration date'), )); - $ob = get_observer_hash(); - if(($itm[0]['author_xchan'] === $ob) || ($itm[0]['owner_xchan'] === $ob)) + if(($itm[0]['author_xchan'] === $ob_hash) || ($itm[0]['owner_xchan'] === $ob_hash)) $o .= '

    ' . t('Delete Layout') . '
    '; $x = array( - 'type' => 'layout', - 'title' => $itm[0]['title'], - 'body' => $itm[0]['body'], - 'term' => $itm[0]['term'], - 'created' => $itm[0]['created'], - 'edited' => $itm[0]['edited'], - 'mimetype' => $itm[0]['mimetype'], + 'type' => 'layout', + 'title' => $itm[0]['title'], + 'body' => $itm[0]['body'], + 'term' => $itm[0]['term'], + 'created' => $itm[0]['created'], + 'edited' => $itm[0]['edited'], + 'mimetype' => $itm[0]['mimetype'], 'pagetitle' => $page_title, - 'mid' => $itm[0]['mid'] + 'mid' => $itm[0]['mid'] ); $o .= EOL . EOL . t('Share') . EOL . '' . EOL . EOL; diff --git a/mod/editwebpage.php b/mod/editwebpage.php index 7b5f9f602..8181415b8 100644 --- a/mod/editwebpage.php +++ b/mod/editwebpage.php @@ -214,9 +214,7 @@ function editwebpage_content(&$a) { )); - $ob = (($observer) ? $observer['xchan_hash'] : ''); - - if(($itm[0]['author_xchan'] === $ob) || ($itm[0]['owner_xchan'] === $ob)) + if(($itm[0]['author_xchan'] === $ob_hash) || ($itm[0]['owner_xchan'] === $ob_hash)) $o .= '

    ' . t('Delete Webpage') . '
    '; diff --git a/mod/layouts.php b/mod/layouts.php index 2d14212cf..aaf5db0ef 100644 --- a/mod/layouts.php +++ b/mod/layouts.php @@ -1,36 +1,82 @@ 1 && argv(1) === 'sys' && is_site_admin()) { + $sys = get_sys_channel(); + if($sys && intval($sys['channel_id'])) { + $a->is_sys = true; + } + } if(argc() > 1) $which = argv(1); - else { + else + return; + + profile_load($a,$which); + +} + + +function layouts_content(&$a) { + + if(! $a->profile) { notice( t('Requested profile is not available.') . EOL ); $a->error = 404; return; } - profile_load($a,$which,0); + $which = argv(1); + $uid = local_user(); + $owner = 0; + $channel = null; + $observer = $a->get_observer(); - // Figure out who the page owner is. - $r = q("select channel_id from channel where channel_address = '%s'", - dbesc($which) - ); - if($r) { - $owner = intval($r[0]['channel_id']); + $channel = $a->get_channel(); + + if($a->is_sys && is_site_admin()) { + $sys = get_sys_channel(); + if($sys && intval($sys['channel_id'])) { + $uid = $owner = intval($sys['channel_id']); + $channel = $sys; + $observer = $sys; + } + } + + if(! $owner) { + // Figure out who the page owner is. + $r = q("select channel_id from channel where channel_address = '%s'", + dbesc($which) + ); + if($r) { + $owner = intval($r[0]['channel_id']); + } + } + + $ob_hash = (($observer) ? $observer['xchan_hash'] : ''); + + $perms = get_all_perms($owner,$ob_hash); + + if(! $perms['write_pages']) { + notice( t('Permission denied.') . EOL); + return; } // Block design features from visitors - if((! local_user()) || (local_user() != $owner)) { + if((! $uid) || ($uid != $owner)) { notice( t('Permission denied.') . EOL); return; } // Get the observer, check their permissions - $observer = $a->get_observer(); $ob_hash = (($observer) ? $observer['xchan_hash'] : ''); $perms = get_all_perms($owner,$ob_hash); @@ -41,7 +87,9 @@ function layouts_content(&$a) { } if((argc() > 3) && (argv(2) === 'share') && (argv(3))) { - $r = q("select sid, service, mimetype, title, body from item_id left join item on item.id = item_id.iid where item_id.uid = %d and item.mid = '%s' and service = 'PDL' order by sid asc", + $r = q("select sid, service, mimetype, title, body from item_id + left join item on item.id = item_id.iid + where item_id.uid = %d and item.mid = '%s' and service = 'PDL' order by sid asc", intval($owner), dbesc(argv(3)) ); @@ -63,7 +111,6 @@ function layouts_content(&$a) { 'id' => 'layout-help-tab', )); - $o .= replace_macros(get_markup_template('common_tabs.tpl'),array('$tabs' => $tabs)); @@ -71,18 +118,16 @@ function layouts_content(&$a) { // 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_PDL, - 'is_owner' => true, - 'nickname' => $a->profile['channel_address'], - 'lockstate' => (($group || $cid || $channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'), - 'bang' => (($group || $cid) ? '!' : ''), - 'showacl' => false, - 'visitor' => false, - 'nopreview' => 1, - 'ptlabel' => t('Layout Name'), + 'webpage' => ITEM_PDL, + 'is_owner' => true, + 'nickname' => $a->profile['channel_address'], + 'lockstate' => (($channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'), + 'bang' => '', + 'showacl' => false, + 'visitor' => false, + 'nopreview' => 1, + 'ptlabel' => t('Layout Name'), 'profile_uid' => intval($owner), ); @@ -96,10 +141,8 @@ function layouts_content(&$a) { $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. - // TODO - this should be replaced with pagelist_widget - - $r = q("select iid, sid, mid from item_id left join item on item.id = item_id.iid where item_id.uid = %d and service = 'PDL' order by sid asc", + $r = q("select iid, sid, mid from item_id left join item on item.id = item_id.iid + where item_id.uid = %d and service = 'PDL' order by sid asc", intval($owner) ); @@ -108,24 +151,28 @@ function layouts_content(&$a) { if($r) { $pages = array(); foreach($r as $rr) { - $pages[$rr['iid']][] = array('url' => $rr['iid'],'title' => $rr['sid'], 'mid' => $rr['mid']); + $pages[$rr['iid']][] = array( + 'url' => $rr['iid'], + 'title' => $rr['sid'], + 'mid' => $rr['mid'] + ); } } - //Build the base URL for edit links - $url = z_root() . "/editlayout/" . $which; + $url = z_root() . '/editlayout/' . $which; - return $o . replace_macros(get_markup_template("layoutlist.tpl"), array( + $o .= replace_macros(get_markup_template('layoutlist.tpl'), array( '$baseurl' => $url, - '$edit' => t('Edit'), - '$share' => t('Share'), - '$pages' => $pages, + '$edit' => t('Edit'), + '$share' => t('Share'), + '$pages' => $pages, '$channel' => $which, - '$view' => t('View'), + '$view' => t('View'), '$preview' => '1', )); + return $o; } diff --git a/version.inc b/version.inc index 6c86bf1e2..519095cc9 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2014-11-11.856 +2014-11-12.857 -- cgit v1.2.3 From 1ed144b83c3cefb685dfff37fd7d415bf5a2ffdb Mon Sep 17 00:00:00 2001 From: marijus Date: Wed, 12 Nov 2014 10:27:13 +0100 Subject: make search and advanced search use the same input form --- include/contact_widgets.php | 3 +-- mod/directory.php | 3 ++- view/tpl/peoplefind.tpl | 22 ++++++---------------- 3 files changed, 9 insertions(+), 19 deletions(-) diff --git a/include/contact_widgets.php b/include/contact_widgets.php index 28a9fcfd3..ee9394e95 100644 --- a/include/contact_widgets.php +++ b/include/contact_widgets.php @@ -29,8 +29,7 @@ function findpeople_widget() { '$random' => t('Random Profile'), '$inv' => t('Invite Friends'), '$advanced_search' => $advanced_search, - '$advanced_hint' => t('Exammple: name=fred and country=iceland'), - '$find_advanced' => t('Advanced Find'), + '$advanced_hint' => "\r\n" . t('Advanced example: name=fred and country=iceland'), '$loggedin' => local_user() )); diff --git a/mod/directory.php b/mod/directory.php index 256f7ca9a..d4a4c383a 100644 --- a/mod/directory.php +++ b/mod/directory.php @@ -42,7 +42,8 @@ function directory_content(&$a) { else $search = ((x($_GET,'search')) ? notags(trim(rawurldecode($_GET['search']))) : ''); - $advanced = ((x($_REQUEST,'query')) ? notags(trim($_REQUEST['query'])) : ''); + if(strpos($search,'=') && local_user() && get_pconfig(local_user(),'feature','expert')) + $advanced = $search; $keywords = (($_GET['keywords']) ? $_GET['keywords'] : ''); diff --git a/view/tpl/peoplefind.tpl b/view/tpl/peoplefind.tpl index 6ec37539b..2f23948c8 100755 --- a/view/tpl/peoplefind.tpl +++ b/view/tpl/peoplefind.tpl @@ -1,25 +1,15 @@

    {{$findpeople}}

    -
    -
    - -
    - -
    -
    -
    - {{if $advanced_search}} -
    -
    - +
    +
    +
    - + +
    -
    - {{/if}} - +
      {{if $similar}}
    • {{$similar}}
      • {{/if}} {{if $loggedin}}
    • {{$suggest}}
      • {{/if}} -- cgit v1.2.3 From 498344e81ffcdc8ecc718507735f25b9967278b1 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 12 Nov 2014 01:43:34 -0800 Subject: sys edit ability to menus and menu items --- mod/menu.php | 38 +++++++++++++------ mod/mitem.php | 118 ++++++++++++++++++++++++++++++++++------------------------ 2 files changed, 96 insertions(+), 60 deletions(-) diff --git a/mod/menu.php b/mod/menu.php index a43ebfee6..92923e1ff 100644 --- a/mod/menu.php +++ b/mod/menu.php @@ -1,13 +1,23 @@ is_sys = true; + } + + if(! $uid) return; - $_REQUEST['menu_channel_id'] = local_user(); + $_REQUEST['menu_channel_id'] = $uid; + if($_REQUEST['menu_bookmark']) $_REQUEST['menu_flags'] |= MENU_BOOKMARK; if($_REQUEST['menu_system']) @@ -19,7 +29,7 @@ function menu_post(&$a) { $r = menu_edit($_REQUEST); if($r) { info( t('Menu updated.') . EOL); - goaway(z_root() . '/mitem/' . $menu_id); + goaway(z_root() . '/mitem/' . $menu_id . (($a->is_sys) ? '?f=&sys=1' : '')); } else notice( t('Unable to update menu.'). EOL); @@ -28,7 +38,7 @@ function menu_post(&$a) { $r = menu_create($_REQUEST); if($r) { info( t('Menu created.') . EOL); - goaway(z_root() . '/mitem/' . $r); + goaway(z_root() . '/mitem/' . $r . (($a->is_sys) ? '?f=&sys=1' : '')); } else notice( t('Unable to create menu.'). EOL); @@ -40,18 +50,22 @@ function menu_post(&$a) { function menu_content(&$a) { - if(! local_user()) { + $uid = local_user(); + + if($a->is_sys && is_site_admin()) { + $sys = get_sys_channel(); + $uid = intval($sys['channel_id']); + } + + if(! $uid) { notice( t('Permission denied.') . EOL); return ''; } -// $a->set_widget('design',design_tools()); - - if(argc() == 1) { // list menus - $x = menu_list(local_user()); + $x = menu_list($uid); if($x) { for($y = 0; $y < count($x); $y ++) { $x[$y]['bookmark'] = (($x[$y]['menu_flags'] & MENU_BOOKMARK) ? true : false); @@ -89,19 +103,19 @@ function menu_content(&$a) { } elseif(intval(argv(1))) { - $m = menu_fetch_id(intval(argv(1)),local_user()); + $m = menu_fetch_id(intval(argv(1)),$uid); if(! $m) { notice( t('Menu not found.') . EOL); return ''; } if(argc() == 3 && argv(2) == 'drop') { - $r = menu_delete_id(intval(argv(1)),local_user()); + $r = menu_delete_id(intval(argv(1)),$uid); if($r) info( t('Menu deleted.') . EOL); else notice( t('Menu could not be deleted.'). EOL); - goaway(z_root() . '/menu'); + goaway(z_root() . '/menu' . (($a->is_sys) ? '?f=&sys=1' : '')); } else { $o = replace_macros(get_markup_template('menuedit.tpl'), array( diff --git a/mod/mitem.php b/mod/mitem.php index 3240bb68b..7098d7489 100644 --- a/mod/mitem.php +++ b/mod/mitem.php @@ -4,12 +4,22 @@ require_once('include/menu.php'); require_once('include/acl_selectors.php'); function mitem_init(&$a) { - if(! local_user()) + + $uid = local_user(); + + if(array_key_exists('sys',$_REQUEST) && $_REQUEST['sys'] && is_site_admin()) { + $sys = get_sys_channel(); + $uid = intval($sys['channel_id']); + $a->is_sys = true; + } + + if(! $uid) return; + if(argc() < 2) return; - $m = menu_fetch_id(intval(argv(1)),local_user()); + $m = menu_fetch_id(intval(argv(1)),$uid); if(! $m) { notice( t('Menu not found.') . EOL); return ''; @@ -20,8 +30,18 @@ function mitem_init(&$a) { function mitem_post(&$a) { - if(! local_user()) + $uid = local_user(); + + if($a->is_sys && is_site_admin()) { + $sys = get_sys_channel(); + $uid = intval($sys['channel_id']); + } + + if(! $uid) { return; + } + + if(! $a->data['menu']) return; @@ -29,7 +49,7 @@ function mitem_post(&$a) { $channel = $a->get_channel(); - $_REQUEST['mitem_channel_id'] = local_user(); + $_REQUEST['mitem_channel_id'] = $uid; $_REQUEST['menu_id'] = $a->data['menu']['menu_id']; $_REQUEST['mitem_flags'] = 0; @@ -42,20 +62,20 @@ function mitem_post(&$a) { $mitem_id = ((argc() > 2) ? intval(argv(2)) : 0); if($mitem_id) { $_REQUEST['mitem_id'] = $mitem_id; - $r = menu_edit_item($_REQUEST['menu_id'],local_user(),$_REQUEST); + $r = menu_edit_item($_REQUEST['menu_id'],$uid,$_REQUEST); if($r) { info( t('Menu element updated.') . EOL); - goaway(z_root() . '/mitem/' . $_REQUEST['menu_id']); + goaway(z_root() . '/mitem/' . $_REQUEST['menu_id'] . (($a->is_sys) ? '?f=&sys=1' : '')); } else notice( t('Unable to update menu element.') . EOL); } else { - $r = menu_add_item($_REQUEST['menu_id'],local_user(),$_REQUEST); + $r = menu_add_item($_REQUEST['menu_id'],$uid,$_REQUEST); if($r) { info( t('Menu element added.') . EOL); - goaway(z_root() . '/mitem/' . $_REQUEST['menu_id']); + goaway(z_root() . '/mitem/' . $_REQUEST['menu_id'] . (($a->is_sys) ? '?f=&sys=1' : '')); } else notice( t('Unable to add menu element.') . EOL); @@ -69,7 +89,20 @@ function mitem_post(&$a) { function mitem_content(&$a) { - if(! local_user()) { + $uid = local_user(); + $channel = $a->get_channel(); + $observer = $a->get_observer(); + + $ob_hash = (($observer) ? $observer['xchan_hash'] : ''); + + if($a->is_sys && is_site_admin()) { + $sys = get_sys_channel(); + $uid = intval($sys['channel_id']); + $channel = $sys; + $ob_hash = $sys['xchan_hash']; + } + + if(! $uid) { notice( t('Permission denied.') . EOL); return ''; } @@ -79,67 +112,61 @@ function mitem_content(&$a) { return ''; } - $channel = $a->get_channel(); - - $m = menu_fetch($a->data['menu']['menu_name'],local_user(), get_observer_hash()); + $m = menu_fetch($a->data['menu']['menu_name'],$uid,$ob_hash); $a->data['menu_item'] = $m; if(argc() == 2) { $r = q("select * from menu_item where mitem_menu_id = %d and mitem_channel_id = %d order by mitem_order asc, mitem_desc asc", intval($a->data['menu']['menu_id']), - local_user() + intval($uid) ); $o .= replace_macros(get_markup_template('mitemlist.tpl'),array( - '$title' => t('Manage Menu Elements'), + '$title' => t('Manage Menu Elements'), '$menuname' => $a->data['menu']['menu_name'], '$menudesc' => $a->data['menu']['menu_desc'], - '$edmenu' => t('Edit menu'), - '$menu_id' => $a->data['menu']['menu_id'], - '$mlist' => $r, - '$edit' => t('Edit element'), - '$drop' => t('Drop element'), - '$new' => t('New element'), + '$edmenu' => t('Edit menu'), + '$menu_id' => $a->data['menu']['menu_id'], + '$mlist' => $r, + '$edit' => t('Edit element'), + '$drop' => t('Drop element'), + '$new' => t('New element'), '$hintmenu' => t('Edit this menu container'), - '$hintnew' => t('Add menu element'), + '$hintnew' => t('Add menu element'), '$hintdrop' => t('Delete this menu item'), '$hintedit' => t('Edit this menu item') - )); - - + )); + return $o; - } if(argc() > 2) { - - if(argv(2) === 'new') { $perm_defaults = array( 'allow_cid' => $channel['channel_allow_cid'], 'allow_gid' => $channel['channel_allow_gid'], - 'deny_cid' => $channel['channel_deny_cid'], - 'deny_gid' => $channel['channel_deny_gid'] + 'deny_cid' => $channel['channel_deny_cid'], + 'deny_gid' => $channel['channel_deny_gid'] ); $o = replace_macros(get_markup_template('mitemedit.tpl'), array( - '$header' => t('New Menu Element'), - '$menu_id' => $a->data['menu']['menu_id'], + '$header' => t('New Menu Element'), + '$menu_id' => $a->data['menu']['menu_id'], '$permissions' => t('Menu Item Permissions'), - '$permdesc' => t("\x28click to open/close\x29"), - '$aclselect' => populate_acl($perm_defaults,false), - '$mitem_desc' => array('mitem_desc', t('Link text'), '', '','*'), - '$mitem_link' => array('mitem_link', t('URL of link'), '', '', '*'), - '$usezid' => array('usezid', t('Use Red magic-auth if available'), true, ''), - '$newwin' => array('newwin', t('Open link in new window'), false,''), + '$permdesc' => t("\x28click to open/close\x29"), + '$aclselect' => populate_acl($perm_defaults,false), + '$mitem_desc' => array('mitem_desc', t('Link text'), '', '','*'), + '$mitem_link' => array('mitem_link', t('URL of link'), '', '', '*'), + '$usezid' => array('usezid', t('Use RedMatrix magic-auth if available'), true, ''), + '$newwin' => array('newwin', t('Open link in new window'), false,''), // permissions go here '$mitem_order' => array('mitem_order', t('Order in list'),'0',t('Higher numbers will sink to bottom of listing')), - '$submit' => t('Create') + '$submit' => t('Create') )); return $o; } @@ -148,23 +175,23 @@ function mitem_content(&$a) { elseif(intval(argv(2))) { $m = q("select * from menu_item where mitem_id = %d and mitem_channel_id = %d limit 1", intval(argv(2)), - intval(local_user()) + intval($uid) ); if(! $m) { notice( t('Menu item not found.') . EOL); - goaway(z_root() . '/menu'); + goaway(z_root() . '/menu'. (($a->is_sys) ? '?f=&sys=1' : '')); } $mitem = $m[0]; if(argc() == 4 && argv(3) == 'drop') { - $r = menu_del_item($mitem['mitem_menu_id'], local_user(),intval(argv(2))); + $r = menu_del_item($mitem['mitem_menu_id'], $uid, intval(argv(2))); if($r) info( t('Menu item deleted.') . EOL); else notice( t('Menu item could not be deleted.'). EOL); - goaway(z_root() . '/mitem/' . $mitem['mitem_menu_id']); + goaway(z_root() . '/mitem/' . $mitem['mitem_menu_id'] . (($a->is_sys) ? '?f=&sys=1' : '')); } else { @@ -179,7 +206,7 @@ function mitem_content(&$a) { '$mitem_id' => intval(argv(2)), '$mitem_desc' => array('mitem_desc', t('Link text'), $mitem['mitem_desc'], '','*'), '$mitem_link' => array('mitem_link', t('URL of link'), $mitem['mitem_link'], '', '*'), - '$usezid' => array('usezid', t('Use Red magic-auth if available'), (($mitem['mitem_flags'] & MENU_ITEM_ZID) ? 1 : 0), ''), + '$usezid' => array('usezid', t('Use RedMatrix magic-auth if available'), (($mitem['mitem_flags'] & MENU_ITEM_ZID) ? 1 : 0), ''), '$newwin' => array('newwin', t('Open link in new window'), (($mitem['mitem_flags'] & MENU_ITEM_NEWWIN) ? 1 : 0),''), // permissions go here '$mitem_order' => array('mitem_order', t('Order in list'),$mitem['mitem_order'],t('Higher numbers will sink to bottom of listing')), @@ -188,10 +215,5 @@ function mitem_content(&$a) { return $o; } } - } - - - - } -- cgit v1.2.3 From fc2bf4c29b45a97ec745c26821cc31cfe97f091c Mon Sep 17 00:00:00 2001 From: Klaus Weidenbach Date: Thu, 13 Nov 2014 00:00:50 +0100 Subject: Some Doxygen documentation. Add some more Doxygen formating for boot.php and dba_driver.php. Cleaning a bit up, too. --- boot.php | 324 ++++++++++++++++++++++----------------------- include/dba/dba_driver.php | 172 ++++++++++++++++++------ 2 files changed, 290 insertions(+), 206 deletions(-) diff --git a/boot.php b/boot.php index fb059f8b0..d883dcc28 100755 --- a/boot.php +++ b/boot.php @@ -1,6 +1,8 @@ ' . "\r\n" ); +define ( 'EOL', '
      ' . "\r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); define ( 'NULL_DATE', '0000-00-00 00:00:00' ); define ( 'TEMPLATE_BUILD_PATH', 'store/[data]/smarty3' ); @@ -196,7 +198,6 @@ define ( 'UPDATE_SUCCESS', 0); define ( 'UPDATE_FAILED', 1); - define ( 'CLIENT_MODE_NORMAL', 0x0000); define ( 'CLIENT_MODE_LOAD', 0x0001); define ( 'CLIENT_MODE_UPDATE', 0x0002); @@ -263,13 +264,11 @@ define ( 'NETWORK_PHANTOM', 'unkn'); // Place holder * Permissions */ - define ( 'PERMS_R_STREAM', 0x00001); define ( 'PERMS_R_PROFILE', 0x00002); define ( 'PERMS_R_PHOTOS', 0x00004); define ( 'PERMS_R_ABOOK', 0x00008); - define ( 'PERMS_W_STREAM', 0x00010); define ( 'PERMS_W_WALL', 0x00020); define ( 'PERMS_W_TAGWALL', 0x00040); @@ -321,7 +320,6 @@ define ( 'ATTACH_FLAG_DIR', 0x0001); define ( 'ATTACH_FLAG_OS', 0x0002); - define ( 'MENU_ITEM_ZID', 0x0001); define ( 'MENU_ITEM_NEWWIN', 0x0002); define ( 'MENU_ITEM_CHATROOM', 0x0004); @@ -336,13 +334,11 @@ define ( 'POLL_MULTIPLE_CHOICE', 0x0004); define ( 'POLL_OVERWRITE', 0x8000); // If you vote twice remove the prior entry - define ( 'UPDATE_FLAGS_UPDATED', 0x0001); define ( 'UPDATE_FLAGS_FORCED', 0x0002); define ( 'UPDATE_FLAGS_DELETED', 0x1000); - define ( 'DROPITEM_NORMAL', 0); define ( 'DROPITEM_PHASE1', 1); define ( 'DROPITEM_PHASE2', 2); @@ -448,7 +444,6 @@ define ( 'TERM_OBJ_OBJECT', 5 ); define ( 'TERM_OBJ_THING', 6 ); define ( 'TERM_OBJ_APP', 7 ); - /** * various namespaces we may need to parse */ @@ -513,7 +508,6 @@ define ( 'GRAVITY_PARENT', 0); define ( 'GRAVITY_LIKE', 3); define ( 'GRAVITY_COMMENT', 6); - /** * Account Flags */ @@ -589,7 +583,6 @@ function startup() { @set_time_limit(0); if(function_exists ('ini_set')) { - // This has to be quite large to deal with embedded private photos @ini_set('pcre.backtrack_limit', 500000); @@ -615,7 +608,6 @@ function startup() { } unset($process); } - } /** @@ -630,8 +622,6 @@ function startup() { * before we spit the page out. * */ - - class App { public $install = false; // true if we are installing the software @@ -643,7 +633,6 @@ class App { public $poi = null; // "person of interest", generally a referenced connection public $layout = array(); // Comanche parsed template - private $perms = null; // observer permissions private $widgets = array(); // widgets for this page private $widgetlist = null; // widget ordering and inclusion directives @@ -672,7 +661,7 @@ class App { public $timezone; public $interactive = true; public $plugins; - private $apps = array(); + private $apps = array(); public $identities; public $css_sources = array(); public $js_sources = array(); @@ -680,16 +669,16 @@ class App { public $is_sys = false; public $nav_sel; - public $category; + public $category; // Allow themes to control internal parameters // by changing App values in theme.php - public $sourcename = ''; - public $videowidth = 425; - public $videoheight = 350; - public $force_max_items = 0; - public $theme_thread_allow = true; + public $sourcename = ''; + public $videowidth = 425; + public $videoheight = 350; + public $force_max_items = 0; + public $theme_thread_allow = true; // An array for all theme-controllable parameters // Mostly unimplemented yet. Only options 'template_engine' and @@ -732,9 +721,7 @@ class App { private $cached_profile_picdate; - function __construct() { - // we'll reset this after we read our config file date_default_timezone_set('UTC'); @@ -753,7 +740,6 @@ class App { . 'library/langdet' . PATH_SEPARATOR . '.' ); - $this->scheme = 'http'; if(x($_SERVER,'HTTPS') && $_SERVER['HTTPS']) $this->scheme = 'https'; @@ -792,7 +778,6 @@ class App { $this->cmd = 'channel/' . substr($this->cmd,1); - /** * * Break the URL path into C style argc/argv style arguments for our @@ -820,7 +805,6 @@ class App { $this->module = 'home'; } - /** * See if there is any page number information, and initialise * pagination @@ -857,8 +841,6 @@ class App { } function get_baseurl($ssl = false) { - - if(is_array($this->config) && array_key_exists('system',$this->config) && is_array($this->config['system']) @@ -868,7 +850,6 @@ class App { return $url; } - $scheme = $this->scheme; $this->baseurl = $scheme . "://" . $this->hostname . ((isset($this->path) && strlen($this->path)) ? '/' . $this->path : '' ); @@ -933,7 +914,6 @@ class App { return $this->channel; } - function set_observer($xchan) { $this->observer = $xchan; } @@ -1097,6 +1077,7 @@ class App { break; }*/ } + function get_template_ldelim($engine = 'smarty3') { return $this->ldelim[$engine]; } @@ -1107,7 +1088,6 @@ class App { function head_set_icon($icon) { $this->data['pageicon'] = $icon; - } function head_get_icon() { @@ -1117,7 +1097,7 @@ class App { return $icon; } -} +} // End App class // retrieve the App structure @@ -1129,21 +1109,26 @@ function get_app() { } - -// Multi-purpose function to check variable state. -// Usage: x($var) or $x($array,'key') -// returns false if variable/key is not set -// if variable is set, returns 1 if has 'non-zero' value, otherwise returns 0. -// e.g. x('') or x(0) returns 0; - - -function x($s,$k = NULL) { - if($k != NULL) { - if((is_array($s)) && (array_key_exists($k,$s))) { +/** + * @brief Multi-purpose function to check variable state. + * + * Usage: x($var) or $x($array, 'key') + * + * returns false if variable/key is not set + * if variable is set, returns 1 if has 'non-zero' value, otherwise returns 0. + * e.g. x('') or x(0) returns 0; + * + * @param string|array $s variable to check + * @param string $k key inside the array to check + * @return bool + */ +function x($s, $k = null) { + if($k != null) { + if((is_array($s)) && (array_key_exists($k, $s))) { if($s[$k]) return (int) 1; return (int) 0; - } + } return false; } else { @@ -1160,7 +1145,6 @@ function x($s,$k = NULL) { // called from db initialisation if db is dead. - function system_unavailable() { include('include/system_unavailable.php'); system_down(); @@ -1170,6 +1154,7 @@ function system_unavailable() { function clean_urls() { global $a; + // if($a->config['system']['clean_urls']) return true; // return false; @@ -1177,9 +1162,11 @@ function clean_urls() { function z_path() { global $a; + $base = $a->get_baseurl(); if(! clean_urls()) $base .= '/?q='; + return $base; } @@ -1191,6 +1178,7 @@ function z_root() { function absurl($path) { if(strpos($path,'/') === 0) return z_path() . $path; + return $path; } @@ -1200,9 +1188,6 @@ function os_mkdir($path,$mode = 0777,$recursive = false) { @umask($oldumask); } - - - function is_ajax() { return (!empty($_SERVER['HTTP_X_REQUESTED_WITH']) && strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) == 'xmlhttprequest'); } @@ -1212,7 +1197,6 @@ function is_ajax() { // base url for use in cmdline programs which don't have // $_SERVER variables, and synchronising the state of installed plugins. - function check_config(&$a) { $build = get_config('system','db_version'); @@ -1222,21 +1206,22 @@ function check_config(&$a) { $saved = get_config('system','urlverify'); if(! $saved) set_config('system','urlverify',bin2hex(z_root())); + if(($saved) && ($saved != bin2hex(z_root()))) { // our URL changed. Do something. $oldurl = hex2bin($saved); logger('Baseurl changed!'); - $oldhost = substr($oldurl,strpos($oldurl,'//')+2); - $host = substr(z_root(),strpos(z_root(),'//')+2); + $oldhost = substr($oldurl, strpos($oldurl, '//') + 2); + $host = substr(z_root(), strpos(z_root(), '//') + 2); $is_ip_addr = ((preg_match("/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/",$host)) ? true : false); $was_ip_addr = ((preg_match("/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/",$oldhost)) ? true : false); // only change the url to an ip address if it was already an ip and not a dns name if((! $is_ip_addr) || ($is_ip_addr && $was_ip_addr)) { fix_system_urls($oldurl,z_root()); - set_config('system','urlverify',bin2hex(z_root())); + set_config('system', 'urlverify', bin2hex(z_root())); } else logger('Attempt to change baseurl from a DNS name to an IP address was refused.'); @@ -1251,8 +1236,8 @@ function check_config(&$a) { // so we just need to keep this around a couple of weeks until the hubs that // already exist have one $syschan_exists = get_sys_channel(); - if (! $syschan_exists) - create_sys_channel(); + if (! $syschan_exists) + create_sys_channel(); if($build != DB_UPDATE_VERSION) { $stored = intval($build); @@ -1323,7 +1308,6 @@ function check_config(&$a) { } else set_config('database','update_r' . $x, 'success'); - } } set_config('system','db_version', DB_UPDATE_VERSION); @@ -1380,13 +1364,10 @@ function check_config(&$a) { } } - load_hooks(); - return; } - function fix_system_urls($oldurl,$newurl) { require_once('include/crypto.php'); @@ -1470,16 +1451,13 @@ function fix_system_urls($oldurl,$newurl) { } - - // wrapper for adding a login box. If $register == true provide a registration // link. This will most always depend on the value of $a->config['system']['register_policy']. // returns the complete html for inserting into the page - function login($register = false, $form_id = 'main-login', $hiddens=false) { $a = get_app(); - $o = ""; + $o = ''; $reg = false; $reglink = get_config('system','register_link'); if(! strlen($reglink)) @@ -1498,17 +1476,15 @@ function login($register = false, $form_id = 'main-login', $hiddens=false) { } else { $a->page['htmlhead'] .= replace_macros(get_markup_template("login_head.tpl"),array( - '$baseurl' => $a->get_baseurl(true) + '$baseurl' => $a->get_baseurl(true) )); $tpl = get_markup_template("login.tpl"); if(strlen($a->query_string)) - $_SESSION['login_return_url'] = $a->query_string; + $_SESSION['login_return_url'] = $a->query_string; } - $o .= replace_macros($tpl,array( - '$dest_url' => $dest_url, '$logout' => t('Logout'), '$login' => t('Login'), @@ -1517,14 +1493,12 @@ function login($register = false, $form_id = 'main-login', $hiddens=false) { '$lpassword' => array('password', t('Password'), '', ''), '$remember' => array('remember', t('Remember me'), '', ''), '$hiddens' => $hiddens, - '$register' => $reg, - '$lostpass' => t('Forgot your password?'), '$lostlink' => t('Password Reset'), )); - call_hooks('login_hook',$o); + call_hooks('login_hook', $o); return $o; } @@ -1532,7 +1506,6 @@ function login($register = false, $form_id = 'main-login', $hiddens=false) { // Used to end the current process, after saving session state. - function killme() { session_write_close(); exit; @@ -1541,33 +1514,44 @@ function killme() { // redirect to another URL and terminate this process. - function goaway($s) { header("Location: $s"); killme(); } - +/** + * @brief Returns the entity id of locally logged in account or false. + * + * Returns numeric account_id if authenticated or 0. It is possible to be + * authenticated and not connected to a channel. + * + * @return int|bool account_id or false + */ function get_account_id() { if(get_app()->account) return intval(get_app()->account['account_id']); + return false; } - -// Returns the entity id of locally logged in user or false. - - +/** + * @brief Returns the entity id of locally logged in user or false. + * + * Returns authenticated numeric channel_id if authenticated and connected to + * a channel or 0. Sometimes referred to as $uid in the code. + * + * @return int|bool channel_id or false + */ function local_user() { - if((x($_SESSION,'authenticated')) && (x($_SESSION,'uid'))) + if((x($_SESSION, 'authenticated')) && (x($_SESSION, 'uid'))) return intval($_SESSION['uid']); + return false; } // Returns contact id of authenticated site visitor or false - function remote_user() { if((x($_SESSION,'authenticated')) && (x($_SESSION,'visitor_id'))) return $_SESSION['visitor_id']; @@ -1578,15 +1562,14 @@ function remote_user() { // contents of $s are displayed prominently on the page the next time // a page is loaded. Usually used for errors or alerts. - function notice($s) { $a = get_app(); - if(! x($_SESSION,'sysmsg')) $_SESSION['sysmsg'] = array(); + if(! x($_SESSION, 'sysmsg')) $_SESSION['sysmsg'] = array(); if($a->interactive) { // shameless plug, permission is denied and they have no identity. // There's a fairly good chance that they've not got zot. - if((stristr($s,t('permission denied'))) && (! get_observer_hash())) { - $s .= '
      ' . t('Got Zot?') . ''; + if((stristr($s, t('permission denied'))) && (! get_observer_hash())) { + $s .= '
      ' . t('Got Zot?') . ''; } $_SESSION['sysmsg'][] = $s; } @@ -1595,24 +1578,21 @@ function notice($s) { function info($s) { $a = get_app(); - if(! x($_SESSION,'sysmsg_info')) $_SESSION['sysmsg_info'] = array(); + if(! x($_SESSION, 'sysmsg_info')) $_SESSION['sysmsg_info'] = array(); if($a->interactive) $_SESSION['sysmsg_info'][] = $s; } - - -// wrapper around config to limit the text length of an incoming message - - +/** + * @brief Wrapper around config to limit the text length of an incoming message + * + * @return int + */ function get_max_import_size() { - return(intval(get_config('system','max_import_size'))); + return(intval(get_config('system', 'max_import_size'))); } - - - /** * * Wrap calls to proc_close(proc_open()) and call hook @@ -1626,8 +1606,6 @@ function get_max_import_size() { * * $cmd and string args are surrounded with "" */ - - function proc_run($cmd){ $a = get_app(); @@ -1660,24 +1638,28 @@ function proc_run($cmd){ if(count($args) && $args[0] === 'php') $args[0] = ((x($a->config,'system')) && (x($a->config['system'],'php_path')) && (strlen($a->config['system']['php_path'])) ? $a->config['system']['php_path'] : 'php'); - for($x = 0; $x < count($args); $x ++) + + for($x = 0; $x < count($args); $x++) $args[$x] = escapeshellarg($args[$x]); $cmdline = implode($args," "); - if(is_windows()) { $cwd = getcwd(); $cmd = "cmd /c start \"title\" /D \"$cwd\" /b $cmdline"; proc_close(proc_open($cmd, array(), $foo)); } else - proc_close(proc_open($cmdline." &",array(),$foo)); + proc_close(proc_open($cmdline ." &", array(), $foo)); } - +/** + * @brief Checks if we are running on M$ Windows. + * + * @return bool true if we run on M$ Windows + */ function is_windows() { - return ((strtoupper(substr(PHP_OS,0,3)) === 'WIN') ? true : false); + return ((strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') ? true : false); } @@ -1709,7 +1691,6 @@ function current_theme(){ $page_theme = null; } - $is_mobile = $a->is_mobile || $a->is_tablet; $standard_system_theme = ((isset($a->config['system']['theme'])) ? $a->config['system']['theme'] : ''); @@ -1724,7 +1705,7 @@ function current_theme(){ $system_theme = ((isset($a->config['system']['mobile_theme'])) ? $a->config['system']['mobile_theme'] : ''); $theme_name = ((isset($_SESSION) && x($_SESSION,'mobile_theme')) ? $_SESSION['mobile_theme'] : $system_theme); - if($theme_name === '' || $theme_name === '---' ) { + if($theme_name === '' || $theme_name === '---' ) { // user has selected to have the mobile theme be the same as the normal one $system_theme = $standard_system_theme; $theme_name = $standard_theme_name; @@ -1732,21 +1713,20 @@ function current_theme(){ } } else { - $system_theme = $standard_system_theme; - $theme_name = $standard_theme_name; + $system_theme = $standard_system_theme; + $theme_name = $standard_theme_name; if($page_theme) $theme_name = $page_theme; } - if($theme_name && (file_exists('view/theme/' . $theme_name . '/css/style.css') || file_exists('view/theme/' . $theme_name . '/php/style.php'))) return($theme_name); foreach($app_base_themes as $t) { - if(file_exists('view/theme/' . $t . '/css/style.css')|| + if(file_exists('view/theme/' . $t . '/css/style.css') || file_exists('view/theme/' . $t . '/php/style.php')) return($t); } @@ -1771,9 +1751,17 @@ function current_theme_url($installing = false) { $opts .= ((x($a->layout,'schema')) ? '&schema=' . $a->layout['schema'] : ''); if(file_exists('view/theme/' . $t . '/php/style.php')) return('view/theme/' . $t . '/php/style.pcss' . $opts); + return('view/theme/' . $t . '/css/style.css'); } +/** + * @brief Check if current user has admin role. + * + * Check if the current user has ACCOUNT_ROLE_ADMIN. + * + * @return bool true if user is an admin + */ function is_site_admin() { $a = get_app(); if((intval($_SESSION['authenticated'])) @@ -1783,19 +1771,25 @@ function is_site_admin() { return false; } +/** + * @brief Check if current user has developer role. + * + * Check if the current user has ACCOUNT_ROLE_DEVELOPER. + * + * @return bool true if user is a developer + */ function is_developer() { $a = get_app(); if((intval($_SESSION['authenticated'])) && (is_array($a->account)) && ($a->account['account_roles'] & ACCOUNT_ROLE_DEVELOPER)) return true; + return false; } - function load_contact_links($uid) { - $a = get_app(); $ret = array(); @@ -1815,30 +1809,30 @@ function load_contact_links($uid) { } else $ret['empty'] = true; + $a->contacts = $ret; - return; } /** - * returns querystring as string from a mapped array + * @brief Returns querystring as string from a mapped array. * - * @param params Array + * @param array $params mapped array with query parameters + * @param string $name of parameter, default null * @return string */ - -function build_querystring($params, $name=null) { - $ret = ""; - foreach($params as $key=>$val) { +function build_querystring($params, $name = null) { + $ret = ''; + foreach($params as $key => $val) { if(is_array($val)) { - if($name==null) { + if($name === null) { $ret .= build_querystring($val, $key); } else { - $ret .= build_querystring($val, $name."[$key]"); + $ret .= build_querystring($val, $name . "[$key]"); } } else { $val = urlencode($val); - if($name!=null) { + if($name != null) { $ret .= $name . "[$key]" . "=$val&"; } else { $ret .= "$key=$val&"; @@ -1858,6 +1852,7 @@ function argc() { function argv($x) { if(array_key_exists($x,get_app()->argv)) return get_app()->argv[$x]; + return ''; } @@ -1869,15 +1864,16 @@ function get_observer_hash() { $observer = get_app()->get_observer(); if(is_array($observer)) return $observer['xchan_hash']; + return ''; } /** -* Returns the complete URL of the current page, e.g.: http(s)://something.com/network -* -* Taken from http://webcheatsheet.com/php/get_current_page_url.php -*/ + * Returns the complete URL of the current page, e.g.: http(s)://something.com/network + * + * Taken from http://webcheatsheet.com/php/get_current_page_url.php + */ function curPageURL() { $pageURL = 'http'; if ($_SERVER["HTTPS"] == "on") {$pageURL .= "s";} @@ -1890,13 +1886,20 @@ function curPageURL() { return $pageURL; } -function get_custom_nav(&$a,$navname) { +function get_custom_nav(&$a, $navname) { if(! $navname) return $a->page['nav']; // load custom nav menu by name here - } +/** + * @brief Loads a page definition file for a module. + * + * If there is no parsed Comanche template already load a module's pdl file + * and parse it with Comanche. + * + * @param App &$a global application object + */ function load_pdl(&$a) { require_once('include/comanche.php'); @@ -1904,34 +1907,34 @@ function load_pdl(&$a) { $n = 'mod_' . $a->module . '.pdl' ; $u = comanche_get_channel_id(); if($u) - $s = get_pconfig($u,'system',$n); + $s = get_pconfig($u, 'system', $n); + if((! $s) && (($p = theme_include($n)) != '')) $s = @file_get_contents($p); + if($s) - comanche_parser($a,$s); + comanche_parser($a, $s); } - } - - +/** + * @brief build the page. + * + * Build the page - now that we have all the components + * + * @param App &$a global application object + */ function construct_page(&$a) { - - /** - * Build the page - now that we have all the components - */ - - $comanche = ((count($a->layout)) ? true : false); require_once(theme_include('theme_init.php')); $installing = false; - if($a->module == 'setup') + if($a->module == 'setup') { $installing = true; - else { + } else { nav($a); } @@ -1941,7 +1944,6 @@ function construct_page(&$a) { } } - if(($p = theme_include(current_theme() . '.js')) != '') head_add_js($p); @@ -1950,10 +1952,10 @@ function construct_page(&$a) { require_once('include/js_strings.php'); - if(x($a->page,'template_style')) + if(x($a->page, 'template_style')) head_add_css($a->page['template_style'] . '.css'); else - head_add_css(((x($a->page,'template')) ? $a->page['template'] : 'default' ) . '.css'); + head_add_css(((x($a->page, 'template')) ? $a->page['template'] : 'default' ) . '.css'); head_add_css('mod_' . $a->module . '.css'); head_add_css(current_theme_url($installing)); @@ -1963,11 +1965,12 @@ function construct_page(&$a) { $a->build_pagehead(); $arr = $a->get_widgets(); - ksort($arr,SORT_NUMERIC); + ksort($arr, SORT_NUMERIC); if(count($arr)) { foreach($arr as $x) { - if(! array_key_exists($x['location'],$a->page)) + if(! array_key_exists($x['location'], $a->page)) $a->page[$x['location']] = ''; + $a->page[$x['location']] .= $x['html']; } } @@ -1983,27 +1986,25 @@ function construct_page(&$a) { if($comanche) { $arr = array('module' => $a->module, 'layout' => $a->layout); - call_hooks('construct_page',$arr); + call_hooks('construct_page', $arr); $a->layout = $arr['layout']; foreach($a->layout as $k => $v) { - if((strpos($k,'region_') === 0) && strlen($v)) { - if(strpos($v,'$region_') !== false) { - $v = preg_replace_callback('/\$region_([a-zA-Z0-9]+)/ism','comanche_replace_region',$v); + if((strpos($k, 'region_') === 0) && strlen($v)) { + if(strpos($v, '$region_') !== false) { + $v = preg_replace_callback('/\$region_([a-zA-Z0-9]+)/ism', 'comanche_replace_region', $v); } // And a couple of convenience macros - if(strpos($v,'$nav') !== false) { - $v = str_replace('$nav',$a->page['nav'],$v); + if(strpos($v, '$nav') !== false) { + $v = str_replace('$nav', $a->page['nav'], $v); } - if(strpos($v,'$content') !== false) { - - $v = str_replace('$content',$a->page['content'],$v); + if(strpos($v, '$content') !== false) { + $v = str_replace('$content', $a->page['content'], $v); } - $a->page[substr($k,7)] = $v; - + $a->page[substr($k, 7)] = $v; } } } @@ -2030,13 +2031,8 @@ function construct_page(&$a) { header("Content-type: text/html; charset=utf-8"); require_once(theme_include( - ((x($a->page,'template')) - ? $a->page['template'] - : 'default' ) - . '.php' ) + ((x($a->page, 'template')) ? $a->page['template'] : 'default' ) . '.php' ) ); - - return; } @@ -2047,20 +2043,24 @@ function appdirpath() { function head_set_icon($icon) { global $a; + $a->data['pageicon'] = $icon; // logger('head_set_icon: ' . $icon); } function head_get_icon() { global $a; + $icon = $a->data['pageicon']; - if(! strpos($icon,'://')) + if(! strpos($icon, '://')) $icon = z_root() . $icon; + return $icon; } function get_directory_realm() { - if($x = get_config('system','directory_realm')) + if($x = get_config('system', 'directory_realm')) return $x; + return DIRECTORY_REALM; } diff --git a/include/dba/dba_driver.php b/include/dba/dba_driver.php index 3e19b7aa4..31b7890f1 100755 --- a/include/dba/dba_driver.php +++ b/include/dba/dba_driver.php @@ -1,23 +1,48 @@ -install($server, $port, $user,$pass,$db))) { + if(($install) && (! $this->install($server, $port, $user, $pass, $db))) { return; } - $this->connect($server, $port, $user,$pass,$db); + $this->connect($server, $port, $user, $pass, $db); } - - function install($server,$user,$pass,$db) { + function install($server, $user, $pass, $db) { if (!(strlen($server) && strlen($user))){ $this->connected = false; $this->db = null; @@ -56,7 +115,11 @@ abstract class dba_driver { return true; } - + /** + * @brief Sets the database driver's debugging state. + * + * @param int $dbg 0 to disable debugging + */ function dbg($dbg) { $this->debug = $dbg; } @@ -67,10 +130,12 @@ abstract class dba_driver { } } -} +} // end abstract dba_driver class +// Procedural functions + function printable($s) { $s = preg_replace("~([\x01-\x08\x0E-\x0F\x10-\x1F\x7F-\xFF])~",".", $s); $s = str_replace("\x00",'.',$s); @@ -79,91 +144,110 @@ function printable($s) { return $s; } -// Procedural functions - +/** + * @brief set database driver debugging state. + * + * @param int $state 0 to disable debugging + */ function dbg($state) { global $db; + if($db) - $db->dbg($state); + $db->dbg($state); } - +/** + * @brief Escape strings being passed to DB queries. + * + * Always escape strings being used in DB queries. This function returns the + * escaped string. Integer DB parameters should all be proven integers by + * wrapping with intval(). + * + * @param string $str A string to pass to a DB query + * @return Return an escaped string of the value to pass to a DB query. + */ function dbesc($str) { global $db; + if($db && $db->connected) return($db->escape($str)); else - return(str_replace("'","\\'",$str)); + return(str_replace("'", "\\'", $str)); } - - -// Function: q($sql,$args); -// Description: execute SQL query with printf style args. -// Example: $r = q("SELECT * FROM `%s` WHERE `uid` = %d", -// 'user', 1); - - +/** + * @brief Execute a SQL query with printf style args. + * + * printf style arguments %s and %d are replaced with variable arguments, which + * should each be appropriately dbesc() or intval(). + * SELECT queries return an array of results or false if SQL or DB error. Other + * queries return true if the command was successful or false if it wasn't. + * + * Example: + * $r = q("SELECT * FROM `%s` WHERE `uid` = %d", + * 'user', 1); + * + * @param string $sql The SQL query to execute + * @return bool|array + */ function q($sql) { - global $db; + $args = func_get_args(); unset($args[0]); if($db && $db->connected) { - $stmt = vsprintf($sql,$args); + $stmt = vsprintf($sql, $args); if($stmt === false) { - if(version_compare(PHP_VERSION,'5.4.0') >= 0) - logger('dba: vsprintf error: ' . print_r(debug_backtrace(DEBUG_BACKTRACE_PROVIDE_OBJECT,1),true)); + if(version_compare(PHP_VERSION, '5.4.0') >= 0) + logger('dba: vsprintf error: ' . + print_r(debug_backtrace(DEBUG_BACKTRACE_PROVIDE_OBJECT, 1), true)); else - logger('dba: vsprintf error: ' . print_r(debug_backtrace(),true)); + logger('dba: vsprintf error: ' . print_r(debug_backtrace(), true)); } return $db->q($stmt); } - /** - * + /* * This will happen occasionally trying to store the * session data after abnormal program termination - * */ logger('dba: no database: ' . print_r($args,true)); - return false; + return false; } /** + * @brief Raw DB query, no arguments. * - * Raw db query, no arguments + * This function executes a raw DB query without any arguments. * + * @param string $sql The SQL query to execute */ - - function dbq($sql) { - global $db; + if($db && $db->connected) $ret = $db->q($sql); else $ret = false; + return $ret; } -// Caller is responsible for ensuring that any integer arguments to + +// Caller is responsible for ensuring that any integer arguments to // dbesc_array are actually integers and not malformed strings containing // SQL injection vectors. All integer array elements should be specifically // cast to int to avoid trouble. - - function dbesc_array_cb(&$item, $key) { if(is_string($item)) $item = dbesc($item); } - function dbesc_array(&$arr) { if(is_array($arr) && count($arr)) { array_walk($arr,'dbesc_array_cb'); -- cgit v1.2.3 From 4e7567ffa22f04a491821d63c634630d5aacc5b9 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 12 Nov 2014 15:31:24 -0800 Subject: History of RedMatrix, Friendica, Mike Macgirvin, and associated other stuff. --- doc/history.md | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 doc/history.md diff --git a/doc/history.md b/doc/history.md new file mode 100644 index 000000000..616e95ed1 --- /dev/null +++ b/doc/history.md @@ -0,0 +1,48 @@ +RedMatrix History +================= + +RedMatrix is a collaborative effort by the RedMatrix community and based on work introduced in Friendica by the Friendica community. The core design, the project mission, and software base itself was written primarily by Mike Macgirvin and is the culmination of more than a decade of actual software design using this platform and an evolving vision of the role of communication software in our lives. Many others have contributed to this work, both conceptually and in terms of actual code (way too many to list). + +##Mike Macgirvin -- Biography + +Mike Macgirvin is an American software engineer now living in Australia. He spent his early adult years designing and repairing semiconductor fabrication equipment for a number of companies as a self-described "machine wizard". In 1985 he became a research engineer at Stanford University and soon became a Unix systems administrator writing communication software and utilities and becoming an expert in emerging internet technologies. He authored an email "client" called "ML" which pioneered some advanced concepts in encryption, the ability to filter message streams into different "views", and multi-protocol support. In 1996 he went to Netscape Communications to become tech lead on their Messaging Server and integrate this with Collabra (groupware) into a comprehensive communications server package. He stayed on after Netscape was acquired by America Online and was tech manager of the Groups@AOL project until 2001. + +During a layoff round, Mike was let go from America Online in August 2001 and purchased a music store in Mountain View, California later to be known as "Sonica Music Company". Sonica folded in late 2006. He returned to working on software full-time and was employed briefly at Symantec before moving to Australia in early 2007. He is currently employed as a Computer Systems Officer at the University of Wollongong. + + +##RedMatrix - The Early Years + +The software which went into creating RedMatrix has been through three distinct historical phases. It began in 2003 when Mike Macgirvin was looking for a content management system to power the website for his music store and found the available solutions to be lacking in various respects. The project was born as the "PurpleHaze weblog" under the nom de plume "Nerdware Communications". It was a multi-user PHP/MySQL CMS which provided blogs, forums, photo albums, events and more. Initially it provided the basis for a social community and shopping for customers of the store, but was also linked to Mike's personal weblog running on another domain. The distinguishing characteristic of this software was the ability for so-called "normal users" to re-assemble the components and choose different content feeds - and in essence create their own personal "multi-user CMS" as a view. Their custom view was able to communicate with anybody else that used the system, but could be partitioned so that adult sites and motorcycle enthusiast sites would not be visible to each other and not clash (or in this case Mike's personal website and the music store website). This software was developed primarily from 2003 until 2008. + +In 2006 this software was used as the prototype for Symantec's "safeweb" reputation and community site. It was developed and enhanced until about 2008. A rewrite took place in 2008 named "Reflection" but work stagnated as the community dwindled. The need for content management systems and communications software dropped dramatically during this time as humans flocked to the new social aggregrators - Facebook and Twitter. + + +##Mistpark/Friendica + +In early 2010, Mike left Facebook, concerned at the company's increasing hold and control of personal information. In his words "Companies die. We watched it happen in the dot-com years. When they do, their databases are sold to the highest bidder.". Mike used some remnants of the old CMS project to create a decentralised social communications platform. This was launched in late July 2010 as "Mistpark". The name was chosen as a tribute to his new home in the Southern Highlands of Australia. The key innovation in this project was the ability to authenticate remotely and invisibly to other decentralised instances of the software so to allow remote viewing of private photos and provide "wall-to-wall" posting across website instances. The lack of simple remote identity *provenance* was a serious limitation of other decentralised communication protocols. + +In August 2010, the name was changed to "Friendika". The name Friendika had some symbolic issues, since the suffix was common with "swastika" and "Amerika", both having negative connotations, however the dot-com domain was available. Friendica was in fact the first choice but the 'friendica.com' domain name was already registered. It became available a year later and the project was renamed to Friendica in late 2011. + +The software also took on a new role - cross-service federation. Federation allowed the software to "behave as" a StatusNet site and friends and messages could communicate to the other service from their own platforms. It was also hoped to provide federation with Diaspora - a project with similar scope being developed in secret in New York and released a month or two later. Over the course of the next year, the federation ability was extended to provide integrated communications from RSS feeds, to and from email, StatusNet, Facebook, Twitter, and the emerging Diaspora project. The software provided a single "view" of your entire social space no matter what provider you or your friends used. StatusNet and Diaspora were supported natively so that one account could access any of these services. Facebook and Twitter used "API federation" which required the person to have an account on those services with which to link. + +By July 2012, Twitter and Facebook had both changed their terms of service and essentially outlawed "API federation" in the way Friendica was using it. Diaspora announced they were changing their protocol and would not maintain compatibility nor provide any warning when compatibility would break (or documentation on the proposed changes). The creator of StatusNet was also leaving his project to create something new (pump.io). As the software's primary visible feature was "federation", this created a bit of a crisis. The federated social web was crumbling. Also of concern was that independent and decentralised social websites shut down frequently leaving all their members to have to start over again on another site. Mike realsied he did not want to be held hostage to the decisions that other projects and companies and independent websites make. + +Mike had been working on this project for some time and there were a number of things which needed re-writing, including the base communication protocol protocol which Friendica used (DFRN or the "Distributed Friends and Relations Network" protocol). These ideas were starting to emerge as a different method of communication he called "zot". Zot began as a way to create a common language for federated websites, but there was no interest in this ability and as mentioned, the federated web was crumbling. The first version was soon scrapped and zot was re-designed and re-ignited as a streamlined communication protocol which was location-independent; e.g. not tied to any website. This would allow people to carry on unaffected if their website operator shut down temporarily or permanently. They wouldn't have to make friends all over again, and permissions of everything on the system wouldn't have to be changed to allow bob@site1 to see something that was private to him, even though he was now bob@site2. This was a serious problem with decentralisation. People moved and their online identities were lost and had to be re-created from scratch and existing relationships destroyed and had to be created all over again. + + +##RedMatrix + +In July 2012, Mike left the Friendica project and began "full-time" (he was and is still employed doing other work) development of "zot" and a new base project called "red". Red is Spanish for "network". It wasn't really a "social network" and especially not a "federated social network". It was just Red (technically "la red"), or "the network". Work began by removing all the "federation" components and going back to basics - communication and remote authentication. It was a major re-write and took roughly six months before even basic communication was re-established. It was also no longer compatible with Friendica - which had been given to the "Friendica community" and by this time was developing separately on its own track. + +It became clear during this time that the single most compelling feature of the project wasn't the social network, but the authentication layer and decentralised access control mechanisms. Combined with zot's location independence it created a new model for software which had never existed previously - decentralised identity-aware web publishing and single sign-on to any compatible provider across the web. These weren't *evolutionary*, they were **revolutionary**. One of the biggest flaws of the modern web is the reliance on different passwords for every service you use, or reliance on a single provider if you were to tie them to - say your Facebook login. Facebook can remove your account at any time. Gone. If you rely on their authentication for all your websites, your entire online identity - gone. + +An early visitor to the project noted that he had some difficulty finding the project on Google because of the choice of name - "red". Yes, this was a poor decision in retrospect. We were buried on page 23,712 of the search results. The concept that was emerging around this identity-aware publishing was that of "a matrix of inter-connected thought streams", since we didn't have a concept of "people" and "friends". All were just connected "channels" with different ways to connect. So "Red Matrix" was chosen to give it a searchable name. It had nothing to do with the Matrix film and red and blue pills, though that is frequently cited (erronously); and in fact isn't a bad analogy. + +The concept of identity-aware content was alien to anything that existed previously on the web, so to make it useful we had to provide the ability to use it for content. This brought back concepts from the old "Content Management System" on which the software was originally based. To get it up and running quickly we created a markup language for webpages called "Comanche" which let you describe a page in high-level terms based on bbcode tags. We also added WebDAV so you could put decentralised access control on files and drag/drop from your operating system. So now you could have private photos, webpages, files, events, conversations, chatrooms - and they are visible to those you choose - no matter what site they use. All they need is zot. And your viewers could move to another site or just pop up at a different site any time they want and we don't care. + +Over time a few federation components re-emerged. The ability to view RSS feeds was important to many people. Diaspora never really managed to re-write their protocol, so that was re-implemented and allowed RedMatrix to connect with Diaspora and Friendica again (Friendica still had their Diaspora protocol intact, so this was the most common language now remaining on the free web - despite its faults). Diaspora communications aren't able to make use of the advanced identity features, but they work for basic communications. + +That brings us up to the present. Where will RedMatrix go from here? I don't know. That's up to you. + + + -- cgit v1.2.3 From 40e3da7b4f927a7ad487626bf13c9e0a6a890f8f Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 12 Nov 2014 15:40:11 -0800 Subject: add history link --- doc/main.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/main.bb b/doc/main.bb index c9984b1f6..6222948ad 100644 --- a/doc/main.bb +++ b/doc/main.bb @@ -45,6 +45,7 @@ Zot is the great new communicaton protocol invented especially for the RedMatrix [zrl=[baseurl]/help/faq_admins]FAQ For Admins[/zrl] [size=large][b]Technical Documentation[/b][/size] +[zrl=[baseurl]/help/history]RedMatrix history[/zrl] [zrl=[baseurl]/help/Zot---A-High-Level-Overview]A high level overview of Zot[/zrl] [zrl=[baseurl]/help/zot]An introduction to Zot[/zrl] [zrl=[baseurl]/help/zot_structures]Zot Stuctures[/zrl] -- cgit v1.2.3 From f41c748fe2f0a7d9b45ceb91543c51e596e75f2a Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 12 Nov 2014 15:47:29 -0800 Subject: Some dates couldn't be verified without going way back in the archives so at least make this document accurate based on what I have in front of me. --- doc/history.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/history.md b/doc/history.md index 616e95ed1..7b15bc45d 100644 --- a/doc/history.md +++ b/doc/history.md @@ -19,11 +19,11 @@ In 2006 this software was used as the prototype for Symantec's "safeweb" reputat ##Mistpark/Friendica -In early 2010, Mike left Facebook, concerned at the company's increasing hold and control of personal information. In his words "Companies die. We watched it happen in the dot-com years. When they do, their databases are sold to the highest bidder.". Mike used some remnants of the old CMS project to create a decentralised social communications platform. This was launched in late July 2010 as "Mistpark". The name was chosen as a tribute to his new home in the Southern Highlands of Australia. The key innovation in this project was the ability to authenticate remotely and invisibly to other decentralised instances of the software so to allow remote viewing of private photos and provide "wall-to-wall" posting across website instances. The lack of simple remote identity *provenance* was a serious limitation of other decentralised communication protocols. +In early 2010, Mike left Facebook, concerned at the company's increasing hold and control of personal information. In his words "Companies die. We watched it happen in the dot-com years. When they do, their databases are sold to the highest bidder.". Mike used some remnants of the old CMS project to create a decentralised social communications platform. This was launched in July 2010 as "Mistpark". The name was chosen as a tribute to his new home in the Southern Highlands of Australia. The key innovation in this project was the ability to authenticate remotely and invisibly to other decentralised instances of the software so to allow remote viewing of private photos and provide "wall-to-wall" posting across website instances. The lack of simple remote identity *provenance* was a serious limitation of other decentralised communication protocols. -In August 2010, the name was changed to "Friendika". The name Friendika had some symbolic issues, since the suffix was common with "swastika" and "Amerika", both having negative connotations, however the dot-com domain was available. Friendica was in fact the first choice but the 'friendica.com' domain name was already registered. It became available a year later and the project was renamed to Friendica in late 2011. +In late 2010, the name was changed to "Friendika". The name Friendika had some symbolic issues, since the suffix was common with "swastika" and "Amerika", both having negative connotations, however the dot-com domain was available. Friendica was in fact the first choice but the 'friendica.com' domain name was already registered. It became available a year later and the project was renamed to Friendica in late 2011. -The software also took on a new role - cross-service federation. Federation allowed the software to "behave as" a StatusNet site and friends and messages could communicate to the other service from their own platforms. It was also hoped to provide federation with Diaspora - a project with similar scope being developed in secret in New York and released a month or two later. Over the course of the next year, the federation ability was extended to provide integrated communications from RSS feeds, to and from email, StatusNet, Facebook, Twitter, and the emerging Diaspora project. The software provided a single "view" of your entire social space no matter what provider you or your friends used. StatusNet and Diaspora were supported natively so that one account could access any of these services. Facebook and Twitter used "API federation" which required the person to have an account on those services with which to link. +The software also took on a new role - cross-service federation; which was first introduced in August and September 2010. Federation allowed the software to "behave as" a StatusNet site and friends and messages could communicate to the other service from their own platforms. It was also hoped to provide federation with Diaspora - a project with similar scope being developed in secret in New York and first released in November of that year. Over the course of the next year, the federation ability was extended to provide integrated communications from RSS feeds, to and from email, StatusNet, Facebook, Twitter, and the emerging Diaspora project. The software provided a single "view" of your entire social space no matter what provider you or your friends used. StatusNet and Diaspora were supported natively so that one account could access any of these services. Facebook and Twitter used "API federation" which required the person to have an account on those services with which to link. By July 2012, Twitter and Facebook had both changed their terms of service and essentially outlawed "API federation" in the way Friendica was using it. Diaspora announced they were changing their protocol and would not maintain compatibility nor provide any warning when compatibility would break (or documentation on the proposed changes). The creator of StatusNet was also leaving his project to create something new (pump.io). As the software's primary visible feature was "federation", this created a bit of a crisis. The federated social web was crumbling. Also of concern was that independent and decentralised social websites shut down frequently leaving all their members to have to start over again on another site. Mike realsied he did not want to be held hostage to the decisions that other projects and companies and independent websites make. -- cgit v1.2.3 From 9478fd7fd4b64552caff98edbf0efc59c3370d28 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 12 Nov 2014 16:04:49 -0800 Subject: more minor wordsmithing --- doc/history.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/history.md b/doc/history.md index 7b15bc45d..b2cec32bf 100644 --- a/doc/history.md +++ b/doc/history.md @@ -25,7 +25,7 @@ In late 2010, the name was changed to "Friendika". The name Friendika had some s The software also took on a new role - cross-service federation; which was first introduced in August and September 2010. Federation allowed the software to "behave as" a StatusNet site and friends and messages could communicate to the other service from their own platforms. It was also hoped to provide federation with Diaspora - a project with similar scope being developed in secret in New York and first released in November of that year. Over the course of the next year, the federation ability was extended to provide integrated communications from RSS feeds, to and from email, StatusNet, Facebook, Twitter, and the emerging Diaspora project. The software provided a single "view" of your entire social space no matter what provider you or your friends used. StatusNet and Diaspora were supported natively so that one account could access any of these services. Facebook and Twitter used "API federation" which required the person to have an account on those services with which to link. -By July 2012, Twitter and Facebook had both changed their terms of service and essentially outlawed "API federation" in the way Friendica was using it. Diaspora announced they were changing their protocol and would not maintain compatibility nor provide any warning when compatibility would break (or documentation on the proposed changes). The creator of StatusNet was also leaving his project to create something new (pump.io). As the software's primary visible feature was "federation", this created a bit of a crisis. The federated social web was crumbling. Also of concern was that independent and decentralised social websites shut down frequently leaving all their members to have to start over again on another site. Mike realsied he did not want to be held hostage to the decisions that other projects and companies and independent websites make. +By July 2012, Twitter and Facebook had both changed their terms of service and essentially outlawed "API federation" in the way Friendica was using it. Diaspora announced they were changing their protocol and would not maintain compatibility nor provide any warning when compatibility would break (or documentation on the proposed changes). The creator of StatusNet was also leaving his project to create something new (pump.io). As the software's primary visible feature was "federation", this created a bit of a crisis. The federated social web was crumbling. Also of concern was that independent and decentralised social websites shut down frequently leaving all their members to have to start over again on another site. Mike realised he did not want to be held hostage to the decisions that other projects and companies and independent websites make. Friendica lacked autonomy and the ability to stand on its own. Mike had been working on this project for some time and there were a number of things which needed re-writing, including the base communication protocol protocol which Friendica used (DFRN or the "Distributed Friends and Relations Network" protocol). These ideas were starting to emerge as a different method of communication he called "zot". Zot began as a way to create a common language for federated websites, but there was no interest in this ability and as mentioned, the federated web was crumbling. The first version was soon scrapped and zot was re-designed and re-ignited as a streamlined communication protocol which was location-independent; e.g. not tied to any website. This would allow people to carry on unaffected if their website operator shut down temporarily or permanently. They wouldn't have to make friends all over again, and permissions of everything on the system wouldn't have to be changed to allow bob@site1 to see something that was private to him, even though he was now bob@site2. This was a serious problem with decentralisation. People moved and their online identities were lost and had to be re-created from scratch and existing relationships destroyed and had to be created all over again. @@ -34,7 +34,7 @@ Mike had been working on this project for some time and there were a number of t In July 2012, Mike left the Friendica project and began "full-time" (he was and is still employed doing other work) development of "zot" and a new base project called "red". Red is Spanish for "network". It wasn't really a "social network" and especially not a "federated social network". It was just Red (technically "la red"), or "the network". Work began by removing all the "federation" components and going back to basics - communication and remote authentication. It was a major re-write and took roughly six months before even basic communication was re-established. It was also no longer compatible with Friendica - which had been given to the "Friendica community" and by this time was developing separately on its own track. -It became clear during this time that the single most compelling feature of the project wasn't the social network, but the authentication layer and decentralised access control mechanisms. Combined with zot's location independence it created a new model for software which had never existed previously - decentralised identity-aware web publishing and single sign-on to any compatible provider across the web. These weren't *evolutionary*, they were **revolutionary**. One of the biggest flaws of the modern web is the reliance on different passwords for every service you use, or reliance on a single provider if you were to tie them to - say your Facebook login. Facebook can remove your account at any time. Gone. If you rely on their authentication for all your websites, your entire online identity - gone. +It became clear during this time that the single most compelling feature of the project wasn't the social network, but the authentication layer and decentralised access control mechanisms. Combined with zot's location independence it created a new model for software which had never existed previously - decentralised identity-aware web publishing and single sign-on to any compatible provider across the web. These weren't *evolutionary*, they were **revolutionary**. One of the biggest flaws of the modern web is the reliance on different passwords for every service you use, or reliance on a single provider if you were to tie them to - say your Facebook login. Facebook can remove your account at any time. Gone. If you rely on their authentication for all your websites, your entire online identity - gone. This is what was missing from Friendica - a compelling software feature which could stand on its own, without requiring a social network and especially without requiring a federated social network with all the mentioned external dependencies. An early visitor to the project noted that he had some difficulty finding the project on Google because of the choice of name - "red". Yes, this was a poor decision in retrospect. We were buried on page 23,712 of the search results. The concept that was emerging around this identity-aware publishing was that of "a matrix of inter-connected thought streams", since we didn't have a concept of "people" and "friends". All were just connected "channels" with different ways to connect. So "Red Matrix" was chosen to give it a searchable name. It had nothing to do with the Matrix film and red and blue pills, though that is frequently cited (erronously); and in fact isn't a bad analogy. -- cgit v1.2.3 From 634475164ea3bfe6a430623ee9bc0fa4cc2bd055 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 12 Nov 2014 16:11:18 -0800 Subject: wordsmith --- doc/history.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/history.md b/doc/history.md index b2cec32bf..3b8de6928 100644 --- a/doc/history.md +++ b/doc/history.md @@ -38,7 +38,7 @@ It became clear during this time that the single most compelling feature of the An early visitor to the project noted that he had some difficulty finding the project on Google because of the choice of name - "red". Yes, this was a poor decision in retrospect. We were buried on page 23,712 of the search results. The concept that was emerging around this identity-aware publishing was that of "a matrix of inter-connected thought streams", since we didn't have a concept of "people" and "friends". All were just connected "channels" with different ways to connect. So "Red Matrix" was chosen to give it a searchable name. It had nothing to do with the Matrix film and red and blue pills, though that is frequently cited (erronously); and in fact isn't a bad analogy. -The concept of identity-aware content was alien to anything that existed previously on the web, so to make it useful we had to provide the ability to use it for content. This brought back concepts from the old "Content Management System" on which the software was originally based. To get it up and running quickly we created a markup language for webpages called "Comanche" which let you describe a page in high-level terms based on bbcode tags. We also added WebDAV so you could put decentralised access control on files and drag/drop from your operating system. So now you could have private photos, webpages, files, events, conversations, chatrooms - and they are visible to those you choose - no matter what site they use. All they need is zot. And your viewers could move to another site or just pop up at a different site any time they want and we don't care. +The concept of identity-aware content was alien to anything that existed previously on the web, so to make it useful we had to provide the ability to use it for content. This brought back concepts from the old "Content Management System" on which the software was originally based. To get it up and running quickly we created a markup language for webpages called "Comanche" which let you describe a page in high-level terms based on bbcode tags. We also added WebDAV so you could put decentralised access control on files and drag/drop from your operating system. So now you could have private photos, webpages, files, events, conversations, chatrooms - and they are visible to those you choose - no matter what site they use. All they need is zot. And your viewers could move to another site or just pop up at a different site any time they want and we don't care. And it also had a built-in social network and lots of additional privacy and encryption features which were added even before the Snowden revelations gave them added urgency. Over time a few federation components re-emerged. The ability to view RSS feeds was important to many people. Diaspora never really managed to re-write their protocol, so that was re-implemented and allowed RedMatrix to connect with Diaspora and Friendica again (Friendica still had their Diaspora protocol intact, so this was the most common language now remaining on the free web - despite its faults). Diaspora communications aren't able to make use of the advanced identity features, but they work for basic communications. -- cgit v1.2.3 From a2cf1900c8383ca18507904329a8723fce1ae806 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 12 Nov 2014 18:04:00 -0800 Subject: this should make all the 'sys' webpage design tools useable by the admin --- mod/blocks.php | 160 +++++++++++++++++++++++++----------------- mod/editblock.php | 197 ++++++++++++++++++++++++++++++---------------------- mod/editlayout.php | 5 +- mod/editwebpage.php | 5 +- 4 files changed, 211 insertions(+), 156 deletions(-) diff --git a/mod/blocks.php b/mod/blocks.php index 3f2bef116..6237a645b 100644 --- a/mod/blocks.php +++ b/mod/blocks.php @@ -1,108 +1,140 @@ 1 && argv(1) === 'sys' && is_site_admin()) { + $sys = get_sys_channel(); + if($sys && intval($sys['channel_id'])) { + $a->is_sys = true; + } + } if(argc() > 1) $which = argv(1); - else { + else + return; + + profile_load($a,$which); + +} + + +function blocks_content(&$a) { + + if(! $a->profile) { notice( t('Requested profile is not available.') . EOL ); $a->error = 404; return; } - profile_load($a,$which,0); + $which = argv(1); + $uid = local_user(); + $owner = 0; + $channel = null; + $observer = $a->get_observer(); - // Figure out who the page owner is. - $r = q("select channel_id from channel where channel_address = '%s'", - dbesc($which) - ); - if($r) { - $owner = intval($r[0]['channel_id']); - } + $channel = $a->get_channel(); - // Block design features from visitors + if($a->is_sys && is_site_admin()) { + $sys = get_sys_channel(); + if($sys && intval($sys['channel_id'])) { + $uid = $owner = intval($sys['channel_id']); + $channel = $sys; + $observer = $sys; + } + } - if((! local_user()) || (local_user() != $owner)) { - notice( t('Permission denied.') . EOL); - return; + if(! $owner) { + // Figure out who the page owner is. + $r = q("select channel_id from channel where channel_address = '%s'", + dbesc($which) + ); + if($r) { + $owner = intval($r[0]['channel_id']); + } } + $ob_hash = (($observer) ? $observer['xchan_hash'] : ''); + $perms = get_all_perms($owner,$ob_hash); + if(! $perms['write_pages']) { + notice( t('Permission denied.') . EOL); + return; + } -// Get the observer, check their permissions - $observer = $a->get_observer(); - $ob_hash = (($observer) ? $observer['xchan_hash'] : ''); + // Block design features from visitors - $perms = get_all_perms($owner,$ob_hash); + if((! $uid) || ($uid != $owner)) { + notice( t('Permission denied.') . EOL); + return; + } - if(! $perms['write_pages']) { - notice( t('Permission denied.') . EOL); - return; - } + if(feature_enabled($owner,'expert')) { + $mimetype = (($_REQUEST['mimetype']) ? $_REQUEST['mimetype'] : get_pconfig($owner,'system','page_mimetype')); + if(! $mimetype) + $mimetype = 'choose'; + } + else { + $mimetype = 'text/bbcode'; + } -// 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. -require_once ('include/conversation.php'); - $x = array( - 'webpage' => ITEM_BUILDBLOCK, - 'is_owner' => true, - 'nickname' => $a->profile['channel_address'], - 'lockstate' => (($group || $cid || $channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'), - 'bang' => (($group || $cid) ? '!' : ''), - 'showacl' => false, - 'visitor' => true, - 'mimetype' => 'choose', - 'ptlabel' => t('Block Name'), - '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']; + $x = array( + 'webpage' => ITEM_BUILDBLOCK, + 'is_owner' => true, + 'nickname' => $a->profile['channel_address'], + 'lockstate' => (($channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'), + 'bang' => '', + 'showacl' => false, + 'visitor' => true, + 'mimetype' => $mimetype, + 'ptlabel' => t('Block Name'), + '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. -//TODO - this should be replaced with pagelist_widget + $o .= status_editor($a,$x); -$r = q("select * from item_id where uid = %d and service = 'BUILDBLOCK' order by sid asc", - intval($owner) -); + $r = q("select * from item_id where uid = %d and service = 'BUILDBLOCK' order by sid asc", + intval($owner) + ); - $pages = null; + $pages = null; - if($r) { - $pages = array(); - foreach($r as $rr) { - $pages[$rr['iid']][] = array('url' => $rr['iid'],'title' => $rr['sid']); - } - } + if($r) { + $pages = array(); + foreach($r as $rr) { + $pages[$rr['iid']][] = array('url' => $rr['iid'],'title' => $rr['sid']); + } + } + //Build the base URL for edit links + $url = z_root() . '/editblock/' . $which; -//Build the base URL for edit links - $url = z_root() . "/editblock/" . $which; -// This isn't pretty, but it works. Until I figure out what to do with the UI, it's Good Enough(TM). - return $o . replace_macros(get_markup_template("blocklist.tpl"), array( + $o .= replace_macros(get_markup_template('blocklist.tpl'), array( '$baseurl' => $url, '$edit' => t('Edit'), '$pages' => $pages, '$channel' => $which, '$view' => t('View'), '$preview' => '1', - - )); + )); - + return $o; } diff --git a/mod/editblock.php b/mod/editblock.php index 3b6ce4bbf..c58a93410 100644 --- a/mod/editblock.php +++ b/mod/editblock.php @@ -1,50 +1,92 @@ 1 && argv(1) === 'sys' && is_site_admin()) { + $sys = get_sys_channel(); + if($sys && intval($sys['channel_id'])) { + $a->is_sys = true; + } + } - if(argc() < 2) { - notice( t('Item not found') . EOL); + if(argc() > 1) + $which = argv(1); + else return; - } - $channel = get_channel_by_nick(argv(1)); + profile_load($a,$which); - if($c) { - $owner = intval($channel['channel_id']); - } +} - $o = ''; +function editblock_content(&$a) { + + if(! $a->profile) { + notice( t('Requested profile is not available.') . EOL ); + $a->error = 404; + return; + } - // Figure out which post we're editing - $post_id = ((argc() > 2) ? intval(argv(2)) : 0); + $which = argv(1); + $uid = local_user(); + $owner = 0; + $channel = null; + $observer = $a->get_observer(); - if(! ($post_id && $channel)) { - notice( t('Item not found') . EOL); - return; + $channel = $a->get_channel(); + + if($a->is_sys && is_site_admin()) { + $sys = get_sys_channel(); + if($sys && intval($sys['channel_id'])) { + $uid = $owner = intval($sys['channel_id']); + $channel = $sys; + $observer = $sys; + } } - // Now we've got a post and an owner, let's find out if we're allowed to edit it + if(! $owner) { + // Figure out who the page owner is. + $r = q("select channel_id from channel where channel_address = '%s'", + dbesc($which) + ); + if($r) { + $owner = intval($r[0]['channel_id']); + } + } + + $ob_hash = (($observer) ? $observer['xchan_hash'] : ''); - if(! perm_is_allowed($channel['channel_id'],get_observer_hash(),'write_pages')) { + if(! perm_is_allowed($owner,$ob_hash,'write_pages')) { notice( t('Permission denied.') . EOL); return; } + $is_owner = (($uid && $uid == $owner) ? true : false); + + $o = ''; - // We've already figured out which item we want and whose copy we need, so we don't need anything fancy here + // Figure out which post we're editing + $post_id = ((argc() > 2) ? intval(argv(2)) : 0); + + + if(! ($post_id && $owner)) { + notice( t('Item not found') . EOL); + return; + } + $itm = q("SELECT * FROM `item` WHERE `id` = %d and uid = %s LIMIT 1", intval($post_id), - intval($channel['channel_id']) + intval($owner) ); if($itm) { $item_id = q("select * from item_id where service = 'BUILDBLOCK' and iid = %d limit 1", - $itm[0]['id'] + intval($itm[0]['id']) ); if($item_id) $block_title = $item_id[0]['sid']; @@ -57,10 +99,6 @@ function editblock_content(&$a) { $plaintext = true; - // You may or may not be a local user. -// if(local_user() && feature_enabled(local_user(),'richtext')) -// $plaintext = false; - $mimeselect = ''; $mimetype = $itm[0]['mimetype']; @@ -79,11 +117,11 @@ function editblock_content(&$a) { $a->page['htmlhead'] .= replace_macros(get_markup_template('jot-header.tpl'), array( - '$baseurl' => $a->get_baseurl(), - '$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'), - '$ispublic' => ' ', // t('Visible to everybody'), - '$geotag' => '', - '$nickname' => $channel['channel_address'], + '$baseurl' => $a->get_baseurl(), + '$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'), + '$ispublic' => ' ', // t('Visible to everybody'), + '$geotag' => '', + '$nickname' => $channel['channel_address'], '$confirmdelete' => t('Delete block?') )); @@ -96,79 +134,70 @@ function editblock_content(&$a) { call_hooks('jot_tool', $jotplugins); call_hooks('jot_networks', $jotnets); - - //$tpl = replace_macros($tpl,array('$jotplugins' => $jotplugins)); - - // FIXME A return path with $_SESSION doesn't always work for observer - it may WSoD instead of loading a sensible page. - //So, send folk to the webpage list. - $rp = 'blocks/' . $channel['channel_address']; $o .= replace_macros($tpl,array( - '$return_path' => $rp, - '$action' => 'item', - '$webpage' => ITEM_BUILDBLOCK, - '$share' => t('Edit'), - '$upload' => t('Upload photo'), - '$attach' => t('Attach file'), - '$weblink' => t('Insert web link'), - '$youtube' => t('Insert YouTube video'), - '$video' => t('Insert Vorbis [.ogg] video'), - '$audio' => t('Insert Vorbis [.ogg] audio'), - '$setloc' => t('Set your location'), - '$noloc' => t('Clear browser location'), - '$wait' => t('Please wait'), - '$permset' => t('Permission settings'), - '$ptyp' => $itm[0]['type'], - '$mimeselect' => $mimeselect, - '$content' => undo_post_tagging($itm[0]['body']), - '$post_id' => $post_id, - '$baseurl' => $a->get_baseurl(), - '$defloc' => $channel['channel_location'], - '$visitor' => false, - '$public' => t('Public post'), - '$jotnets' => $jotnets, - '$title' => htmlspecialchars($itm[0]['title'],ENT_COMPAT,'UTF-8'), - '$placeholdertitle' => t('Set title'), - '$pagetitle' => $block_title, - '$category' => '', + '$return_path' => $rp, + '$action' => 'item', + '$webpage' => ITEM_BUILDBLOCK, + '$share' => t('Edit'), + '$upload' => t('Upload photo'), + '$attach' => t('Attach file'), + '$weblink' => t('Insert web link'), + '$youtube' => t('Insert YouTube video'), + '$video' => t('Insert Vorbis [.ogg] video'), + '$audio' => t('Insert Vorbis [.ogg] audio'), + '$setloc' => t('Set your location'), + '$noloc' => t('Clear browser location'), + '$wait' => t('Please wait'), + '$permset' => t('Permission settings'), + '$ptyp' => $itm[0]['type'], + '$mimeselect' => $mimeselect, + '$content' => undo_post_tagging($itm[0]['body']), + '$post_id' => $post_id, + '$baseurl' => $a->get_baseurl(), + '$defloc' => $channel['channel_location'], + '$visitor' => false, + '$public' => t('Public post'), + '$jotnets' => $jotnets, + '$title' => htmlspecialchars($itm[0]['title'],ENT_COMPAT,'UTF-8'), + '$placeholdertitle' => t('Set title'), + '$pagetitle' => $block_title, + '$category' => '', '$placeholdercategory' => t('Categories (comma-separated list)'), - '$emtitle' => t('Example: bob@example.com, mary@example.com'), - '$lockstate' => $lockstate, - '$acl' => '', - '$bang' => '', - '$profile_uid' => (intval($channel['channel_id'])), - '$preview' => ((feature_enabled(local_user(),'preview')) ? t('Preview') : ''), - '$jotplugins' => $jotplugins, - '$sourceapp' => $itm[0]['app'], - '$defexpire' => '', - '$feature_expire' => false, - '$expires' => t('Set expiration date'), + '$emtitle' => t('Example: bob@example.com, mary@example.com'), + '$lockstate' => $lockstate, + '$acl' => '', + '$bang' => '', + '$profile_uid' => (intval($channel['channel_id'])), + '$preview' => ((feature_enabled($uid,'preview')) ? t('Preview') : ''), + '$jotplugins' => $jotplugins, + '$sourceapp' => $itm[0]['app'], + '$defexpire' => '', + '$feature_expire' => false, + '$expires' => t('Set expiration date'), )); - $ob = get_observer_hash(); - - if(($itm[0]['author_xchan'] === $ob) || ($itm[0]['owner_xchan'] === $ob)) + if(($itm[0]['author_xchan'] === $ob_hash) || ($itm[0]['owner_xchan'] === $ob_hash)) $o .= '

      ' . t('Delete Block') . '
      '; $x = array( - 'type' => 'block', - 'title' => $itm[0]['title'], - 'body' => $itm[0]['body'], - 'term' => $itm[0]['term'], - 'created' => $itm[0]['created'], - 'edited' => $itm[0]['edited'], - 'mimetype' => $itm[0]['mimetype'], + 'type' => 'block', + 'title' => $itm[0]['title'], + 'body' => $itm[0]['body'], + 'term' => $itm[0]['term'], + 'created' => $itm[0]['created'], + 'edited' => $itm[0]['edited'], + 'mimetype' => $itm[0]['mimetype'], 'pagetitle' => $page_title, - 'mid' => $itm[0]['mid'] + 'mid' => $itm[0]['mid'] ); $o .= EOL . EOL . t('Share') . EOL . '' . EOL . EOL; - return $o; } diff --git a/mod/editlayout.php b/mod/editlayout.php index 27e6ef410..94e2e628c 100644 --- a/mod/editlayout.php +++ b/mod/editlayout.php @@ -60,14 +60,11 @@ function editlayout_content(&$a) { $ob_hash = (($observer) ? $observer['xchan_hash'] : ''); - $perms = get_all_perms($owner,$ob_hash); - - if(! $perms['write_pages']) { + if(! perm_is_allowed($owner,$ob_hash,'write_pages')) { notice( t('Permission denied.') . EOL); return; } - $is_owner = (($uid && $uid == $owner) ? true : false); $o = ''; diff --git a/mod/editwebpage.php b/mod/editwebpage.php index 8181415b8..2acb3bd84 100644 --- a/mod/editwebpage.php +++ b/mod/editwebpage.php @@ -60,14 +60,11 @@ function editwebpage_content(&$a) { $ob_hash = (($observer) ? $observer['xchan_hash'] : ''); - $perms = get_all_perms($owner,$ob_hash); - - if(! $perms['write_pages']) { + if(! perm_is_allowed($owner,$ob_hash,'write_pages')) { notice( t('Permission denied.') . EOL); return; } - $is_owner = (($uid && $uid == $owner) ? true : false); $o = ''; -- cgit v1.2.3 From 800e457290a6cb602470bc07a52e8530628469dc Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 12 Nov 2014 18:35:33 -0800 Subject: populate initial ACL before the ajax loader gets called, just in case the form is submitted before it completes. Related to issue #615 --- view/js/acl.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/view/js/acl.js b/view/js/acl.js index ec5e59962..eb702d2b0 100644 --- a/view/js/acl.js +++ b/view/js/acl.js @@ -17,6 +17,9 @@ function ACL(backend_url, preset){ that.item_tpl = unescape($(".acl-list-item[rel=acl-template]").html()); that.showall = $("#acl-showall"); + // set the initial ACL lists in case the enclosing form gets submitted before the ajax loader completes. + that.on_submit(); + if (preset.length==0) that.showall.removeClass("btn-default").addClass("btn-warning"); /*events*/ @@ -26,7 +29,6 @@ function ACL(backend_url, preset){ $(document).on('click','.acl-button-show',that.on_button_show); $(document).on('click','.acl-button-hide',that.on_button_hide); $("#acl-search").keypress(that.on_search); -// $("#acl-wrapper").parents("form").submit(that.on_submit); /* startup! */ that.get(0,100); -- cgit v1.2.3 From a77abb06948dc73c7839bd849f4d43da98d701d4 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 12 Nov 2014 19:04:24 -0800 Subject: minor word tweaks --- doc/history.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/history.md b/doc/history.md index 3b8de6928..5d6641da2 100644 --- a/doc/history.md +++ b/doc/history.md @@ -23,11 +23,11 @@ In early 2010, Mike left Facebook, concerned at the company's increasing hold an In late 2010, the name was changed to "Friendika". The name Friendika had some symbolic issues, since the suffix was common with "swastika" and "Amerika", both having negative connotations, however the dot-com domain was available. Friendica was in fact the first choice but the 'friendica.com' domain name was already registered. It became available a year later and the project was renamed to Friendica in late 2011. -The software also took on a new role - cross-service federation; which was first introduced in August and September 2010. Federation allowed the software to "behave as" a StatusNet site and friends and messages could communicate to the other service from their own platforms. It was also hoped to provide federation with Diaspora - a project with similar scope being developed in secret in New York and first released in November of that year. Over the course of the next year, the federation ability was extended to provide integrated communications from RSS feeds, to and from email, StatusNet, Facebook, Twitter, and the emerging Diaspora project. The software provided a single "view" of your entire social space no matter what provider you or your friends used. StatusNet and Diaspora were supported natively so that one account could access any of these services. Facebook and Twitter used "API federation" which required the person to have an account on those services with which to link. +Soon after version 1 was released in July 2010 - providing basic social communications, the software also took on a new role - cross-service federation; which was first introduced in August and September 2010. Federation allowed the software to "behave as" a StatusNet site and friends and messages could communicate to the other service from their own platforms. It was also hoped to provide federation with Diaspora - a project with similar scope being developed in secret in New York and first released in November of that year. Over the course of the next year, the federation ability was extended to provide integrated communications from RSS feeds, to and from email, StatusNet, Facebook, Twitter, and the emerging Diaspora project. The software provided a single "view" of your entire social space no matter what provider you or your friends used. StatusNet and Diaspora were supported natively so that one account could access any of these services. Facebook and Twitter used "API federation" which required the person to have an account on those services with which to link. -By July 2012, Twitter and Facebook had both changed their terms of service and essentially outlawed "API federation" in the way Friendica was using it. Diaspora announced they were changing their protocol and would not maintain compatibility nor provide any warning when compatibility would break (or documentation on the proposed changes). The creator of StatusNet was also leaving his project to create something new (pump.io). As the software's primary visible feature was "federation", this created a bit of a crisis. The federated social web was crumbling. Also of concern was that independent and decentralised social websites shut down frequently leaving all their members to have to start over again on another site. Mike realised he did not want to be held hostage to the decisions that other projects and companies and independent websites make. Friendica lacked autonomy and the ability to stand on its own. +By July 2012, Twitter and Facebook had both changed their terms of service and essentially outlawed "API federation" in the way Friendica was using it. Diaspora announced they were changing their protocol and would not maintain compatibility nor provide any warning when compatibility would break (or documentation on the proposed changes). The creator of StatusNet was also leaving his project to create something new (pump.io). As the software's primary visible feature was "federation", this created a bit of a crisis. The federated social web was crumbling. Also of concern was that independent and decentralised social websites shut down frequently leaving all their members to have to start over again on another site. Mike realised he did not want to be held hostage to the decisions that other projects and companies and independent websites make. Friendica could operate on its own without attaching to these other networks, but its vision and implementation of a federated social world depended on federation with others for its project identity - so this created an identity crisis. -Mike had been working on this project for some time and there were a number of things which needed re-writing, including the base communication protocol protocol which Friendica used (DFRN or the "Distributed Friends and Relations Network" protocol). These ideas were starting to emerge as a different method of communication he called "zot". Zot began as a way to create a common language for federated websites, but there was no interest in this ability and as mentioned, the federated web was crumbling. The first version was soon scrapped and zot was re-designed and re-ignited as a streamlined communication protocol which was location-independent; e.g. not tied to any website. This would allow people to carry on unaffected if their website operator shut down temporarily or permanently. They wouldn't have to make friends all over again, and permissions of everything on the system wouldn't have to be changed to allow bob@site1 to see something that was private to him, even though he was now bob@site2. This was a serious problem with decentralisation. People moved and their online identities were lost and had to be re-created from scratch and existing relationships destroyed and had to be created all over again. +Mike had been working on this project for some time and there were a number of things which needed re-writing, including the base communication protocol which Friendica used (DFRN or the "Distributed Friends and Relations Network" protocol). These ideas were starting to emerge as a different method of communication he called "zot". Zot began as a way to create a common language for federated websites, but there was no interest in this ability and as mentioned, the federated web was crumbling. The first version was soon scrapped and zot was re-designed and re-ignited as a streamlined communication protocol which was location-independent; e.g. not tied to any website. This would allow people to carry on unaffected if their website operator shut down temporarily or permanently. They wouldn't have to make friends all over again, and permissions of everything on the system wouldn't have to be changed to allow bob@site1 to see something that was private to him, even though he was now bob@site2. This was a serious problem with decentralisation. People moved and their online identities were lost and had to be re-created from scratch and existing relationships destroyed and had to be created all over again. ##RedMatrix -- cgit v1.2.3 From 1c1705e060bb56fb2f0eda70cc92e855d6245848 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 12 Nov 2014 19:43:54 -0800 Subject: ok, I think I'll give it a break now. --- doc/history.md | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/doc/history.md b/doc/history.md index 5d6641da2..5d60f2c0f 100644 --- a/doc/history.md +++ b/doc/history.md @@ -1,11 +1,11 @@ RedMatrix History ================= -RedMatrix is a collaborative effort by the RedMatrix community and based on work introduced in Friendica by the Friendica community. The core design, the project mission, and software base itself was written primarily by Mike Macgirvin and is the culmination of more than a decade of actual software design using this platform and an evolving vision of the role of communication software in our lives. Many others have contributed to this work, both conceptually and in terms of actual code (way too many to list). +RedMatrix is a collaborative effort by the RedMatrix community and based on work introduced in Friendica by the Friendica community. The core design, the project mission, and software base itself were created/written primarily by Mike Macgirvin and represent the culmination of over a decade of software design using variations of this platform and an evolving vision of the role of communication software in our lives. Many others have contributed to this work, both conceptually and in terms of actual code (way too many to list individually). ##Mike Macgirvin -- Biography -Mike Macgirvin is an American software engineer now living in Australia. He spent his early adult years designing and repairing semiconductor fabrication equipment for a number of companies as a self-described "machine wizard". In 1985 he became a research engineer at Stanford University and soon became a Unix systems administrator writing communication software and utilities and becoming an expert in emerging internet technologies. He authored an email "client" called "ML" which pioneered some advanced concepts in encryption, the ability to filter message streams into different "views", and multi-protocol support. In 1996 he went to Netscape Communications to become tech lead on their Messaging Server and integrate this with Collabra (groupware) into a comprehensive communications server package. He stayed on after Netscape was acquired by America Online and was tech manager of the Groups@AOL project until 2001. +Mike Macgirvin is an American software engineer now living in Australia. He spent his early adult years designing and repairing semiconductor fabrication equipment for a number of companies as a self-described "machine wizard". In 1985 he became a research engineer at Stanford University and soon became a Unix systems administrator writing communication software and utilities and becoming an expert in emerging internet technologies such as the now ubiquitous "World Wide Web". He authored an email "client" called "ML" which pioneered some advanced concepts in encryption, the ability to filter message streams into different "views", and multi-protocol support. In 1996 he went to Netscape Communications to become tech lead on their Messaging Server and integrate this with Collabra (groupware) into a comprehensive communications server package. He stayed on after Netscape was acquired by America Online and was tech manager of the Groups@AOL project until 2001. During a layoff round, Mike was let go from America Online in August 2001 and purchased a music store in Mountain View, California later to be known as "Sonica Music Company". Sonica folded in late 2006. He returned to working on software full-time and was employed briefly at Symantec before moving to Australia in early 2007. He is currently employed as a Computer Systems Officer at the University of Wollongong. @@ -25,20 +25,22 @@ In late 2010, the name was changed to "Friendika". The name Friendika had some s Soon after version 1 was released in July 2010 - providing basic social communications, the software also took on a new role - cross-service federation; which was first introduced in August and September 2010. Federation allowed the software to "behave as" a StatusNet site and friends and messages could communicate to the other service from their own platforms. It was also hoped to provide federation with Diaspora - a project with similar scope being developed in secret in New York and first released in November of that year. Over the course of the next year, the federation ability was extended to provide integrated communications from RSS feeds, to and from email, StatusNet, Facebook, Twitter, and the emerging Diaspora project. The software provided a single "view" of your entire social space no matter what provider you or your friends used. StatusNet and Diaspora were supported natively so that one account could access any of these services. Facebook and Twitter used "API federation" which required the person to have an account on those services with which to link. -By July 2012, Twitter and Facebook had both changed their terms of service and essentially outlawed "API federation" in the way Friendica was using it. Diaspora announced they were changing their protocol and would not maintain compatibility nor provide any warning when compatibility would break (or documentation on the proposed changes). The creator of StatusNet was also leaving his project to create something new (pump.io). As the software's primary visible feature was "federation", this created a bit of a crisis. The federated social web was crumbling. Also of concern was that independent and decentralised social websites shut down frequently leaving all their members to have to start over again on another site. Mike realised he did not want to be held hostage to the decisions that other projects and companies and independent websites make. Friendica could operate on its own without attaching to these other networks, but its vision and implementation of a federated social world depended on federation with others for its project identity - so this created an identity crisis. +By July 2012, Twitter and Facebook had both changed their terms of service and essentially outlawed "API federation" in the way Friendica was using it. Diaspora announced they were changing their protocol and would not maintain compatibility nor provide any warning when compatibility would break (or documentation on the proposed changes). The creator of StatusNet was also leaving his project to create something new (pump.io). As the software's primary purpose by this time was "federation of different social services into one interface", this created a bit of a crisis. The federated social web was crumbling. Also of concern was that independent and decentralised social websites shut down frequently, requiring all their members to start over again on another site. Often the effort involved to do this seemed daunting - and many people ran back to the relative safety of the large corporate providers - Facebook, Twitter, and now Google+. + +Mike realised he did not want to be held hostage to the decisions that other projects and companies and independent websites make. Friendica could operate on its own without attaching to these other networks, but its vision and implementation of a federated social world depended on federation with others for its project identity - so this created an identity crisis. Mike had been working on this project for some time and there were a number of things which needed re-writing, including the base communication protocol which Friendica used (DFRN or the "Distributed Friends and Relations Network" protocol). These ideas were starting to emerge as a different method of communication he called "zot". Zot began as a way to create a common language for federated websites, but there was no interest in this ability and as mentioned, the federated web was crumbling. The first version was soon scrapped and zot was re-designed and re-ignited as a streamlined communication protocol which was location-independent; e.g. not tied to any website. This would allow people to carry on unaffected if their website operator shut down temporarily or permanently. They wouldn't have to make friends all over again, and permissions of everything on the system wouldn't have to be changed to allow bob@site1 to see something that was private to him, even though he was now bob@site2. This was a serious problem with decentralisation. People moved and their online identities were lost and had to be re-created from scratch and existing relationships destroyed and had to be created all over again. ##RedMatrix -In July 2012, Mike left the Friendica project and began "full-time" (he was and is still employed doing other work) development of "zot" and a new base project called "red". Red is Spanish for "network". It wasn't really a "social network" and especially not a "federated social network". It was just Red (technically "la red"), or "the network". Work began by removing all the "federation" components and going back to basics - communication and remote authentication. It was a major re-write and took roughly six months before even basic communication was re-established. It was also no longer compatible with Friendica - which had been given to the "Friendica community" and by this time was developing separately on its own track. +In July 2012, Mike left the Friendica project and began "full-time" (he was and is still employed doing other work) development of "zot" and a new base project called "red". Red is Spanish for "network". It wasn't really a "social network" and especially not a "federated social network". It was just Red (technically "la red"), or "the network". Work began by removing all the "federation" components and going back to basics - communication and remote authentication. It was a major re-write and took roughly six months before even basic communication was re-established. It was also no longer compatible with Friendica - which had been given to the "Friendica community" and by this time (December 2012) was developing separately on its own track. -It became clear during this time that the single most compelling feature of the project wasn't the social network, but the authentication layer and decentralised access control mechanisms. Combined with zot's location independence it created a new model for software which had never existed previously - decentralised identity-aware web publishing and single sign-on to any compatible provider across the web. These weren't *evolutionary*, they were **revolutionary**. One of the biggest flaws of the modern web is the reliance on different passwords for every service you use, or reliance on a single provider if you were to tie them to - say your Facebook login. Facebook can remove your account at any time. Gone. If you rely on their authentication for all your websites, your entire online identity - gone. This is what was missing from Friendica - a compelling software feature which could stand on its own, without requiring a social network and especially without requiring a federated social network with all the mentioned external dependencies. +It became clear during this time that the single most compelling feature of the project wasn't the social network at all, but the authentication layer and decentralised access control mechanisms. Combined with zot's location independence it created a new model for software which had never existed previously - decentralised identity-aware web publishing and single sign-on to any compatible provider across the web. These weren't *evolutionary*, they were **revolutionary**. One of the biggest flaws of the modern web is the reliance on different passwords for every service you use, or reliance on a single provider if you were to tie them to - say your Facebook login. Facebook can remove your account at any time. Gone. If you rely on their authentication for all your websites, your entire online identity - now gone. This is also what was missing from Friendica - a compelling software feature which could stand on its own, without requiring a social network and especially without requiring a federated social network with all the mentioned external dependencies. An early visitor to the project noted that he had some difficulty finding the project on Google because of the choice of name - "red". Yes, this was a poor decision in retrospect. We were buried on page 23,712 of the search results. The concept that was emerging around this identity-aware publishing was that of "a matrix of inter-connected thought streams", since we didn't have a concept of "people" and "friends". All were just connected "channels" with different ways to connect. So "Red Matrix" was chosen to give it a searchable name. It had nothing to do with the Matrix film and red and blue pills, though that is frequently cited (erronously); and in fact isn't a bad analogy. -The concept of identity-aware content was alien to anything that existed previously on the web, so to make it useful we had to provide the ability to use it for content. This brought back concepts from the old "Content Management System" on which the software was originally based. To get it up and running quickly we created a markup language for webpages called "Comanche" which let you describe a page in high-level terms based on bbcode tags. We also added WebDAV so you could put decentralised access control on files and drag/drop from your operating system. So now you could have private photos, webpages, files, events, conversations, chatrooms - and they are visible to those you choose - no matter what site they use. All they need is zot. And your viewers could move to another site or just pop up at a different site any time they want and we don't care. And it also had a built-in social network and lots of additional privacy and encryption features which were added even before the Snowden revelations gave them added urgency. +The concept of identity-aware content was alien to anything that existed previously on the web, so to make it useful we had to provide the ability to use it for content. It needed content publishing tools. This brought back concepts from the old "Content Management System" on which the software was originally based. To get it up and running quickly we created a markup language for webpages called "Comanche" which let you describe a page in high-level terms based on bbcode tags. We also added WebDAV so you could put decentralised access control on files and drag/drop from your operating system. So now you could have private photos, webpages, files, events, conversations, chatrooms - and they are visible to those you choose - no matter what site they use. All they need is zot. And your viewers could move to another site or just pop up at a different site any time they want and we don't care. And it **also** had a built-in social network; with lots of additional privacy and encryption features which were added even before the Snowden revelations gave them added urgency. Over time a few federation components re-emerged. The ability to view RSS feeds was important to many people. Diaspora never really managed to re-write their protocol, so that was re-implemented and allowed RedMatrix to connect with Diaspora and Friendica again (Friendica still had their Diaspora protocol intact, so this was the most common language now remaining on the free web - despite its faults). Diaspora communications aren't able to make use of the advanced identity features, but they work for basic communications. -- cgit v1.2.3 From 226d695525c10c258ced5cdcce5580e71e196b1f Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 12 Nov 2014 23:55:04 -0800 Subject: make it a bit personal --- doc/history.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/history.md b/doc/history.md index 5d60f2c0f..b626d376e 100644 --- a/doc/history.md +++ b/doc/history.md @@ -5,9 +5,9 @@ RedMatrix is a collaborative effort by the RedMatrix community and based on work ##Mike Macgirvin -- Biography -Mike Macgirvin is an American software engineer now living in Australia. He spent his early adult years designing and repairing semiconductor fabrication equipment for a number of companies as a self-described "machine wizard". In 1985 he became a research engineer at Stanford University and soon became a Unix systems administrator writing communication software and utilities and becoming an expert in emerging internet technologies such as the now ubiquitous "World Wide Web". He authored an email "client" called "ML" which pioneered some advanced concepts in encryption, the ability to filter message streams into different "views", and multi-protocol support. In 1996 he went to Netscape Communications to become tech lead on their Messaging Server and integrate this with Collabra (groupware) into a comprehensive communications server package. He stayed on after Netscape was acquired by America Online and was tech manager of the Groups@AOL project until 2001. +Mike Macgirvin is an American software engineer now living in Australia. He spent his early adult years designing and repairing semiconductor fabrication equipment for a number of companies as a self-described "machine wizard". In 1985 he became a research engineer at Stanford University for the Gravity Probe-B space mission and soon became a Unix systems administrator writing communication software and utilities; and becoming an expert in emerging internet technologies such as the now ubiquitous "World Wide Web". He authored an email "client" called "ML" which pioneered some advanced concepts in encryption, the ability to filter message streams into different "views", and multi-protocol support; and was an active proponent of and participant in the open source software *movement*. In 1996 he went to Netscape Communications to become tech lead on their Messaging Server and integrate this with Collabra (groupware) into a comprehensive communications server package. He stayed on after Netscape was acquired by America Online and was tech manager of the Groups@AOL project until 2001. -During a layoff round, Mike was let go from America Online in August 2001 and purchased a music store in Mountain View, California later to be known as "Sonica Music Company". Sonica folded in late 2006. He returned to working on software full-time and was employed briefly at Symantec before moving to Australia in early 2007. He is currently employed as a Computer Systems Officer at the University of Wollongong. +During a layoff round, Mike was let go from America Online in August 2001 and purchased a music store in Mountain View, California later to be known as "Sonica Music Company". Opening a retail store for non-essential goods at the beginning of a prolonged economic downturn was in retrospect probably not the wisest career move. Sonica eventually folded; in late 2006. Mike returned to working on software and systems support full-time and was employed briefly at Symantec before moving to Australia in early 2007. He currently lives on a farm "out in the middle of nowhere" and is employed as a Computer Systems Officer at the University of Wollongong. ##RedMatrix - The Early Years @@ -34,7 +34,7 @@ Mike had been working on this project for some time and there were a number of t ##RedMatrix -In July 2012, Mike left the Friendica project and began "full-time" (he was and is still employed doing other work) development of "zot" and a new base project called "red". Red is Spanish for "network". It wasn't really a "social network" and especially not a "federated social network". It was just Red (technically "la red"), or "the network". Work began by removing all the "federation" components and going back to basics - communication and remote authentication. It was a major re-write and took roughly six months before even basic communication was re-established. It was also no longer compatible with Friendica - which had been given to the "Friendica community" and by this time (December 2012) was developing separately on its own track. +In July 2012, Mike left the Friendica project and began development of "zot" and a new base project called "red" in his somewhat elusive *spare time*. Red is Spanish for "network". It wasn't really a "social network" and especially not a "federated social network". It was just Red (technically "la red"), or "the network". Work began by removing all the "federation" components and going back to basics - communication and remote authentication. It was a major re-write and took roughly six months before even basic communication was re-established. It was also no longer compatible with Friendica - which had been given to the "Friendica community" and by this time (December 2012) was developing separately on its own track. It became clear during this time that the single most compelling feature of the project wasn't the social network at all, but the authentication layer and decentralised access control mechanisms. Combined with zot's location independence it created a new model for software which had never existed previously - decentralised identity-aware web publishing and single sign-on to any compatible provider across the web. These weren't *evolutionary*, they were **revolutionary**. One of the biggest flaws of the modern web is the reliance on different passwords for every service you use, or reliance on a single provider if you were to tie them to - say your Facebook login. Facebook can remove your account at any time. Gone. If you rely on their authentication for all your websites, your entire online identity - now gone. This is also what was missing from Friendica - a compelling software feature which could stand on its own, without requiring a social network and especially without requiring a federated social network with all the mentioned external dependencies. -- cgit v1.2.3 From 306f5d9cbe34578dd31080db3d3be5a229cea96f Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 13 Nov 2014 01:04:26 -0800 Subject: let's try this without a timeout --- version.inc | 2 +- view/tpl/acl_selector.tpl | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/version.inc b/version.inc index 519095cc9..d86614502 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2014-11-12.857 +2014-11-13.858 diff --git a/view/tpl/acl_selector.tpl b/view/tpl/acl_selector.tpl index 4babf5669..e8b779622 100755 --- a/view/tpl/acl_selector.tpl +++ b/view/tpl/acl_selector.tpl @@ -31,14 +31,14 @@
    -- cgit v1.2.3 From 109cb936632c693d3f24afb9e2ce533797ad1a7f Mon Sep 17 00:00:00 2001 From: Jeroen Date: Thu, 13 Nov 2014 16:27:33 +0000 Subject: update nl --- view/nl/messages.po | 5634 ++++++++++++++++++++++++++------------------------- view/nl/strings.php | 941 ++++----- 2 files changed, 3353 insertions(+), 3222 deletions(-) diff --git a/view/nl/messages.po b/view/nl/messages.po index 550b18e50..49ac858c9 100644 --- a/view/nl/messages.po +++ b/view/nl/messages.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: Red Matrix\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-24 00:04-0700\n" -"PO-Revision-Date: 2014-10-27 13:39+0000\n" +"POT-Creation-Date: 2014-11-07 00:04-0800\n" +"PO-Revision-Date: 2014-11-13 16:16+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" @@ -25,149 +25,17 @@ msgid "Cannot locate DNS info for database server '%s'" msgstr "Kan DNS-informatie voor databaseserver '%s' niet vinden" #: ../../include/photo/photo_driver.php:680 ../../include/photos.php:51 -#: ../../mod/photos.php:91 ../../mod/photos.php:657 ../../mod/photos.php:679 +#: ../../mod/photos.php:91 ../../mod/photos.php:652 #: ../../mod/profile_photo.php:142 ../../mod/profile_photo.php:301 #: ../../mod/profile_photo.php:423 msgid "Profile Photos" msgstr "Profielfoto's" -#: ../../include/network.php:590 -msgid "view full size" -msgstr "volledige grootte tonen" - -#: ../../include/oembed.php:171 -msgid "Embedded content" -msgstr "Ingesloten inhoud" - -#: ../../include/oembed.php:180 -msgid "Embedding disabled" -msgstr "Insluiten uitgeschakeld" - -#: ../../include/items.php:377 ../../mod/profperm.php:23 -#: ../../mod/subthread.php:49 ../../mod/group.php:68 ../../mod/like.php:242 -#: ../../index.php:388 -msgid "Permission denied" -msgstr "Toegang geweigerd" - -#: ../../include/items.php:964 ../../include/items.php:1009 -msgid "(Unknown)" -msgstr "(Onbekend)" - -#: ../../include/items.php:1165 -msgid "Visible to anybody on the internet." -msgstr "Voor iedereen op het internet zichtbaar." - -#: ../../include/items.php:1167 -msgid "Visible to you only." -msgstr "Alleen voor jou zichtbaar." - -#: ../../include/items.php:1169 -msgid "Visible to anybody in this network." -msgstr "Voor iedereen in dit netwerk zichtbaar." - -#: ../../include/items.php:1171 -msgid "Visible to anybody authenticated." -msgstr "Voor iedereen die geauthenticeerd is zichtbaar." - -#: ../../include/items.php:1173 -#, php-format -msgid "Visible to anybody on %s." -msgstr "Voor iedereen op %s zichtbaar." - -#: ../../include/items.php:1175 -msgid "Visible to all connections." -msgstr "Voor alle connecties zichtbaar." - -#: ../../include/items.php:1177 -msgid "Visible to approved connections." -msgstr "Voor alle goedgekeurde connecties zichtbaar." - -#: ../../include/items.php:1179 -msgid "Visible to specific connections." -msgstr "Voor specifieke connecties zichtbaar." - -#: ../../include/items.php:3938 ../../mod/display.php:32 -#: ../../mod/filestorage.php:26 ../../mod/admin.php:168 -#: ../../mod/admin.php:898 ../../mod/admin.php:1101 ../../mod/thing.php:76 -#: ../../mod/viewsrc.php:20 -msgid "Item not found." -msgstr "Item niet gevonden." - -#: ../../include/items.php:4005 ../../include/attach.php:116 -#: ../../include/attach.php:163 ../../include/attach.php:226 -#: ../../include/attach.php:240 ../../include/attach.php:280 -#: ../../include/attach.php:294 ../../include/attach.php:318 -#: ../../include/attach.php:511 ../../include/attach.php:584 -#: ../../include/photos.php:15 ../../include/chat.php:116 -#: ../../mod/mood.php:112 ../../mod/photos.php:68 ../../mod/photos.php:526 -#: ../../mod/mitem.php:73 ../../mod/achievements.php:30 -#: ../../mod/settings.php:496 ../../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/blocks.php:29 ../../mod/blocks.php:44 ../../mod/bookmarks.php:46 -#: ../../mod/profiles.php:179 ../../mod/profiles.php:532 -#: ../../mod/events.php:195 ../../mod/channel.php:89 ../../mod/channel.php:193 -#: ../../mod/channel.php:236 ../../mod/chat.php:90 ../../mod/chat.php:95 -#: ../../mod/register.php:70 ../../mod/regmod.php:17 ../../mod/common.php:35 -#: ../../mod/network.php:12 ../../mod/connections.php:169 -#: ../../mod/connedit.php:254 ../../mod/delegate.php:6 ../../mod/page.php:28 -#: ../../mod/page.php:78 ../../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/profile_photo.php:263 -#: ../../mod/profile_photo.php:276 ../../mod/sources.php:66 -#: ../../mod/filestorage.php:18 ../../mod/filestorage.php:67 -#: ../../mod/filestorage.php:82 ../../mod/filestorage.php:109 -#: ../../mod/fsuggest.php:78 ../../mod/suggest.php:26 ../../mod/group.php:9 -#: ../../mod/thing.php:247 ../../mod/thing.php:264 ../../mod/thing.php:299 -#: ../../mod/invite.php:13 ../../mod/invite.php:104 ../../mod/item.php:182 -#: ../../mod/item.php:190 ../../mod/item.php:954 ../../mod/layouts.php:27 -#: ../../mod/layouts.php:39 ../../mod/like.php:154 -#: ../../mod/viewconnections.php:22 ../../mod/viewconnections.php:27 -#: ../../mod/viewsrc.php:14 ../../mod/mail.php:111 ../../mod/manage.php:6 -#: ../../mod/menu.php:44 ../../mod/webpages.php:40 ../../mod/message.php:16 -#: ../../mod/new_channel.php:68 ../../mod/new_channel.php:99 -#: ../../mod/notifications.php:66 ../../mod/appman.php:66 -#: ../../mod/service_limits.php:7 ../../index.php:190 ../../index.php:389 -msgid "Permission denied." -msgstr "Toegang geweigerd" - -#: ../../include/items.php:4376 ../../mod/group.php:38 ../../mod/group.php:140 -msgid "Collection not found." -msgstr "Collectie niet gevonden." - -#: ../../include/items.php:4391 -msgid "Collection is empty." -msgstr "Collectie is leeg" - -#: ../../include/items.php:4398 -#, php-format -msgid "Collection: %s" -msgstr "Collectie: %s" - -#: ../../include/items.php:4409 -#, php-format -msgid "Connection: %s" -msgstr "Connectie: %s" - -#: ../../include/items.php:4412 -msgid "Connection not found." -msgstr "Connectie niet gevonden." - -#: ../../include/notify.php:23 -msgid "created a new post" -msgstr "maakte een nieuw bericht aan" - -#: ../../include/notify.php:24 -#, php-format -msgid "commented on %s's post" -msgstr "gaf een reactie op een bericht van %s" - #: ../../include/apps.php:126 msgid "Site Admin" msgstr "Hubbeheerder" -#: ../../include/apps.php:127 ../../include/conversation.php:1570 +#: ../../include/apps.php:127 ../../include/conversation.php:1572 #: ../../include/nav.php:117 msgid "Bookmarks" msgstr "Bladwijzers" @@ -176,7 +44,7 @@ msgstr "Bladwijzers" msgid "Address Book" msgstr "Connecties" -#: ../../include/apps.php:129 ../../include/nav.php:125 ../../boot.php:1496 +#: ../../include/apps.php:129 ../../include/nav.php:125 ../../boot.php:1513 msgid "Login" msgstr "Inloggen" @@ -189,18 +57,18 @@ msgstr "Kanaalbeheer" msgid "Matrix" msgstr "Matrix" -#: ../../include/apps.php:132 ../../include/widgets.php:521 +#: ../../include/apps.php:132 ../../include/widgets.php:548 #: ../../include/nav.php:218 ../../mod/admin.php:953 ../../mod/admin.php:1158 msgid "Settings" msgstr "Instellingen" #: ../../include/apps.php:133 ../../include/conversation.php:1546 -#: ../../include/nav.php:106 ../../include/RedDAV/RedBrowser.php:241 +#: ../../include/RedDAV/RedBrowser.php:241 ../../include/nav.php:106 #: ../../mod/fbrowser.php:114 msgid "Files" msgstr "Bestanden" -#: ../../include/apps.php:134 ../../include/conversation.php:1581 +#: ../../include/apps.php:134 ../../include/conversation.php:1583 #: ../../include/nav.php:121 ../../mod/webpages.php:129 msgid "Webpages" msgstr "Webpagina's" @@ -209,8 +77,8 @@ msgstr "Webpagina's" msgid "Channel Home" msgstr "Tijdlijn kanaal" -#: ../../include/apps.php:136 ../../include/identity.php:1113 -#: ../../include/identity.php:1231 ../../mod/profperm.php:112 +#: ../../include/apps.php:136 ../../include/identity.php:1120 +#: ../../include/identity.php:1238 ../../mod/profperm.php:112 msgid "Profile" msgstr "Profiel" @@ -229,8 +97,8 @@ msgstr "Agenda" msgid "Directory" msgstr "Gids" -#: ../../include/apps.php:140 ../../include/nav.php:168 ../../mod/help.php:60 -#: ../../mod/help.php:65 +#: ../../include/apps.php:140 ../../include/nav.php:168 ../../mod/help.php:58 +#: ../../mod/help.php:63 msgid "Help" msgstr "Hulp" @@ -288,8 +156,8 @@ msgstr "Bericht" msgid "Profile Photo" msgstr "Profielfoto" -#: ../../include/apps.php:242 ../../mod/settings.php:79 -#: ../../mod/settings.php:545 +#: ../../include/apps.php:242 ../../mod/settings.php:81 +#: ../../mod/settings.php:575 msgid "Update" msgstr "Bijwerken" @@ -304,29 +172,70 @@ msgstr "Aanschaffen" #: ../../include/apps.php:249 ../../include/page_widgets.php:8 #: ../../include/page_widgets.php:36 ../../include/RedDAV/RedBrowser.php:250 #: ../../include/menu.php:42 ../../include/ItemObject.php:100 -#: ../../mod/settings.php:581 ../../mod/blocks.php:99 +#: ../../mod/settings.php:611 ../../mod/blocks.php:99 #: ../../mod/connections.php:381 ../../mod/connections.php:394 -#: ../../mod/connections.php:413 ../../mod/editblock.php:111 -#: ../../mod/editlayout.php:106 ../../mod/editpost.php:112 -#: ../../mod/editwebpage.php:143 ../../mod/thing.php:233 -#: ../../mod/layouts.php:121 ../../mod/menu.php:59 ../../mod/webpages.php:131 +#: ../../mod/connections.php:413 ../../mod/webpages.php:131 +#: ../../mod/editblock.php:111 ../../mod/editlayout.php:106 +#: ../../mod/editpost.php:112 ../../mod/editwebpage.php:143 +#: ../../mod/thing.php:233 ../../mod/layouts.php:121 ../../mod/menu.php:59 msgid "Edit" msgstr "Bewerken" #: ../../include/apps.php:250 ../../include/conversation.php:638 #: ../../include/RedDAV/RedBrowser.php:251 ../../include/ItemObject.php:120 -#: ../../mod/photos.php:1062 ../../mod/settings.php:582 -#: ../../mod/connedit.php:462 ../../mod/group.php:176 ../../mod/admin.php:732 +#: ../../mod/photos.php:1066 ../../mod/settings.php:612 +#: ../../mod/connedit.php:476 ../../mod/group.php:176 ../../mod/admin.php:732 #: ../../mod/admin.php:863 ../../mod/thing.php:234 msgid "Delete" msgstr "Verwijderen" #: ../../include/apps.php:331 ../../include/apps.php:382 #: ../../include/conversation.php:1003 ../../include/RedDAV/RedBrowser.php:163 -#: ../../mod/photos.php:1124 ../../mod/connedit.php:498 +#: ../../mod/photos.php:711 ../../mod/photos.php:1128 +#: ../../mod/connedit.php:512 msgid "Unknown" msgstr "Onbekend" +#: ../../include/attach.php:116 ../../include/attach.php:163 +#: ../../include/attach.php:226 ../../include/attach.php:240 +#: ../../include/attach.php:280 ../../include/attach.php:294 +#: ../../include/attach.php:318 ../../include/attach.php:511 +#: ../../include/attach.php:584 ../../include/chat.php:116 +#: ../../include/items.php:4005 ../../include/photos.php:15 +#: ../../mod/mood.php:112 ../../mod/photos.php:68 ../../mod/mitem.php:73 +#: ../../mod/achievements.php:30 ../../mod/settings.php:526 +#: ../../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/blocks.php:29 +#: ../../mod/blocks.php:44 ../../mod/profiles.php:179 +#: ../../mod/profiles.php:532 ../../mod/events.php:195 +#: ../../mod/channel.php:89 ../../mod/channel.php:193 +#: ../../mod/channel.php:236 ../../mod/chat.php:90 ../../mod/chat.php:95 +#: ../../mod/register.php:70 ../../mod/regmod.php:17 ../../mod/common.php:35 +#: ../../mod/network.php:12 ../../mod/connections.php:169 +#: ../../mod/connedit.php:266 ../../mod/delegate.php:6 +#: ../../mod/webpages.php:40 ../../mod/bookmarks.php:46 +#: ../../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/profile_photo.php:263 ../../mod/profile_photo.php:276 +#: ../../mod/sources.php:66 ../../mod/filestorage.php:18 +#: ../../mod/filestorage.php:67 ../../mod/filestorage.php:82 +#: ../../mod/filestorage.php:109 ../../mod/fsuggest.php:78 +#: ../../mod/suggest.php:26 ../../mod/group.php:9 ../../mod/like.php:154 +#: ../../mod/thing.php:247 ../../mod/thing.php:264 ../../mod/thing.php:299 +#: ../../mod/invite.php:13 ../../mod/invite.php:104 ../../mod/item.php:184 +#: ../../mod/item.php:192 ../../mod/item.php:964 ../../mod/layouts.php:27 +#: ../../mod/layouts.php:39 ../../mod/locs.php:71 +#: ../../mod/viewconnections.php:22 ../../mod/viewconnections.php:27 +#: ../../mod/viewsrc.php:14 ../../mod/mail.php:111 ../../mod/manage.php:6 +#: ../../mod/menu.php:44 ../../mod/message.php:16 ../../mod/new_channel.php:68 +#: ../../mod/new_channel.php:99 ../../mod/notifications.php:66 +#: ../../mod/page.php:28 ../../mod/page.php:78 ../../mod/appman.php:66 +#: ../../mod/service_limits.php:7 ../../index.php:190 ../../index.php:390 +msgid "Permission denied." +msgstr "Toegang geweigerd" + #: ../../include/attach.php:221 ../../include/attach.php:275 msgid "Item was not found." msgstr "Item niet gevonden" @@ -385,2675 +294,2855 @@ msgstr "directory aanmaken (mkdir) mislukt." msgid "database storage failed." msgstr "opslag in database mislukt." -#: ../../include/page_widgets.php:6 -msgid "New Page" -msgstr "Nieuwe pagina" - -#: ../../include/page_widgets.php:39 ../../mod/blocks.php:102 -#: ../../mod/layouts.php:125 ../../mod/webpages.php:134 -msgid "View" -msgstr "Weergeven" +#: ../../include/conversation.php:120 ../../include/text.php:1743 +#: ../../include/diaspora.php:1923 ../../mod/subthread.php:72 +#: ../../mod/subthread.php:174 ../../mod/tagger.php:45 ../../mod/like.php:298 +msgid "photo" +msgstr "foto" -#: ../../include/page_widgets.php:40 ../../include/conversation.php:1114 -#: ../../include/ItemObject.php:608 ../../mod/photos.php:1013 -#: ../../mod/editblock.php:141 ../../mod/editlayout.php:135 -#: ../../mod/editpost.php:140 ../../mod/editwebpage.php:174 -#: ../../mod/webpages.php:135 -msgid "Preview" -msgstr "Voorvertoning" +#: ../../include/conversation.php:123 ../../include/text.php:1746 +#: ../../mod/tagger.php:49 +msgid "event" +msgstr "gebeurtenis" -#: ../../include/page_widgets.php:41 ../../mod/webpages.php:136 -msgid "Actions" -msgstr "Acties" +#: ../../include/conversation.php:126 ../../mod/like.php:89 +msgid "channel" +msgstr "kanaal" -#: ../../include/page_widgets.php:42 ../../mod/webpages.php:137 -msgid "Page Link" -msgstr "Paginalink" +#: ../../include/conversation.php:148 ../../include/text.php:1749 +#: ../../include/diaspora.php:1923 ../../mod/subthread.php:72 +#: ../../mod/subthread.php:174 ../../mod/tagger.php:53 ../../mod/like.php:298 +msgid "status" +msgstr "bericht" -#: ../../include/page_widgets.php:43 ../../mod/webpages.php:138 -msgid "Title" -msgstr "Titel" +#: ../../include/conversation.php:150 ../../include/text.php:1751 +#: ../../mod/tagger.php:55 +msgid "comment" +msgstr "reactie" -#: ../../include/page_widgets.php:44 ../../mod/webpages.php:139 -msgid "Created" -msgstr "Aangemaakt" +#: ../../include/conversation.php:164 ../../include/diaspora.php:1952 +#: ../../mod/like.php:344 +#, php-format +msgid "%1$s likes %2$s's %3$s" +msgstr "%1$s vindt %3$s van %2$s leuk" -#: ../../include/page_widgets.php:45 ../../mod/webpages.php:140 -msgid "Edited" -msgstr "Bewerkt" +#: ../../include/conversation.php:167 ../../mod/like.php:346 +#, 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/security.php:320 -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:204 +#, php-format +msgid "%1$s is now connected with %2$s" +msgstr "%1$s is nu met %2$s verbonden" -#: ../../include/widgets.php:29 ../../include/contact_widgets.php:93 -msgid "Categories" -msgstr "Categorieën" +#: ../../include/conversation.php:239 +#, php-format +msgid "%1$s poked %2$s" +msgstr "%1$s heeft %2$s aangestoten" -#: ../../include/widgets.php:86 ../../include/nav.php:171 -#: ../../mod/apps.php:33 -msgid "Apps" -msgstr "Apps" +#: ../../include/conversation.php:243 ../../include/text.php:901 +msgid "poked" +msgstr "aangestoten" -#: ../../include/widgets.php:87 -msgid "System" -msgstr "Systeem" +#: ../../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/widgets.php:89 ../../include/conversation.php:1449 -msgid "Personal" -msgstr "Persoonlijk" +#: ../../include/conversation.php:637 ../../include/ItemObject.php:126 +msgid "Select" +msgstr "Kies" -#: ../../include/widgets.php:90 -msgid "Create Personal App" -msgstr "Persoonlijke app maken" +#: ../../include/conversation.php:645 ../../include/ItemObject.php:89 +msgid "Private Message" +msgstr "Privébericht" -#: ../../include/widgets.php:91 -msgid "Edit Personal App" -msgstr "Persoonlijke app bewerken" +#: ../../include/conversation.php:652 ../../include/ItemObject.php:194 +msgid "Message signature validated" +msgstr "Berichtkenmerk gevalideerd" -#: ../../include/widgets.php:135 ../../include/widgets.php:175 -#: ../../include/identity.php:833 ../../include/conversation.php:948 -#: ../../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:653 ../../include/ItemObject.php:195 +msgid "Message signature incorrect" +msgstr "Berichtkenmerk onjuist" -#: ../../include/widgets.php:137 ../../mod/suggest.php:53 -msgid "Ignore/Hide" -msgstr "Negeren/Verbergen" +#: ../../include/conversation.php:674 +#, php-format +msgid "View %s's profile @ %s" +msgstr "Bekijk het profiel van %s @ %s" -#: ../../include/widgets.php:143 ../../mod/connections.php:267 -msgid "Suggestions" -msgstr "Voorgestelde kanalen" +#: ../../include/conversation.php:689 +msgid "Categories:" +msgstr "Categorieën:" -#: ../../include/widgets.php:144 -msgid "See more..." -msgstr "Meer..." +#: ../../include/conversation.php:690 +msgid "Filed under:" +msgstr "Bewaard onder:" -#: ../../include/widgets.php:166 +#: ../../include/conversation.php:698 ../../include/ItemObject.php:265 #, php-format -msgid "You have %1$.0f of %2$.0f allowed connections." -msgstr "Je hebt %1$.0f van de %2$.0f toegestane connecties." +msgid " from %s" +msgstr " van %s" -#: ../../include/widgets.php:172 -msgid "Add New Connection" -msgstr "Nieuwe connectie toevoegen" +#: ../../include/conversation.php:701 ../../include/ItemObject.php:268 +#, php-format +msgid "last edited: %s" +msgstr "laatst bewerkt: %s" -#: ../../include/widgets.php:173 -msgid "Enter the channel address" -msgstr "Vul het adres van het nieuwe kanaal in" +#: ../../include/conversation.php:702 ../../include/ItemObject.php:269 +#, php-format +msgid "Expires: %s" +msgstr "Verloopt: %s" -#: ../../include/widgets.php:174 -msgid "Example: bob@example.com, http://example.com/barbara" -msgstr "Voorbeeld: bob@example.com, http://example.com/barbara" +#: ../../include/conversation.php:717 +msgid "View in context" +msgstr "In context bekijken" -#: ../../include/widgets.php:191 -msgid "Notes" -msgstr "Aantekeningen" - -#: ../../include/widgets.php:193 ../../include/text.php:823 -#: ../../include/text.php:835 ../../mod/rbmark.php:28 ../../mod/rbmark.php:98 -#: ../../mod/filer.php:50 ../../mod/admin.php:1341 ../../mod/admin.php:1362 -msgid "Save" -msgstr "Opslaan" +#: ../../include/conversation.php:719 ../../include/conversation.php:1153 +#: ../../include/ItemObject.php:310 ../../mod/photos.php:974 +#: ../../mod/editblock.php:120 ../../mod/editlayout.php:115 +#: ../../mod/editpost.php:121 ../../mod/editwebpage.php:152 +#: ../../mod/mail.php:234 ../../mod/mail.php:349 +msgid "Please wait" +msgstr "Even wachten" -#: ../../include/widgets.php:263 -msgid "Remove term" -msgstr "Verwijder zoekterm" +#: ../../include/conversation.php:843 +msgid "remove" +msgstr "verwijderen" -#: ../../include/widgets.php:272 ../../include/features.php:58 -msgid "Saved Searches" -msgstr "Opgeslagen zoekopdrachten" +#: ../../include/conversation.php:847 ../../include/nav.php:257 +msgid "Loading..." +msgstr "Aan het laden..." -#: ../../include/widgets.php:273 ../../include/group.php:302 -msgid "add" -msgstr "toevoegen" +#: ../../include/conversation.php:848 +msgid "Delete Selected Items" +msgstr "Verwijder de geselecteerde items" -#: ../../include/widgets.php:303 ../../include/contact_widgets.php:58 -#: ../../include/features.php:72 -msgid "Saved Folders" -msgstr "Bewaarde mappen" +#: ../../include/conversation.php:942 +msgid "View Source" +msgstr "Bron weergeven" -#: ../../include/widgets.php:306 ../../include/contact_widgets.php:61 -#: ../../include/contact_widgets.php:96 -msgid "Everything" -msgstr "Alles" +#: ../../include/conversation.php:943 +msgid "Follow Thread" +msgstr "Conversatie volgen" -#: ../../include/widgets.php:342 -msgid "Archives" -msgstr "Archieven" +#: ../../include/conversation.php:944 +msgid "View Status" +msgstr "Status weergeven" -#: ../../include/widgets.php:404 -msgid "Refresh" -msgstr "Vernieuwen" +#: ../../include/conversation.php:945 ../../include/nav.php:99 +#: ../../mod/connedit.php:429 ../../mod/connedit.php:544 +msgid "View Profile" +msgstr "Profiel weergeven" -#: ../../include/widgets.php:405 ../../mod/connedit.php:492 -msgid "Me" -msgstr "Ik" +#: ../../include/conversation.php:946 +msgid "View Photos" +msgstr "Foto's weergeven" -#: ../../include/widgets.php:406 ../../mod/connedit.php:494 -msgid "Best Friends" -msgstr "Goede vrienden" +#: ../../include/conversation.php:947 +msgid "Matrix Activity" +msgstr "Activiteit in de RedMatrix" -#: ../../include/widgets.php:407 ../../include/identity.php:381 -#: ../../include/identity.php:382 ../../include/identity.php:389 -#: ../../include/profile_selectors.php:80 ../../mod/connedit.php:495 -msgid "Friends" -msgstr "Vrienden" +#: ../../include/conversation.php:948 ../../include/identity.php:840 +#: ../../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/widgets.php:408 -msgid "Co-workers" -msgstr "Collega's" +#: ../../include/conversation.php:949 +msgid "Edit Contact" +msgstr "Contact bewerken" -#: ../../include/widgets.php:409 ../../mod/connedit.php:496 -msgid "Former Friends" -msgstr "Oude vrienden" +#: ../../include/conversation.php:950 +msgid "Send PM" +msgstr "Privébericht verzenden" -#: ../../include/widgets.php:410 ../../mod/connedit.php:497 -msgid "Acquaintances" -msgstr "Kennissen" +#: ../../include/conversation.php:1024 +#, php-format +msgid "%s likes this." +msgstr "%s vindt dit leuk." -#: ../../include/widgets.php:411 -msgid "Everybody" -msgstr "Iedereen" +#: ../../include/conversation.php:1024 +#, php-format +msgid "%s doesn't like this." +msgstr "%s vindt dit niet leuk." -#: ../../include/widgets.php:443 -msgid "Account settings" -msgstr "Account" +#: ../../include/conversation.php:1028 +#, 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/widgets.php:449 -msgid "Channel settings" -msgstr "Kanaal" +#: ../../include/conversation.php:1030 +#, 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/widgets.php:455 -msgid "Additional features" -msgstr "Extra functies" +#: ../../include/conversation.php:1036 +msgid "and" +msgstr "en" -#: ../../include/widgets.php:461 -msgid "Feature settings" -msgstr "Plug-ins" +#: ../../include/conversation.php:1039 +#, 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/widgets.php:467 -msgid "Display settings" -msgstr "Weergave" +#: ../../include/conversation.php:1040 +#, php-format +msgid "%s like this." +msgstr "%s vinden dit leuk." -#: ../../include/widgets.php:473 -msgid "Connected apps" -msgstr "Verbonden applicaties" +#: ../../include/conversation.php:1040 +#, php-format +msgid "%s don't like this." +msgstr "%s vinden dit niet leuk." -#: ../../include/widgets.php:479 -msgid "Export channel" -msgstr "Kanaal exporteren" +#: ../../include/conversation.php:1097 +msgid "Visible to everybody" +msgstr "Voor iedereen zichtbaar" -#: ../../include/widgets.php:485 -msgid "Export content" -msgstr "Inhoud exporteren" +#: ../../include/conversation.php:1098 ../../mod/mail.php:170 +#: ../../mod/mail.php:282 +msgid "Please enter a link URL:" +msgstr "Vul een internetadres/URL in:" -#: ../../include/widgets.php:491 -msgid "Automatic Permissions (Advanced)" -msgstr "Automatische permissies (geavanceerd)" +#: ../../include/conversation.php:1099 +msgid "Please enter a video link/URL:" +msgstr "Vul een videolink/URL in:" -#: ../../include/widgets.php:501 -msgid "Premium Channel Settings" -msgstr "Instellingen premiumkanaal" +#: ../../include/conversation.php:1100 +msgid "Please enter an audio link/URL:" +msgstr "Vul een audiolink/URL in:" -#: ../../include/widgets.php:510 ../../include/features.php:49 -#: ../../mod/sources.php:88 -msgid "Channel Sources" -msgstr "Kanaalbronnen" +#: ../../include/conversation.php:1101 +msgid "Tag term:" +msgstr "Label:" -#: ../../include/widgets.php:535 ../../mod/mail.php:124 -#: ../../mod/message.php:31 -msgid "Messages" -msgstr "Berichten" +#: ../../include/conversation.php:1102 ../../mod/filer.php:49 +msgid "Save to Folder:" +msgstr "Bewaar in map: " -#: ../../include/widgets.php:540 -msgid "Check Mail" -msgstr "Controleer op nieuwe berichten" +#: ../../include/conversation.php:1103 +msgid "Where are you right now?" +msgstr "Waar bevind je je op dit moment?" -#: ../../include/widgets.php:545 ../../include/nav.php:209 -msgid "New Message" -msgstr "Nieuw bericht" +#: ../../include/conversation.php:1104 ../../mod/editpost.php:52 +#: ../../mod/mail.php:171 ../../mod/mail.php:283 +msgid "Expires YYYY-MM-DD HH:MM" +msgstr "Verloopt op DD-MM-YYYY om HH:MM" -#: ../../include/widgets.php:621 -msgid "Chat Rooms" -msgstr "Chatkanalen" +#: ../../include/conversation.php:1114 ../../include/page_widgets.php:40 +#: ../../include/ItemObject.php:608 ../../mod/photos.php:994 +#: ../../mod/webpages.php:135 ../../mod/editblock.php:141 +#: ../../mod/editlayout.php:135 ../../mod/editpost.php:140 +#: ../../mod/editwebpage.php:174 +msgid "Preview" +msgstr "Voorvertoning" -#: ../../include/widgets.php:639 -msgid "Bookmarked Chatrooms" -msgstr "Bladwijzers van chatkanalen" +#: ../../include/conversation.php:1128 ../../mod/photos.php:973 +#: ../../mod/editblock.php:168 ../../mod/editlayout.php:161 +#: ../../mod/editwebpage.php:201 ../../mod/layouts.php:122 +msgid "Share" +msgstr "Delen" -#: ../../include/widgets.php:657 -msgid "Suggested Chatrooms" -msgstr "Voorgestelde chatkanalen" +#: ../../include/conversation.php:1130 ../../mod/editwebpage.php:139 +msgid "Page link title" +msgstr "Titel van paginalink" -#: ../../include/zot.php:655 -msgid "Invalid data packet" -msgstr "Datapakket ongeldig" +#: ../../include/conversation.php:1133 +msgid "Post as" +msgstr "Bericht plaatsen als" -#: ../../include/zot.php:671 -msgid "Unable to verify channel signature" -msgstr "Kanaalkenmerk kon niet worden geverifieerd. " +#: ../../include/conversation.php:1134 ../../mod/editblock.php:112 +#: ../../mod/editlayout.php:107 ../../mod/editpost.php:113 +#: ../../mod/editwebpage.php:144 ../../mod/mail.php:231 ../../mod/mail.php:345 +msgid "Upload photo" +msgstr "Foto uploaden" -#: ../../include/zot.php:1763 -#, php-format -msgid "Unable to verify site signature for %s" -msgstr "Hubkenmerk voor %s kon niet worden geverifieerd" +#: ../../include/conversation.php:1135 +msgid "upload photo" +msgstr "foto uploaden" -#: ../../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/conversation.php:1136 ../../mod/editblock.php:113 +#: ../../mod/editlayout.php:108 ../../mod/editpost.php:114 +#: ../../mod/editwebpage.php:145 ../../mod/mail.php:232 ../../mod/mail.php:346 +msgid "Attach file" +msgstr "Bestand toevoegen" -#: ../../include/photos.php:111 -msgid "Image file is empty." -msgstr "Afbeeldingsbestand is leeg" +#: ../../include/conversation.php:1137 +msgid "attach file" +msgstr "bestand toevoegen" -#: ../../include/photos.php:140 ../../mod/profile_photo.php:216 -msgid "Unable to process image" -msgstr "Afbeelding kan niet verwerkt worden" +#: ../../include/conversation.php:1138 ../../mod/editblock.php:114 +#: ../../mod/editlayout.php:109 ../../mod/editpost.php:115 +#: ../../mod/editwebpage.php:146 ../../mod/mail.php:233 ../../mod/mail.php:347 +msgid "Insert web link" +msgstr "Weblink invoegen" -#: ../../include/photos.php:212 -msgid "Photo storage failed." -msgstr "Foto kan niet worden opgeslagen" +#: ../../include/conversation.php:1139 +msgid "web link" +msgstr "Weblink" -#: ../../include/photos.php:340 ../../include/conversation.php:1540 -msgid "Photo Albums" -msgstr "Fotoalbums" +#: ../../include/conversation.php:1140 +msgid "Insert video link" +msgstr "Videolink invoegen" -#: ../../include/photos.php:344 -msgid "Upload New Photos" -msgstr "Nieuwe foto's uploaden" +#: ../../include/conversation.php:1141 +msgid "video link" +msgstr "videolink" -#: ../../include/acl_selectors.php:240 -msgid "Visible to your default audience" -msgstr "Voor iedereen zichtbaar, mits niet anders ingesteld" +#: ../../include/conversation.php:1142 +msgid "Insert audio link" +msgstr "Audiolink invoegen" -#: ../../include/acl_selectors.php:241 -msgid "Show" -msgstr "Tonen" +#: ../../include/conversation.php:1143 +msgid "audio link" +msgstr "audiolink" -#: ../../include/acl_selectors.php:242 -msgid "Don't show" -msgstr "Niet tonen" - -#: ../../include/acl_selectors.php:248 ../../mod/photos.php:604 -#: ../../mod/photos.php:968 ../../mod/events.php:585 ../../mod/chat.php:209 -#: ../../mod/filestorage.php:137 -msgid "Permissions" -msgstr "Permissies" +#: ../../include/conversation.php:1144 ../../mod/editblock.php:118 +#: ../../mod/editlayout.php:113 ../../mod/editpost.php:119 +#: ../../mod/editwebpage.php:150 +msgid "Set your location" +msgstr "Locatie instellen" -#: ../../include/acl_selectors.php:249 ../../include/ItemObject.php:305 -msgid "Close" -msgstr "Sluiten" +#: ../../include/conversation.php:1145 +msgid "set location" +msgstr "locatie instellen" -#: ../../include/activities.php:39 -msgid " and " -msgstr " en " +#: ../../include/conversation.php:1146 ../../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/activities.php:47 -msgid "public profile" -msgstr "openbaar profiel" +#: ../../include/conversation.php:1147 +msgid "clear location" +msgstr "locatie wissen" -#: ../../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/conversation.php:1149 ../../mod/editblock.php:132 +#: ../../mod/editlayout.php:126 ../../mod/editpost.php:132 +#: ../../mod/editwebpage.php:167 +msgid "Set title" +msgstr "Titel instellen" -#: ../../include/activities.php:53 -#, php-format -msgid "Visit %1$s's %2$s" -msgstr "Bezoek het %2$s van %1$s" +#: ../../include/conversation.php:1152 ../../mod/events.php:563 +#: ../../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/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/conversation.php:1154 ../../mod/editblock.php:121 +#: ../../mod/editlayout.php:116 ../../mod/editpost.php:122 +#: ../../mod/editwebpage.php:153 +msgid "Permission settings" +msgstr "Permissies" -#: ../../include/api.php:1084 -msgid "Public Timeline" -msgstr "Openbare tijdlijn" +#: ../../include/conversation.php:1155 +msgid "permissions" +msgstr "permissies" -#: ../../include/identity.php:31 ../../mod/item.php:1344 -msgid "Unable to obtain identity information from database" -msgstr "Niet in staat om identiteitsinformatie uit de database te verkrijgen" +#: ../../include/conversation.php:1162 ../../mod/editblock.php:129 +#: ../../mod/editlayout.php:123 ../../mod/editpost.php:129 +#: ../../mod/editwebpage.php:162 +msgid "Public post" +msgstr "Openbaar bericht" -#: ../../include/identity.php:66 -msgid "Empty name" -msgstr "Ontbrekende naam" +#: ../../include/conversation.php:1164 ../../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/identity.php:68 -msgid "Name too long" -msgstr "Naam te lang" +#: ../../include/conversation.php:1177 ../../mod/editblock.php:146 +#: ../../mod/editlayout.php:140 ../../mod/editpost.php:146 +#: ../../mod/editwebpage.php:179 ../../mod/mail.php:238 ../../mod/mail.php:352 +msgid "Set expiration date" +msgstr "Verloopdatum instellen" -#: ../../include/identity.php:169 -msgid "No account identifier" -msgstr "Geen account-identificator" +#: ../../include/conversation.php:1179 ../../include/ItemObject.php:611 +#: ../../mod/editpost.php:148 ../../mod/mail.php:240 ../../mod/mail.php:354 +msgid "Encrypt text" +msgstr "Tekst versleutelen" -#: ../../include/identity.php:181 -msgid "Nickname is required." -msgstr "Bijnaam is verplicht" +#: ../../include/conversation.php:1181 ../../mod/events.php:569 +#: ../../mod/editpost.php:150 +msgid "OK" +msgstr "OK" -#: ../../include/identity.php:195 -msgid "Reserved nickname. Please choose another." -msgstr "Deze naam is gereserveerd. Kies een andere." +#: ../../include/conversation.php:1182 ../../mod/settings.php:550 +#: ../../mod/settings.php:576 ../../mod/events.php:568 +#: ../../mod/editpost.php:151 ../../mod/fbrowser.php:82 +#: ../../mod/fbrowser.php:117 ../../mod/tagrm.php:11 ../../mod/tagrm.php:134 +msgid "Cancel" +msgstr "Annuleren" -#: ../../include/identity.php:200 ../../include/dimport.php:34 -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/conversation.php:1426 +msgid "Discover" +msgstr "Ontdekken" -#: ../../include/identity.php:282 -msgid "Unable to retrieve created identity" -msgstr "Niet in staat om aangemaakte identiteit te vinden" +#: ../../include/conversation.php:1429 +msgid "Imported public streams" +msgstr "Openbare streams importeren" -#: ../../include/identity.php:342 -msgid "Default Profile" -msgstr "Standaardprofiel" +#: ../../include/conversation.php:1434 +msgid "Commented Order" +msgstr "Nieuwe reacties bovenaan" -#: ../../include/identity.php:636 -msgid "Requested channel is not available." -msgstr "Opgevraagd kanaal is niet beschikbaar." +#: ../../include/conversation.php:1437 +msgid "Sort by Comment Date" +msgstr "Berichten met nieuwe reacties bovenaan" -#: ../../include/identity.php:684 ../../mod/achievements.php:11 -#: ../../mod/profile.php:16 ../../mod/blocks.php:10 ../../mod/connect.php:13 -#: ../../mod/filestorage.php:48 ../../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/conversation.php:1441 +msgid "Posted Order" +msgstr "Nieuwe berichten bovenaan" -#: ../../include/identity.php:847 ../../mod/profiles.php:722 -msgid "Change profile photo" -msgstr "Profielfoto veranderen" +#: ../../include/conversation.php:1444 +msgid "Sort by Post Date" +msgstr "Nieuwe berichten bovenaan" -#: ../../include/identity.php:853 -msgid "Profiles" -msgstr "Profielen" +#: ../../include/conversation.php:1449 ../../include/widgets.php:89 +msgid "Personal" +msgstr "Persoonlijk" -#: ../../include/identity.php:853 -msgid "Manage/edit profiles" -msgstr "Profielen beheren/bewerken" +#: ../../include/conversation.php:1452 +msgid "Posts that mention or involve you" +msgstr "Alleen berichten die jou vermelden of waar je op een andere manier bij betrokken bent" -#: ../../include/identity.php:854 ../../mod/profiles.php:723 -msgid "Create New Profile" -msgstr "Nieuw profiel aanmaken" +#: ../../include/conversation.php:1458 ../../mod/connections.php:211 +#: ../../mod/connections.php:224 ../../mod/menu.php:61 +msgid "New" +msgstr "Nieuw" -#: ../../include/identity.php:857 ../../include/nav.php:103 -msgid "Edit Profile" -msgstr "Profiel bewerken" +#: ../../include/conversation.php:1461 +msgid "Activity Stream - by date" +msgstr "Activiteitenstroom - volgens datum" -#: ../../include/identity.php:868 ../../mod/profiles.php:734 -msgid "Profile Image" -msgstr "Profielfoto" +#: ../../include/conversation.php:1467 +msgid "Starred" +msgstr "Met ster" -#: ../../include/identity.php:871 -msgid "visible to everybody" -msgstr "Voor iedereen zichtbaar" +#: ../../include/conversation.php:1470 +msgid "Favourite Posts" +msgstr "Favoriete berichten" -#: ../../include/identity.php:872 ../../mod/profiles.php:617 -#: ../../mod/profiles.php:738 -msgid "Edit visibility" -msgstr "Zichtbaarheid bewerken" +#: ../../include/conversation.php:1477 +msgid "Spam" +msgstr "Spam" -#: ../../include/identity.php:884 ../../include/event.php:40 -#: ../../include/bb2diaspora.php:480 ../../mod/events.php:579 -#: ../../mod/directory.php:156 ../../mod/dirprofile.php:105 -msgid "Location:" -msgstr "Plaats:" +#: ../../include/conversation.php:1480 +msgid "Posts flagged as SPAM" +msgstr "Berichten gemarkeerd als SPAM" -#: ../../include/identity.php:886 ../../include/identity.php:1123 -#: ../../mod/directory.php:158 -msgid "Gender:" -msgstr "Geslacht:" +#: ../../include/conversation.php:1516 ../../mod/admin.php:867 +msgid "Channel" +msgstr "Kanaal" -#: ../../include/identity.php:887 ../../include/identity.php:1167 -#: ../../mod/directory.php:160 -msgid "Status:" -msgstr "Status:" +#: ../../include/conversation.php:1519 +msgid "Status Messages and Posts" +msgstr "Berichten in dit kanaal" -#: ../../include/identity.php:888 ../../include/identity.php:1178 -#: ../../mod/directory.php:162 -msgid "Homepage:" -msgstr "Homepagina:" +#: ../../include/conversation.php:1528 +msgid "About" +msgstr "Over" -#: ../../include/identity.php:889 ../../mod/dirprofile.php:151 -msgid "Online Now" -msgstr "Nu online" +#: ../../include/conversation.php:1531 +msgid "Profile Details" +msgstr "Profiel" -#: ../../include/identity.php:967 ../../include/identity.php:1047 -#: ../../mod/ping.php:298 -msgid "g A l F d" -msgstr "G:i, l d F" +#: ../../include/conversation.php:1540 ../../include/photos.php:340 +msgid "Photo Albums" +msgstr "Fotoalbums" -#: ../../include/identity.php:968 ../../include/identity.php:1048 -msgid "F d" -msgstr "d F" +#: ../../include/conversation.php:1549 +msgid "Files and Storage" +msgstr "Bestanden en opslagruimte" -#: ../../include/identity.php:1013 ../../include/identity.php:1088 -#: ../../mod/ping.php:320 -msgid "[today]" -msgstr "[vandaag]" +#: ../../include/conversation.php:1559 ../../include/conversation.php:1562 +msgid "Chatrooms" +msgstr "Chatkanalen" -#: ../../include/identity.php:1025 -msgid "Birthday Reminders" -msgstr "Verjaardagsherinneringen" +#: ../../include/conversation.php:1575 +msgid "Saved Bookmarks" +msgstr "Opgeslagen bladwijzers" -#: ../../include/identity.php:1026 -msgid "Birthdays this week:" -msgstr "Verjaardagen deze week:" +#: ../../include/conversation.php:1586 +msgid "Manage Webpages" +msgstr "Webpagina's beheren" -#: ../../include/identity.php:1081 -msgid "[No description]" -msgstr "[Geen omschrijving]" +#: ../../include/notify.php:23 +msgid "created a new post" +msgstr "maakte een nieuw bericht aan" -#: ../../include/identity.php:1099 -msgid "Event Reminders" -msgstr "Herinneringen" +#: ../../include/notify.php:24 +#, php-format +msgid "commented on %s's post" +msgstr "gaf een reactie op een bericht van %s" -#: ../../include/identity.php:1100 -msgid "Events this week:" -msgstr "Gebeurtenissen deze week:" +#: ../../include/page_widgets.php:6 +msgid "New Page" +msgstr "Nieuwe pagina" -#: ../../include/identity.php:1121 ../../mod/settings.php:953 -msgid "Full Name:" -msgstr "Volledige naam:" +#: ../../include/page_widgets.php:39 ../../mod/blocks.php:102 +#: ../../mod/webpages.php:134 ../../mod/layouts.php:125 +msgid "View" +msgstr "Weergeven" -#: ../../include/identity.php:1128 -msgid "Like this channel" -msgstr "Vind dit kanaal leuk" +#: ../../include/page_widgets.php:41 ../../mod/webpages.php:136 +msgid "Actions" +msgstr "Acties" -#: ../../include/identity.php:1139 ../../include/taxonomy.php:338 -#: ../../include/ItemObject.php:146 -msgctxt "noun" -msgid "Like" -msgid_plural "Likes" -msgstr[0] "vindt dit leuk" -msgstr[1] "vinden dit leuk" +#: ../../include/page_widgets.php:42 ../../mod/webpages.php:137 +msgid "Page Link" +msgstr "Paginalink" -#: ../../include/identity.php:1152 -msgid "j F, Y" -msgstr "F j Y" +#: ../../include/page_widgets.php:43 ../../mod/webpages.php:138 +msgid "Title" +msgstr "Titel" -#: ../../include/identity.php:1153 -msgid "j F" -msgstr "F j" +#: ../../include/page_widgets.php:44 ../../mod/webpages.php:139 +msgid "Created" +msgstr "Aangemaakt" -#: ../../include/identity.php:1160 -msgid "Birthday:" -msgstr "Geboortedatum:" +#: ../../include/page_widgets.php:45 ../../mod/webpages.php:140 +msgid "Edited" +msgstr "Bewerkt" -#: ../../include/identity.php:1164 -msgid "Age:" -msgstr "Leeftijd:" +#: ../../include/security.php:320 +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:1173 -#, php-format -msgid "for %1$d %2$s" -msgstr "voor %1$d %2$s" +#: ../../include/event.php:11 ../../include/bb2diaspora.php:463 +msgid "l F d, Y \\@ g:i A" +msgstr "l d F Y \\@ G:i" -#: ../../include/identity.php:1176 ../../mod/profiles.php:639 -msgid "Sexual Preference:" -msgstr "Seksuele voorkeur:" +#: ../../include/event.php:20 ../../include/bb2diaspora.php:469 +msgid "Starts:" +msgstr "Start:" -#: ../../include/identity.php:1180 ../../mod/profiles.php:641 -msgid "Hometown:" -msgstr "Oorspronkelijk uit:" +#: ../../include/event.php:30 ../../include/bb2diaspora.php:477 +msgid "Finishes:" +msgstr "Einde:" -#: ../../include/identity.php:1182 -msgid "Tags:" -msgstr "Trefwoorden:" +#: ../../include/event.php:40 ../../include/bb2diaspora.php:485 +#: ../../include/identity.php:891 ../../mod/events.php:579 +#: ../../mod/directory.php:156 ../../mod/dirprofile.php:105 +msgid "Location:" +msgstr "Plaats:" -#: ../../include/identity.php:1184 ../../mod/profiles.php:642 -msgid "Political Views:" -msgstr "Politieke overtuigingen:" +#: ../../include/event.php:326 +msgid "This event has been added to your calendar." +msgstr "Dit evenement is aan jouw agenda toegevoegd." -#: ../../include/identity.php:1186 -msgid "Religion:" -msgstr "Religie:" +#: ../../include/oembed.php:171 +msgid "Embedded content" +msgstr "Ingesloten inhoud" -#: ../../include/identity.php:1188 ../../mod/directory.php:164 -msgid "About:" -msgstr "Over:" +#: ../../include/oembed.php:180 +msgid "Embedding disabled" +msgstr "Insluiten uitgeschakeld" -#: ../../include/identity.php:1190 -msgid "Hobbies/Interests:" -msgstr "Hobby's/interesses:" +#: ../../include/permissions.php:13 +msgid "Can view my normal stream and posts" +msgstr "Kan mijn normale kanaalstream en berichten bekijken" -#: ../../include/identity.php:1192 ../../mod/profiles.php:645 -msgid "Likes:" -msgstr "Houdt van:" +#: ../../include/permissions.php:14 +msgid "Can view my default channel profile" +msgstr "Kan mijn standaard kanaalprofiel bekijken" -#: ../../include/identity.php:1194 ../../mod/profiles.php:646 -msgid "Dislikes:" -msgstr "Houdt niet van:" +#: ../../include/permissions.php:15 +msgid "Can view my photo albums" +msgstr "Kan mijn fotoalbums bekijken" -#: ../../include/identity.php:1197 -msgid "Contact information and Social Networks:" -msgstr "Contactinformatie en sociale netwerken:" +#: ../../include/permissions.php:16 +msgid "Can view my connections" +msgstr "Kan een lijst met mijn connecties bekijken" -#: ../../include/identity.php:1199 -msgid "My other channels:" -msgstr "Mijn andere kanalen" +#: ../../include/permissions.php:17 +msgid "Can view my file storage" +msgstr "Kan mijn bestanden bekijken" -#: ../../include/identity.php:1201 -msgid "Musical interests:" -msgstr "Muzikale interesses:" +#: ../../include/permissions.php:18 +msgid "Can view my webpages" +msgstr "Kan mijn pagina's bekijken" -#: ../../include/identity.php:1203 -msgid "Books, literature:" -msgstr "Boeken, literatuur:" +#: ../../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/identity.php:1205 -msgid "Television:" -msgstr "Televisie:" +#: ../../include/permissions.php:22 +msgid "Can post on my channel page (\"wall\")" +msgstr "Kan een bericht in mijn kanaal plaatsen" -#: ../../include/identity.php:1207 -msgid "Film/dance/culture/entertainment:" -msgstr "Films/dansen/cultuur/vermaak:" +#: ../../include/permissions.php:23 +msgid "Can comment on or like my posts" +msgstr "Kan op mijn berichten reageren of deze (niet) leuk vinden" -#: ../../include/identity.php:1209 -msgid "Love/Romance:" -msgstr "Liefde/romantiek:" +#: ../../include/permissions.php:24 +msgid "Can send me private mail messages" +msgstr "Kan mij privéberichten sturen" -#: ../../include/identity.php:1211 -msgid "Work/employment:" -msgstr "Werk/beroep:" +#: ../../include/permissions.php:25 +msgid "Can post photos to my photo albums" +msgstr "Kan foto's aan mijn fotoalbums toevoegen" -#: ../../include/identity.php:1213 -msgid "School/education:" -msgstr "School/opleiding:" +#: ../../include/permissions.php:26 +msgid "Can like/dislike stuff" +msgstr "Kan dingen leuk of niet leuk vinden" -#: ../../include/identity.php:1233 -msgid "Like this thing" -msgstr "Vind dit ding leuk" +#: ../../include/permissions.php:26 +msgid "Profiles and things other than posts/comments" +msgstr "Profielen en dingen, buiten berichten en reacties" -#: ../../include/conversation.php:120 ../../include/text.php:1743 -#: ../../include/diaspora.php:1924 ../../mod/subthread.php:72 -#: ../../mod/subthread.php:174 ../../mod/tagger.php:45 ../../mod/like.php:294 -msgid "photo" -msgstr "foto" +#: ../../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/conversation.php:123 ../../include/text.php:1746 -#: ../../mod/tagger.php:49 -msgid "event" -msgstr "gebeurtenis" +#: ../../include/permissions.php:28 +msgid "Advanced - useful for creating group forum channels" +msgstr "Geavanceerd - nuttig voor kanalen met een groep- cq. forumfunctie" -#: ../../include/conversation.php:126 ../../mod/like.php:89 -msgid "channel" -msgstr "kanaal" +#: ../../include/permissions.php:29 +msgid "Can chat with me (when available)" +msgstr "Kan met mij chatten (wanneer beschikbaar)" -#: ../../include/conversation.php:148 ../../include/text.php:1749 -#: ../../include/diaspora.php:1924 ../../mod/subthread.php:72 -#: ../../mod/subthread.php:174 ../../mod/tagger.php:53 ../../mod/like.php:294 -msgid "status" -msgstr "bericht" +#: ../../include/permissions.php:30 +msgid "Can write to my file storage" +msgstr "Kan bestanden aan mijn bestandsopslag toevoegen" -#: ../../include/conversation.php:150 ../../include/text.php:1751 -#: ../../mod/tagger.php:55 -msgid "comment" -msgstr "reactie" +#: ../../include/permissions.php:31 +msgid "Can edit my webpages" +msgstr "Kan mijn pagina's bewerken" -#: ../../include/conversation.php:164 ../../include/diaspora.php:1953 -#: ../../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/permissions.php:33 +msgid "Can source my public posts in derived channels" +msgstr "Kan mijn openbare berichten als bron voor andere kanalen gebruiken" -#: ../../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/permissions.php:33 +msgid "Somewhat advanced - very useful in open communities" +msgstr "Enigszins geavanceerd (erg nuttig voor kanalen van forums/groepen)" -#: ../../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/permissions.php:35 +msgid "Can administer my channel resources" +msgstr "Kan mijn kanaal beheren" -#: ../../include/conversation.php:239 -#, php-format -msgid "%1$s poked %2$s" -msgstr "%1$s heeft %2$s aangestoten" +#: ../../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/conversation.php:243 ../../include/text.php:901 -msgid "poked" -msgstr "aangestoten" +#: ../../include/permissions.php:785 +msgid "Social Networking" +msgstr "Sociaal netwerk" -#: ../../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/permissions.php:786 ../../include/permissions.php:788 +#: ../../include/permissions.php:790 +msgid "Mostly Public" +msgstr "Vrijwel alles openbaar" -#: ../../include/conversation.php:637 ../../include/ItemObject.php:126 -msgid "Select" -msgstr "Kies" +#: ../../include/permissions.php:786 ../../include/permissions.php:788 +#: ../../include/permissions.php:790 +msgid "Restricted" +msgstr "Beperkt zichtbaar" -#: ../../include/conversation.php:645 ../../include/ItemObject.php:89 -msgid "Private Message" -msgstr "Privébericht" +#: ../../include/permissions.php:786 ../../include/permissions.php:788 +msgid "Private" +msgstr "Verborgen kanaal" -#: ../../include/conversation.php:652 ../../include/ItemObject.php:194 -msgid "Message signature validated" -msgstr "Berichtkenmerk gevalideerd" +#: ../../include/permissions.php:787 +msgid "Community Forum" +msgstr "Groepsforum" -#: ../../include/conversation.php:653 ../../include/ItemObject.php:195 -msgid "Message signature incorrect" -msgstr "Berichtkenmerk onjuist" +#: ../../include/permissions.php:789 +msgid "Feed Republish" +msgstr "Feed herpubliceren" -#: ../../include/conversation.php:674 -#, php-format -msgid "View %s's profile @ %s" -msgstr "Bekijk het profiel van %s @ %s" +#: ../../include/permissions.php:791 +msgid "Special Purpose" +msgstr "Speciaal doel" -#: ../../include/conversation.php:689 -msgid "Categories:" -msgstr "Categorieën:" +#: ../../include/permissions.php:792 +msgid "Celebrity/Soapbox" +msgstr "Beroemdheid/alleen volgen" -#: ../../include/conversation.php:690 -msgid "Filed under:" -msgstr "Bewaard onder:" +#: ../../include/permissions.php:792 +msgid "Group Repository" +msgstr "Groepsopslag" -#: ../../include/conversation.php:698 ../../include/ItemObject.php:265 +#: ../../include/permissions.php:793 ../../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/permissions.php:794 +msgid "Custom/Expert Mode" +msgstr "Expertmodus/handmatig aanpassen" + +#: ../../include/activities.php:39 +msgid " and " +msgstr " en " + +#: ../../include/activities.php:47 +msgid "public profile" +msgstr "openbaar profiel" + +#: ../../include/activities.php:52 #, php-format -msgid " from %s" -msgstr " van %s" +msgid "%1$s changed %2$s to “%3$s”" +msgstr "%1$s veranderde %2$s naar “%3$s”" -#: ../../include/conversation.php:701 ../../include/ItemObject.php:268 +#: ../../include/activities.php:53 #, php-format -msgid "last edited: %s" -msgstr "laatst bewerkt: %s" +msgid "Visit %1$s's %2$s" +msgstr "Bezoek het %2$s van %1$s" -#: ../../include/conversation.php:702 ../../include/ItemObject.php:269 +#: ../../include/activities.php:56 #, php-format -msgid "Expires: %s" -msgstr "Verloopt: %s" - -#: ../../include/conversation.php:717 -msgid "View in context" -msgstr "In context bekijken" +msgid "%1$s has an updated %2$s, changing %3$s." +msgstr "%1$s heeft een aangepaste %2$s, %3$s veranderd." -#: ../../include/conversation.php:719 ../../include/conversation.php:1153 -#: ../../include/ItemObject.php:310 ../../mod/photos.php:993 -#: ../../mod/editblock.php:120 ../../mod/editlayout.php:115 -#: ../../mod/editpost.php:121 ../../mod/editwebpage.php:152 -#: ../../mod/mail.php:234 ../../mod/mail.php:349 -msgid "Please wait" -msgstr "Even wachten" +#: ../../include/datetime.php:43 ../../include/datetime.php:45 +msgid "Miscellaneous" +msgstr "Diversen" -#: ../../include/conversation.php:843 -msgid "remove" -msgstr "verwijderen" +#: ../../include/datetime.php:241 +msgid "never" +msgstr "nooit" -#: ../../include/conversation.php:847 ../../include/nav.php:257 -msgid "Loading..." -msgstr "Aan het laden..." +#: ../../include/datetime.php:247 +msgid "less than a second ago" +msgstr "minder dan een seconde geleden" -#: ../../include/conversation.php:848 -msgid "Delete Selected Items" -msgstr "Verwijder de geselecteerde items" +#: ../../include/datetime.php:250 +msgid "year" +msgstr "jaar" -#: ../../include/conversation.php:942 -msgid "View Source" -msgstr "Bron weergeven" +#: ../../include/datetime.php:250 +msgid "years" +msgstr "jaren" -#: ../../include/conversation.php:943 -msgid "Follow Thread" -msgstr "Conversatie volgen" +#: ../../include/datetime.php:251 +msgid "month" +msgstr "maand" -#: ../../include/conversation.php:944 -msgid "View Status" -msgstr "Status weergeven" +#: ../../include/datetime.php:251 +msgid "months" +msgstr "maanden" -#: ../../include/conversation.php:945 ../../include/nav.php:99 -#: ../../mod/connedit.php:415 ../../mod/connedit.php:529 -msgid "View Profile" -msgstr "Profiel weergeven" +#: ../../include/datetime.php:252 +msgid "week" +msgstr "week" -#: ../../include/conversation.php:946 -msgid "View Photos" -msgstr "Foto's weergeven" +#: ../../include/datetime.php:252 +msgid "weeks" +msgstr "weken" -#: ../../include/conversation.php:947 -msgid "Matrix Activity" -msgstr "Activiteit in de RedMatrix" +#: ../../include/datetime.php:253 +msgid "day" +msgstr "dag" -#: ../../include/conversation.php:949 -msgid "Edit Contact" -msgstr "Contact bewerken" +#: ../../include/datetime.php:253 +msgid "days" +msgstr "dagen" -#: ../../include/conversation.php:950 -msgid "Send PM" -msgstr "Privébericht verzenden" +#: ../../include/datetime.php:254 +msgid "hour" +msgstr "uur" -#: ../../include/conversation.php:1024 -#, php-format -msgid "%s likes this." -msgstr "%s vindt dit leuk." +#: ../../include/datetime.php:254 +msgid "hours" +msgstr "uren" -#: ../../include/conversation.php:1024 -#, php-format -msgid "%s doesn't like this." -msgstr "%s vindt dit niet leuk." +#: ../../include/datetime.php:255 +msgid "minute" +msgstr "minuut" -#: ../../include/conversation.php:1028 -#, 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/datetime.php:255 +msgid "minutes" +msgstr "minuten" -#: ../../include/conversation.php:1030 -#, 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/datetime.php:256 +msgid "second" +msgstr "seconde" -#: ../../include/conversation.php:1036 -msgid "and" -msgstr "en" +#: ../../include/datetime.php:256 +msgid "seconds" +msgstr "seconden" -#: ../../include/conversation.php:1039 +#: ../../include/datetime.php:265 #, 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" +msgid "%1$d %2$s ago" +msgstr "%1$d %2$s geleden" -#: ../../include/conversation.php:1040 +#: ../../include/datetime.php:470 #, php-format -msgid "%s like this." -msgstr "%s vinden dit leuk." +msgid "%1$s's birthday" +msgstr "Verjaardag van %1$s" -#: ../../include/conversation.php:1040 +#: ../../include/datetime.php:471 #, php-format -msgid "%s don't like this." -msgstr "%s vinden dit niet leuk." +msgid "Happy Birthday %1$s" +msgstr "Gefeliciteerd met je verjaardag %1$s" -#: ../../include/conversation.php:1097 -msgid "Visible to everybody" -msgstr "Voor iedereen zichtbaar" +#: ../../include/bb2diaspora.php:384 +msgid "Attachments:" +msgstr "Bijlagen:" -#: ../../include/conversation.php:1098 ../../mod/mail.php:170 -#: ../../mod/mail.php:282 -msgid "Please enter a link URL:" -msgstr "Vul een internetadres/URL in:" +#: ../../include/bb2diaspora.php:465 +msgid "Redmatrix event notification:" +msgstr "Notificatie RedMatrix-gebeurtenis:" -#: ../../include/conversation.php:1099 -msgid "Please enter a video link/URL:" -msgstr "Vul een videolink/URL in:" +#: ../../include/zot.php:661 +msgid "Invalid data packet" +msgstr "Datapakket ongeldig" -#: ../../include/conversation.php:1100 -msgid "Please enter an audio link/URL:" -msgstr "Vul een audiolink/URL in:" +#: ../../include/zot.php:677 +msgid "Unable to verify channel signature" +msgstr "Kanaalkenmerk kon niet worden geverifieerd. " -#: ../../include/conversation.php:1101 -msgid "Tag term:" -msgstr "Label:" +#: ../../include/zot.php:1791 +#, php-format +msgid "Unable to verify site signature for %s" +msgstr "Hubkenmerk voor %s kon niet worden geverifieerd" -#: ../../include/conversation.php:1102 ../../mod/filer.php:49 -msgid "Save to Folder:" -msgstr "Bewaar in map: " +#: ../../include/auth.php:116 +msgid "Logged out." +msgstr "Uitgelogd." -#: ../../include/conversation.php:1103 -msgid "Where are you right now?" -msgstr "Waar bevind je je op dit moment?" +#: ../../include/auth.php:257 +msgid "Failed authentication" +msgstr "Mislukte authenticatie" -#: ../../include/conversation.php:1104 ../../mod/editpost.php:52 -#: ../../mod/mail.php:171 ../../mod/mail.php:283 -msgid "Expires YYYY-MM-DD HH:MM" -msgstr "Verloopt op DD-MM-YYYY om HH:MM" +#: ../../include/auth.php:271 ../../mod/openid.php:190 +msgid "Login failed." +msgstr "Inloggen mislukt." -#: ../../include/conversation.php:1128 ../../mod/photos.php:992 -#: ../../mod/editblock.php:168 ../../mod/editlayout.php:161 -#: ../../mod/editwebpage.php:201 ../../mod/layouts.php:122 -msgid "Share" -msgstr "Delen" +#: ../../include/RedDAV/RedBrowser.php:106 +#: ../../include/RedDAV/RedBrowser.php:249 +msgid "parent" +msgstr "omhoog" -#: ../../include/conversation.php:1130 ../../mod/editwebpage.php:139 -msgid "Page link title" -msgstr "Titel van paginalink" +#: ../../include/RedDAV/RedBrowser.php:130 +msgid "Collection" +msgstr "map" -#: ../../include/conversation.php:1133 -msgid "Post as" -msgstr "Bericht plaatsen als" +#: ../../include/RedDAV/RedBrowser.php:133 +msgid "Principal" +msgstr "principal" -#: ../../include/conversation.php:1134 ../../mod/editblock.php:112 -#: ../../mod/editlayout.php:107 ../../mod/editpost.php:113 -#: ../../mod/editwebpage.php:144 ../../mod/mail.php:231 ../../mod/mail.php:345 -msgid "Upload photo" -msgstr "Foto uploaden" +#: ../../include/RedDAV/RedBrowser.php:136 +msgid "Addressbook" +msgstr "Adresboek" -#: ../../include/conversation.php:1135 -msgid "upload photo" -msgstr "foto uploaden" +#: ../../include/RedDAV/RedBrowser.php:139 +msgid "Calendar" +msgstr "Agenda" -#: ../../include/conversation.php:1136 ../../mod/editblock.php:113 -#: ../../mod/editlayout.php:108 ../../mod/editpost.php:114 -#: ../../mod/editwebpage.php:145 ../../mod/mail.php:232 ../../mod/mail.php:346 -msgid "Attach file" -msgstr "Bestand toevoegen" +#: ../../include/RedDAV/RedBrowser.php:142 +msgid "Schedule Inbox" +msgstr "Planning-postvak IN" -#: ../../include/conversation.php:1137 -msgid "attach file" -msgstr "bestand toevoegen" +#: ../../include/RedDAV/RedBrowser.php:145 +msgid "Schedule Outbox" +msgstr "Planning-postvak UIT" -#: ../../include/conversation.php:1138 ../../mod/editblock.php:114 -#: ../../mod/editlayout.php:109 ../../mod/editpost.php:115 -#: ../../mod/editwebpage.php:146 ../../mod/mail.php:233 ../../mod/mail.php:347 -msgid "Insert web link" -msgstr "Weblink invoegen" +#: ../../include/RedDAV/RedBrowser.php:223 +#, php-format +msgid "%1$s used" +msgstr "%1$s gebruikt" -#: ../../include/conversation.php:1139 -msgid "web link" -msgstr "Weblink" +#: ../../include/RedDAV/RedBrowser.php:228 +#, php-format +msgid "%1$s used of %2$s (%3$s%)" +msgstr "%1$s van %2$s gebruikt (%3$s%)" -#: ../../include/conversation.php:1140 -msgid "Insert video link" -msgstr "Videolink invoegen" +#: ../../include/RedDAV/RedBrowser.php:245 ../../mod/settings.php:551 +#: ../../mod/settings.php:577 ../../mod/admin.php:868 +msgid "Name" +msgstr "Naam" -#: ../../include/conversation.php:1141 -msgid "video link" -msgstr "videolink" +#: ../../include/RedDAV/RedBrowser.php:246 +msgid "Type" +msgstr "Type" -#: ../../include/conversation.php:1142 -msgid "Insert audio link" -msgstr "Audiolink invoegen" +#: ../../include/RedDAV/RedBrowser.php:247 +msgid "Size" +msgstr "Grootte" -#: ../../include/conversation.php:1143 -msgid "audio link" -msgstr "audiolink" - -#: ../../include/conversation.php:1144 ../../mod/editblock.php:118 -#: ../../mod/editlayout.php:113 ../../mod/editpost.php:119 -#: ../../mod/editwebpage.php:150 -msgid "Set your location" -msgstr "Locatie instellen" +#: ../../include/RedDAV/RedBrowser.php:248 +msgid "Last Modified" +msgstr "Laatst gewijzigd" -#: ../../include/conversation.php:1145 -msgid "set location" -msgstr "locatie instellen" +#: ../../include/RedDAV/RedBrowser.php:252 +msgid "Total" +msgstr "Totaal" -#: ../../include/conversation.php:1146 ../../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/RedDAV/RedBrowser.php:305 +msgid "Create new folder" +msgstr "Nieuwe map aanmaken" -#: ../../include/conversation.php:1147 -msgid "clear location" -msgstr "locatie wissen" +#: ../../include/RedDAV/RedBrowser.php:306 ../../mod/mitem.php:142 +#: ../../mod/menu.php:84 ../../mod/new_channel.php:122 +msgid "Create" +msgstr "Aanmaken" -#: ../../include/conversation.php:1149 ../../mod/editblock.php:132 -#: ../../mod/editlayout.php:126 ../../mod/editpost.php:132 -#: ../../mod/editwebpage.php:167 -msgid "Set title" -msgstr "Titel instellen" +#: ../../include/RedDAV/RedBrowser.php:307 +msgid "Upload file" +msgstr "Bestand uploaden" -#: ../../include/conversation.php:1152 ../../mod/events.php:563 -#: ../../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/RedDAV/RedBrowser.php:308 ../../mod/photos.php:736 +#: ../../mod/photos.php:1241 ../../mod/profile_photo.php:361 +msgid "Upload" +msgstr "Uploaden" -#: ../../include/conversation.php:1154 ../../mod/editblock.php:121 -#: ../../mod/editlayout.php:116 ../../mod/editpost.php:122 -#: ../../mod/editwebpage.php:153 -msgid "Permission settings" -msgstr "Permissies" +#: ../../include/bookmarks.php:35 +#, php-format +msgid "%1$s's bookmarks" +msgstr "Bladwijzers van %1$s" -#: ../../include/conversation.php:1155 -msgid "permissions" -msgstr "permissies" +#: ../../include/comanche.php:35 ../../view/theme/apw/php/config.php:185 +msgid "Default" +msgstr "Standaard" -#: ../../include/conversation.php:1162 ../../mod/editblock.php:129 -#: ../../mod/editlayout.php:123 ../../mod/editpost.php:129 -#: ../../mod/editwebpage.php:162 -msgid "Public post" -msgstr "Openbaar bericht" +#: ../../include/contact_selectors.php:56 +msgid "Frequently" +msgstr "Regelmatig" -#: ../../include/conversation.php:1164 ../../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/contact_selectors.php:57 +msgid "Hourly" +msgstr "Elk uur" -#: ../../include/conversation.php:1177 ../../mod/editblock.php:146 -#: ../../mod/editlayout.php:140 ../../mod/editpost.php:146 -#: ../../mod/editwebpage.php:179 ../../mod/mail.php:238 ../../mod/mail.php:352 -msgid "Set expiration date" -msgstr "Verloopdatum instellen" +#: ../../include/contact_selectors.php:58 +msgid "Twice daily" +msgstr "Twee keer per dag" -#: ../../include/conversation.php:1179 ../../include/ItemObject.php:611 -#: ../../mod/editpost.php:148 ../../mod/mail.php:240 ../../mod/mail.php:354 -msgid "Encrypt text" -msgstr "Tekst versleutelen" +#: ../../include/contact_selectors.php:59 +msgid "Daily" +msgstr "Dagelijks" -#: ../../include/conversation.php:1181 ../../mod/events.php:569 -#: ../../mod/editpost.php:150 -msgid "OK" -msgstr "OK" +#: ../../include/contact_selectors.php:60 +msgid "Weekly" +msgstr "Wekelijks" -#: ../../include/conversation.php:1182 ../../mod/settings.php:520 -#: ../../mod/settings.php:546 ../../mod/events.php:568 -#: ../../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/contact_selectors.php:61 +msgid "Monthly" +msgstr "Maandelijks" -#: ../../include/conversation.php:1426 -msgid "Discover" -msgstr "Ontdekken" +#: ../../include/contact_selectors.php:76 +msgid "Friendica" +msgstr "Friendica" -#: ../../include/conversation.php:1429 -msgid "Imported public streams" -msgstr "Openbare streams importeren" +#: ../../include/contact_selectors.php:77 +msgid "OStatus" +msgstr "OStatus" -#: ../../include/conversation.php:1434 -msgid "Commented Order" -msgstr "Nieuwe reacties bovenaan" +#: ../../include/contact_selectors.php:78 +msgid "RSS/Atom" +msgstr "RSS/Atom" -#: ../../include/conversation.php:1437 -msgid "Sort by Comment Date" -msgstr "Berichten met nieuwe reacties bovenaan" +#: ../../include/contact_selectors.php:79 ../../mod/admin.php:728 +#: ../../mod/admin.php:737 ../../boot.php:1515 +msgid "Email" +msgstr "E-mail" -#: ../../include/conversation.php:1441 -msgid "Posted Order" -msgstr "Nieuwe berichten bovenaan" +#: ../../include/contact_selectors.php:80 +msgid "Diaspora" +msgstr "Diaspora" -#: ../../include/conversation.php:1444 -msgid "Sort by Post Date" -msgstr "Nieuwe berichten bovenaan" +#: ../../include/contact_selectors.php:81 +msgid "Facebook" +msgstr "Facebook" -#: ../../include/conversation.php:1452 -msgid "Posts that mention or involve you" -msgstr "Alleen berichten die jou vermelden of waar je op een andere manier bij betrokken bent" +#: ../../include/contact_selectors.php:82 +msgid "Zot!" +msgstr "Zot!" -#: ../../include/conversation.php:1458 ../../mod/connections.php:211 -#: ../../mod/connections.php:224 ../../mod/menu.php:61 -msgid "New" -msgstr "Nieuw" +#: ../../include/contact_selectors.php:83 +msgid "LinkedIn" +msgstr "LinkedIn" -#: ../../include/conversation.php:1461 -msgid "Activity Stream - by date" -msgstr "Activiteitenstroom - volgens datum" +#: ../../include/contact_selectors.php:84 +msgid "XMPP/IM" +msgstr "XMPP/IM" -#: ../../include/conversation.php:1467 -msgid "Starred" -msgstr "Met ster" +#: ../../include/contact_selectors.php:85 +msgid "MySpace" +msgstr "MySpace" -#: ../../include/conversation.php:1470 -msgid "Favourite Posts" -msgstr "Favoriete berichten" +#: ../../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/conversation.php:1477 -msgid "Spam" -msgstr "Spam" +#: ../../include/contact_widgets.php:19 ../../mod/admin.php:418 +msgid "Advanced" +msgstr "Geavanceerd" -#: ../../include/conversation.php:1480 -msgid "Posts flagged as SPAM" -msgstr "Berichten gemarkeerd als SPAM" +#: ../../include/contact_widgets.php:22 +msgid "Find Channels" +msgstr "Kanalen vinden" -#: ../../include/conversation.php:1516 ../../mod/admin.php:867 -msgid "Channel" -msgstr "Kanaal" +#: ../../include/contact_widgets.php:23 +msgid "Enter name or interest" +msgstr "Vul naam of interesse in" -#: ../../include/conversation.php:1519 -msgid "Status Messages and Posts" -msgstr "Berichten in dit kanaal" +#: ../../include/contact_widgets.php:24 +msgid "Connect/Follow" +msgstr "Verbinden/volgen" -#: ../../include/conversation.php:1528 -msgid "About" -msgstr "Over" +#: ../../include/contact_widgets.php:25 +msgid "Examples: Robert Morgenstein, Fishing" +msgstr "Voorbeeld: Robert Morgenstein, vissen" -#: ../../include/conversation.php:1531 -msgid "Profile Details" -msgstr "Profiel" +#: ../../include/contact_widgets.php:26 ../../mod/connections.php:412 +#: ../../mod/directory.php:222 ../../mod/directory.php:227 +msgid "Find" +msgstr "Vinden" -#: ../../include/conversation.php:1549 -msgid "Files and Storage" -msgstr "Bestanden en opslagruimte" +#: ../../include/contact_widgets.php:27 ../../mod/suggest.php:59 +msgid "Channel Suggestions" +msgstr "Voorgestelde kanalen" -#: ../../include/conversation.php:1558 ../../include/conversation.php:1561 -msgid "Chatrooms" -msgstr "Chatkanalen" +#: ../../include/contact_widgets.php:29 +msgid "Random Profile" +msgstr "Willekeurig profiel" -#: ../../include/conversation.php:1573 -msgid "Saved Bookmarks" -msgstr "Opgeslagen bladwijzers" +#: ../../include/contact_widgets.php:30 +msgid "Invite Friends" +msgstr "Vrienden uitnodigen" -#: ../../include/conversation.php:1584 -msgid "Manage Webpages" -msgstr "Webpagina's beheren" +#: ../../include/contact_widgets.php:32 +msgid "Exammple: name=fred and country=iceland" +msgstr "Voorbeeld: (voor naam) name=herman en (voor land) country=nederland" -#: ../../include/auth.php:116 -msgid "Logged out." -msgstr "Uitgelogd." +#: ../../include/contact_widgets.php:33 +msgid "Advanced Find" +msgstr "Geavanceerd zoeken" -#: ../../include/auth.php:257 -msgid "Failed authentication" -msgstr "Mislukte authenticatie" +#: ../../include/contact_widgets.php:58 ../../include/features.php:72 +#: ../../include/widgets.php:303 +msgid "Saved Folders" +msgstr "Bewaarde mappen" -#: ../../include/auth.php:271 ../../mod/openid.php:190 -msgid "Login failed." -msgstr "Inloggen mislukt." +#: ../../include/contact_widgets.php:61 ../../include/contact_widgets.php:96 +#: ../../include/widgets.php:306 +msgid "Everything" +msgstr "Alles" -#: ../../include/text.php:321 -msgid "prev" -msgstr "vorige" +#: ../../include/contact_widgets.php:93 ../../include/taxonomy.php:230 +#: ../../include/widgets.php:29 +msgid "Categories" +msgstr "Categorieën" -#: ../../include/text.php:323 -msgid "first" -msgstr "eerste" +#: ../../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:352 -msgid "last" -msgstr "laatste" +#: ../../include/contact_widgets.php:131 +msgid "show more" +msgstr "meer connecties weergeven" -#: ../../include/text.php:355 -msgid "next" -msgstr "volgende" +#: ../../include/account.php:23 +msgid "Not a valid email address" +msgstr "Geen geldig e-mailadres" -#: ../../include/text.php:367 -msgid "older" -msgstr "ouder" +#: ../../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/text.php:369 -msgid "newer" -msgstr "nieuwer" +#: ../../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/text.php:736 -msgid "No connections" -msgstr "Geen connecties" +#: ../../include/account.php:64 +msgid "An invitation is required." +msgstr "Een uitnodiging is vereist" -#: ../../include/text.php:749 +#: ../../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/account.php:245 #, php-format -msgid "%d Connection" -msgid_plural "%d Connections" -msgstr[0] "%d connectie" -msgstr[1] "%d connecties" +msgid "Registration confirmation for %s" +msgstr "Registratiebevestiging voor %s" -#: ../../include/text.php:762 -msgid "View Connections" -msgstr "Connecties weergeven" +#: ../../include/account.php:313 +#, php-format +msgid "Registration request at %s" +msgstr "Registratiebevestiging voor %s" -#: ../../include/text.php:901 -msgid "poke" -msgstr "aanstoten" +#: ../../include/account.php:315 ../../include/account.php:342 +#: ../../include/account.php:399 +msgid "Administrator" +msgstr "Beheerder" -#: ../../include/text.php:902 -msgid "ping" -msgstr "ping" +#: ../../include/account.php:337 +msgid "your registration password" +msgstr "jouw registratiewachtwoord" -#: ../../include/text.php:902 -msgid "pinged" -msgstr "gepingd" +#: ../../include/account.php:340 ../../include/account.php:397 +#, php-format +msgid "Registration details for %s" +msgstr "Registratiegegevens voor %s" -#: ../../include/text.php:903 -msgid "prod" -msgstr "por" +#: ../../include/account.php:406 +msgid "Account approved." +msgstr "Account goedgekeurd" -#: ../../include/text.php:903 -msgid "prodded" -msgstr "gepord" +#: ../../include/account.php:440 +#, php-format +msgid "Registration revoked for %s" +msgstr "Registratie ingetrokken voor %s" -#: ../../include/text.php:904 -msgid "slap" -msgstr "slaan" +#: ../../include/account.php:486 +msgid "Account verified. Please login." +msgstr "Account is geverifieerd. Je kan inloggen." -#: ../../include/text.php:904 -msgid "slapped" -msgstr "sloeg" +#: ../../include/account.php:647 ../../include/account.php:649 +msgid "Click here to upgrade." +msgstr "Klik hier om te upgraden." -#: ../../include/text.php:905 -msgid "finger" -msgstr "finger" +#: ../../include/account.php:655 +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:905 -msgid "fingered" -msgstr "gefingerd" +#: ../../include/account.php:660 +msgid "This action is not available under your subscription plan." +msgstr "Deze handeling is niet mogelijk met jouw abonnement." -#: ../../include/text.php:906 -msgid "rebuff" -msgstr "afpoeieren" +#: ../../include/bbcode.php:112 ../../include/bbcode.php:653 +#: ../../include/bbcode.php:656 ../../include/bbcode.php:661 +#: ../../include/bbcode.php:664 ../../include/bbcode.php:667 +#: ../../include/bbcode.php:670 ../../include/bbcode.php:675 +#: ../../include/bbcode.php:678 ../../include/bbcode.php:683 +#: ../../include/bbcode.php:686 ../../include/bbcode.php:689 +#: ../../include/bbcode.php:692 +msgid "Image/photo" +msgstr "Afbeelding/foto" -#: ../../include/text.php:906 -msgid "rebuffed" -msgstr "afgepoeierd" +#: ../../include/bbcode.php:147 ../../include/bbcode.php:703 +msgid "Encrypted content" +msgstr "Versleutelde inhoud" -#: ../../include/text.php:915 -msgid "happy" -msgstr "gelukkig" +#: ../../include/bbcode.php:165 +msgid "Install design element: " +msgstr "Installeer ontwerp-onderdeel" -#: ../../include/text.php:916 -msgid "sad" -msgstr "bedroefd" +#: ../../include/bbcode.php:171 +msgid "QR code" +msgstr "QR-code" -#: ../../include/text.php:917 -msgid "mellow" -msgstr "mellow" +#: ../../include/bbcode.php:220 +#, php-format +msgid "%1$s wrote the following %2$s %3$s" +msgstr "%1$s schreef het volgende %2$s %3$s" -#: ../../include/text.php:918 -msgid "tired" -msgstr "moe" +#: ../../include/bbcode.php:222 +msgid "post" +msgstr "bericht" -#: ../../include/text.php:919 -msgid "perky" -msgstr "parmantig" +#: ../../include/bbcode.php:621 +msgid "$1 spoiler" +msgstr "$1 spoiler" -#: ../../include/text.php:920 -msgid "angry" -msgstr "boos" +#: ../../include/bbcode.php:641 +msgid "$1 wrote:" +msgstr "$1 schreef:" -#: ../../include/text.php:921 -msgid "stupified" -msgstr "beteuterd" +#: ../../include/dir_fns.php:56 +msgid "Sort Options" +msgstr "Sorteeropties" -#: ../../include/text.php:922 -msgid "puzzled" -msgstr "verward" +#: ../../include/dir_fns.php:57 +msgid "Alphabetic" +msgstr "Alfabetisch" -#: ../../include/text.php:923 -msgid "interested" -msgstr "geïnteresseerd" +#: ../../include/dir_fns.php:58 +msgid "Reverse Alphabetic" +msgstr "Omgekeerd alfabetisch" -#: ../../include/text.php:924 -msgid "bitter" -msgstr "verbitterd" +#: ../../include/dir_fns.php:59 +msgid "Newest to Oldest" +msgstr "Nieuw naar oud" -#: ../../include/text.php:925 -msgid "cheerful" -msgstr "vrolijk" +#: ../../include/dir_fns.php:71 +msgid "Enable Safe Search" +msgstr "Veilig zoeken inschakelen" -#: ../../include/text.php:926 -msgid "alive" -msgstr "levendig" +#: ../../include/dir_fns.php:73 +msgid "Disable Safe Search" +msgstr "Veilig zoeken uitschakelen" -#: ../../include/text.php:927 -msgid "annoyed" -msgstr "geërgerd" +#: ../../include/dir_fns.php:75 +msgid "Safe Mode" +msgstr "Veilig zoeken" -#: ../../include/text.php:928 -msgid "anxious" -msgstr "bezorgd" +#: ../../include/taxonomy.php:210 +msgid "Tags" +msgstr "Labels" -#: ../../include/text.php:929 -msgid "cranky" -msgstr "humeurig" +#: ../../include/taxonomy.php:249 +msgid "Keywords" +msgstr "Trefwoorden" -#: ../../include/text.php:930 -msgid "disturbed" -msgstr "verontrust" +#: ../../include/taxonomy.php:274 +msgid "have" +msgstr "heb" -#: ../../include/text.php:931 -msgid "frustrated" -msgstr "gefrustreerd " +#: ../../include/taxonomy.php:274 +msgid "has" +msgstr "heeft" -#: ../../include/text.php:932 -msgid "depressed" -msgstr "gedeprimeerd" +#: ../../include/taxonomy.php:275 +msgid "want" +msgstr "wil" -#: ../../include/text.php:933 -msgid "motivated" -msgstr "gemotiveerd" +#: ../../include/taxonomy.php:275 +msgid "wants" +msgstr "wil" -#: ../../include/text.php:934 -msgid "relaxed" -msgstr "ontspannen" +#: ../../include/taxonomy.php:276 ../../include/ItemObject.php:221 +msgid "like" +msgstr "vind dit leuk" -#: ../../include/text.php:935 -msgid "surprised" -msgstr "verrast" +#: ../../include/taxonomy.php:276 +msgid "likes" +msgstr "vindt dit leuk" -#: ../../include/text.php:1099 -msgid "Monday" -msgstr "maandag" +#: ../../include/taxonomy.php:277 ../../include/ItemObject.php:222 +msgid "dislike" +msgstr "vind dit niet leuk" + +#: ../../include/taxonomy.php:277 +msgid "dislikes" +msgstr "vindt dit niet leuk" + +#: ../../include/taxonomy.php:360 ../../include/identity.php:1146 +#: ../../include/ItemObject.php:146 ../../mod/photos.php:1023 +msgctxt "noun" +msgid "Like" +msgid_plural "Likes" +msgstr[0] "vindt dit leuk" +msgstr[1] "vinden dit leuk" + +#: ../../include/enotify.php:41 +msgid "Red Matrix Notification" +msgstr "RedMatrix-notificatie" + +#: ../../include/enotify.php:42 +msgid "redmatrix" +msgstr "RedMatrix" + +#: ../../include/enotify.php:44 +msgid "Thank You," +msgstr "Bedankt," + +#: ../../include/enotify.php:46 +#, php-format +msgid "%s Administrator" +msgstr "Beheerder %s" + +#: ../../include/enotify.php:81 +#, php-format +msgid "%s " +msgstr "%s " + +#: ../../include/enotify.php:85 +#, php-format +msgid "[Red:Notify] New mail received at %s" +msgstr "[Red:Notificatie] Nieuw privébericht ontvangen op %s" + +#: ../../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/enotify.php:88 +#, php-format +msgid "%1$s sent you %2$s." +msgstr "%1$s zond jou %2$s." + +#: ../../include/enotify.php:88 +msgid "a private message" +msgstr "een privébericht" + +#: ../../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/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/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/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/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/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/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/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/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/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/enotify.php:210 +#, php-format +msgid "[Red:Notify] %s tagged you" +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 op %3$s" + +#: ../../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/enotify.php:225 +#, php-format +msgid "[Red:Notify] %1$s poked you" +msgstr "[Red:Notificatie] %1$s heeft je aangestoten" + +#: ../../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/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/enotify.php:243 +#, php-format +msgid "[Red:Notify] %s tagged your post" +msgstr "[Red:Notificatie] %s heeft jouw bericht gelabeld" + +#: ../../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/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/enotify.php:257 +msgid "[Red:Notify] Introduction received" +msgstr "[Red:Notificatie] Connectieverzoek ontvangen" + +#: ../../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/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/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/enotify.php:265 +#, 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." + +#: ../../include/enotify.php:272 +msgid "[Red:Notify] Friend suggestion received" +msgstr "[Red:Notificatie] Kanaalvoorstel ontvangen" -#: ../../include/text.php:1099 -msgid "Tuesday" -msgstr "dinsdag" +#: ../../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/text.php:1099 -msgid "Wednesday" -msgstr "woensdag" +#: ../../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/text.php:1099 -msgid "Thursday" -msgstr "donderdag" +#: ../../include/enotify.php:280 +msgid "Name:" +msgstr "Naam:" -#: ../../include/text.php:1099 -msgid "Friday" -msgstr "vrijdag" +#: ../../include/enotify.php:281 +msgid "Photo:" +msgstr "Foto:" -#: ../../include/text.php:1099 -msgid "Saturday" -msgstr "zaterdag" +#: ../../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/text.php:1099 -msgid "Sunday" -msgstr "zondag" +#: ../../include/enotify.php:477 +msgid "[Red:Notify]" +msgstr "[Red:Notificatie]" -#: ../../include/text.php:1103 -msgid "January" -msgstr "januari" +#: ../../include/chat.php:10 +msgid "Missing room name" +msgstr "Naam chatkanaal ontbreekt" -#: ../../include/text.php:1103 -msgid "February" -msgstr "februari" +#: ../../include/chat.php:19 +msgid "Duplicate room name" +msgstr "Naam chatkanaal bestaat al" -#: ../../include/text.php:1103 -msgid "March" -msgstr "maart" +#: ../../include/chat.php:68 ../../include/chat.php:76 +msgid "Invalid room specifier." +msgstr "Ongeldige omschrijving chatkanaal" -#: ../../include/text.php:1103 -msgid "April" -msgstr "april" +#: ../../include/chat.php:105 +msgid "Room not found." +msgstr "Chatkanaal niet gevonden" -#: ../../include/text.php:1103 -msgid "May" -msgstr "mei" +#: ../../include/chat.php:126 +msgid "Room is full" +msgstr "Chatkanaal is vol" -#: ../../include/text.php:1103 -msgid "June" -msgstr "juni" +#: ../../include/items.php:377 ../../mod/profperm.php:23 +#: ../../mod/subthread.php:49 ../../mod/group.php:68 ../../mod/like.php:246 +#: ../../index.php:389 +msgid "Permission denied" +msgstr "Toegang geweigerd" -#: ../../include/text.php:1103 -msgid "July" -msgstr "juli" +#: ../../include/items.php:964 ../../include/items.php:1009 +msgid "(Unknown)" +msgstr "(Onbekend)" -#: ../../include/text.php:1103 -msgid "August" -msgstr "augustus" +#: ../../include/items.php:1165 +msgid "Visible to anybody on the internet." +msgstr "Voor iedereen op het internet zichtbaar." -#: ../../include/text.php:1103 -msgid "September" -msgstr "september" +#: ../../include/items.php:1167 +msgid "Visible to you only." +msgstr "Alleen voor jou zichtbaar." -#: ../../include/text.php:1103 -msgid "October" -msgstr "oktober" +#: ../../include/items.php:1169 +msgid "Visible to anybody in this network." +msgstr "Voor iedereen in dit netwerk zichtbaar." -#: ../../include/text.php:1103 -msgid "November" -msgstr "november" +#: ../../include/items.php:1171 +msgid "Visible to anybody authenticated." +msgstr "Voor iedereen die geauthenticeerd is zichtbaar." -#: ../../include/text.php:1103 -msgid "December" -msgstr "december" +#: ../../include/items.php:1173 +#, php-format +msgid "Visible to anybody on %s." +msgstr "Voor iedereen op %s zichtbaar." -#: ../../include/text.php:1181 -msgid "unknown.???" -msgstr "onbekend.???" +#: ../../include/items.php:1175 +msgid "Visible to all connections." +msgstr "Voor alle connecties zichtbaar." -#: ../../include/text.php:1182 -msgid "bytes" -msgstr "bytes" +#: ../../include/items.php:1177 +msgid "Visible to approved connections." +msgstr "Voor alle goedgekeurde connecties zichtbaar." -#: ../../include/text.php:1221 -msgid "remove category" -msgstr "categorie verwijderen" +#: ../../include/items.php:1179 +msgid "Visible to specific connections." +msgstr "Voor specifieke connecties zichtbaar." -#: ../../include/text.php:1291 -msgid "remove from file" -msgstr "uit map verwijderen" +#: ../../include/items.php:3938 ../../mod/display.php:32 +#: ../../mod/filestorage.php:26 ../../mod/admin.php:168 +#: ../../mod/admin.php:898 ../../mod/admin.php:1101 ../../mod/thing.php:76 +#: ../../mod/viewsrc.php:20 +msgid "Item not found." +msgstr "Item niet gevonden." -#: ../../include/text.php:1356 ../../include/text.php:1368 -msgid "Click to open/close" -msgstr "Klik om te openen of te sluiten" +#: ../../include/items.php:4394 ../../mod/group.php:38 ../../mod/group.php:140 +msgid "Collection not found." +msgstr "Collectie niet gevonden." -#: ../../include/text.php:1523 ../../mod/events.php:409 -msgid "Link to Source" -msgstr "Originele locatie" +#: ../../include/items.php:4409 +msgid "Collection is empty." +msgstr "Collectie is leeg" -#: ../../include/text.php:1542 -msgid "Select a page layout: " -msgstr "Kies een paginalay-out: " +#: ../../include/items.php:4416 +#, php-format +msgid "Collection: %s" +msgstr "Collectie: %s" -#: ../../include/text.php:1545 ../../include/text.php:1610 -msgid "default" -msgstr "standaard" +#: ../../include/items.php:4427 +#, php-format +msgid "Connection: %s" +msgstr "Connectie: %s" -#: ../../include/text.php:1581 -msgid "Page content type: " -msgstr "Opmaakcode pagina" +#: ../../include/items.php:4430 +msgid "Connection not found." +msgstr "Connectie niet gevonden." -#: ../../include/text.php:1622 -msgid "Select an alternate language" -msgstr "Kies een andere taal" +#: ../../include/text.php:321 +msgid "prev" +msgstr "vorige" -#: ../../include/text.php:1756 -msgid "activity" -msgstr "activiteit" +#: ../../include/text.php:323 +msgid "first" +msgstr "eerste" -#: ../../include/text.php:2028 -msgid "Design" -msgstr "Ontwerp" +#: ../../include/text.php:352 +msgid "last" +msgstr "laatste" -#: ../../include/text.php:2030 -msgid "Blocks" -msgstr "Blokken" +#: ../../include/text.php:355 +msgid "next" +msgstr "volgende" -#: ../../include/text.php:2031 -msgid "Menus" -msgstr "Menu's" +#: ../../include/text.php:367 +msgid "older" +msgstr "ouder" -#: ../../include/text.php:2032 -msgid "Layouts" -msgstr "Lay-outs" +#: ../../include/text.php:369 +msgid "newer" +msgstr "nieuwer" -#: ../../include/text.php:2033 -msgid "Pages" -msgstr "Pagina's" +#: ../../include/text.php:736 +msgid "No connections" +msgstr "Geen connecties" -#: ../../include/bookmarks.php:35 +#: ../../include/text.php:749 #, php-format -msgid "%1$s's bookmarks" -msgstr "Bladwijzers van %1$s" +msgid "%d Connection" +msgid_plural "%d Connections" +msgstr[0] "%d connectie" +msgstr[1] "%d connecties" -#: ../../include/taxonomy.php:210 -msgid "Tags" -msgstr "Labels" +#: ../../include/text.php:762 +msgid "View Connections" +msgstr "Connecties weergeven" -#: ../../include/taxonomy.php:227 -msgid "Keywords" -msgstr "Trefwoorden" +#: ../../include/text.php:823 ../../include/text.php:835 +#: ../../include/widgets.php:193 ../../mod/rbmark.php:28 +#: ../../mod/rbmark.php:98 ../../mod/filer.php:50 ../../mod/admin.php:1341 +#: ../../mod/admin.php:1362 +msgid "Save" +msgstr "Opslaan" -#: ../../include/taxonomy.php:252 -msgid "have" -msgstr "heb" +#: ../../include/text.php:901 +msgid "poke" +msgstr "aanstoten" -#: ../../include/taxonomy.php:252 -msgid "has" -msgstr "heeft" +#: ../../include/text.php:902 +msgid "ping" +msgstr "ping" -#: ../../include/taxonomy.php:253 -msgid "want" -msgstr "wil" +#: ../../include/text.php:902 +msgid "pinged" +msgstr "gepingd" + +#: ../../include/text.php:903 +msgid "prod" +msgstr "por" + +#: ../../include/text.php:903 +msgid "prodded" +msgstr "gepord" + +#: ../../include/text.php:904 +msgid "slap" +msgstr "slaan" -#: ../../include/taxonomy.php:253 -msgid "wants" -msgstr "wil" +#: ../../include/text.php:904 +msgid "slapped" +msgstr "sloeg" -#: ../../include/taxonomy.php:254 ../../include/ItemObject.php:221 -msgid "like" -msgstr "vind dit leuk" +#: ../../include/text.php:905 +msgid "finger" +msgstr "finger" -#: ../../include/taxonomy.php:254 -msgid "likes" -msgstr "vindt dit leuk" +#: ../../include/text.php:905 +msgid "fingered" +msgstr "gefingerd" -#: ../../include/taxonomy.php:255 ../../include/ItemObject.php:222 -msgid "dislike" -msgstr "vind dit niet leuk" +#: ../../include/text.php:906 +msgid "rebuff" +msgstr "afpoeieren" -#: ../../include/taxonomy.php:255 -msgid "dislikes" -msgstr "vindt dit niet leuk" +#: ../../include/text.php:906 +msgid "rebuffed" +msgstr "afgepoeierd" -#: ../../include/comanche.php:35 ../../view/theme/apw/php/config.php:185 -msgid "Default" -msgstr "Standaard" +#: ../../include/text.php:915 +msgid "happy" +msgstr "gelukkig" -#: ../../include/contact_selectors.php:56 -msgid "Frequently" -msgstr "Regelmatig" +#: ../../include/text.php:916 +msgid "sad" +msgstr "bedroefd" -#: ../../include/contact_selectors.php:57 -msgid "Hourly" -msgstr "Elk uur" +#: ../../include/text.php:917 +msgid "mellow" +msgstr "mellow" -#: ../../include/contact_selectors.php:58 -msgid "Twice daily" -msgstr "Twee keer per dag" +#: ../../include/text.php:918 +msgid "tired" +msgstr "moe" -#: ../../include/contact_selectors.php:59 -msgid "Daily" -msgstr "Dagelijks" +#: ../../include/text.php:919 +msgid "perky" +msgstr "parmantig" -#: ../../include/contact_selectors.php:60 -msgid "Weekly" -msgstr "Wekelijks" +#: ../../include/text.php:920 +msgid "angry" +msgstr "boos" -#: ../../include/contact_selectors.php:61 -msgid "Monthly" -msgstr "Maandelijks" +#: ../../include/text.php:921 +msgid "stupified" +msgstr "beteuterd" -#: ../../include/contact_selectors.php:76 -msgid "Friendica" -msgstr "Friendica" +#: ../../include/text.php:922 +msgid "puzzled" +msgstr "verward" -#: ../../include/contact_selectors.php:77 -msgid "OStatus" -msgstr "OStatus" +#: ../../include/text.php:923 +msgid "interested" +msgstr "geïnteresseerd" -#: ../../include/contact_selectors.php:78 -msgid "RSS/Atom" -msgstr "RSS/Atom" +#: ../../include/text.php:924 +msgid "bitter" +msgstr "verbitterd" -#: ../../include/contact_selectors.php:79 ../../mod/admin.php:728 -#: ../../mod/admin.php:737 ../../boot.php:1498 -msgid "Email" -msgstr "E-mail" +#: ../../include/text.php:925 +msgid "cheerful" +msgstr "vrolijk" -#: ../../include/contact_selectors.php:80 -msgid "Diaspora" -msgstr "Diaspora" +#: ../../include/text.php:926 +msgid "alive" +msgstr "levendig" -#: ../../include/contact_selectors.php:81 -msgid "Facebook" -msgstr "Facebook" +#: ../../include/text.php:927 +msgid "annoyed" +msgstr "geërgerd" -#: ../../include/contact_selectors.php:82 -msgid "Zot!" -msgstr "Zot!" +#: ../../include/text.php:928 +msgid "anxious" +msgstr "bezorgd" -#: ../../include/contact_selectors.php:83 -msgid "LinkedIn" -msgstr "LinkedIn" +#: ../../include/text.php:929 +msgid "cranky" +msgstr "humeurig" -#: ../../include/contact_selectors.php:84 -msgid "XMPP/IM" -msgstr "XMPP/IM" +#: ../../include/text.php:930 +msgid "disturbed" +msgstr "verontrust" -#: ../../include/contact_selectors.php:85 -msgid "MySpace" -msgstr "MySpace" +#: ../../include/text.php:931 +msgid "frustrated" +msgstr "gefrustreerd " -#: ../../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:932 +msgid "depressed" +msgstr "gedeprimeerd" -#: ../../include/contact_widgets.php:19 ../../mod/admin.php:418 -msgid "Advanced" -msgstr "Geavanceerd" +#: ../../include/text.php:933 +msgid "motivated" +msgstr "gemotiveerd" -#: ../../include/contact_widgets.php:22 -msgid "Find Channels" -msgstr "Kanalen vinden" +#: ../../include/text.php:934 +msgid "relaxed" +msgstr "ontspannen" -#: ../../include/contact_widgets.php:23 -msgid "Enter name or interest" -msgstr "Vul naam of interesse in" +#: ../../include/text.php:935 +msgid "surprised" +msgstr "verrast" -#: ../../include/contact_widgets.php:24 -msgid "Connect/Follow" -msgstr "Verbinden/volgen" +#: ../../include/text.php:1099 +msgid "Monday" +msgstr "maandag" -#: ../../include/contact_widgets.php:25 -msgid "Examples: Robert Morgenstein, Fishing" -msgstr "Voorbeeld: Robert Morgenstein, vissen" +#: ../../include/text.php:1099 +msgid "Tuesday" +msgstr "dinsdag" -#: ../../include/contact_widgets.php:26 ../../mod/connections.php:412 -#: ../../mod/directory.php:222 ../../mod/directory.php:227 -msgid "Find" -msgstr "Vinden" +#: ../../include/text.php:1099 +msgid "Wednesday" +msgstr "woensdag" -#: ../../include/contact_widgets.php:27 ../../mod/suggest.php:59 -msgid "Channel Suggestions" -msgstr "Voorgestelde kanalen" +#: ../../include/text.php:1099 +msgid "Thursday" +msgstr "donderdag" -#: ../../include/contact_widgets.php:29 -msgid "Random Profile" -msgstr "Willekeurig profiel" +#: ../../include/text.php:1099 +msgid "Friday" +msgstr "vrijdag" -#: ../../include/contact_widgets.php:30 -msgid "Invite Friends" -msgstr "Vrienden uitnodigen" +#: ../../include/text.php:1099 +msgid "Saturday" +msgstr "zaterdag" -#: ../../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:1099 +msgid "Sunday" +msgstr "zondag" -#: ../../include/contact_widgets.php:33 -msgid "Advanced Find" -msgstr "Geavanceerd zoeken" +#: ../../include/text.php:1103 +msgid "January" +msgstr "januari" -#: ../../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:1103 +msgid "February" +msgstr "februari" -#: ../../include/contact_widgets.php:131 -msgid "show more" -msgstr "meer connecties weergeven" +#: ../../include/text.php:1103 +msgid "March" +msgstr "maart" -#: ../../include/event.php:11 ../../include/bb2diaspora.php:458 -msgid "l F d, Y \\@ g:i A" -msgstr "l d F Y \\@ G:i" +#: ../../include/text.php:1103 +msgid "April" +msgstr "april" -#: ../../include/event.php:20 ../../include/bb2diaspora.php:464 -msgid "Starts:" -msgstr "Start:" +#: ../../include/text.php:1103 +msgid "May" +msgstr "mei" -#: ../../include/event.php:30 ../../include/bb2diaspora.php:472 -msgid "Finishes:" -msgstr "Einde:" +#: ../../include/text.php:1103 +msgid "June" +msgstr "juni" -#: ../../include/event.php:326 -msgid "This event has been added to your calendar." -msgstr "Dit evenement is aan jouw agenda toegevoegd." +#: ../../include/text.php:1103 +msgid "July" +msgstr "juli" -#: ../../include/account.php:23 -msgid "Not a valid email address" -msgstr "Geen geldig e-mailadres" +#: ../../include/text.php:1103 +msgid "August" +msgstr "augustus" -#: ../../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/text.php:1103 +msgid "September" +msgstr "september" -#: ../../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/text.php:1103 +msgid "October" +msgstr "oktober" -#: ../../include/account.php:64 -msgid "An invitation is required." -msgstr "Een uitnodiging is vereist" +#: ../../include/text.php:1103 +msgid "November" +msgstr "november" -#: ../../include/account.php:68 -msgid "Invitation could not be verified." -msgstr "Uitnodiging kon niet geverifieerd worden" +#: ../../include/text.php:1103 +msgid "December" +msgstr "december" -#: ../../include/account.php:119 -msgid "Please enter the required information." -msgstr "Vul de vereiste informatie in." +#: ../../include/text.php:1181 +msgid "unknown.???" +msgstr "onbekend.???" -#: ../../include/account.php:187 -msgid "Failed to store account information." -msgstr "Account-informatie kon niet opgeslagen worden." +#: ../../include/text.php:1182 +msgid "bytes" +msgstr "bytes" -#: ../../include/account.php:245 -#, php-format -msgid "Registration confirmation for %s" -msgstr "Registratiebevestiging voor %s" +#: ../../include/text.php:1221 +msgid "remove category" +msgstr "categorie verwijderen" -#: ../../include/account.php:313 -#, php-format -msgid "Registration request at %s" -msgstr "Registratiebevestiging voor %s" +#: ../../include/text.php:1291 +msgid "remove from file" +msgstr "uit map verwijderen" -#: ../../include/account.php:315 ../../include/account.php:342 -#: ../../include/account.php:399 -msgid "Administrator" -msgstr "Beheerder" +#: ../../include/text.php:1356 ../../include/text.php:1368 +msgid "Click to open/close" +msgstr "Klik om te openen of te sluiten" -#: ../../include/account.php:337 -msgid "your registration password" -msgstr "jouw registratiewachtwoord" +#: ../../include/text.php:1523 ../../mod/events.php:409 +msgid "Link to Source" +msgstr "Originele locatie" -#: ../../include/account.php:340 ../../include/account.php:397 -#, php-format -msgid "Registration details for %s" -msgstr "Registratiegegevens voor %s" +#: ../../include/text.php:1542 +msgid "Select a page layout: " +msgstr "Kies een paginalay-out: " -#: ../../include/account.php:406 -msgid "Account approved." -msgstr "Account goedgekeurd" +#: ../../include/text.php:1545 ../../include/text.php:1610 +msgid "default" +msgstr "standaard" -#: ../../include/account.php:440 -#, php-format -msgid "Registration revoked for %s" -msgstr "Registratie ingetrokken voor %s" +#: ../../include/text.php:1581 +msgid "Page content type: " +msgstr "Opmaakcode pagina" -#: ../../include/account.php:486 -msgid "Account verified. Please login." -msgstr "Account is geverifieerd. Je kan inloggen." +#: ../../include/text.php:1622 +msgid "Select an alternate language" +msgstr "Kies een andere taal" -#: ../../include/account.php:647 ../../include/account.php:649 -msgid "Click here to upgrade." -msgstr "Klik hier om te upgraden." +#: ../../include/text.php:1756 +msgid "activity" +msgstr "activiteit" -#: ../../include/account.php:655 -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:2028 +msgid "Design" +msgstr "Ontwerp" -#: ../../include/account.php:660 -msgid "This action is not available under your subscription plan." -msgstr "Deze handeling is niet mogelijk met jouw abonnement." +#: ../../include/text.php:2030 +msgid "Blocks" +msgstr "Blokken" -#: ../../include/nav.php:95 ../../include/nav.php:128 ../../boot.php:1495 -msgid "Logout" -msgstr "Uitloggen" +#: ../../include/text.php:2031 +msgid "Menus" +msgstr "Menu's" -#: ../../include/nav.php:95 ../../include/nav.php:128 -msgid "End this session" -msgstr "Beëindig deze sessie" +#: ../../include/text.php:2032 +msgid "Layouts" +msgstr "Lay-outs" -#: ../../include/nav.php:98 ../../include/nav.php:159 -msgid "Home" -msgstr "Home" +#: ../../include/text.php:2033 +msgid "Pages" +msgstr "Pagina's" -#: ../../include/nav.php:98 -msgid "Your posts and conversations" -msgstr "Jouw berichten en conversaties" +#: ../../include/features.php:23 +msgid "General Features" +msgstr "Algemene functies" -#: ../../include/nav.php:99 -msgid "Your profile page" -msgstr "Jouw profielpagina" +#: ../../include/features.php:25 +msgid "Content Expiration" +msgstr "Inhoud laten verlopen" -#: ../../include/nav.php:101 -msgid "Edit Profiles" -msgstr "Bewerk profielen" +#: ../../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/nav.php:101 -msgid "Manage/Edit profiles" -msgstr "Beheer/wijzig profielen" +#: ../../include/features.php:26 +msgid "Multiple Profiles" +msgstr "Meerdere profielen" -#: ../../include/nav.php:103 -msgid "Edit your profile" -msgstr "Jouw profiel bewerken" +#: ../../include/features.php:26 +msgid "Ability to create multiple profiles" +msgstr "Mogelijkheid om meerdere profielen aan te maken" -#: ../../include/nav.php:105 -msgid "Your photos" -msgstr "Jouw foto's" +#: ../../include/features.php:27 +msgid "Advanced Profiles" +msgstr "Geavanceerde profielen" -#: ../../include/nav.php:106 -msgid "Your files" -msgstr "Jouw bestanden" +#: ../../include/features.php:27 +msgid "Additional profile sections and selections" +msgstr "Extra onderdelen en keuzes voor je profiel" -#: ../../include/nav.php:111 -msgid "Your chatrooms" -msgstr "Jouw chatkanalen" +#: ../../include/features.php:28 +msgid "Profile Import/Export" +msgstr "Profiel importen/exporteren" -#: ../../include/nav.php:117 -msgid "Your bookmarks" -msgstr "Jouw bladwijzers" +#: ../../include/features.php:28 +msgid "Save and load profile details across sites/channels" +msgstr "Profielgegevens opslaan en in andere hubs/kanalen gebruiken." -#: ../../include/nav.php:121 -msgid "Your webpages" -msgstr "Jouw webpagina's" +#: ../../include/features.php:29 +msgid "Web Pages" +msgstr "Webpagina's" -#: ../../include/nav.php:125 -msgid "Sign in" -msgstr "Inloggen" +#: ../../include/features.php:29 +msgid "Provide managed web pages on your channel" +msgstr "Sta beheerde webpagina's op jouw kanaal toe" -#: ../../include/nav.php:142 -#, php-format -msgid "%s - click to logout" -msgstr "%s - klik om uit te loggen" +#: ../../include/features.php:30 +msgid "Private Notes" +msgstr "Privé-aantekeningen" -#: ../../include/nav.php:145 -msgid "Remote authentication" -msgstr "Authenticatie op afstand" +#: ../../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/nav.php:145 -msgid "Click to authenticate to your home hub" -msgstr "Authenticeer jezelf via (bijvoorbeeld) jouw RedMatrix-hub" +#: ../../include/features.php:34 +msgid "Navigation Channel Select" +msgstr "Kanaal kiezen in navigatiemenu" -#: ../../include/nav.php:159 -msgid "Home Page" -msgstr "Homepage" +#: ../../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/nav.php:163 ../../mod/register.php:220 ../../boot.php:1472 -msgid "Register" -msgstr "Registreren" +#: ../../include/features.php:38 +msgid "Extended Identity Sharing" +msgstr "Uitgebreid identiteit delen" -#: ../../include/nav.php:163 -msgid "Create an account" -msgstr "Maak een account aan" +#: ../../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/nav.php:168 -msgid "Help and documentation" -msgstr "Hulp en documentatie" +#: ../../include/features.php:39 +msgid "Expert Mode" +msgstr "Expertmodus" -#: ../../include/nav.php:171 -msgid "Applications, utilities, links, games" -msgstr "Apps" +#: ../../include/features.php:39 +msgid "Enable Expert Mode to provide advanced configuration options" +msgstr "Schakel de expertmodus in voor geavanceerde instellingen" -#: ../../include/nav.php:173 -msgid "Search site content" -msgstr "Inhoud van deze RedMatrix-hub doorzoeken" +#: ../../include/features.php:40 +msgid "Premium Channel" +msgstr "Premiumkanaal" -#: ../../include/nav.php:176 -msgid "Channel Locator" -msgstr "Kanalengids" +#: ../../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/nav.php:190 -msgid "Your matrix" -msgstr "Jouw matrix" +#: ../../include/features.php:45 +msgid "Post Composition Features" +msgstr "Functies voor het opstellen van berichten" -#: ../../include/nav.php:191 -msgid "Mark all matrix notifications seen" -msgstr "Markeer alle matrixnotificaties als bekeken" +#: ../../include/features.php:47 +msgid "Use Markdown" +msgstr "Markdown gebruiken" + +#: ../../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/nav.php:193 -msgid "Channel home" -msgstr "Tijdlijn kanaal" +#: ../../include/features.php:48 +msgid "Post Preview" +msgstr "Voorvertoning" -#: ../../include/nav.php:194 -msgid "Mark all channel notifications seen" -msgstr "Alle kanaalnotificaties als gelezen markeren" +#: ../../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/nav.php:197 ../../mod/connections.php:406 -msgid "Connections" -msgstr "Connecties" +#: ../../include/features.php:49 ../../include/widgets.php:537 +#: ../../mod/sources.php:88 +msgid "Channel Sources" +msgstr "Kanaalbronnen" -#: ../../include/nav.php:200 -msgid "Notices" -msgstr "Notificaties" +#: ../../include/features.php:49 +msgid "Automatically import channel content from other channels or feeds" +msgstr "Automatisch inhoud uit andere kanalen of feeds importeren." -#: ../../include/nav.php:200 -msgid "Notifications" -msgstr "Notificaties" +#: ../../include/features.php:50 +msgid "Even More Encryption" +msgstr "Extra encryptie" -#: ../../include/nav.php:201 -msgid "See all notifications" -msgstr "Alle notificaties weergeven" +#: ../../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/nav.php:202 ../../mod/notifications.php:99 -msgid "Mark all system notifications seen" -msgstr "Markeer alle systeemnotificaties als bekeken" +#: ../../include/features.php:55 +msgid "Network and Stream Filtering" +msgstr "Netwerk- en streamfilter" -#: ../../include/nav.php:204 -msgid "Private mail" -msgstr "Privéberichten" +#: ../../include/features.php:56 +msgid "Search by Date" +msgstr "Zoek op datum" -#: ../../include/nav.php:205 -msgid "See all private messages" -msgstr "Alle privéberichten weergeven" +#: ../../include/features.php:56 +msgid "Ability to select posts by date ranges" +msgstr "Mogelijkheid om berichten op datum te filteren " -#: ../../include/nav.php:206 -msgid "Mark all private messages seen" -msgstr "Markeer alle privéberichten als bekeken" +#: ../../include/features.php:57 +msgid "Collections Filter" +msgstr "Filter op collecties" -#: ../../include/nav.php:207 -msgid "Inbox" -msgstr "Postvak IN" +#: ../../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/nav.php:208 -msgid "Outbox" -msgstr "Postvak UIT" +#: ../../include/features.php:58 ../../include/widgets.php:272 +msgid "Saved Searches" +msgstr "Opgeslagen zoekopdrachten" -#: ../../include/nav.php:212 -msgid "Event Calendar" -msgstr "Agenda" +#: ../../include/features.php:58 +msgid "Save search terms for re-use" +msgstr "Sla zoekopdrachten op voor hergebruik" -#: ../../include/nav.php:213 -msgid "See all events" -msgstr "Alle gebeurtenissen weergeven" +#: ../../include/features.php:59 +msgid "Network Personal Tab" +msgstr "Persoonlijke netwerktab" -#: ../../include/nav.php:214 -msgid "Mark all events seen" -msgstr "Markeer alle gebeurtenissen als bekeken" +#: ../../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/nav.php:216 -msgid "Manage Your Channels" -msgstr "Beheer je kanalen" +#: ../../include/features.php:60 +msgid "Network New Tab" +msgstr "Nieuwe netwerktab" -#: ../../include/nav.php:218 -msgid "Account/Channel Settings" -msgstr "Account-/kanaal-instellingen" +#: ../../include/features.php:60 +msgid "Enable tab to display all new Network activity" +msgstr "Laat de tab alle nieuwe netwerkactiviteit tonen" -#: ../../include/nav.php:226 ../../mod/admin.php:123 -msgid "Admin" -msgstr "Beheer" +#: ../../include/features.php:61 +msgid "Affinity Tool" +msgstr "Verwantschapsfilter" -#: ../../include/nav.php:226 -msgid "Site Setup and Configuration" -msgstr "Hub instellen en beheren" +#: ../../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/nav.php:262 -msgid "Please wait..." -msgstr "Wachten aub..." +#: ../../include/features.php:62 +msgid "Suggest Channels" +msgstr "Kanalen voorstellen" -#: ../../include/dir_fns.php:56 -msgid "Sort Options" -msgstr "Sorteeropties" +#: ../../include/features.php:62 +msgid "Show channel suggestions" +msgstr "Voor jou mogelijk interessante kanalen voorstellen" -#: ../../include/dir_fns.php:57 -msgid "Alphabetic" -msgstr "Alfabetisch" +#: ../../include/features.php:67 +msgid "Post/Comment Tools" +msgstr "Bericht- en reactiehulpmiddelen" -#: ../../include/dir_fns.php:58 -msgid "Reverse Alphabetic" -msgstr "Omgekeerd alfabetisch" +#: ../../include/features.php:69 +msgid "Edit Sent Posts" +msgstr "Bewerk verzonden berichten" -#: ../../include/dir_fns.php:59 -msgid "Newest to Oldest" -msgstr "Nieuw naar oud" +#: ../../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/dir_fns.php:71 -msgid "Enable Safe Search" -msgstr "Veilig zoeken inschakelen" +#: ../../include/features.php:70 +msgid "Tagging" +msgstr "Labelen" -#: ../../include/dir_fns.php:73 -msgid "Disable Safe Search" -msgstr "Veilig zoeken uitschakelen" +#: ../../include/features.php:70 +msgid "Ability to tag existing posts" +msgstr "Mogelijkheid om bestaande berichten te labelen" -#: ../../include/dir_fns.php:75 -msgid "Safe Mode" -msgstr "Veilig zoeken" +#: ../../include/features.php:71 +msgid "Post Categories" +msgstr "Categorieën berichten" -#: ../../include/bb2diaspora.php:379 -msgid "Attachments:" -msgstr "Bijlagen:" +#: ../../include/features.php:71 +msgid "Add categories to your posts" +msgstr "Voeg categorieën toe aan je berichten" -#: ../../include/enotify.php:41 -msgid "Red Matrix Notification" -msgstr "RedMatrix-notificatie" +#: ../../include/features.php:72 +msgid "Ability to file posts under folders" +msgstr "Mogelijkheid om berichten in mappen op te slaan" -#: ../../include/enotify.php:42 -msgid "redmatrix" -msgstr "RedMatrix" +#: ../../include/features.php:73 +msgid "Dislike Posts" +msgstr "Vind berichten niet leuk" -#: ../../include/enotify.php:44 -msgid "Thank You," -msgstr "Bedankt," +#: ../../include/features.php:73 +msgid "Ability to dislike posts/comments" +msgstr "Mogelijkheid om berichten en reacties niet leuk te vinden" -#: ../../include/enotify.php:46 -#, php-format -msgid "%s Administrator" -msgstr "Beheerder %s" +#: ../../include/features.php:74 +msgid "Star Posts" +msgstr "Geef berichten een ster" -#: ../../include/enotify.php:81 -#, php-format -msgid "%s " -msgstr "%s " +#: ../../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/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:75 +msgid "Tag Cloud" +msgstr "Wolk met trefwoorden/labels" -#: ../../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:75 +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:88 -#, php-format -msgid "%1$s sent you %2$s." -msgstr "%1$s zond jou %2$s." +#: ../../include/follow.php:28 +msgid "Channel is blocked on this site." +msgstr "Kanaal is op deze hub geblokkeerd." -#: ../../include/enotify.php:88 -msgid "a private message" -msgstr "een privébericht" +#: ../../include/follow.php:33 +msgid "Channel location missing." +msgstr "Ontbrekende kanaallocatie." -#: ../../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/follow.php:82 +msgid "Response from remote channel was incomplete." +msgstr "Antwoord van het kanaal op afstand was niet volledig." -#: ../../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/follow.php:99 +msgid "Channel was deleted and no longer exists." +msgstr "Kanaal is verwijderd en bestaat niet meer." -#: ../../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/follow.php:135 ../../include/follow.php:202 +msgid "Protocol disabled." +msgstr "Protocol uitgeschakeld." -#: ../../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/follow.php:176 +msgid "Channel discovery failed." +msgstr "Kanaal ontdekken mislukt." -#: ../../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/follow.php:192 +msgid "local account not found." +msgstr "lokale account niet gevonden." -#: ../../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/follow.php:220 +msgid "Cannot connect to yourself." +msgstr "Kan niet met jezelf verbinden" -#: ../../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/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/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/group.php:234 +msgid "Default privacy group for new contacts" +msgstr "Standaard privacy-collectie voor nieuwe kanalen" -#: ../../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/group.php:253 ../../mod/admin.php:737 +msgid "All Channels" +msgstr "Alle kanalen" -#: ../../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/group.php:275 +msgid "edit" +msgstr "bewerken" -#: ../../include/enotify.php:210 -#, php-format -msgid "[Red:Notify] %s tagged you" -msgstr "[Red:Notificatie] %s heeft je genoemd" +#: ../../include/group.php:297 +msgid "Collections" +msgstr "Collecties" -#: ../../include/enotify.php:211 -#, php-format -msgid "%1$s, %2$s tagged you at %3$s" -msgstr "%1$s, %2$s noemde jou op %3$s" +#: ../../include/group.php:298 +msgid "Edit collection" +msgstr "Collectie bewerken" -#: ../../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/group.php:299 +msgid "Create a new collection" +msgstr "Nieuwe collectie aanmaken" -#: ../../include/enotify.php:225 -#, php-format -msgid "[Red:Notify] %1$s poked you" -msgstr "[Red:Notificatie] %1$s heeft je aangestoten" +#: ../../include/group.php:300 +msgid "Channels not in any collection" +msgstr "Kanalen die zich in geen enkele collectie bevinden" -#: ../../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/group.php:302 ../../include/widgets.php:273 +msgid "add" +msgstr "toevoegen" -#: ../../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/identity.php:31 ../../mod/item.php:1361 +msgid "Unable to obtain identity information from database" +msgstr "Niet in staat om identiteitsinformatie uit de database te verkrijgen" -#: ../../include/enotify.php:243 -#, php-format -msgid "[Red:Notify] %s tagged your post" -msgstr "[Red:Notificatie] %s heeft jouw bericht gelabeld" +#: ../../include/identity.php:66 +msgid "Empty name" +msgstr "Ontbrekende naam" -#: ../../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/identity.php:68 +msgid "Name too long" +msgstr "Naam te lang" -#: ../../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/identity.php:169 +msgid "No account identifier" +msgstr "Geen account-identificator" -#: ../../include/enotify.php:257 -msgid "[Red:Notify] Introduction received" -msgstr "[Red:Notificatie] Connectieverzoek ontvangen" +#: ../../include/identity.php:182 +msgid "Nickname is required." +msgstr "Bijnaam is verplicht" -#: ../../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/identity.php:196 +msgid "Reserved nickname. Please choose another." +msgstr "Deze naam is gereserveerd. Kies een andere." -#: ../../include/enotify.php:259 -#, php-format +#: ../../include/identity.php:201 ../../include/dimport.php:34 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/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" +"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/enotify.php:265 -#, 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." +#: ../../include/identity.php:283 +msgid "Unable to retrieve created identity" +msgstr "Niet in staat om aangemaakte identiteit te vinden" -#: ../../include/enotify.php:272 -msgid "[Red:Notify] Friend suggestion received" -msgstr "[Red:Notificatie] Kanaalvoorstel ontvangen" +#: ../../include/identity.php:343 +msgid "Default Profile" +msgstr "Standaardprofiel" -#: ../../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/identity.php:387 ../../include/identity.php:388 +#: ../../include/identity.php:395 ../../include/widgets.php:431 +#: ../../include/profile_selectors.php:80 ../../mod/settings.php:304 +#: ../../mod/settings.php:308 ../../mod/settings.php:309 +#: ../../mod/settings.php:312 ../../mod/settings.php:323 +#: ../../mod/connedit.php:509 +msgid "Friends" +msgstr "Vrienden" -#: ../../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/identity.php:643 +msgid "Requested channel is not available." +msgstr "Opgevraagd kanaal is niet beschikbaar." -#: ../../include/enotify.php:280 -msgid "Name:" -msgstr "Naam:" +#: ../../include/identity.php:691 ../../mod/achievements.php:11 +#: ../../mod/profile.php:16 ../../mod/blocks.php:10 ../../mod/connect.php:13 +#: ../../mod/webpages.php:8 ../../mod/filestorage.php:48 +#: ../../mod/layouts.php:8 ../../mod/hcard.php:8 +msgid "Requested profile is not available." +msgstr "Opgevraagd profiel is niet beschikbaar" -#: ../../include/enotify.php:281 -msgid "Photo:" -msgstr "Foto:" +#: ../../include/identity.php:854 ../../mod/profiles.php:722 +msgid "Change profile photo" +msgstr "Profielfoto veranderen" -#: ../../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/identity.php:860 +msgid "Profiles" +msgstr "Profielen" -#: ../../include/enotify.php:477 -msgid "[Red:Notify]" -msgstr "[Red:Notificatie]" +#: ../../include/identity.php:860 +msgid "Manage/edit profiles" +msgstr "Profielen beheren/bewerken" -#: ../../include/chat.php:10 -msgid "Missing room name" -msgstr "Naam chatkanaal ontbreekt" +#: ../../include/identity.php:861 ../../mod/profiles.php:723 +msgid "Create New Profile" +msgstr "Nieuw profiel aanmaken" -#: ../../include/chat.php:19 -msgid "Duplicate room name" -msgstr "Naam chatkanaal bestaat al" +#: ../../include/identity.php:864 ../../include/nav.php:103 +msgid "Edit Profile" +msgstr "Profiel bewerken" -#: ../../include/chat.php:68 ../../include/chat.php:76 -msgid "Invalid room specifier." -msgstr "Ongeldige omschrijving chatkanaal" +#: ../../include/identity.php:875 ../../mod/profiles.php:734 +msgid "Profile Image" +msgstr "Profielfoto" -#: ../../include/chat.php:105 -msgid "Room not found." -msgstr "Chatkanaal niet gevonden" +#: ../../include/identity.php:878 +msgid "visible to everybody" +msgstr "Voor iedereen zichtbaar" -#: ../../include/chat.php:126 -msgid "Room is full" -msgstr "Chatkanaal is vol" +#: ../../include/identity.php:879 ../../mod/profiles.php:617 +#: ../../mod/profiles.php:738 +msgid "Edit visibility" +msgstr "Zichtbaarheid bewerken" -#: ../../include/features.php:23 -msgid "General Features" -msgstr "Algemene functies" +#: ../../include/identity.php:893 ../../include/identity.php:1130 +#: ../../mod/directory.php:158 +msgid "Gender:" +msgstr "Geslacht:" -#: ../../include/features.php:25 -msgid "Content Expiration" -msgstr "Inhoud laten verlopen" +#: ../../include/identity.php:894 ../../include/identity.php:1174 +#: ../../mod/directory.php:160 +msgid "Status:" +msgstr "Status:" -#: ../../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:895 ../../include/identity.php:1185 +#: ../../mod/directory.php:162 +msgid "Homepage:" +msgstr "Homepagina:" -#: ../../include/features.php:26 -msgid "Multiple Profiles" -msgstr "Meerdere profielen" +#: ../../include/identity.php:896 ../../mod/dirprofile.php:151 +msgid "Online Now" +msgstr "Nu online" -#: ../../include/features.php:26 -msgid "Ability to create multiple profiles" -msgstr "Mogelijkheid om meerdere profielen aan te maken" +#: ../../include/identity.php:974 ../../include/identity.php:1054 +#: ../../mod/ping.php:316 +msgid "g A l F d" +msgstr "G:i, l d F" -#: ../../include/features.php:27 -msgid "Advanced Profiles" -msgstr "Geavanceerde profielen" +#: ../../include/identity.php:975 ../../include/identity.php:1055 +msgid "F d" +msgstr "d F" -#: ../../include/features.php:27 -msgid "Additional profile sections and selections" -msgstr "Extra onderdelen en keuzes voor je profiel" +#: ../../include/identity.php:1020 ../../include/identity.php:1095 +#: ../../mod/ping.php:338 +msgid "[today]" +msgstr "[vandaag]" -#: ../../include/features.php:28 -msgid "Profile Import/Export" -msgstr "Profiel importen/exporteren" +#: ../../include/identity.php:1032 +msgid "Birthday Reminders" +msgstr "Verjaardagsherinneringen" -#: ../../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:1033 +msgid "Birthdays this week:" +msgstr "Verjaardagen deze week:" -#: ../../include/features.php:29 -msgid "Web Pages" -msgstr "Webpagina's" +#: ../../include/identity.php:1088 +msgid "[No description]" +msgstr "[Geen omschrijving]" -#: ../../include/features.php:29 -msgid "Provide managed web pages on your channel" -msgstr "Sta beheerde webpagina's op jouw kanaal toe" +#: ../../include/identity.php:1106 +msgid "Event Reminders" +msgstr "Herinneringen" -#: ../../include/features.php:30 -msgid "Private Notes" -msgstr "Privé-aantekeningen" +#: ../../include/identity.php:1107 +msgid "Events this week:" +msgstr "Gebeurtenissen deze week:" -#: ../../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/identity.php:1128 ../../mod/settings.php:984 +msgid "Full Name:" +msgstr "Volledige naam:" -#: ../../include/features.php:34 -msgid "Navigation Channel Select" -msgstr "Kanaal kiezen in navigatiemenu" +#: ../../include/identity.php:1135 +msgid "Like this channel" +msgstr "Vind dit kanaal leuk" -#: ../../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/identity.php:1159 +msgid "j F, Y" +msgstr "F j Y" -#: ../../include/features.php:38 -msgid "Extended Identity Sharing" -msgstr "Uitgebreid identiteit delen" +#: ../../include/identity.php:1160 +msgid "j F" +msgstr "F j" -#: ../../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/identity.php:1167 +msgid "Birthday:" +msgstr "Geboortedatum:" -#: ../../include/features.php:39 -msgid "Expert Mode" -msgstr "Expertmodus" +#: ../../include/identity.php:1171 +msgid "Age:" +msgstr "Leeftijd:" -#: ../../include/features.php:39 -msgid "Enable Expert Mode to provide advanced configuration options" -msgstr "Schakel de expertmodus in voor geavanceerde instellingen" +#: ../../include/identity.php:1180 +#, php-format +msgid "for %1$d %2$s" +msgstr "voor %1$d %2$s" -#: ../../include/features.php:40 -msgid "Premium Channel" -msgstr "Premiumkanaal" +#: ../../include/identity.php:1183 ../../mod/profiles.php:639 +msgid "Sexual Preference:" +msgstr "Seksuele voorkeur:" -#: ../../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/identity.php:1187 ../../mod/profiles.php:641 +msgid "Hometown:" +msgstr "Oorspronkelijk uit:" -#: ../../include/features.php:45 -msgid "Post Composition Features" -msgstr "Functies voor het opstellen van berichten" +#: ../../include/identity.php:1189 +msgid "Tags:" +msgstr "Trefwoorden:" -#: ../../include/features.php:47 -msgid "Use Markdown" -msgstr "Markdown gebruiken" +#: ../../include/identity.php:1191 ../../mod/profiles.php:642 +msgid "Political Views:" +msgstr "Politieke overtuigingen:" -#: ../../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/identity.php:1193 +msgid "Religion:" +msgstr "Religie:" -#: ../../include/features.php:48 -msgid "Post Preview" -msgstr "Voorvertoning" +#: ../../include/identity.php:1195 ../../mod/directory.php:164 +msgid "About:" +msgstr "Over:" -#: ../../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/identity.php:1197 +msgid "Hobbies/Interests:" +msgstr "Hobby's/interesses:" -#: ../../include/features.php:49 -msgid "Automatically import channel content from other channels or feeds" -msgstr "Automatisch inhoud uit andere kanalen of feeds importeren." +#: ../../include/identity.php:1199 ../../mod/profiles.php:645 +msgid "Likes:" +msgstr "Houdt van:" -#: ../../include/features.php:50 -msgid "Even More Encryption" -msgstr "Extra encryptie" +#: ../../include/identity.php:1201 ../../mod/profiles.php:646 +msgid "Dislikes:" +msgstr "Houdt niet van:" -#: ../../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/identity.php:1204 +msgid "Contact information and Social Networks:" +msgstr "Contactinformatie en sociale netwerken:" -#: ../../include/features.php:55 -msgid "Network and Stream Filtering" -msgstr "Netwerk- en streamfilter" +#: ../../include/identity.php:1206 +msgid "My other channels:" +msgstr "Mijn andere kanalen" -#: ../../include/features.php:56 -msgid "Search by Date" -msgstr "Zoek op datum" +#: ../../include/identity.php:1208 +msgid "Musical interests:" +msgstr "Muzikale interesses:" -#: ../../include/features.php:56 -msgid "Ability to select posts by date ranges" -msgstr "Mogelijkheid om berichten op datum te filteren " +#: ../../include/identity.php:1210 +msgid "Books, literature:" +msgstr "Boeken, literatuur:" -#: ../../include/features.php:57 -msgid "Collections Filter" -msgstr "Filter op collecties" +#: ../../include/identity.php:1212 +msgid "Television:" +msgstr "Televisie:" -#: ../../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/identity.php:1214 +msgid "Film/dance/culture/entertainment:" +msgstr "Films/dansen/cultuur/vermaak:" -#: ../../include/features.php:58 -msgid "Save search terms for re-use" -msgstr "Sla zoekopdrachten op voor hergebruik" +#: ../../include/identity.php:1216 +msgid "Love/Romance:" +msgstr "Liefde/romantiek:" -#: ../../include/features.php:59 -msgid "Network Personal Tab" -msgstr "Persoonlijke netwerktab" +#: ../../include/identity.php:1218 +msgid "Work/employment:" +msgstr "Werk/beroep:" -#: ../../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/identity.php:1220 +msgid "School/education:" +msgstr "School/opleiding:" -#: ../../include/features.php:60 -msgid "Network New Tab" -msgstr "Nieuwe netwerktab" +#: ../../include/identity.php:1240 +msgid "Like this thing" +msgstr "Vind dit ding leuk" -#: ../../include/features.php:60 -msgid "Enable tab to display all new Network activity" -msgstr "Laat de tab alle nieuwe netwerkactiviteit tonen" +#: ../../include/widgets.php:86 ../../include/nav.php:171 +#: ../../mod/apps.php:33 +msgid "Apps" +msgstr "Apps" -#: ../../include/features.php:61 -msgid "Affinity Tool" -msgstr "Verwantschapsfilter" +#: ../../include/widgets.php:87 +msgid "System" +msgstr "Systeem" -#: ../../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/widgets.php:90 +msgid "Create Personal App" +msgstr "Persoonlijke app maken" -#: ../../include/features.php:62 -msgid "Suggest Channels" -msgstr "Kanalen voorstellen" +#: ../../include/widgets.php:91 +msgid "Edit Personal App" +msgstr "Persoonlijke app bewerken" -#: ../../include/features.php:62 -msgid "Show channel suggestions" -msgstr "Voor jou mogelijk interessante kanalen voorstellen" +#: ../../include/widgets.php:137 ../../mod/suggest.php:53 +msgid "Ignore/Hide" +msgstr "Negeren/Verbergen" -#: ../../include/features.php:67 -msgid "Post/Comment Tools" -msgstr "Bericht- en reactiehulpmiddelen" +#: ../../include/widgets.php:143 ../../mod/connections.php:267 +msgid "Suggestions" +msgstr "Voorgestelde kanalen" -#: ../../include/features.php:69 -msgid "Edit Sent Posts" -msgstr "Bewerk verzonden berichten" +#: ../../include/widgets.php:144 +msgid "See more..." +msgstr "Meer..." -#: ../../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/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/features.php:70 -msgid "Tagging" -msgstr "Labelen" +#: ../../include/widgets.php:172 +msgid "Add New Connection" +msgstr "Nieuwe connectie toevoegen" -#: ../../include/features.php:70 -msgid "Ability to tag existing posts" -msgstr "Mogelijkheid om bestaande berichten te labelen" +#: ../../include/widgets.php:173 +msgid "Enter the channel address" +msgstr "Vul het adres van het nieuwe kanaal in" -#: ../../include/features.php:71 -msgid "Post Categories" -msgstr "Categorieën berichten" +#: ../../include/widgets.php:174 +msgid "Example: bob@example.com, http://example.com/barbara" +msgstr "Voorbeeld: bob@example.com, http://example.com/barbara" -#: ../../include/features.php:71 -msgid "Add categories to your posts" -msgstr "Voeg categorieën toe aan je berichten" +#: ../../include/widgets.php:191 +msgid "Notes" +msgstr "Aantekeningen" -#: ../../include/features.php:72 -msgid "Ability to file posts under folders" -msgstr "Mogelijkheid om berichten in mappen op te slaan" +#: ../../include/widgets.php:263 +msgid "Remove term" +msgstr "Verwijder zoekterm" -#: ../../include/features.php:73 -msgid "Dislike Posts" -msgstr "Vind berichten niet leuk" +#: ../../include/widgets.php:352 +msgid "Archives" +msgstr "Archieven" -#: ../../include/features.php:73 -msgid "Ability to dislike posts/comments" -msgstr "Mogelijkheid om berichten en reacties niet leuk te vinden" +#: ../../include/widgets.php:428 +msgid "Refresh" +msgstr "Vernieuwen" -#: ../../include/features.php:74 -msgid "Star Posts" -msgstr "Geef berichten een ster" +#: ../../include/widgets.php:429 ../../mod/connedit.php:506 +msgid "Me" +msgstr "Ik" -#: ../../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/widgets.php:430 ../../mod/connedit.php:508 +msgid "Best Friends" +msgstr "Goede vrienden" -#: ../../include/features.php:75 -msgid "Tag Cloud" -msgstr "Wolk met trefwoorden/labels" +#: ../../include/widgets.php:432 +msgid "Co-workers" +msgstr "Collega's" -#: ../../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" +#: ../../include/widgets.php:433 ../../mod/connedit.php:510 +msgid "Former Friends" +msgstr "Oude vrienden" -#: ../../include/follow.php:26 -msgid "Channel is blocked on this site." -msgstr "Kanaal is op deze hub geblokkeerd." +#: ../../include/widgets.php:434 ../../mod/connedit.php:511 +msgid "Acquaintances" +msgstr "Kennissen" -#: ../../include/follow.php:31 -msgid "Channel location missing." -msgstr "Ontbrekende kanaallocatie." +#: ../../include/widgets.php:435 +msgid "Everybody" +msgstr "Iedereen" -#: ../../include/follow.php:80 -msgid "Response from remote channel was incomplete." -msgstr "Antwoord van het kanaal op afstand was niet volledig." +#: ../../include/widgets.php:469 +msgid "Account settings" +msgstr "Account" -#: ../../include/follow.php:97 -msgid "Channel was deleted and no longer exists." -msgstr "Kanaal is verwijderd en bestaat niet meer." +#: ../../include/widgets.php:475 +msgid "Channel settings" +msgstr "Kanaal" -#: ../../include/follow.php:133 ../../include/follow.php:202 -msgid "Protocol disabled." -msgstr "Protocol uitgeschakeld." +#: ../../include/widgets.php:481 +msgid "Additional features" +msgstr "Extra functies" -#: ../../include/follow.php:176 -msgid "Channel discovery failed." -msgstr "Kanaal ontdekken mislukt." +#: ../../include/widgets.php:487 +msgid "Feature settings" +msgstr "Plug-ins" -#: ../../include/follow.php:192 -msgid "local account not found." -msgstr "lokale account niet gevonden." +#: ../../include/widgets.php:493 +msgid "Display settings" +msgstr "Weergave" -#: ../../include/follow.php:219 -msgid "Cannot connect to yourself." -msgstr "Kan niet met jezelf verbinden" +#: ../../include/widgets.php:499 +msgid "Connected apps" +msgstr "Verbonden applicaties" -#: ../../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/widgets.php:505 +msgid "Export channel" +msgstr "Kanaal exporteren" -#: ../../include/group.php:234 -msgid "Default privacy group for new contacts" -msgstr "Standaard privacy-collectie voor nieuwe kanalen" +#: ../../include/widgets.php:511 +msgid "Export content" +msgstr "Inhoud exporteren" -#: ../../include/group.php:253 ../../mod/admin.php:737 -msgid "All Channels" -msgstr "Alle kanalen" +#: ../../include/widgets.php:520 ../../mod/connedit.php:538 +msgid "Connection Default Permissions" +msgstr "Standaard permissies voor connecties" -#: ../../include/group.php:275 -msgid "edit" -msgstr "bewerken" +#: ../../include/widgets.php:528 +msgid "Premium Channel Settings" +msgstr "Instellingen premiumkanaal" -#: ../../include/group.php:297 -msgid "Collections" -msgstr "Collecties" +#: ../../include/widgets.php:562 ../../mod/mail.php:124 +#: ../../mod/message.php:31 +msgid "Messages" +msgstr "Berichten" -#: ../../include/group.php:298 -msgid "Edit collection" -msgstr "Collectie bewerken" +#: ../../include/widgets.php:567 +msgid "Check Mail" +msgstr "Controleer op nieuwe berichten" -#: ../../include/group.php:299 -msgid "Create a new collection" -msgstr "Nieuwe collectie aanmaken" +#: ../../include/widgets.php:572 ../../include/nav.php:209 +msgid "New Message" +msgstr "Nieuw bericht" -#: ../../include/group.php:300 -msgid "Channels not in any collection" -msgstr "Kanalen die zich in geen enkele collectie bevinden" +#: ../../include/widgets.php:648 +msgid "Chat Rooms" +msgstr "Chatkanalen" -#: ../../include/bbcode.php:112 ../../include/bbcode.php:653 -#: ../../include/bbcode.php:656 ../../include/bbcode.php:661 -#: ../../include/bbcode.php:664 ../../include/bbcode.php:667 -#: ../../include/bbcode.php:670 ../../include/bbcode.php:675 -#: ../../include/bbcode.php:678 ../../include/bbcode.php:683 -#: ../../include/bbcode.php:686 ../../include/bbcode.php:689 -#: ../../include/bbcode.php:692 -msgid "Image/photo" -msgstr "Afbeelding/foto" +#: ../../include/widgets.php:666 +msgid "Bookmarked Chatrooms" +msgstr "Bladwijzers van chatkanalen" -#: ../../include/bbcode.php:147 ../../include/bbcode.php:703 -msgid "Encrypted content" -msgstr "Versleutelde inhoud" +#: ../../include/widgets.php:684 +msgid "Suggested Chatrooms" +msgstr "Voorgestelde chatkanalen" -#: ../../include/bbcode.php:165 -msgid "Install design element: " -msgstr "Installeer ontwerp-onderdeel" +#: ../../include/Contact.php:123 +msgid "New window" +msgstr "Nieuw venster" -#: ../../include/bbcode.php:171 -msgid "QR code" -msgstr "QR-code" +#: ../../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/bbcode.php:220 +#: ../../include/Contact.php:211 ../../mod/admin.php:649 #, php-format -msgid "%1$s wrote the following %2$s %3$s" -msgstr "%1$s schreef het volgende %2$s %3$s" +msgid "User '%s' deleted" +msgstr "Account '%s' verwijderd" -#: ../../include/bbcode.php:222 -msgid "post" -msgstr "bericht" +#: ../../include/message.php:18 +msgid "No recipient provided." +msgstr "Geen ontvanger opgegeven." -#: ../../include/bbcode.php:621 -msgid "$1 spoiler" -msgstr "$1 spoiler" +#: ../../include/message.php:23 +msgid "[no subject]" +msgstr "[geen onderwerp]" -#: ../../include/bbcode.php:641 -msgid "$1 wrote:" -msgstr "$1 schreef:" +#: ../../include/message.php:45 +msgid "Unable to determine sender." +msgstr "Afzender kan niet bepaald worden." -#: ../../include/RedDAV/RedBrowser.php:106 -#: ../../include/RedDAV/RedBrowser.php:249 -msgid "parent" -msgstr "omhoog" +#: ../../include/message.php:200 +msgid "Stored post could not be verified." +msgstr "Opgeslagen bericht kon niet worden geverifieerd." -#: ../../include/RedDAV/RedBrowser.php:130 -msgid "Collection" -msgstr "map" +#: ../../include/nav.php:95 ../../include/nav.php:128 ../../boot.php:1512 +msgid "Logout" +msgstr "Uitloggen" -#: ../../include/RedDAV/RedBrowser.php:133 -msgid "Principal" -msgstr "principal" +#: ../../include/nav.php:95 ../../include/nav.php:128 +msgid "End this session" +msgstr "Beëindig deze sessie" -#: ../../include/RedDAV/RedBrowser.php:136 -msgid "Addressbook" -msgstr "Adresboek" +#: ../../include/nav.php:98 ../../include/nav.php:159 +msgid "Home" +msgstr "Home" -#: ../../include/RedDAV/RedBrowser.php:139 -msgid "Calendar" -msgstr "Agenda" +#: ../../include/nav.php:98 +msgid "Your posts and conversations" +msgstr "Jouw berichten en conversaties" -#: ../../include/RedDAV/RedBrowser.php:142 -msgid "Schedule Inbox" -msgstr "Planning-postvak IN" +#: ../../include/nav.php:99 +msgid "Your profile page" +msgstr "Jouw profielpagina" -#: ../../include/RedDAV/RedBrowser.php:145 -msgid "Schedule Outbox" -msgstr "Planning-postvak UIT" +#: ../../include/nav.php:101 +msgid "Edit Profiles" +msgstr "Bewerk profielen" -#: ../../include/RedDAV/RedBrowser.php:223 -#, php-format -msgid "%1$s used" -msgstr "%1$s gebruikt" +#: ../../include/nav.php:101 +msgid "Manage/Edit profiles" +msgstr "Beheer/wijzig profielen" -#: ../../include/RedDAV/RedBrowser.php:228 -#, php-format -msgid "%1$s used of %2$s (%3$s%)" -msgstr "%1$s van %2$s gebruikt (%3$s%)" +#: ../../include/nav.php:103 +msgid "Edit your profile" +msgstr "Jouw profiel bewerken" -#: ../../include/RedDAV/RedBrowser.php:245 ../../mod/settings.php:521 -#: ../../mod/settings.php:547 ../../mod/admin.php:868 -msgid "Name" -msgstr "Naam" +#: ../../include/nav.php:105 +msgid "Your photos" +msgstr "Jouw foto's" -#: ../../include/RedDAV/RedBrowser.php:246 -msgid "Type" -msgstr "Type" +#: ../../include/nav.php:106 +msgid "Your files" +msgstr "Jouw bestanden" -#: ../../include/RedDAV/RedBrowser.php:247 -msgid "Size" -msgstr "Grootte" +#: ../../include/nav.php:111 +msgid "Your chatrooms" +msgstr "Jouw chatkanalen" -#: ../../include/RedDAV/RedBrowser.php:248 -msgid "Last Modified" -msgstr "Laatst gewijzigd" +#: ../../include/nav.php:117 +msgid "Your bookmarks" +msgstr "Jouw bladwijzers" -#: ../../include/RedDAV/RedBrowser.php:252 -msgid "Total" -msgstr "Totaal" +#: ../../include/nav.php:121 +msgid "Your webpages" +msgstr "Jouw webpagina's" -#: ../../include/RedDAV/RedBrowser.php:305 -msgid "Create new folder" -msgstr "Nieuwe map aanmaken" +#: ../../include/nav.php:125 +msgid "Sign in" +msgstr "Inloggen" -#: ../../include/RedDAV/RedBrowser.php:306 ../../mod/mitem.php:142 -#: ../../mod/menu.php:84 ../../mod/new_channel.php:122 -msgid "Create" -msgstr "Aanmaken" +#: ../../include/nav.php:142 +#, php-format +msgid "%s - click to logout" +msgstr "%s - klik om uit te loggen" -#: ../../include/RedDAV/RedBrowser.php:307 -msgid "Upload file" -msgstr "Bestand uploaden" +#: ../../include/nav.php:145 +msgid "Remote authentication" +msgstr "Authenticatie op afstand" -#: ../../include/RedDAV/RedBrowser.php:308 ../../mod/photos.php:745 -#: ../../mod/photos.php:1226 ../../mod/profile_photo.php:361 -msgid "Upload" -msgstr "Uploaden" +#: ../../include/nav.php:145 +msgid "Click to authenticate to your home hub" +msgstr "Authenticeer jezelf via (bijvoorbeeld) jouw RedMatrix-hub" -#: ../../include/message.php:18 -msgid "No recipient provided." -msgstr "Geen ontvanger opgegeven." +#: ../../include/nav.php:159 +msgid "Home Page" +msgstr "Homepage" -#: ../../include/message.php:23 -msgid "[no subject]" -msgstr "[geen onderwerp]" +#: ../../include/nav.php:163 ../../mod/register.php:220 ../../boot.php:1489 +msgid "Register" +msgstr "Registreren" + +#: ../../include/nav.php:163 +msgid "Create an account" +msgstr "Maak een account aan" + +#: ../../include/nav.php:168 +msgid "Help and documentation" +msgstr "Hulp en documentatie" + +#: ../../include/nav.php:171 +msgid "Applications, utilities, links, games" +msgstr "Apps" -#: ../../include/message.php:45 -msgid "Unable to determine sender." -msgstr "Afzender kan niet bepaald worden." +#: ../../include/nav.php:173 +msgid "Search site content" +msgstr "Inhoud van deze RedMatrix-hub doorzoeken" -#: ../../include/message.php:200 -msgid "Stored post could not be verified." -msgstr "Opgeslagen bericht kon niet worden geverifieerd." +#: ../../include/nav.php:176 +msgid "Channel Locator" +msgstr "Kanalengids" -#: ../../include/ItemObject.php:130 -msgid "Save to Folder" -msgstr "In map opslaan" +#: ../../include/nav.php:190 +msgid "Your matrix" +msgstr "Jouw matrix" -#: ../../include/ItemObject.php:142 ../../include/ItemObject.php:154 -msgid "View all" -msgstr "Toon alles" +#: ../../include/nav.php:191 +msgid "Mark all matrix notifications seen" +msgstr "Markeer alle matrixnotificaties als bekeken" -#: ../../include/ItemObject.php:151 -msgctxt "noun" -msgid "Dislike" -msgid_plural "Dislikes" -msgstr[0] "vindt dit niet leuk" -msgstr[1] "vinden dit niet leuk" +#: ../../include/nav.php:193 +msgid "Channel home" +msgstr "Tijdlijn kanaal" -#: ../../include/ItemObject.php:179 -msgid "Add Star" -msgstr "Ster toevoegen" +#: ../../include/nav.php:194 +msgid "Mark all channel notifications seen" +msgstr "Alle kanaalnotificaties als gelezen markeren" -#: ../../include/ItemObject.php:180 -msgid "Remove Star" -msgstr "Ster verwijderen" +#: ../../include/nav.php:197 ../../mod/connections.php:406 +msgid "Connections" +msgstr "Connecties" -#: ../../include/ItemObject.php:181 -msgid "Toggle Star Status" -msgstr "Ster toevoegen of verwijderen" +#: ../../include/nav.php:200 +msgid "Notices" +msgstr "Notificaties" -#: ../../include/ItemObject.php:185 -msgid "starred" -msgstr "met ster" +#: ../../include/nav.php:200 +msgid "Notifications" +msgstr "Notificaties" -#: ../../include/ItemObject.php:203 -msgid "Add Tag" -msgstr "Label toevoegen" +#: ../../include/nav.php:201 +msgid "See all notifications" +msgstr "Alle notificaties weergeven" -#: ../../include/ItemObject.php:221 ../../mod/photos.php:990 -msgid "I like this (toggle)" -msgstr "Vind ik leuk" +#: ../../include/nav.php:202 ../../mod/notifications.php:99 +msgid "Mark all system notifications seen" +msgstr "Markeer alle systeemnotificaties als bekeken" -#: ../../include/ItemObject.php:222 ../../mod/photos.php:991 -msgid "I don't like this (toggle)" -msgstr "Vind ik niet leuk" +#: ../../include/nav.php:204 +msgid "Private mail" +msgstr "Privéberichten" -#: ../../include/ItemObject.php:226 -msgid "Share This" -msgstr "Delen" +#: ../../include/nav.php:205 +msgid "See all private messages" +msgstr "Alle privéberichten weergeven" -#: ../../include/ItemObject.php:226 -msgid "share" -msgstr "delen" +#: ../../include/nav.php:206 +msgid "Mark all private messages seen" +msgstr "Markeer alle privéberichten als bekeken" -#: ../../include/ItemObject.php:249 ../../include/ItemObject.php:250 -#, php-format -msgid "View %s's profile - %s" -msgstr "Profiel van %s bekijken - %s" +#: ../../include/nav.php:207 +msgid "Inbox" +msgstr "Postvak IN" -#: ../../include/ItemObject.php:251 -msgid "to" -msgstr "aan" +#: ../../include/nav.php:208 +msgid "Outbox" +msgstr "Postvak UIT" -#: ../../include/ItemObject.php:252 -msgid "via" -msgstr "via" +#: ../../include/nav.php:212 +msgid "Event Calendar" +msgstr "Agenda" -#: ../../include/ItemObject.php:253 -msgid "Wall-to-Wall" -msgstr "Kanaal-naar-kanaal" +#: ../../include/nav.php:213 +msgid "See all events" +msgstr "Alle gebeurtenissen weergeven" -#: ../../include/ItemObject.php:254 -msgid "via Wall-To-Wall:" -msgstr "via kanaal-naar-kanaal" +#: ../../include/nav.php:214 +msgid "Mark all events seen" +msgstr "Markeer alle gebeurtenissen als bekeken" -#: ../../include/ItemObject.php:290 -msgid "Save Bookmarks" -msgstr "Bladwijzers opslaan" +#: ../../include/nav.php:216 +msgid "Manage Your Channels" +msgstr "Beheer je kanalen" -#: ../../include/ItemObject.php:291 -msgid "Add to Calendar" -msgstr "Aan agenda toevoegen" +#: ../../include/nav.php:218 +msgid "Account/Channel Settings" +msgstr "Account-/kanaal-instellingen" -#: ../../include/ItemObject.php:299 -msgctxt "noun" -msgid "Likes" -msgstr "vinden dit leuk" +#: ../../include/nav.php:226 ../../mod/admin.php:123 +msgid "Admin" +msgstr "Beheer" -#: ../../include/ItemObject.php:300 -msgctxt "noun" -msgid "Dislikes" -msgstr "vinden dit niet leuk" +#: ../../include/nav.php:226 +msgid "Site Setup and Configuration" +msgstr "Hub instellen en beheren" -#: ../../include/ItemObject.php:331 -#, php-format -msgid "%d comment" -msgid_plural "%d comments" -msgstr[0] "%d reactie" -msgstr[1] "%d reacties weergeven" +#: ../../include/nav.php:262 +msgid "Please wait..." +msgstr "Wachten aub..." -#: ../../include/ItemObject.php:332 ../../include/js_strings.php:7 -msgid "[+] show all" -msgstr "[+] alle" +#: ../../include/network.php:590 +msgid "view full size" +msgstr "volledige grootte tonen" -#: ../../include/ItemObject.php:596 ../../mod/photos.php:1009 -#: ../../mod/photos.php:1096 -msgid "This is you" -msgstr "Dit ben jij" +#: ../../include/acl_selectors.php:240 +msgid "Visible to your default audience" +msgstr "Voor iedereen zichtbaar, mits niet anders ingesteld" -#: ../../include/ItemObject.php:598 ../../include/js_strings.php:6 -#: ../../mod/photos.php:1011 ../../mod/photos.php:1098 -msgid "Comment" -msgstr "Reactie" +#: ../../include/acl_selectors.php:241 +msgid "Show" +msgstr "Tonen" -#: ../../include/ItemObject.php:599 ../../mod/mood.php:135 -#: ../../mod/photos.php:563 ../../mod/photos.php:672 ../../mod/photos.php:972 -#: ../../mod/photos.php:1012 ../../mod/photos.php:1099 -#: ../../mod/settings.php:519 ../../mod/settings.php:631 -#: ../../mod/settings.php:660 ../../mod/settings.php:684 -#: ../../mod/settings.php:760 ../../mod/settings.php:945 -#: ../../mod/poke.php:166 ../../mod/profiles.php:615 ../../mod/events.php:587 -#: ../../mod/chat.php:177 ../../mod/chat.php:211 ../../mod/connect.php:92 -#: ../../mod/connedit.php:540 ../../mod/setup.php:307 ../../mod/setup.php:350 -#: ../../mod/pdledit.php:58 ../../mod/sources.php:104 -#: ../../mod/sources.php:138 ../../mod/filestorage.php:146 -#: ../../mod/fsuggest.php:108 ../../mod/group.php:81 ../../mod/admin.php:414 -#: ../../mod/admin.php:725 ../../mod/admin.php:861 ../../mod/admin.php:994 -#: ../../mod/admin.php:1193 ../../mod/admin.php:1280 ../../mod/thing.php:284 -#: ../../mod/thing.php:327 ../../mod/import.php:480 ../../mod/invite.php:142 -#: ../../mod/mail.php:348 ../../mod/appman.php:99 ../../mod/poll.php:68 -#: ../../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/acl_selectors.php:242 +msgid "Don't show" +msgstr "Niet tonen" -#: ../../include/ItemObject.php:600 -msgid "Bold" -msgstr "Vet" +#: ../../include/acl_selectors.php:248 ../../mod/photos.php:589 +#: ../../mod/photos.php:948 ../../mod/events.php:585 ../../mod/chat.php:209 +#: ../../mod/filestorage.php:137 +msgid "Permissions" +msgstr "Permissies" -#: ../../include/ItemObject.php:601 -msgid "Italic" -msgstr "Cursief" +#: ../../include/acl_selectors.php:249 ../../include/ItemObject.php:305 +#: ../../mod/photos.php:1145 +msgid "Close" +msgstr "Sluiten" -#: ../../include/ItemObject.php:602 -msgid "Underline" -msgstr "Onderstrepen" +#: ../../include/api.php:1084 +msgid "Public Timeline" +msgstr "Openbare tijdlijn" -#: ../../include/ItemObject.php:603 -msgid "Quote" -msgstr "Citeren" +#: ../../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/ItemObject.php:604 -msgid "Code" -msgstr "Broncode" +#: ../../include/photos.php:111 +msgid "Image file is empty." +msgstr "Afbeeldingsbestand is leeg" -#: ../../include/ItemObject.php:605 -msgid "Image" -msgstr "Afbeelding" +#: ../../include/photos.php:140 ../../mod/profile_photo.php:216 +msgid "Unable to process image" +msgstr "Afbeelding kan niet verwerkt worden" -#: ../../include/ItemObject.php:606 -msgid "Link" -msgstr "Link" +#: ../../include/photos.php:212 +msgid "Photo storage failed." +msgstr "Foto kan niet worden opgeslagen" -#: ../../include/ItemObject.php:607 -msgid "Video" -msgstr "Video" +#: ../../include/photos.php:344 +msgid "Upload New Photos" +msgstr "Nieuwe foto's uploaden" #: ../../include/js_strings.php:5 msgid "Delete this item?" msgstr "Dit item verwijderen?" +#: ../../include/js_strings.php:6 ../../include/ItemObject.php:598 +#: ../../mod/photos.php:992 ../../mod/photos.php:1102 +msgid "Comment" +msgstr "Reactie" + +#: ../../include/js_strings.php:7 ../../include/ItemObject.php:332 +msgid "[+] show all" +msgstr "[+] alle" + #: ../../include/js_strings.php:8 msgid "[-] show less" msgstr "[-] minder reacties weergeven" @@ -3171,19 +3260,6 @@ msgstr " " msgid "timeago.numbers" msgstr "timeago.numbers" -#: ../../include/Contact.php:123 -msgid "New window" -msgstr "Nieuw venster" - -#: ../../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/Contact.php:211 ../../mod/admin.php:649 -#, php-format -msgid "User '%s' deleted" -msgstr "Account '%s' verwijderd" - #: ../../include/profile_selectors.php:6 #: ../../include/profile_selectors.php:23 msgid "Male" @@ -3234,13 +3310,6 @@ msgstr "Genderneutraal" msgid "Non-specific" msgstr "Niet gespecificeerd" -#: ../../include/profile_selectors.php:6 -#: ../../include/profile_selectors.php:23 -#: ../../include/profile_selectors.php:61 -#: ../../include/profile_selectors.php:97 ../../include/permissions.php:746 -msgid "Other" -msgstr "Anders" - #: ../../include/profile_selectors.php:6 msgid "Undecided" msgstr "Nog niet beslist" @@ -3427,211 +3496,163 @@ msgstr "Maakt mij niks uit" msgid "Ask me" msgstr "Vraag het me" -#: ../../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 plaatsen" - -#: ../../include/permissions.php:23 -msgid "Can comment on or like my posts" -msgstr "Kan op mijn berichten reageren of deze (niet) leuk vinden" - -#: ../../include/permissions.php:24 -msgid "Can send me private mail messages" -msgstr "Kan mij privéberichten sturen" - -#: ../../include/permissions.php:25 -msgid "Can post photos to my photo albums" -msgstr "Kan foto's aan mijn fotoalbums toevoegen" - -#: ../../include/permissions.php:26 -msgid "Can like/dislike stuff" -msgstr "Kan dingen leuk of niet leuk vinden" - -#: ../../include/permissions.php:26 -msgid "Profiles and things other than posts/comments" -msgstr "Profielen en dingen, buiten berichten en reacties" - -#: ../../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/permissions.php:28 -msgid "Advanced - useful for creating group forum channels" -msgstr "Geavanceerd - nuttig voor kanalen met een groep- cq. forumfunctie" - -#: ../../include/permissions.php:29 -msgid "Can chat with me (when available)" -msgstr "Kan met mij chatten (wanneer beschikbaar)" - -#: ../../include/permissions.php:30 -msgid "Can write to my file storage" -msgstr "Kan bestanden aan mijn bestandsopslag toevoegen" - -#: ../../include/permissions.php:31 -msgid "Can edit my webpages" -msgstr "Kan mijn pagina's bewerken" - -#: ../../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/ItemObject.php:130 +msgid "Save to Folder" +msgstr "In map opslaan" -#: ../../include/permissions.php:33 -msgid "Somewhat advanced - very useful in open communities" -msgstr "Enigszins geavanceerd (erg nuttig voor kanalen van forums/groepen)" +#: ../../include/ItemObject.php:142 ../../include/ItemObject.php:154 +#: ../../mod/photos.php:1019 ../../mod/photos.php:1031 +msgid "View all" +msgstr "Toon alles" -#: ../../include/permissions.php:35 -msgid "Can administer my channel resources" -msgstr "Kan mijn kanaal beheren" +#: ../../include/ItemObject.php:151 ../../mod/photos.php:1028 +msgctxt "noun" +msgid "Dislike" +msgid_plural "Dislikes" +msgstr[0] "vindt dit niet leuk" +msgstr[1] "vinden dit niet 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/ItemObject.php:179 +msgid "Add Star" +msgstr "Ster toevoegen" -#: ../../include/permissions.php:738 -msgid "Social Networking" -msgstr "Sociaal netwerk" +#: ../../include/ItemObject.php:180 +msgid "Remove Star" +msgstr "Ster verwijderen" -#: ../../include/permissions.php:739 ../../include/permissions.php:741 -#: ../../include/permissions.php:743 ../../include/permissions.php:745 -msgid "Mostly Public" -msgstr "Vrijwel alles openbaar" +#: ../../include/ItemObject.php:181 +msgid "Toggle Star Status" +msgstr "Ster toevoegen of verwijderen" -#: ../../include/permissions.php:739 ../../include/permissions.php:741 -#: ../../include/permissions.php:743 -msgid "Restricted" -msgstr "Beperkt zichtbaar" +#: ../../include/ItemObject.php:185 +msgid "starred" +msgstr "met ster" -#: ../../include/permissions.php:739 ../../include/permissions.php:741 -msgid "Private" -msgstr "Verborgen kanaal" +#: ../../include/ItemObject.php:203 +msgid "Add Tag" +msgstr "Label toevoegen" -#: ../../include/permissions.php:740 -msgid "Community Forum" -msgstr "Groepsforum" +#: ../../include/ItemObject.php:221 ../../mod/photos.php:971 +msgid "I like this (toggle)" +msgstr "Vind ik leuk" -#: ../../include/permissions.php:742 -msgid "Feed Republish" -msgstr "Feed herpubliceren" +#: ../../include/ItemObject.php:222 ../../mod/photos.php:972 +msgid "I don't like this (toggle)" +msgstr "Vind ik niet leuk" -#: ../../include/permissions.php:744 -msgid "Celebrity/Soapbox" -msgstr "Beroemdheid/alleen volgen" +#: ../../include/ItemObject.php:226 +msgid "Share This" +msgstr "Delen" -#: ../../include/permissions.php:747 -msgid "Custom/Expert Mode" -msgstr "Expertmodus/handmatig aanpassen" +#: ../../include/ItemObject.php:226 +msgid "share" +msgstr "delen" -#: ../../include/datetime.php:43 ../../include/datetime.php:45 -msgid "Miscellaneous" -msgstr "Diversen" +#: ../../include/ItemObject.php:249 ../../include/ItemObject.php:250 +#, php-format +msgid "View %s's profile - %s" +msgstr "Profiel van %s bekijken - %s" -#: ../../include/datetime.php:238 -msgid "never" -msgstr "nooit" +#: ../../include/ItemObject.php:251 +msgid "to" +msgstr "aan" -#: ../../include/datetime.php:244 -msgid "less than a second ago" -msgstr "minder dan een seconde geleden" +#: ../../include/ItemObject.php:252 +msgid "via" +msgstr "via" -#: ../../include/datetime.php:247 -msgid "year" -msgstr "jaar" +#: ../../include/ItemObject.php:253 +msgid "Wall-to-Wall" +msgstr "Kanaal-naar-kanaal" -#: ../../include/datetime.php:247 -msgid "years" -msgstr "jaren" +#: ../../include/ItemObject.php:254 +msgid "via Wall-To-Wall:" +msgstr "via kanaal-naar-kanaal" -#: ../../include/datetime.php:248 -msgid "month" -msgstr "maand" +#: ../../include/ItemObject.php:290 +msgid "Save Bookmarks" +msgstr "Bladwijzers opslaan" -#: ../../include/datetime.php:248 -msgid "months" -msgstr "maanden" +#: ../../include/ItemObject.php:291 +msgid "Add to Calendar" +msgstr "Aan agenda toevoegen" -#: ../../include/datetime.php:249 -msgid "week" -msgstr "week" +#: ../../include/ItemObject.php:299 ../../mod/photos.php:1139 +msgctxt "noun" +msgid "Likes" +msgstr "vinden dit leuk" -#: ../../include/datetime.php:249 -msgid "weeks" -msgstr "weken" +#: ../../include/ItemObject.php:300 ../../mod/photos.php:1140 +msgctxt "noun" +msgid "Dislikes" +msgstr "vinden dit niet leuk" -#: ../../include/datetime.php:250 -msgid "day" -msgstr "dag" +#: ../../include/ItemObject.php:331 +#, php-format +msgid "%d comment" +msgid_plural "%d comments" +msgstr[0] "%d reactie" +msgstr[1] "%d reacties weergeven" -#: ../../include/datetime.php:250 -msgid "days" -msgstr "dagen" +#: ../../include/ItemObject.php:596 ../../mod/photos.php:990 +#: ../../mod/photos.php:1100 +msgid "This is you" +msgstr "Dit ben jij" -#: ../../include/datetime.php:251 -msgid "hour" -msgstr "uur" +#: ../../include/ItemObject.php:599 ../../mod/mood.php:135 +#: ../../mod/photos.php:595 ../../mod/photos.php:669 ../../mod/photos.php:953 +#: ../../mod/photos.php:993 ../../mod/photos.php:1103 +#: ../../mod/settings.php:549 ../../mod/settings.php:661 +#: ../../mod/settings.php:690 ../../mod/settings.php:714 +#: ../../mod/settings.php:790 ../../mod/settings.php:976 +#: ../../mod/poke.php:166 ../../mod/profiles.php:615 ../../mod/events.php:587 +#: ../../mod/chat.php:177 ../../mod/chat.php:211 ../../mod/connect.php:92 +#: ../../mod/connedit.php:555 ../../mod/setup.php:307 ../../mod/setup.php:350 +#: ../../mod/pdledit.php:58 ../../mod/sources.php:104 +#: ../../mod/sources.php:138 ../../mod/filestorage.php:146 +#: ../../mod/fsuggest.php:108 ../../mod/group.php:81 ../../mod/admin.php:414 +#: ../../mod/admin.php:725 ../../mod/admin.php:861 ../../mod/admin.php:994 +#: ../../mod/admin.php:1193 ../../mod/admin.php:1280 ../../mod/thing.php:284 +#: ../../mod/thing.php:327 ../../mod/import.php:480 ../../mod/invite.php:142 +#: ../../mod/locs.php:99 ../../mod/mail.php:348 ../../mod/appman.php:99 +#: ../../mod/poll.php:68 ../../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/datetime.php:251 -msgid "hours" -msgstr "uren" +#: ../../include/ItemObject.php:600 +msgid "Bold" +msgstr "Vet" -#: ../../include/datetime.php:252 -msgid "minute" -msgstr "minuut" +#: ../../include/ItemObject.php:601 +msgid "Italic" +msgstr "Cursief" -#: ../../include/datetime.php:252 -msgid "minutes" -msgstr "minuten" +#: ../../include/ItemObject.php:602 +msgid "Underline" +msgstr "Onderstrepen" -#: ../../include/datetime.php:253 -msgid "second" -msgstr "seconde" +#: ../../include/ItemObject.php:603 +msgid "Quote" +msgstr "Citeren" -#: ../../include/datetime.php:253 -msgid "seconds" -msgstr "seconden" +#: ../../include/ItemObject.php:604 +msgid "Code" +msgstr "Broncode" -#: ../../include/datetime.php:262 -#, php-format -msgid "%1$d %2$s ago" -msgstr "%1$d %2$s geleden" +#: ../../include/ItemObject.php:605 +msgid "Image" +msgstr "Afbeelding" -#: ../../include/datetime.php:467 -#, php-format -msgid "%1$s's birthday" -msgstr "Verjaardag van %1$s" +#: ../../include/ItemObject.php:606 +msgid "Link" +msgstr "Link" -#: ../../include/datetime.php:468 -#, php-format -msgid "Happy Birthday %1$s" -msgstr "Gefeliciteerd met je verjaardag %1$s" +#: ../../include/ItemObject.php:607 +msgid "Video" +msgstr "Video" #: ../../mod/mood.php:132 msgid "Set your current mood and tell your friends" @@ -3645,149 +3666,148 @@ msgstr "Informatie over de pagina-eigenaar werd niet ontvangen." msgid "Album not found." msgstr "Album niet gevonden." -#: ../../mod/photos.php:119 ../../mod/photos.php:673 +#: ../../mod/photos.php:119 ../../mod/photos.php:670 msgid "Delete Album" msgstr "Verwijder album" -#: ../../mod/photos.php:159 ../../mod/photos.php:973 +#: ../../mod/photos.php:159 ../../mod/photos.php:954 msgid "Delete Photo" msgstr "Verwijder foto" -#: ../../mod/photos.php:443 ../../mod/search.php:13 ../../mod/directory.php:15 +#: ../../mod/photos.php:459 ../../mod/search.php:13 ../../mod/directory.php:15 #: ../../mod/dirprofile.php:9 ../../mod/display.php:9 #: ../../mod/viewconnections.php:17 msgid "Public access denied." msgstr "Openbare toegang geweigerd." -#: ../../mod/photos.php:453 +#: ../../mod/photos.php:470 msgid "No photos selected" msgstr "Geen foto's geselecteerd" -#: ../../mod/photos.php:500 +#: ../../mod/photos.php:514 msgid "Access to this item is restricted." msgstr "Toegang tot dit item is beperkt." -#: ../../mod/photos.php:574 +#: ../../mod/photos.php:553 #, 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." +msgid "%1$.2f MB of %2$.2f MB photo storage used." +msgstr "%1$.2f MB van %2$.2f MB aan foto-opslag gebruikt." -#: ../../mod/photos.php:577 +#: ../../mod/photos.php:556 #, php-format -msgid "You have used %1$.2f Mbytes of photo storage." -msgstr "Je gebruikt %1$.2f MB aan foto-opslagruimte." +msgid "%1$.2f MB photo storage used." +msgstr "%1$.2f MB aan foto-opslag gebruikt." -#: ../../mod/photos.php:596 +#: ../../mod/photos.php:580 msgid "Upload Photos" msgstr "Foto's uploaden" -#: ../../mod/photos.php:600 ../../mod/photos.php:668 -msgid "New album name: " -msgstr "Nieuwe albumnaam: " +#: ../../mod/photos.php:584 ../../mod/photos.php:663 ../../mod/photos.php:941 +msgid "Enter a new album name" +msgstr "Vul een nieuwe albumnaam in" -#: ../../mod/photos.php:601 -msgid "or existing album name: " -msgstr "of een bestaande albumnaam: " +#: ../../mod/photos.php:585 ../../mod/photos.php:664 ../../mod/photos.php:942 +msgid "or select an existing one (doubleclick)" +msgstr "of kies een bestaand album (dubbelklikken)" -#: ../../mod/photos.php:602 +#: ../../mod/photos.php:586 msgid "Do not show a status post for this upload" msgstr "Plaats geen bericht voor deze upload." -#: ../../mod/photos.php:622 +#: ../../mod/photos.php:614 msgid "Album name could not be decoded" msgstr "Albumnaam kon niet gedecodeerd worden" -#: ../../mod/photos.php:657 ../../mod/photos.php:679 ../../mod/photos.php:1148 -#: ../../mod/photos.php:1163 +#: ../../mod/photos.php:652 ../../mod/photos.php:1163 +#: ../../mod/photos.php:1178 msgid "Contact Photos" msgstr "Connectiefoto's" -#: ../../mod/photos.php:681 -msgid "Edit Album" -msgstr "Album bewerken" - -#: ../../mod/photos.php:687 +#: ../../mod/photos.php:676 msgid "Show Newest First" msgstr "Nieuwste eerst weergeven" -#: ../../mod/photos.php:689 +#: ../../mod/photos.php:678 msgid "Show Oldest First" msgstr "Oudste eerst weergeven" -#: ../../mod/photos.php:716 ../../mod/photos.php:1195 +#: ../../mod/photos.php:705 ../../mod/photos.php:1210 msgid "View Photo" msgstr "Foto weergeven" -#: ../../mod/photos.php:794 +#: ../../mod/photos.php:734 +msgid "Edit Album" +msgstr "Album bewerken" + +#: ../../mod/photos.php:779 msgid "Permission denied. Access to this item may be restricted." msgstr "Toegang geweigerd. Toegang tot dit item kan zijn beperkt." -#: ../../mod/photos.php:796 +#: ../../mod/photos.php:781 msgid "Photo not available" msgstr "Foto niet aanwezig" -#: ../../mod/photos.php:856 +#: ../../mod/photos.php:839 msgid "Use as profile photo" msgstr "Als profielfoto gebruiken" -#: ../../mod/photos.php:863 +#: ../../mod/photos.php:846 msgid "Private Photo" msgstr "Privéfoto" -#: ../../mod/photos.php:874 ../../mod/events.php:433 +#: ../../mod/photos.php:857 ../../mod/events.php:433 msgid "Previous" msgstr "Vorige" -#: ../../mod/photos.php:878 +#: ../../mod/photos.php:861 msgid "View Full Size" msgstr "Volledige grootte weergeven" -#: ../../mod/photos.php:883 ../../mod/events.php:434 ../../mod/setup.php:261 +#: ../../mod/photos.php:866 ../../mod/events.php:434 ../../mod/setup.php:261 msgid "Next" msgstr "Volgende" -#: ../../mod/photos.php:922 ../../mod/delegate.php:130 ../../mod/tagrm.php:93 +#: ../../mod/photos.php:903 ../../mod/delegate.php:130 ../../mod/tagrm.php:133 msgid "Remove" msgstr "Verwijderen" -#: ../../mod/photos.php:956 +#: ../../mod/photos.php:935 msgid "Edit photo" msgstr "Foto bewerken" -#: ../../mod/photos.php:958 +#: ../../mod/photos.php:937 msgid "Rotate CW (right)" msgstr "Draai met de klok mee (naar rechts)" -#: ../../mod/photos.php:959 +#: ../../mod/photos.php:938 msgid "Rotate CCW (left)" msgstr "Draai tegen de klok in (naar links)" -#: ../../mod/photos.php:962 -msgid "New album name" -msgstr "Nieuwe albumnaam" - -#: ../../mod/photos.php:965 +#: ../../mod/photos.php:945 msgid "Caption" msgstr "Bijschrift" -#: ../../mod/photos.php:967 +#: ../../mod/photos.php:947 msgid "Add a Tag" msgstr "Label toevoegen" -#: ../../mod/photos.php:970 -msgid "" -"Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" -msgstr "Voorbeeld: @bob, @Barbara_Jansen, @jan@example.com, #Friesland, #camping" +#: ../../mod/photos.php:950 +msgid "Example: @bob, @Barbara_Jensen, @jim@example.com" +msgstr "Voorbeeld: @bob, @Barbara_Jansen, @jan@voorbeeld.nl" + +#: ../../mod/photos.php:952 +msgid "Flag as adult in album view" +msgstr "Markeer als voor volwassenen in albumweergave" -#: ../../mod/photos.php:1125 +#: ../../mod/photos.php:1129 msgid "In This Photo:" msgstr "Op deze foto:" -#: ../../mod/photos.php:1201 +#: ../../mod/photos.php:1216 msgid "View Album" msgstr "Album weergeven" -#: ../../mod/photos.php:1224 +#: ../../mod/photos.php:1239 msgid "Recent Photos" msgstr "Recente foto's" @@ -3860,7 +3880,7 @@ msgstr "Nieuw menu-element" msgid "Menu Item Permissions" msgstr "Permissies menu-item" -#: ../../mod/mitem.php:134 ../../mod/mitem.php:177 ../../mod/settings.php:980 +#: ../../mod/mitem.php:134 ../../mod/mitem.php:177 ../../mod/settings.php:1011 msgid "(click to open/close)" msgstr "(klik om te openen/sluiten)" @@ -3912,15 +3932,15 @@ msgstr "Wijzigen" msgid "Some blurb about what to do when you're new here" msgstr "Welkom op de RedMatrix. Klik op de tab ontdekken of klik rechtsboven op de kanalengids, om kanalen te vinden. Rechtsboven vind je ook onze apps, waar je vrijwel alles van de RedMatrix kan vinden. Voor hulp met de RedMatrix klik je op het vraagteken of als je meer vragen hebt stel je die in het supportkanaal (liefst in het Engels)." -#: ../../mod/ping.php:237 +#: ../../mod/ping.php:255 msgid "sent you a private message" msgstr "stuurde jou een privébericht" -#: ../../mod/ping.php:288 +#: ../../mod/ping.php:306 msgid "added your channel" msgstr "voegde jouw kanaal toe" -#: ../../mod/ping.php:329 +#: ../../mod/ping.php:347 msgid "posted an event" msgstr "plaatste een gebeurtenis" @@ -3928,471 +3948,540 @@ msgstr "plaatste een gebeurtenis" msgid "network" msgstr "netwerk" -#: ../../mod/settings.php:71 +#: ../../mod/settings.php:73 msgid "Name is required" msgstr "Naam is vereist" -#: ../../mod/settings.php:75 +#: ../../mod/settings.php:77 msgid "Key and Secret are required" msgstr "Key en secret zijn vereist" -#: ../../mod/settings.php:198 +#: ../../mod/settings.php:197 msgid "Passwords do not match. Password unchanged." msgstr "Wachtwoorden komen niet overeen. Wachtwoord onveranderd." -#: ../../mod/settings.php:202 +#: ../../mod/settings.php:201 msgid "Empty passwords are not allowed. Password unchanged." msgstr "Lege wachtwoorden zijn niet toegestaan. Wachtwoord onveranderd." -#: ../../mod/settings.php:216 +#: ../../mod/settings.php:215 msgid "Password changed." msgstr "Wachtwoord veranderd." -#: ../../mod/settings.php:218 +#: ../../mod/settings.php:217 msgid "Password update failed. Please try again." msgstr "Bijwerken wachtwoord mislukt. Probeer opnieuw." -#: ../../mod/settings.php:232 +#: ../../mod/settings.php:231 msgid "Not valid email." msgstr "Geen geldig e-mailadres." -#: ../../mod/settings.php:235 +#: ../../mod/settings.php:234 msgid "Protected email address. Cannot change to that email." msgstr "Beschermd e-mailadres. Kan dat e-mailadres niet gebruiken." -#: ../../mod/settings.php:244 +#: ../../mod/settings.php:243 msgid "System failure storing new email. Please try again." msgstr "Systeemfout opslaan van nieuwe e-mail. Probeer het nog een keer." -#: ../../mod/settings.php:447 +#: ../../mod/settings.php:479 msgid "Settings updated." msgstr "Instellingen bijgewerkt." -#: ../../mod/settings.php:518 ../../mod/settings.php:544 -#: ../../mod/settings.php:580 +#: ../../mod/settings.php:548 ../../mod/settings.php:574 +#: ../../mod/settings.php:610 msgid "Add application" msgstr "Applicatie toevoegen" -#: ../../mod/settings.php:521 +#: ../../mod/settings.php:551 msgid "Name of application" msgstr "Naam van applicatie" -#: ../../mod/settings.php:522 ../../mod/settings.php:548 +#: ../../mod/settings.php:552 ../../mod/settings.php:578 msgid "Consumer Key" msgstr "Consumer key" -#: ../../mod/settings.php:522 ../../mod/settings.php:523 +#: ../../mod/settings.php:552 ../../mod/settings.php:553 msgid "Automatically generated - change if desired. Max length 20" msgstr "Automatische gegenereerd - verander wanneer gewenst. Maximale lengte is 20" -#: ../../mod/settings.php:523 ../../mod/settings.php:549 +#: ../../mod/settings.php:553 ../../mod/settings.php:579 msgid "Consumer Secret" msgstr "Consumer secret" -#: ../../mod/settings.php:524 ../../mod/settings.php:550 +#: ../../mod/settings.php:554 ../../mod/settings.php:580 msgid "Redirect" msgstr "Redirect/doorverwijzing" -#: ../../mod/settings.php:524 +#: ../../mod/settings.php:554 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:525 ../../mod/settings.php:551 +#: ../../mod/settings.php:555 ../../mod/settings.php:581 msgid "Icon url" msgstr "URL van pictogram" -#: ../../mod/settings.php:525 +#: ../../mod/settings.php:555 msgid "Optional" msgstr "Optioneel" -#: ../../mod/settings.php:536 +#: ../../mod/settings.php:566 msgid "You can't edit this application." msgstr "Je kan deze applicatie niet bewerken" -#: ../../mod/settings.php:579 +#: ../../mod/settings.php:609 msgid "Connected Apps" msgstr "Verbonden applicaties" -#: ../../mod/settings.php:583 +#: ../../mod/settings.php:613 msgid "Client key starts with" msgstr "Client key begint met" -#: ../../mod/settings.php:584 +#: ../../mod/settings.php:614 msgid "No name" msgstr "Geen naam" -#: ../../mod/settings.php:585 +#: ../../mod/settings.php:615 msgid "Remove authorization" msgstr "Autorisatie verwijderen" -#: ../../mod/settings.php:596 +#: ../../mod/settings.php:626 msgid "No feature settings configured" msgstr "Geen plugin-instellingen ingesteld" -#: ../../mod/settings.php:604 +#: ../../mod/settings.php:634 msgid "Feature Settings" msgstr "Plugin-instellingen" -#: ../../mod/settings.php:627 +#: ../../mod/settings.php:657 msgid "Account Settings" msgstr "Account-instellingen" -#: ../../mod/settings.php:628 +#: ../../mod/settings.php:658 msgid "Password Settings" msgstr "Wachtwoord-instellingen" -#: ../../mod/settings.php:629 +#: ../../mod/settings.php:659 msgid "New Password:" msgstr "Nieuw wachtwoord:" -#: ../../mod/settings.php:630 +#: ../../mod/settings.php:660 msgid "Confirm:" msgstr "Bevestigen:" -#: ../../mod/settings.php:630 +#: ../../mod/settings.php:660 msgid "Leave password fields blank unless changing" msgstr "Laat de wachtwoordvelden leeg, behalve wanneer je deze wil veranderen" -#: ../../mod/settings.php:632 ../../mod/settings.php:954 +#: ../../mod/settings.php:662 ../../mod/settings.php:985 msgid "Email Address:" msgstr "E-mailadres:" -#: ../../mod/settings.php:633 ../../mod/removeaccount.php:61 +#: ../../mod/settings.php:663 ../../mod/removeaccount.php:61 msgid "Remove Account" msgstr "Account verwijderen" -#: ../../mod/settings.php:634 +#: ../../mod/settings.php:664 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:635 ../../mod/settings.php:1019 +#: ../../mod/settings.php:665 ../../mod/settings.php:1067 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:651 +#: ../../mod/settings.php:681 msgid "Off" msgstr "Uit" -#: ../../mod/settings.php:651 +#: ../../mod/settings.php:681 msgid "On" msgstr "Aan" -#: ../../mod/settings.php:658 +#: ../../mod/settings.php:688 msgid "Additional Features" msgstr "Extra functies" -#: ../../mod/settings.php:683 +#: ../../mod/settings.php:713 msgid "Connector Settings" msgstr "Instellingen externe koppelingen" -#: ../../mod/settings.php:713 ../../mod/admin.php:362 +#: ../../mod/settings.php:743 ../../mod/admin.php:362 msgid "No special theme for mobile devices" msgstr "Geen speciaal thema voor mobiele apparaten" -#: ../../mod/settings.php:722 +#: ../../mod/settings.php:752 #, php-format msgid "%s - (Experimental)" msgstr "%s - (experimenteel)" -#: ../../mod/settings.php:758 +#: ../../mod/settings.php:788 msgid "Display Settings" msgstr "Weergave-instellingen" -#: ../../mod/settings.php:764 +#: ../../mod/settings.php:794 msgid "Display Theme:" msgstr "Gebruik thema:" -#: ../../mod/settings.php:765 +#: ../../mod/settings.php:795 msgid "Mobile Theme:" msgstr "Mobiel thema:" -#: ../../mod/settings.php:766 +#: ../../mod/settings.php:796 msgid "Enable user zoom on mobile devices" msgstr "Inzoomen op smartphones en tablets toestaan" -#: ../../mod/settings.php:767 +#: ../../mod/settings.php:797 msgid "Update browser every xx seconds" msgstr "Ververs de webbrowser om de zoveel seconde" -#: ../../mod/settings.php:767 +#: ../../mod/settings.php:797 msgid "Minimum of 10 seconds, no maximum" msgstr "Minimaal 10 seconde, geen maximum" -#: ../../mod/settings.php:768 +#: ../../mod/settings.php:798 msgid "Maximum number of conversations to load at any time:" msgstr "Maximaal aantal conversaties die per keer geladen worden:" -#: ../../mod/settings.php:768 +#: ../../mod/settings.php:798 msgid "Maximum of 100 items" msgstr "Maximaal 100 conversaties" -#: ../../mod/settings.php:769 +#: ../../mod/settings.php:799 msgid "Don't show emoticons" msgstr "Geen emoticons weergeven" -#: ../../mod/settings.php:770 +#: ../../mod/settings.php:800 msgid "Link post titles to source" msgstr "Berichtkoppen naar originele locatie linken" -#: ../../mod/settings.php:771 +#: ../../mod/settings.php:801 msgid "System Page Layout Editor - (advanced)" msgstr "Lay-out bewerken van systeempagina's (geavanceerd)" -#: ../../mod/settings.php:807 +#: ../../mod/settings.php:835 msgid "Nobody except yourself" msgstr "Niemand, behalve jezelf" -#: ../../mod/settings.php:808 +#: ../../mod/settings.php:836 msgid "Only those you specifically allow" msgstr "Alleen connecties met uitdrukkelijke toestemming" -#: ../../mod/settings.php:809 +#: ../../mod/settings.php:837 msgid "Approved connections" msgstr "Geaccepteerde connecties" -#: ../../mod/settings.php:810 +#: ../../mod/settings.php:838 msgid "Any connections" msgstr "Alle connecties" -#: ../../mod/settings.php:811 +#: ../../mod/settings.php:839 msgid "Anybody on this website" msgstr "Iedereen op deze hub" -#: ../../mod/settings.php:812 +#: ../../mod/settings.php:840 msgid "Anybody in this network" msgstr "Iedereen in dit netwerk" -#: ../../mod/settings.php:813 +#: ../../mod/settings.php:841 msgid "Anybody authenticated" msgstr "Geauthenticeerd" -#: ../../mod/settings.php:814 +#: ../../mod/settings.php:842 msgid "Anybody on the internet" msgstr "Iedereen op het internet" -#: ../../mod/settings.php:891 +#: ../../mod/settings.php:916 msgid "Publish your default profile in the network directory" msgstr "Publiceer je standaardprofiel in de kanalengids" -#: ../../mod/settings.php:891 ../../mod/settings.php:896 -#: ../../mod/settings.php:973 ../../mod/api.php:106 ../../mod/profiles.php:574 -#: ../../mod/admin.php:392 +#: ../../mod/settings.php:916 ../../mod/settings.php:921 +#: ../../mod/settings.php:1004 ../../mod/api.php:106 +#: ../../mod/profiles.php:574 ../../mod/admin.php:392 msgid "No" msgstr "Nee" -#: ../../mod/settings.php:891 ../../mod/settings.php:896 -#: ../../mod/settings.php:973 ../../mod/api.php:105 ../../mod/profiles.php:573 -#: ../../mod/admin.php:394 +#: ../../mod/settings.php:916 ../../mod/settings.php:921 +#: ../../mod/settings.php:1004 ../../mod/api.php:105 +#: ../../mod/profiles.php:573 ../../mod/admin.php:394 msgid "Yes" msgstr "Ja" -#: ../../mod/settings.php:896 +#: ../../mod/settings.php:921 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:900 ../../mod/profile_photo.php:365 +#: ../../mod/settings.php:925 ../../mod/profile_photo.php:365 msgid "or" msgstr "of" -#: ../../mod/settings.php:905 +#: ../../mod/settings.php:930 msgid "Your channel address is" msgstr "Jouw kanaaladres is" -#: ../../mod/settings.php:943 +#: ../../mod/settings.php:974 msgid "Channel Settings" msgstr "Kanaal-instellingen" -#: ../../mod/settings.php:952 +#: ../../mod/settings.php:983 msgid "Basic Settings" msgstr "Basis-instellingen" -#: ../../mod/settings.php:955 +#: ../../mod/settings.php:986 msgid "Your Timezone:" msgstr "Jouw tijdzone:" -#: ../../mod/settings.php:956 +#: ../../mod/settings.php:987 msgid "Default Post Location:" msgstr "Standaardlocatie bericht:" -#: ../../mod/settings.php:956 +#: ../../mod/settings.php:987 msgid "Geographical location to display on your posts" msgstr "Geografische locatie die bij het bericht moet worden vermeld" -#: ../../mod/settings.php:957 +#: ../../mod/settings.php:988 msgid "Use Browser Location:" msgstr "Locatie van webbrowser gebruiken:" -#: ../../mod/settings.php:959 +#: ../../mod/settings.php:990 msgid "Adult Content" msgstr "Inhoud voor volwassenen" -#: ../../mod/settings.php:959 +#: ../../mod/settings.php:990 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:961 +#: ../../mod/settings.php:992 msgid "Security and Privacy Settings" -msgstr "Veiligheids- privacy-instellingen" +msgstr "Veiligheids- en privacy-instellingen" -#: ../../mod/settings.php:963 +#: ../../mod/settings.php:994 msgid "Your permissions are already configured. Click to view/adjust" msgstr "Jouw permissies zijn al ingesteld. Klik om ze te bekijken of aan te passen." -#: ../../mod/settings.php:965 +#: ../../mod/settings.php:996 msgid "Hide my online presence" msgstr "Verberg mijn aanwezigheid" -#: ../../mod/settings.php:965 +#: ../../mod/settings.php:996 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:967 +#: ../../mod/settings.php:998 msgid "Simple Privacy Settings:" msgstr "Eenvoudige privacy-instellingen:" -#: ../../mod/settings.php:968 +#: ../../mod/settings.php:999 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:969 +#: ../../mod/settings.php:1000 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:970 +#: ../../mod/settings.php:1001 msgid "Private - default private, never open or public" msgstr "Privé (standaard privé en nooit openbaar)" -#: ../../mod/settings.php:971 +#: ../../mod/settings.php:1002 msgid "Blocked - default blocked to/from everybody" msgstr "Geblokkeerd (standaard geblokkeerd naar/van iedereen)" -#: ../../mod/settings.php:973 +#: ../../mod/settings.php:1004 msgid "Allow others to tag your posts" msgstr "Anderen toestaan om je berichten te labelen" -#: ../../mod/settings.php:973 +#: ../../mod/settings.php:1004 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:975 +#: ../../mod/settings.php:1006 msgid "Advanced Privacy Settings" msgstr "Geavanceerde privacy-instellingen" -#: ../../mod/settings.php:977 +#: ../../mod/settings.php:1008 msgid "Expire other channel content after this many days" msgstr "Inhoud van andere kanalen na zoveel aantal dagen laten verlopen:" -#: ../../mod/settings.php:977 +#: ../../mod/settings.php:1008 msgid "0 or blank prevents expiration" msgstr "0 of leeg voorkomt het verlopen" -#: ../../mod/settings.php:978 +#: ../../mod/settings.php:1009 msgid "Maximum Friend Requests/Day:" msgstr "Maximum aantal connectieverzoeken per dag:" -#: ../../mod/settings.php:978 +#: ../../mod/settings.php:1009 msgid "May reduce spam activity" msgstr "Kan eventuele spam verminderen" -#: ../../mod/settings.php:979 +#: ../../mod/settings.php:1010 msgid "Default Post Permissions" msgstr "Standaard permissies voor nieuwe berichten" -#: ../../mod/settings.php:991 +#: ../../mod/settings.php:1015 +msgid "Channel permissions category:" +msgstr "Kanaaltype en -permissies:" + +#: ../../mod/settings.php:1023 msgid "Maximum private messages per day from unknown people:" msgstr "Maximum aantal privé-berichten per dag van onbekende personen:" -#: ../../mod/settings.php:991 +#: ../../mod/settings.php:1023 msgid "Useful to reduce spamming" msgstr "Kan eventuele spam verminderen" -#: ../../mod/settings.php:994 +#: ../../mod/settings.php:1026 msgid "Notification Settings" msgstr "Notificatie-instellingen" -#: ../../mod/settings.php:995 +#: ../../mod/settings.php:1027 msgid "By default post a status message when:" msgstr "Plaats automatisch een statusbericht wanneer:" -#: ../../mod/settings.php:996 +#: ../../mod/settings.php:1028 msgid "accepting a friend request" msgstr "Een connectieverzoek wordt geaccepteerd" -#: ../../mod/settings.php:997 +#: ../../mod/settings.php:1029 msgid "joining a forum/community" msgstr "Je lid wordt van een groep/forum" -#: ../../mod/settings.php:998 +#: ../../mod/settings.php:1030 msgid "making an interesting profile change" msgstr "Er sprake is van een interessante profielwijziging" -#: ../../mod/settings.php:999 +#: ../../mod/settings.php:1031 msgid "Send a notification email when:" msgstr "Verzend een notificatie per e-mail wanneer:" -#: ../../mod/settings.php:1000 +#: ../../mod/settings.php:1032 msgid "You receive a connection request" msgstr "Je een connectieverzoek ontvangt" -#: ../../mod/settings.php:1001 +#: ../../mod/settings.php:1033 msgid "Your connections are confirmed" msgstr "Jouw connecties zijn bevestigd" -#: ../../mod/settings.php:1002 +#: ../../mod/settings.php:1034 msgid "Someone writes on your profile wall" msgstr "Iemand iets op jouw kanaal heeft geschreven" -#: ../../mod/settings.php:1003 +#: ../../mod/settings.php:1035 msgid "Someone writes a followup comment" msgstr "Iemand een reactie schrijft" -#: ../../mod/settings.php:1004 +#: ../../mod/settings.php:1036 msgid "You receive a private message" msgstr "Je een privé-bericht ontvangt" -#: ../../mod/settings.php:1005 +#: ../../mod/settings.php:1037 msgid "You receive a friend suggestion" msgstr "Je een kanaalvoorstel ontvangt" -#: ../../mod/settings.php:1006 +#: ../../mod/settings.php:1038 msgid "You are tagged in a post" msgstr "Je expliciet in een bericht bent genoemd" -#: ../../mod/settings.php:1007 +#: ../../mod/settings.php:1039 msgid "You are poked/prodded/etc. in a post" msgstr "Je bent in een bericht aangestoten/gepord/etc." -#: ../../mod/settings.php:1010 +#: ../../mod/settings.php:1042 +msgid "Show visual notifications including:" +msgstr "Toon de volgende zichtbare notificaties:" + +#: ../../mod/settings.php:1044 +msgid "Unseen matrix activity" +msgstr "Niet bekeken matrix-activiteit" + +#: ../../mod/settings.php:1045 +msgid "Unseen channel activity" +msgstr "Niet bekeken kanaal-activiteit" + +#: ../../mod/settings.php:1046 +msgid "Unseen private messages" +msgstr "Niet bekeken privéberichten" + +#: ../../mod/settings.php:1046 ../../mod/settings.php:1051 +#: ../../mod/settings.php:1052 ../../mod/settings.php:1053 +msgid "Recommended" +msgstr "Aanbevolen" + +#: ../../mod/settings.php:1047 +msgid "Upcoming events" +msgstr "Aankomende gebeurtenissen" + +#: ../../mod/settings.php:1048 +msgid "Events today" +msgstr "Gebeurtissen van vandaag" + +#: ../../mod/settings.php:1049 +msgid "Upcoming birthdays" +msgstr "Aankomende verjaardagen" + +#: ../../mod/settings.php:1049 +msgid "Not available in all themes" +msgstr "Niet in alle thema's beschikbaar" + +#: ../../mod/settings.php:1050 +msgid "System (personal) notifications" +msgstr "(Persoonlijke) systeemnotificaties" + +#: ../../mod/settings.php:1051 +msgid "System info messages" +msgstr "Systeemmededelingen" + +#: ../../mod/settings.php:1052 +msgid "System critical alerts" +msgstr "Kritische systeemwaarschuwingen" + +#: ../../mod/settings.php:1053 +msgid "New connections" +msgstr "Nieuwe connecties" + +#: ../../mod/settings.php:1054 +msgid "System Registrations" +msgstr "Nieuwe accountregistraties op deze hub" + +#: ../../mod/settings.php:1056 +msgid "Notify me of events this many days in advance" +msgstr "Herinner mij zoveel dagen van te voren aan gebeurtenissen" + +#: ../../mod/settings.php:1056 +msgid "Must be greater than 0" +msgstr "Moet hoger dan 0 zijn" + +#: ../../mod/settings.php:1058 msgid "Advanced Account/Page Type Settings" msgstr "Instellingen geavanceerd account/paginatype" -#: ../../mod/settings.php:1011 +#: ../../mod/settings.php:1059 msgid "Change the behaviour of this account for special situations" msgstr "Verander het gedrag van dit account voor speciale situaties" -#: ../../mod/settings.php:1014 +#: ../../mod/settings.php:1062 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:1015 +#: ../../mod/settings.php:1063 msgid "Miscellaneous Settings" msgstr "Diverse instellingen" -#: ../../mod/settings.php:1017 +#: ../../mod/settings.php:1065 msgid "Personal menu to display in your channel pages" msgstr "Persoonlijk menu om op je kanaalpagina's weer te geven" -#: ../../mod/settings.php:1018 +#: ../../mod/settings.php:1066 msgid "Remove this channel" msgstr "Verwijder dit kanaal" @@ -4458,12 +4547,12 @@ msgstr "Ophalen URL gaf een foutmelding terug: %1$s" msgid "Invalid item." msgstr "Ongeldig item." -#: ../../mod/block.php:39 ../../mod/page.php:45 ../../mod/wall_upload.php:28 +#: ../../mod/block.php:39 ../../mod/wall_upload.php:28 ../../mod/page.php:45 msgid "Channel not found." msgstr "Kanaal niet gevonden." -#: ../../mod/block.php:75 ../../mod/page.php:81 ../../mod/display.php:102 -#: ../../mod/help.php:72 ../../index.php:240 +#: ../../mod/block.php:75 ../../mod/display.php:102 ../../mod/help.php:70 +#: ../../mod/page.php:81 ../../index.php:241 msgid "Page not found." msgstr "Pagina niet gevonden." @@ -4518,18 +4607,6 @@ msgstr "Hubbeheerders: " msgid "Block Name" msgstr "Bloknaam" -#: ../../mod/bookmarks.php:38 -msgid "Bookmark added" -msgstr "Bladwijzer toegevoegd" - -#: ../../mod/bookmarks.php:60 -msgid "My Bookmarks" -msgstr "Mijn bladwijzers" - -#: ../../mod/bookmarks.php:71 -msgid "My Connections Bookmarks" -msgstr "Bladwijzers van mijn connecties" - #: ../../mod/profiles.php:18 ../../mod/profiles.php:165 #: ../../mod/profiles.php:222 ../../mod/profiles.php:547 msgid "Profile not found." @@ -5146,7 +5223,7 @@ msgstr "Restricties voor connecties van premiumkanaal toestaan" 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." +msgstr "Vul je restricties of voorwaarden in, zoals een paypal-afschrift, voorschriften voor leden, enz." #: ../../mod/connect.php:89 ../../mod/connect.php:109 msgid "" @@ -5201,15 +5278,15 @@ msgstr "Ongeldige connectie." msgid "Could not access contact record." msgstr "Kon geen toegang krijgen tot de connectie-gegevens." -#: ../../mod/connections.php:51 ../../mod/connedit.php:78 +#: ../../mod/connections.php:51 ../../mod/connedit.php:86 msgid "Could not locate selected profile." msgstr "Kon het gekozen profiel niet vinden." -#: ../../mod/connections.php:94 ../../mod/connedit.php:132 +#: ../../mod/connections.php:94 ../../mod/connedit.php:140 msgid "Connection updated." msgstr "Connectie bijgewerkt." -#: ../../mod/connections.php:96 ../../mod/connedit.php:134 +#: ../../mod/connections.php:96 ../../mod/connedit.php:142 msgid "Failed to update connection record." msgstr "Bijwerken van connectie-gegevens mislukt." @@ -5294,242 +5371,239 @@ msgstr "Zoeken naar: " msgid "Edit post" msgstr "Bericht bewerken" -#: ../../mod/connedit.php:181 +#: ../../mod/connedit.php:189 msgid "is now connected to" msgstr "is nu verbonden met" -#: ../../mod/connedit.php:296 +#: ../../mod/connedit.php:310 msgid "Could not access address book record." msgstr "Kon geen toegang krijgen tot de record van de connectie." -#: ../../mod/connedit.php:310 +#: ../../mod/connedit.php:324 msgid "Refresh failed - channel is currently unavailable." msgstr "Vernieuwen mislukt - kanaal is momenteel niet beschikbaar" -#: ../../mod/connedit.php:317 +#: ../../mod/connedit.php:331 msgid "Channel has been unblocked" msgstr "Kanaal is gedeblokkeerd" -#: ../../mod/connedit.php:318 +#: ../../mod/connedit.php:332 msgid "Channel has been blocked" msgstr "Kanaal is geblokkeerd" -#: ../../mod/connedit.php:322 ../../mod/connedit.php:334 -#: ../../mod/connedit.php:346 ../../mod/connedit.php:358 -#: ../../mod/connedit.php:374 +#: ../../mod/connedit.php:336 ../../mod/connedit.php:348 +#: ../../mod/connedit.php:360 ../../mod/connedit.php:372 +#: ../../mod/connedit.php:388 msgid "Unable to set address book parameters." msgstr "Niet in staat om de parameters van connecties in te stellen." -#: ../../mod/connedit.php:329 +#: ../../mod/connedit.php:343 msgid "Channel has been unignored" msgstr "Kanaal wordt niet meer genegeerd" -#: ../../mod/connedit.php:330 +#: ../../mod/connedit.php:344 msgid "Channel has been ignored" msgstr "Kanaal wordt genegeerd" -#: ../../mod/connedit.php:341 +#: ../../mod/connedit.php:355 msgid "Channel has been unarchived" msgstr "Kanaal is niet meer gearchiveerd" -#: ../../mod/connedit.php:342 +#: ../../mod/connedit.php:356 msgid "Channel has been archived" msgstr "Kanaal is gearchiveerd" -#: ../../mod/connedit.php:353 +#: ../../mod/connedit.php:367 msgid "Channel has been unhidden" msgstr "Kanaal is niet meer verborgen" -#: ../../mod/connedit.php:354 +#: ../../mod/connedit.php:368 msgid "Channel has been hidden" msgstr "Kanaal is verborgen" -#: ../../mod/connedit.php:369 +#: ../../mod/connedit.php:383 msgid "Channel has been approved" msgstr "Connectie/kanaal is geaccepteerd" -#: ../../mod/connedit.php:370 +#: ../../mod/connedit.php:384 msgid "Channel has been unapproved" msgstr "Connectie/kanaal is afgewezen" -#: ../../mod/connedit.php:398 +#: ../../mod/connedit.php:412 msgid "Connection has been removed." msgstr "Connectie is verwijderd" -#: ../../mod/connedit.php:418 +#: ../../mod/connedit.php:432 #, php-format msgid "View %s's profile" msgstr "Profiel van %s weergeven" -#: ../../mod/connedit.php:422 +#: ../../mod/connedit.php:436 msgid "Refresh Permissions" msgstr "Permissies vernieuwen" -#: ../../mod/connedit.php:425 +#: ../../mod/connedit.php:439 msgid "Fetch updated permissions" msgstr "Aangepaste permissies ophalen" -#: ../../mod/connedit.php:429 +#: ../../mod/connedit.php:443 msgid "Recent Activity" msgstr "Recente activiteit" -#: ../../mod/connedit.php:432 +#: ../../mod/connedit.php:446 msgid "View recent posts and comments" msgstr "Recente berichten en reacties weergeven" -#: ../../mod/connedit.php:436 ../../mod/connedit.php:579 +#: ../../mod/connedit.php:450 ../../mod/connedit.php:594 #: ../../mod/admin.php:734 msgid "Unblock" msgstr "Deblokkeren" -#: ../../mod/connedit.php:436 ../../mod/connedit.php:579 +#: ../../mod/connedit.php:450 ../../mod/connedit.php:594 #: ../../mod/admin.php:733 msgid "Block" msgstr "Blokkeren" -#: ../../mod/connedit.php:439 +#: ../../mod/connedit.php:453 msgid "Block or Unblock this connection" msgstr "Deze connectie blokkeren of deblokkeren" -#: ../../mod/connedit.php:443 ../../mod/connedit.php:580 +#: ../../mod/connedit.php:457 ../../mod/connedit.php:595 msgid "Unignore" msgstr "Niet meer negeren" -#: ../../mod/connedit.php:443 ../../mod/connedit.php:580 +#: ../../mod/connedit.php:457 ../../mod/connedit.php:595 #: ../../mod/notifications.php:51 msgid "Ignore" msgstr "Negeren" -#: ../../mod/connedit.php:446 +#: ../../mod/connedit.php:460 msgid "Ignore or Unignore this connection" msgstr "Deze connectie negeren of niet meer negeren" -#: ../../mod/connedit.php:449 +#: ../../mod/connedit.php:463 msgid "Unarchive" msgstr "Niet meer archiveren" -#: ../../mod/connedit.php:449 +#: ../../mod/connedit.php:463 msgid "Archive" msgstr "Archiveren" -#: ../../mod/connedit.php:452 +#: ../../mod/connedit.php:466 msgid "Archive or Unarchive this connection" msgstr "Deze connectie archiveren of niet meer archiveren" -#: ../../mod/connedit.php:455 +#: ../../mod/connedit.php:469 msgid "Unhide" msgstr "Niet meer verbergen" -#: ../../mod/connedit.php:455 +#: ../../mod/connedit.php:469 msgid "Hide" msgstr "Verbergen" -#: ../../mod/connedit.php:458 +#: ../../mod/connedit.php:472 msgid "Hide or Unhide this connection" msgstr "Deze connectie verbergen of niet meer verbergen" -#: ../../mod/connedit.php:465 +#: ../../mod/connedit.php:479 msgid "Delete this connection" msgstr "Deze connectie verwijderen" -#: ../../mod/connedit.php:508 ../../mod/connedit.php:537 +#: ../../mod/connedit.php:522 ../../mod/connedit.php:552 msgid "Approve this connection" msgstr "Deze connectie accepteren" -#: ../../mod/connedit.php:508 +#: ../../mod/connedit.php:522 msgid "Accept connection to allow communication" msgstr "Keur deze connectie goed om communicatie toe te staan" -#: ../../mod/connedit.php:524 -msgid "Automatic Permissions Settings" -msgstr "Automatische permissies" - -#: ../../mod/connedit.php:524 +#: ../../mod/connedit.php:538 #, php-format msgid "Connections: settings for %s" msgstr "Connecties: instellingen voor %s" -#: ../../mod/connedit.php:528 -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 permissies 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/connedit.php:539 +msgid "Apply these permissions automatically" +msgstr "Deze permissies automatisch toepassen" -#: ../../mod/connedit.php:530 +#: ../../mod/connedit.php:543 +msgid "Apply the permissions indicated on this page to all new connections." +msgstr "Permissies die op deze pagina staan vermeldt op alle nieuwe connecties toepassen." + +#: ../../mod/connedit.php:545 msgid "Slide to adjust your degree of friendship" msgstr "Schuif om te bepalen hoe goed je iemand kent en/of mag" -#: ../../mod/connedit.php:536 +#: ../../mod/connedit.php:551 msgid "inherited" msgstr "geërfd" -#: ../../mod/connedit.php:538 +#: ../../mod/connedit.php:553 msgid "Connection has no individual permissions!" msgstr "Connectie heeft geen individuele permissies!" -#: ../../mod/connedit.php:539 +#: ../../mod/connedit.php:554 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:541 +#: ../../mod/connedit.php:556 msgid "Profile Visibility" msgstr "Zichtbaarheid profiel" -#: ../../mod/connedit.php:542 +#: ../../mod/connedit.php:557 #, 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:543 +#: ../../mod/connedit.php:558 msgid "Contact Information / Notes" msgstr "Informatie/aantekeningen over connectie" -#: ../../mod/connedit.php:544 +#: ../../mod/connedit.php:559 msgid "Edit contact notes" msgstr "Bewerk aantekeningen over contact" -#: ../../mod/connedit.php:546 +#: ../../mod/connedit.php:561 msgid "Their Settings" msgstr "Hun instellingen" -#: ../../mod/connedit.php:547 +#: ../../mod/connedit.php:562 msgid "My Settings" msgstr "Mijn instellingen" -#: ../../mod/connedit.php:549 +#: ../../mod/connedit.php:564 msgid "Clear/Disable Automatic Permissions" msgstr "Verwijderen/uitschakelen automatische permissies" -#: ../../mod/connedit.php:550 +#: ../../mod/connedit.php:565 msgid "Forum Members" msgstr "Forum/groepsleden" -#: ../../mod/connedit.php:551 +#: ../../mod/connedit.php:566 msgid "Soapbox" msgstr "Zeepkist" -#: ../../mod/connedit.php:552 +#: ../../mod/connedit.php:567 msgid "Full Sharing (typical social network permissions)" msgstr "Voluit delen (vergelijkbaar met die van sociale netwerken)" -#: ../../mod/connedit.php:553 +#: ../../mod/connedit.php:568 msgid "Cautious Sharing " msgstr "Voorzichtig delen" -#: ../../mod/connedit.php:554 +#: ../../mod/connedit.php:569 msgid "Follow Only" msgstr "Alleen volgen" -#: ../../mod/connedit.php:555 +#: ../../mod/connedit.php:570 msgid "Individual Permissions" msgstr "Individuele permissies" -#: ../../mod/connedit.php:556 +#: ../../mod/connedit.php:571 msgid "" "Some permissions may be inherited from your channel privacy settings, which have higher priority than " @@ -5537,72 +5611,72 @@ msgid "" "have no effect." msgstr "Sommige permissies 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:557 +#: ../../mod/connedit.php:572 msgid "Advanced Permissions" msgstr "Geavanceerde permissies" -#: ../../mod/connedit.php:558 +#: ../../mod/connedit.php:573 msgid "Simple Permissions (select one and submit)" msgstr "Eenvoudige permissies (selecteer er één en opslaan)" -#: ../../mod/connedit.php:562 +#: ../../mod/connedit.php:577 #, php-format msgid "Visit %s's profile - %s" msgstr "Profiel van %s bezoeken - %s" -#: ../../mod/connedit.php:563 +#: ../../mod/connedit.php:578 msgid "Block/Unblock contact" msgstr "Connectie blokkeren/deblokkeren" -#: ../../mod/connedit.php:564 +#: ../../mod/connedit.php:579 msgid "Ignore contact" msgstr "Connectie negeren" -#: ../../mod/connedit.php:565 +#: ../../mod/connedit.php:580 msgid "Repair URL settings" msgstr "URL-instellingen repareren" -#: ../../mod/connedit.php:566 +#: ../../mod/connedit.php:581 msgid "View conversations" msgstr "Conversaties weergeven" -#: ../../mod/connedit.php:568 +#: ../../mod/connedit.php:583 msgid "Delete contact" msgstr "Connectie verwijderen" -#: ../../mod/connedit.php:571 +#: ../../mod/connedit.php:586 msgid "Last update:" msgstr "Laatste wijziging:" -#: ../../mod/connedit.php:573 +#: ../../mod/connedit.php:588 msgid "Update public posts" msgstr "Openbare berichten updaten" -#: ../../mod/connedit.php:575 +#: ../../mod/connedit.php:590 msgid "Update now" msgstr "Nu updaten" -#: ../../mod/connedit.php:581 +#: ../../mod/connedit.php:596 msgid "Currently blocked" msgstr "Momenteel geblokkeerd" -#: ../../mod/connedit.php:582 +#: ../../mod/connedit.php:597 msgid "Currently ignored" msgstr "Momenteel genegeerd" -#: ../../mod/connedit.php:583 +#: ../../mod/connedit.php:598 msgid "Currently archived" msgstr "Momenteel gearchiveerd" -#: ../../mod/connedit.php:584 +#: ../../mod/connedit.php:599 msgid "Currently pending" msgstr "Moeten nog geaccepteerd of afgewezen worden" -#: ../../mod/connedit.php:585 +#: ../../mod/connedit.php:600 msgid "Hide this contact from others" msgstr "Verberg deze connectie voor anderen" -#: ../../mod/connedit.php:585 +#: ../../mod/connedit.php:600 msgid "" "Replies/likes to your public posts may still be visible" msgstr "Reacties/vind-ik-leuks op jouw openbare berichten kunnen zichtbaar blijven" @@ -5662,6 +5736,18 @@ msgstr "vorige pagina" msgid "No entries (some entries may be hidden)." msgstr "Niets gevonden (sommige kanalen kunnen verborgen zijn)." +#: ../../mod/bookmarks.php:38 +msgid "Bookmark added" +msgstr "Bladwijzer toegevoegd" + +#: ../../mod/bookmarks.php:60 +msgid "My Bookmarks" +msgstr "Mijn bladwijzers" + +#: ../../mod/bookmarks.php:71 +msgid "My Connections Bookmarks" +msgstr "Bladwijzers van mijn connecties" + #: ../../mod/dirprofile.php:108 msgid "Status: " msgstr "Status: " @@ -5690,6 +5776,10 @@ msgstr "Trefwoorden: " msgid "This site is not a directory server" msgstr "Deze hub is geen kanalengidshub (directoryserver)" +#: ../../mod/cloud.php:130 +msgid "RedMatrix - Guests: Username: {your email address}, Password: +++" +msgstr "RedMatrix - gasttoegang: Toegangsnaam: {jouw e-mailadres}, wachtwoord: +++" + #: ../../mod/setup.php:162 msgid "Red Matrix Server - Setup" msgstr "RedMatrix Server - Setup" @@ -6154,9 +6244,22 @@ msgstr "Webpagina verwijderen?" msgid "Delete Webpage" msgstr "Webpagina verwijderen" -#: ../../mod/cloud.php:130 -msgid "RedMatrix - Guests: Username: {your email address}, Password: +++" -msgstr "RedMatrix - gasttoegang: Gebruikersnaam: {jouw e-mailadres}, wachtwoord: +++" +#: ../../mod/impel.php:33 +msgid "webpage" +msgstr "Webpagina" + +#: ../../mod/impel.php:38 +msgid "block" +msgstr "blok" + +#: ../../mod/impel.php:43 +msgid "layout" +msgstr "lay-out" + +#: ../../mod/impel.php:117 +#, php-format +msgid "%s element installed" +msgstr "%s onderdeel geïnstalleerd" #: ../../mod/profile_photo.php:108 msgid "Image uploaded but image cropping failed." @@ -6329,6 +6432,14 @@ msgstr "Kopieer/plak deze code om het bestand aan een bericht te koppelen" 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/help.php:41 ../../mod/help.php:47 ../../mod/help.php:53 +msgid "Help:" +msgstr "Hulp:" + +#: ../../mod/help.php:67 ../../index.php:238 +msgid "Not Found" +msgstr "Niet gevonden" + #: ../../mod/follow.php:25 msgid "Channel added." msgstr "Kanaal toegevoegd." @@ -6414,23 +6525,53 @@ msgstr "Klik op een kanaal om deze toe te voegen of te verwijderen." 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/help.php:43 ../../mod/help.php:49 ../../mod/help.php:55 -msgid "Help:" -msgstr "Hulp:" +#: ../../mod/like.php:15 +msgid "Like/Dislike" +msgstr "Leuk/niet leuk" -#: ../../mod/help.php:69 ../../index.php:237 -msgid "Not Found" -msgstr "Niet gevonden" +#: ../../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:430 +msgid "Action completed." +msgstr "Actie voltooid" + +#: ../../mod/like.php:431 +msgid "Thank you." +msgstr "Bedankt" -#: ../../mod/tagrm.php:41 +#: ../../mod/tagrm.php:44 ../../mod/tagrm.php:94 msgid "Tag removed" msgstr "Label verwijderd" -#: ../../mod/tagrm.php:79 +#: ../../mod/tagrm.php:119 msgid "Remove Item Tag" msgstr "Verwijder itemlabel" -#: ../../mod/tagrm.php:81 +#: ../../mod/tagrm.php:121 msgid "Select a tag to remove: " msgstr "Kies een label om te verwijderen" @@ -6579,7 +6720,7 @@ msgstr "Standaardthema" 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" +msgstr "Standaardthema voor RedMatrix-hub (kan door lid veranderd worden) - verander thema-instellingen" #: ../../mod/admin.php:427 msgid "Mobile system theme" @@ -6678,7 +6819,7 @@ msgstr "Openbare toegang blokkeren" 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." +msgstr "Vink dit aan om alle normaliter openbare persoonlijke pagina's op deze hub alleen toegankelijk te maken voor ingelogde leden." #: ../../mod/admin.php:440 msgid "Verify Email Addresses" @@ -6717,15 +6858,15 @@ 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)" +msgstr "Vink dit aan om het inlogformulier op de homepage van deze hub, die niet-ingelogde bezoekers te zien krijgen, te verbergen. (bijvoorbeeld wanneer je een kanaal op deze RedMatrix-hub als homepage gebruikt)" #: ../../mod/admin.php:445 msgid "Proxy user" -msgstr "Proxy-gebruiker" +msgstr "Gebruikersnaam proxy" #: ../../mod/admin.php:446 msgid "Proxy URL" -msgstr "Proxy-URL" +msgstr "URL proxy" #: ../../mod/admin.php:447 msgid "Network timeout" @@ -6852,7 +6993,7 @@ msgstr "Account '%s' gedeblokkeerd" #: ../../mod/admin.php:658 #, php-format msgid "User '%s' blocked" -msgstr "Gebruiker '%s' geblokkeerd" +msgstr "Lid '%s' geblokkeerd" #: ../../mod/admin.php:724 ../../mod/admin.php:736 msgid "Users" @@ -7290,28 +7431,28 @@ msgstr "of bezoek " msgid "3. Click [Connect]" msgstr "3. Klik op [+ Verbinden]" -#: ../../mod/item.php:150 +#: ../../mod/item.php:151 msgid "Unable to locate original post." msgstr "Niet in staat om de originele locatie van het bericht te vinden. " -#: ../../mod/item.php:409 +#: ../../mod/item.php:411 msgid "Empty post discarded." msgstr "Leeg bericht geannuleerd" -#: ../../mod/item.php:451 +#: ../../mod/item.php:453 msgid "Executable content type not permitted to this channel." msgstr "Uitvoerbare bestanden zijn niet toegestaan op dit kanaal." -#: ../../mod/item.php:881 +#: ../../mod/item.php:891 msgid "System error. Post not saved." msgstr "Systeemfout. Bericht niet opgeslagen." -#: ../../mod/item.php:1349 +#: ../../mod/item.php:1366 #, 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:1355 +#: ../../mod/item.php:1372 #, php-format msgid "You have reached your limit of %1$.0f webpages." msgstr "Je hebt jouw limiet van %1$.0f webpagina's bereikt." @@ -7329,43 +7470,33 @@ msgstr "Hulp voor dit onderdeel" msgid "Layout Name" msgstr "Naam lay-out" -#: ../../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/locs.php:19 ../../mod/locs.php:46 +msgid "Location not found." +msgstr "Locatie niet gevonden." -#: ../../mod/like.php:77 ../../mod/like.php:104 ../../mod/like.php:142 -msgid "Invalid request." -msgstr "Ongeldig verzoek" +#: ../../mod/locs.php:50 +msgid "Primary location cannot be removed." +msgstr "Primaire locatie kan niet worden verwijderd." -#: ../../mod/like.php:119 -msgid "thing" -msgstr "ding" +#: ../../mod/locs.php:82 +msgid "No locations found." +msgstr "Geen locaties gevonden." -#: ../../mod/like.php:165 -msgid "Channel unavailable." -msgstr "Kanaal niet beschikbaar." +#: ../../mod/locs.php:95 +msgid "Manage Channel Locations" +msgstr "Kanaallocaties beheren" -#: ../../mod/like.php:204 -msgid "Previous action reversed." -msgstr "Vorige actie omgedraaid" +#: ../../mod/locs.php:96 +msgid "Location (address)" +msgstr "Locatie (adres)" -#: ../../mod/like.php:417 -msgid "Action completed." -msgstr "Actie voltooid" +#: ../../mod/locs.php:97 +msgid "Primary Location" +msgstr "Primaire locatie" -#: ../../mod/like.php:418 -msgid "Thank you." -msgstr "Bedankt" +#: ../../mod/locs.php:98 +msgid "Drop location" +msgstr "Locatie verwijderen" #: ../../mod/lockview.php:31 msgid "Remote privacy information not available." @@ -7412,7 +7543,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:1506 +#: ../../mod/lostpass.php:85 ../../boot.php:1523 msgid "Password Reset" msgstr "Wachtwoord vergeten?" @@ -7857,31 +7988,6 @@ msgstr "Standaard worden alleen de kanalen die zich op deze hub bevinden uit het msgid "No service class restrictions found." msgstr "Geen abonnementsbeperkingen gevonden." -#: ../../mod/impel.php:33 -msgid "webpage" -msgstr "Webpagina" - -#: ../../mod/impel.php:38 -msgid "block" -msgstr "blok" - -#: ../../mod/impel.php:43 -msgid "layout" -msgstr "lay-out" - -#: ../../mod/impel.php:117 -#, php-format -msgid "%s element installed" -msgstr "%s onderdeel geïnstalleerd" - -#: ../../mod/locs.php:47 ../../mod/locs.php:74 -msgid "Location not found." -msgstr "Locatie niet gevonden." - -#: ../../mod/locs.php:78 -msgid "Primary location cannot be removed." -msgstr "Primaire locatie kan niet worden verwijderd." - #: ../../view/theme/apw/php/config.php:202 #: ../../view/theme/apw/php/config.php:236 msgid "Schema Default" @@ -8167,41 +8273,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:1294 +#: ../../boot.php:1311 #, php-format msgid "Update %s failed. See error logs." msgstr "Update %s mislukt. Zie foutenlogboek." -#: ../../boot.php:1297 +#: ../../boot.php:1314 #, php-format msgid "Update Error at %s" msgstr "Update-fout op %s" -#: ../../boot.php:1471 +#: ../../boot.php:1488 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:1499 +#: ../../boot.php:1516 msgid "Password" msgstr "Wachtwoord" -#: ../../boot.php:1500 +#: ../../boot.php:1517 msgid "Remember me" msgstr "Aangemeld blijven" -#: ../../boot.php:1505 +#: ../../boot.php:1522 msgid "Forgot your password?" msgstr "Wachtwoord vergeten?" -#: ../../boot.php:1570 +#: ../../boot.php:1587 msgid "permission denied" msgstr "toegang geweigerd" -#: ../../boot.php:1571 +#: ../../boot.php:1588 msgid "Got Zot?" msgstr "Heb je Zot?" -#: ../../boot.php:2005 +#: ../../boot.php:2021 msgid "toggle mobile" msgstr "mobiele weergave omschakelen" diff --git a/view/nl/strings.php b/view/nl/strings.php index ead04a495..0266e732b 100644 --- a/view/nl/strings.php +++ b/view/nl/strings.php @@ -7,28 +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["view full size"] = "volledige grootte tonen"; -$a->strings["Embedded content"] = "Ingesloten inhoud"; -$a->strings["Embedding disabled"] = "Insluiten uitgeschakeld"; -$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["Visible to specific connections."] = "Voor specifieke connecties zichtbaar."; -$a->strings["Item not found."] = "Item niet gevonden."; -$a->strings["Permission denied."] = "Toegang geweigerd"; -$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["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"; @@ -63,6 +41,7 @@ $a->strings["Purchase"] = "Aanschaffen"; $a->strings["Edit"] = "Bewerken"; $a->strings["Delete"] = "Verwijderen"; $a->strings["Unknown"] = "Onbekend"; +$a->strings["Permission denied."] = "Toegang geweigerd"; $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"; @@ -77,144 +56,6 @@ $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["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["Categories"] = "Categorieën"; -$a->strings["Apps"] = "Apps"; -$a->strings["System"] = "Systeem"; -$a->strings["Personal"] = "Persoonlijk"; -$a->strings["Create Personal App"] = "Persoonlijke app maken"; -$a->strings["Edit Personal App"] = "Persoonlijke app bewerken"; -$a->strings["Connect"] = "Verbinden"; -$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["Save"] = "Opslaan"; -$a->strings["Remove term"] = "Verwijder zoekterm"; -$a->strings["Saved Searches"] = "Opgeslagen zoekopdrachten"; -$a->strings["add"] = "toevoegen"; -$a->strings["Saved Folders"] = "Bewaarde mappen"; -$a->strings["Everything"] = "Alles"; -$a->strings["Archives"] = "Archieven"; -$a->strings["Refresh"] = "Vernieuwen"; -$a->strings["Me"] = "Ik"; -$a->strings["Best Friends"] = "Goede vrienden"; -$a->strings["Friends"] = "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["Export content"] = "Inhoud exporteren"; -$a->strings["Automatic Permissions (Advanced)"] = "Automatische permissies (geavanceerd)"; -$a->strings["Premium Channel Settings"] = "Instellingen premiumkanaal"; -$a->strings["Channel Sources"] = "Kanaalbronnen"; -$a->strings["Messages"] = "Berichten"; -$a->strings["Check Mail"] = "Controleer op nieuwe berichten"; -$a->strings["New Message"] = "Nieuw bericht"; -$a->strings["Chat Rooms"] = "Chatkanalen"; -$a->strings["Bookmarked Chatrooms"] = "Bladwijzers van chatkanalen"; -$a->strings["Suggested Chatrooms"] = "Voorgestelde chatkanalen"; -$a->strings["Invalid data packet"] = "Datapakket ongeldig"; -$a->strings["Unable to verify channel signature"] = "Kanaalkenmerk kon niet worden geverifieerd. "; -$a->strings["Unable to verify site signature for %s"] = "Hubkenmerk voor %s kon niet worden geverifieerd"; -$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["Visible to your default audience"] = "Voor iedereen zichtbaar, mits niet anders ingesteld"; -$a->strings["Show"] = "Tonen"; -$a->strings["Don't show"] = "Niet tonen"; -$a->strings["Permissions"] = "Permissies"; -$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["Public Timeline"] = "Openbare tijdlijn"; -$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["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["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"; -$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["__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["photo"] = "foto"; $a->strings["event"] = "gebeurtenis"; $a->strings["channel"] = "kanaal"; @@ -247,6 +88,7 @@ $a->strings["View Status"] = "Status weergeven"; $a->strings["View Profile"] = "Profiel weergeven"; $a->strings["View Photos"] = "Foto's weergeven"; $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"; $a->strings["%s likes this."] = "%s vindt dit leuk."; @@ -274,6 +116,7 @@ $a->strings["Tag term:"] = "Label:"; $a->strings["Save to Folder:"] = "Bewaar in map: "; $a->strings["Where are you right now?"] = "Waar bevind je je op dit moment?"; $a->strings["Expires YYYY-MM-DD HH:MM"] = "Verloopt op DD-MM-YYYY om HH:MM"; +$a->strings["Preview"] = "Voorvertoning"; $a->strings["Share"] = "Delen"; $a->strings["Page link title"] = "Titel van paginalink"; $a->strings["Post as"] = "Bericht plaatsen als"; @@ -307,6 +150,7 @@ $a->strings["Commented Order"] = "Nieuwe reacties bovenaan"; $a->strings["Sort by Comment Date"] = "Berichten met nieuwe reacties bovenaan"; $a->strings["Posted Order"] = "Nieuwe berichten bovenaan"; $a->strings["Sort by Post Date"] = "Nieuwe berichten bovenaan"; +$a->strings["Personal"] = "Persoonlijk"; $a->strings["Posts that mention or involve you"] = "Alleen berichten die jou vermelden of waar je op een andere manier bij betrokken bent"; $a->strings["New"] = "Nieuw"; $a->strings["Activity Stream - by date"] = "Activiteitenstroom - volgens datum"; @@ -318,103 +162,113 @@ $a->strings["Channel"] = "Kanaal"; $a->strings["Status Messages and Posts"] = "Berichten in dit kanaal"; $a->strings["About"] = "Over"; $a->strings["Profile Details"] = "Profiel"; +$a->strings["Photo Albums"] = "Fotoalbums"; $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["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["New Page"] = "Nieuwe pagina"; +$a->strings["View"] = "Weergeven"; +$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["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["This event has been added to your calendar."] = "Dit evenement is aan jouw agenda toegevoegd."; +$a->strings["Embedded content"] = "Ingesloten inhoud"; +$a->strings["Embedding disabled"] = "Insluiten uitgeschakeld"; +$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["Social Networking"] = "Sociaal netwerk"; +$a->strings["Mostly Public"] = "Vrijwel alles openbaar"; +$a->strings["Restricted"] = "Beperkt zichtbaar"; +$a->strings["Private"] = "Verborgen kanaal"; +$a->strings["Community Forum"] = "Groepsforum"; +$a->strings["Feed Republish"] = "Feed herpubliceren"; +$a->strings["Special Purpose"] = "Speciaal doel"; +$a->strings["Celebrity/Soapbox"] = "Beroemdheid/alleen volgen"; +$a->strings["Group Repository"] = "Groepsopslag"; +$a->strings["Other"] = "Anders"; +$a->strings["Custom/Expert Mode"] = "Expertmodus/handmatig aanpassen"; +$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["Miscellaneous"] = "Diversen"; +$a->strings["never"] = "nooit"; +$a->strings["less than a second ago"] = "minder dan een seconde geleden"; +$a->strings["year"] = "jaar"; +$a->strings["years"] = "jaren"; +$a->strings["month"] = "maand"; +$a->strings["months"] = "maanden"; +$a->strings["week"] = "week"; +$a->strings["weeks"] = "weken"; +$a->strings["day"] = "dag"; +$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["Attachments:"] = "Bijlagen:"; +$a->strings["Redmatrix event notification:"] = "Notificatie RedMatrix-gebeurtenis:"; +$a->strings["Invalid data packet"] = "Datapakket ongeldig"; +$a->strings["Unable to verify channel signature"] = "Kanaalkenmerk kon niet worden geverifieerd. "; +$a->strings["Unable to verify site signature for %s"] = "Hubkenmerk voor %s kon niet worden geverifieerd"; $a->strings["Logged out."] = "Uitgelogd."; $a->strings["Failed authentication"] = "Mislukte authenticatie"; $a->strings["Login failed."] = "Inloggen mislukt."; -$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["poke"] = "aanstoten"; -$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 paginalay-out: "; -$a->strings["default"] = "standaard"; -$a->strings["Page content type: "] = "Opmaakcode pagina"; -$a->strings["Select an alternate language"] = "Kies een andere taal"; -$a->strings["activity"] = "activiteit"; -$a->strings["Design"] = "Ontwerp"; -$a->strings["Blocks"] = "Blokken"; -$a->strings["Menus"] = "Menu's"; -$a->strings["Layouts"] = "Lay-outs"; -$a->strings["Pages"] = "Pagina's"; +$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["%1\$s's bookmarks"] = "Bladwijzers van %1\$s"; -$a->strings["Tags"] = "Labels"; -$a->strings["Keywords"] = "Trefwoorden"; -$a->strings["have"] = "heb"; -$a->strings["has"] = "heeft"; -$a->strings["want"] = "wil"; -$a->strings["wants"] = "wil"; -$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["Default"] = "Standaard"; $a->strings["Frequently"] = "Regelmatig"; $a->strings["Hourly"] = "Elk uur"; @@ -447,15 +301,14 @@ $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["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["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."; @@ -474,52 +327,14 @@ $a->strings["Account verified. Please login."] = "Account is geverifieerd. Je ka $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["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["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["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["Remote authentication"] = "Authenticatie op afstand"; -$a->strings["Click to authenticate to your home hub"] = "Authenticeer jezelf via (bijvoorbeeld) jouw 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["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["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["Please wait..."] = "Wachten aub..."; +$a->strings["Image/photo"] = "Afbeelding/foto"; +$a->strings["Encrypted content"] = "Versleutelde inhoud"; +$a->strings["Install design element: "] = "Installeer ontwerp-onderdeel"; +$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 spoiler"] = "$1 spoiler"; +$a->strings["$1 wrote:"] = "$1 schreef:"; $a->strings["Sort Options"] = "Sorteeropties"; $a->strings["Alphabetic"] = "Alfabetisch"; $a->strings["Reverse Alphabetic"] = "Omgekeerd alfabetisch"; @@ -527,7 +342,20 @@ $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["Attachments:"] = "Bijlagen:"; +$a->strings["Tags"] = "Labels"; +$a->strings["Keywords"] = "Trefwoorden"; +$a->strings["have"] = "heb"; +$a->strings["has"] = "heeft"; +$a->strings["want"] = "wil"; +$a->strings["wants"] = "wil"; +$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["__ctx:noun__ Like"] = array( + 0 => "vindt dit leuk", + 1 => "vinden dit leuk", +); $a->strings["Red Matrix Notification"] = "RedMatrix-notificatie"; $a->strings["redmatrix"] = "RedMatrix"; $a->strings["Thank You,"] = "Bedankt,"; @@ -573,6 +401,102 @@ $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["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"; +$a->strings["Collection: %s"] = "Collectie: %s"; +$a->strings["Connection: %s"] = "Connectie: %s"; +$a->strings["Connection not found."] = "Connectie niet gevonden."; +$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["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 paginalay-out: "; +$a->strings["default"] = "standaard"; +$a->strings["Page content type: "] = "Opmaakcode pagina"; +$a->strings["Select an alternate language"] = "Kies een andere taal"; +$a->strings["activity"] = "activiteit"; +$a->strings["Design"] = "Ontwerp"; +$a->strings["Blocks"] = "Blokken"; +$a->strings["Menus"] = "Menu's"; +$a->strings["Layouts"] = "Lay-outs"; +$a->strings["Pages"] = "Pagina's"; $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"; @@ -599,6 +523,7 @@ $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."; @@ -607,6 +532,7 @@ $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"; @@ -646,77 +572,170 @@ $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["Image/photo"] = "Afbeelding/foto"; -$a->strings["Encrypted content"] = "Versleutelde inhoud"; -$a->strings["Install design element: "] = "Installeer ontwerp-onderdeel"; -$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 spoiler"] = "$1 spoiler"; -$a->strings["$1 wrote:"] = "$1 schreef:"; -$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["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["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["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"; +$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["Apps"] = "Apps"; +$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["Export content"] = "Inhoud exporteren"; +$a->strings["Connection Default Permissions"] = "Standaard permissies voor connecties"; +$a->strings["Premium Channel Settings"] = "Instellingen premiumkanaal"; +$a->strings["Messages"] = "Berichten"; +$a->strings["Check Mail"] = "Controleer op nieuwe berichten"; +$a->strings["New Message"] = "Nieuw bericht"; +$a->strings["Chat Rooms"] = "Chatkanalen"; +$a->strings["Bookmarked Chatrooms"] = "Bladwijzers van chatkanalen"; +$a->strings["Suggested Chatrooms"] = "Voorgestelde chatkanalen"; +$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["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["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["[+] 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["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["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["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["Remote authentication"] = "Authenticatie op afstand"; +$a->strings["Click to authenticate to your home hub"] = "Authenticeer jezelf via (bijvoorbeeld) jouw 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["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["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["Please wait..."] = "Wachten aub..."; +$a->strings["view full size"] = "volledige grootte tonen"; +$a->strings["Visible to your default audience"] = "Voor iedereen zichtbaar, mits niet anders ingesteld"; +$a->strings["Show"] = "Tonen"; +$a->strings["Don't show"] = "Niet tonen"; +$a->strings["Permissions"] = "Permissies"; +$a->strings["Close"] = "Sluiten"; +$a->strings["Public Timeline"] = "Openbare tijdlijn"; +$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["Upload New Photos"] = "Nieuwe foto's uploaden"; $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"; @@ -745,9 +764,6 @@ $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["User '%s' deleted"] = "Account '%s' verwijderd"; $a->strings["Male"] = "Man"; $a->strings["Female"] = "Vrouw"; $a->strings["Currently Male"] = "Momenteel man"; @@ -760,7 +776,6 @@ $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"; @@ -805,56 +820,44 @@ $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["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["Social Networking"] = "Sociaal netwerk"; -$a->strings["Mostly Public"] = "Vrijwel alles openbaar"; -$a->strings["Restricted"] = "Beperkt zichtbaar"; -$a->strings["Private"] = "Verborgen kanaal"; -$a->strings["Community Forum"] = "Groepsforum"; -$a->strings["Feed Republish"] = "Feed herpubliceren"; -$a->strings["Celebrity/Soapbox"] = "Beroemdheid/alleen volgen"; -$a->strings["Custom/Expert Mode"] = "Expertmodus/handmatig aanpassen"; -$a->strings["Miscellaneous"] = "Diversen"; -$a->strings["never"] = "nooit"; -$a->strings["less than a second ago"] = "minder dan een seconde geleden"; -$a->strings["year"] = "jaar"; -$a->strings["years"] = "jaren"; -$a->strings["month"] = "maand"; -$a->strings["months"] = "maanden"; -$a->strings["week"] = "week"; -$a->strings["weeks"] = "weken"; -$a->strings["day"] = "dag"; -$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["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["This is you"] = "Dit ben jij"; +$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["Set your current mood and tell your friends"] = "Noteer je huidige stemming en toon het aan je connecties"; $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."; @@ -863,18 +866,18 @@ $a->strings["Delete Photo"] = "Verwijder foto"; $a->strings["Public access denied."] = "Openbare toegang geweigerd."; $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["%1$.2f MB of %2$.2f MB photo storage used."] = "%1$.2f MB van %2$.2f MB aan foto-opslag gebruikt."; +$a->strings["%1$.2f MB photo storage used."] = "%1$.2f MB aan foto-opslag gebruikt."; $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["Enter a new album name"] = "Vul een nieuwe albumnaam in"; +$a->strings["or select an existing one (doubleclick)"] = "of kies een bestaand album (dubbelklikken)"; $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["Edit Album"] = "Album bewerken"; $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"; @@ -886,10 +889,10 @@ $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["Example: @bob, @Barbara_Jensen, @jim@example.com"] = "Voorbeeld: @bob, @Barbara_Jansen, @jan@voorbeeld.nl"; +$a->strings["Flag as adult in album view"] = "Markeer als voor volwassenen in albumweergave"; $a->strings["In This Photo:"] = "Op deze foto:"; $a->strings["View Album"] = "Album weergeven"; $a->strings["Recent Photos"] = "Recente foto's"; @@ -1001,7 +1004,7 @@ $a->strings["Geographical location to display on your posts"] = "Geografische lo $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["Security and Privacy Settings"] = "Veiligheids- en privacy-instellingen"; $a->strings["Your permissions are already configured. Click to view/adjust"] = "Jouw permissies zijn al ingesteld. Klik om ze te bekijken of aan te passen."; $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"; @@ -1018,6 +1021,7 @@ $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 permissies voor nieuwe berichten"; +$a->strings["Channel permissions category:"] = "Kanaaltype en -permissies:"; $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"; @@ -1034,6 +1038,22 @@ $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["Show visual notifications including:"] = "Toon de volgende zichtbare notificaties:"; +$a->strings["Unseen matrix activity"] = "Niet bekeken matrix-activiteit"; +$a->strings["Unseen channel activity"] = "Niet bekeken kanaal-activiteit"; +$a->strings["Unseen private messages"] = "Niet bekeken privéberichten"; +$a->strings["Recommended"] = "Aanbevolen"; +$a->strings["Upcoming events"] = "Aankomende gebeurtenissen"; +$a->strings["Events today"] = "Gebeurtissen van vandaag"; +$a->strings["Upcoming birthdays"] = "Aankomende verjaardagen"; +$a->strings["Not available in all themes"] = "Niet in alle thema's beschikbaar"; +$a->strings["System (personal) notifications"] = "(Persoonlijke) systeemnotificaties"; +$a->strings["System info messages"] = "Systeemmededelingen"; +$a->strings["System critical alerts"] = "Kritische systeemwaarschuwingen"; +$a->strings["New connections"] = "Nieuwe connecties"; +$a->strings["System Registrations"] = "Nieuwe accountregistraties op deze hub"; +$a->strings["Notify me of events this many days in advance"] = "Herinner mij zoveel dagen van te voren aan gebeurtenissen"; +$a->strings["Must be greater than 0"] = "Moet hoger dan 0 zijn"; $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!"; @@ -1067,9 +1087,6 @@ $a->strings["Bug reports and issues: please visit"] = "Bugrapporten en andere kw $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["Block Name"] = "Bloknaam"; -$a->strings["Bookmark added"] = "Bladwijzer toegevoegd"; -$a->strings["My Bookmarks"] = "Mijn bladwijzers"; -$a->strings["My Connections Bookmarks"] = "Bladwijzers van mijn connecties"; $a->strings["Profile not found."] = "Profiel niet gevonden."; $a->strings["Profile deleted."] = "Profiel verwijderd."; $a->strings["Profile-"] = "Profiel-"; @@ -1217,7 +1234,7 @@ $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["Please enter your restrictions or conditions, such as paypal receipt, usage guidelines, etc."] = "Vul je restricties of voorwaarden in, zoals een paypal-afschrift, voorschriften voor leden, 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."; @@ -1288,9 +1305,9 @@ $a->strings["Hide or Unhide this connection"] = "Deze connectie verbergen of nie $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 permissies"; $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 permissies 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["Apply these permissions automatically"] = "Deze permissies automatisch toepassen"; +$a->strings["Apply the permissions indicated on this page to all new connections."] = "Permissies die op deze pagina staan vermeldt op alle nieuwe connecties toepassen."; $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 permissies!"; @@ -1339,6 +1356,9 @@ $a->strings["Finding:"] = "Gezocht naar:"; $a->strings["next page"] = "volgende pagina"; $a->strings["previous page"] = "vorige pagina"; $a->strings["No entries (some entries may be hidden)."] = "Niets gevonden (sommige kanalen kunnen verborgen zijn)."; +$a->strings["Bookmark added"] = "Bladwijzer toegevoegd"; +$a->strings["My Bookmarks"] = "Mijn bladwijzers"; +$a->strings["My Connections Bookmarks"] = "Bladwijzers van mijn connecties"; $a->strings["Status: "] = "Status: "; $a->strings["Sexual Preference: "] = "Seksuele voorkeur: "; $a->strings["Homepage: "] = "Homepage: "; @@ -1346,6 +1366,7 @@ $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["RedMatrix - Guests: Username: {your email address}, Password: +++"] = "RedMatrix - gasttoegang: Toegangsnaam: {jouw e-mailadres}, wachtwoord: +++"; $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."; @@ -1444,7 +1465,10 @@ $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["RedMatrix - Guests: Username: {your email address}, Password: +++"] = "RedMatrix - gasttoegang: Gebruikersnaam: {jouw e-mailadres}, wachtwoord: +++"; +$a->strings["webpage"] = "Webpagina"; +$a->strings["block"] = "blok"; +$a->strings["layout"] = "lay-out"; +$a->strings["%s element installed"] = "%s onderdeel geïnstalleerd"; $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."; @@ -1486,6 +1510,8 @@ $a->strings["Include all files and sub folders"] = "Toepassen op alle bestanden $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["Help:"] = "Hulp:"; +$a->strings["Not Found"] = "Niet gevonden"; $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"; @@ -1506,8 +1532,15 @@ $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["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."; +$a->strings["Invalid request."] = "Ongeldig verzoek"; +$a->strings["thing"] = "ding"; +$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["Tag removed"] = "Label verwijderd"; $a->strings["Remove Item Tag"] = "Verwijder itemlabel"; $a->strings["Select a tag to remove: "] = "Kies een label om te verwijderen"; @@ -1545,7 +1578,7 @@ $a->strings["Administrator Information"] = "Informatie over de beheerder van dez $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["Default system theme - may be over-ridden by user profiles - change theme settings"] = "Standaardthema voor RedMatrix-hub (kan door lid 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"; @@ -1567,7 +1600,7 @@ $a->strings["Comma separated list of domains which are allowed to establish frie $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["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 leden."; $a->strings["Verify Email Addresses"] = "E-mailadres verifieren"; $a->strings["Check to verify email addresses used in account registration (recommended)."] = "Inschakelen om e-mailadressen te verifiëren die tijdens de accountregistratie worden gebruikt (aanbevolen)."; $a->strings["Force publish"] = "Dwing kanaalvermelding af"; @@ -1575,9 +1608,9 @@ $a->strings["Check to force all profiles on this site to be listed in the site d $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["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 bezoekers te zien krijgen, te verbergen. (bijvoorbeeld wanneer je een kanaal op deze RedMatrix-hub als homepage gebruikt)"; +$a->strings["Proxy user"] = "Gebruikersnaam proxy"; +$a->strings["Proxy URL"] = "URL proxy"; $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"; @@ -1610,7 +1643,7 @@ $a->strings["%s user deleted"] = array( ); $a->strings["Account not found"] = "Account niet gevonden"; $a->strings["User '%s' unblocked"] = "Account '%s' gedeblokkeerd"; -$a->strings["User '%s' blocked"] = "Gebruiker '%s' geblokkeerd"; +$a->strings["User '%s' blocked"] = "Lid '%s' geblokkeerd"; $a->strings["Users"] = "Accounts"; $a->strings["select all"] = "alles selecteren"; $a->strings["User registrations waiting for confirm"] = "Accounts die op goedkeuring wachten"; @@ -1729,15 +1762,13 @@ $a->strings["You have reached your limit of %1$.0f webpages."] = "Je hebt jouw l $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 lay-out"; -$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."; -$a->strings["Invalid request."] = "Ongeldig verzoek"; -$a->strings["thing"] = "ding"; -$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["Location not found."] = "Locatie niet gevonden."; +$a->strings["Primary location cannot be removed."] = "Primaire locatie kan niet worden verwijderd."; +$a->strings["No locations found."] = "Geen locaties gevonden."; +$a->strings["Manage Channel Locations"] = "Kanaallocaties beheren"; +$a->strings["Location (address)"] = "Locatie (adres)"; +$a->strings["Primary Location"] = "Primaire locatie"; +$a->strings["Drop location"] = "Locatie verwijderen"; $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."; @@ -1853,12 +1884,6 @@ $a->strings["This will completely remove this account including all its channels $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["No service class restrictions found."] = "Geen abonnementsbeperkingen gevonden."; -$a->strings["webpage"] = "Webpagina"; -$a->strings["block"] = "blok"; -$a->strings["layout"] = "lay-out"; -$a->strings["%s element installed"] = "%s onderdeel geïnstalleerd"; -$a->strings["Location not found."] = "Locatie niet gevonden."; -$a->strings["Primary location cannot be removed."] = "Primaire locatie kan niet worden verwijderd."; $a->strings["Schema Default"] = "Standaardschema"; $a->strings["Sans-Serif"] = "Schreefloos"; $a->strings["Monospace"] = "Monospace"; -- cgit v1.2.3 From 1a5a5c7edb8697c93f8bababbafa80245378dd7e Mon Sep 17 00:00:00 2001 From: Habeas Codice Date: Thu, 13 Nov 2014 12:21:58 -0800 Subject: PostgreSQL support initial commit There were 11 main types of changes: - UPDATE's and DELETE's sometimes had LIMIT 1 at the end of them. This is not only non-compliant but it would certainly not do what whoever wrote it thought it would. It is likely this mistake was just copied from Friendica. All of these instances, the LIMIT 1 was simply removed. - Bitwise operations (and even some non-zero int checks) erroneously rely on MySQL implicit integer-boolean conversion in the WHERE clauses. This is non-compliant (and bad programming practice to boot). Proper explicit boolean conversions were added. New queries should use proper conventions. - MySQL has a different operator for bitwise XOR than postgres. Rather than add yet another dba_ func, I converted them to "& ~" ("AND NOT") when turning off, and "|" ("OR") when turning on. There were no true toggles (XOR). New queries should refrain from using XOR when not necessary. - There are several fields which the schema has marked as NOT NULL, but the inserts don't specify them. The reason this works is because mysql totally ignores the constraint and adds an empty text default automatically. Again, non-compliant, obviously. In these cases a default of empty text was added. - Several statements rely on a non-standard MySQL feature (http://dev.mysql.com/doc/refman/5.5/en/group-by-handling.html). These queries can all be rewritten to be standards compliant. Interestingly enough, the newly rewritten standards compliant queries run a zillion times faster, even on MySQL. - A couple of function/operator name translations were needed (RAND/RANDOM, GROUP_CONCAT/STRING_AGG, UTC_NOW, REGEXP/~, ^/#) -- assist functions added in the dba_ - INTERVALs: postgres requires quotes around the value, mysql requires that there are not quotes around the value -- assist functions added in the dba_ - NULL_DATE's -- Postgres does not allow the invalid date '0000-00-00 00:00:00' (there is no such thing as year 0 or month 0 or day 0). We use '0001-01-01 00:00:00' for postgres. Conversions are handled in Zot/item packets automagically by quoting all dates with dbescdate(). - char(##) specifications in the schema creates fields with blank spaces that aren't trimmed in the code. MySQL apparently treats char(##) as varchar(##), again, non-compliant. Since postgres works better with text fields anyway, this ball of bugs was simply side-stepped by using 'text' datatype for all text fields in the postgres schema. varchar was used in a couple of places where it actually seemed appropriate (size constraint), but without rigorously vetting that all of the PHP code actually validates data, new bugs might come out from under the rug. - postgres doesn't store nul bytes and a few other non-printables in text fields, even when quoted. bytea fields were used when storing binary data (photo.data, attach.data). A new dbescbin() function was added to handle this transparently. - postgres does not support LIMIT #,# syntax. All databases support LIMIT # OFFSET # syntax. Statements were updated to be standard. These changes require corresponding changes in the coding standards. Please review those before adding any code going forward. Still on my TODO list: - remove quotes from non-reserved identifiers and make reserved identifiers use dba func for quoting - Rewrite search queries for better results (both MySQL and Postgres) --- boot.php | 12 +- doc/developers.bb | 3 + doc/sql_conventions.bb | 87 +++ include/Contact.php | 56 +- include/RedDAV/RedDirectory.php | 16 +- include/RedDAV/RedFile.php | 10 +- include/account.php | 31 +- include/acl_selectors.php | 2 +- include/api.php | 28 +- include/apps.php | 4 +- include/attach.php | 20 +- include/auth.php | 2 +- include/cache.php | 2 +- include/chat.php | 13 +- include/cli_startup.php | 4 +- include/config.php | 12 +- include/datetime.php | 7 +- include/dba/dba_driver.php | 135 ++++- include/dba/dba_postgres.php | 112 ++++ include/deliver.php | 8 +- include/diaspora.php | 4 +- include/dir_fns.php | 16 +- include/directory.php | 4 +- include/enotify.php | 4 +- include/event.php | 6 +- include/expire.php | 10 +- include/externals.php | 9 +- include/follow.php | 9 +- include/group.php | 11 +- include/hubloc.php | 8 +- include/identity.php | 20 +- include/items.php | 94 +-- include/menu.php | 6 +- include/message.php | 8 +- include/nav.php | 2 +- include/network.php | 10 +- include/notifier.php | 21 +- include/onedirsync.php | 4 +- include/onepoll.php | 15 +- include/permissions.php | 4 +- include/photo/photo_driver.php | 14 +- include/photos.php | 7 +- include/plugin.php | 6 +- include/poller.php | 51 +- include/queue.php | 24 +- include/queue_fn.php | 4 +- include/reddav.php | 22 +- include/security.php | 31 +- include/session.php | 8 +- include/socgraph.php | 57 +- include/statistics_fns.php | 20 +- include/text.php | 18 +- include/widgets.php | 6 +- include/zot.php | 104 ++-- index.php | 4 +- install/database.sql | 1228 --------------------------------------- install/schema_mysql.sql | 1228 +++++++++++++++++++++++++++++++++++++++ install/schema_postgres.sql | 1190 +++++++++++++++++++++++++++++++++++++ mod/acl.php | 29 +- mod/admin.php | 37 +- mod/channel.php | 18 +- mod/chatsvc.php | 4 +- mod/connect.php | 2 +- mod/connections.php | 18 +- mod/connedit.php | 4 +- mod/contactgroup.php | 2 +- mod/delegate.php | 2 +- mod/dirsearch.php | 8 +- mod/display.php | 8 +- mod/events.php | 8 +- mod/filer.php | 2 +- mod/filerm.php | 2 +- mod/fsuggest.php | 2 +- mod/group.php | 6 +- mod/import.php | 6 +- mod/item.php | 6 +- mod/like.php | 4 +- mod/locs.php | 6 +- mod/lostpass.php | 4 +- mod/mail.php | 2 +- mod/manage.php | 12 +- mod/network.php | 22 +- mod/notifications.php | 6 +- mod/openid.php | 2 +- mod/p.php | 2 +- mod/photo.php | 4 +- mod/photos.php | 47 +- mod/ping.php | 34 +- mod/poco.php | 20 +- mod/post.php | 18 +- mod/profile_photo.php | 10 +- mod/profiles.php | 8 +- mod/profperm.php | 4 +- mod/receive.php | 2 +- mod/register.php | 10 +- mod/search.php | 36 +- mod/settings.php | 22 +- mod/setup.php | 32 +- mod/siteinfo.php | 2 +- mod/sources.php | 4 +- mod/starred.php | 2 +- mod/subthread.php | 2 +- mod/thing.php | 6 +- mod/viewconnections.php | 8 +- mod/zfinger.php | 4 +- mod/zotfeed.php | 2 +- vendor/bin/sabredav | 1 - vendor/bin/vobjectvalidate.php | 1 - view/en/htconfig.tpl | 3 +- view/tpl/install_db.tpl | 2 +- view/tpl/install_settings.tpl | 1 + 111 files changed, 3484 insertions(+), 1876 deletions(-) create mode 100644 doc/sql_conventions.bb create mode 100644 include/dba/dba_postgres.php delete mode 100644 install/database.sql create mode 100644 install/schema_mysql.sql create mode 100644 install/schema_postgres.sql delete mode 120000 vendor/bin/sabredav delete mode 120000 vendor/bin/vobjectvalidate.php diff --git a/boot.php b/boot.php index abbf48636..085e6b36b 100755 --- a/boot.php +++ b/boot.php @@ -52,7 +52,7 @@ define ( 'DB_UPDATE_VERSION', 1130 ); define ( 'EOL', '
    ' . "\r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); -define ( 'NULL_DATE', '0000-00-00 00:00:00' ); +//define ( 'NULL_DATE', '0000-00-00 00:00:00' ); define ( 'TEMPLATE_BUILD_PATH', 'store/[data]/smarty3' ); define ( 'DIRECTORY_MODE_NORMAL', 0x0000); // This is technically DIRECTORY_MODE_TERTIARY, but it's the default, hence 0x0000 @@ -555,7 +555,9 @@ define ( 'ITEM_VERIFIED', 0x2000); // Signature verification was success define ( 'ITEM_RETAINED', 0x4000); // We looked at this item once to decide whether or not to expire it, and decided not to. define ( 'ITEM_RSS', 0x8000); // Item comes from a feed. Use this to decide whether to link the title // Don't make us evaluate this same item again. - +define ( 'DBTYPE_MYSQL', 0 ); +define ( 'DBTYPE_POSTGRES', 1 ); + /** * * Reverse the effect of magic_quotes_gpc if it is enabled. @@ -1417,7 +1419,7 @@ function fix_system_urls($oldurl,$newurl) { $replace_xchan_url = ((strpos($rr['xchan_url'],$oldurl) !== false) ? true : false); - $x = q("update xchan set xchan_addr = '%s', xchan_url = '%s', xchan_connurl = '%s', xchan_follow = '%s', xchan_connpage = '%s', xchan_photo_l = '%s', xchan_photo_m = '%s', xchan_photo_s = '%s', xchan_photo_date = '%s' where xchan_hash = '%s' limit 1", + $x = q("update xchan set xchan_addr = '%s', xchan_url = '%s', xchan_connurl = '%s', xchan_follow = '%s', xchan_connpage = '%s', xchan_photo_l = '%s', xchan_photo_m = '%s', xchan_photo_s = '%s', xchan_photo_date = '%s' where xchan_hash = '%s'", dbesc($channel_address . '@' . $rhs), dbesc(($replace_xchan_url) ? str_replace($oldurl,$newurl,$rr['xchan_url']) : $rr['xchan_url']), dbesc(str_replace($oldurl,$newurl,$rr['xchan_connurl'])), @@ -1430,7 +1432,7 @@ function fix_system_urls($oldurl,$newurl) { dbesc($rr['xchan_hash']) ); - $y = q("update hubloc set hubloc_addr = '%s', hubloc_url = '%s', hubloc_url_sig = '%s', hubloc_host = '%s', hubloc_callback = '%s' where hubloc_hash = '%s' and hubloc_url = '%s' limit 1", + $y = q("update hubloc set hubloc_addr = '%s', hubloc_url = '%s', hubloc_url_sig = '%s', hubloc_host = '%s', hubloc_callback = '%s' where hubloc_hash = '%s' and hubloc_url = '%s'", dbesc($channel_address . '@' . $rhs), dbesc($newurl), dbesc(base64url_encode(rsa_sign($newurl,$c[0]['channel_prvkey']))), @@ -1787,7 +1789,7 @@ function load_contact_links($uid) { // logger('load_contact_links'); - $r = q("SELECT abook_id, abook_flags, abook_my_perms, abook_their_perms, xchan_hash, xchan_photo_m, xchan_name, xchan_url from abook left join xchan on abook_xchan = xchan_hash where abook_channel = %d and not (abook_flags & %d) ", + $r = q("SELECT abook_id, abook_flags, abook_my_perms, abook_their_perms, xchan_hash, xchan_photo_m, xchan_name, xchan_url from abook left join xchan on abook_xchan = xchan_hash where abook_channel = %d and not (abook_flags & %d)>0 ", intval($uid), intval(ABOOK_FLAG_SELF) ); diff --git a/doc/developers.bb b/doc/developers.bb index 18e39c4ea..5365fd77a 100644 --- a/doc/developers.bb +++ b/doc/developers.bb @@ -64,4 +64,7 @@ In the interests of consistency we adopt the following code styling. We may acce [li] Generally speaking, opening braces go on the same line as the thing which opens the brace. They are the last character on the line. Closing braces are on a line by themselves. [/li] +[b]See Also[/b] +[zrl=[baseurl]/help/sql_conventions]SQL Conventions[/zrl] + #include doc/macros/main_footer.bb; diff --git a/doc/sql_conventions.bb b/doc/sql_conventions.bb new file mode 100644 index 000000000..88539ae19 --- /dev/null +++ b/doc/sql_conventions.bb @@ -0,0 +1,87 @@ +[h1]SQL Conventions[/h1] +[b]Intro[/b] +The following common SQL conventions appear throughout the code in many places. We use a simple DBA (DataBase Abstraction layer) to handle differences between databases. Please be sure to use only standards-compliant SQL. + +[b]Rule One[/b] +Worth Repeating: Don't use non-standard SQL. This goes for addons as well. If you do use non-standard SQL, and the dba funcs are insufficient, do a if()/switch() or similar for all currently supported databases. Currently nothing red# does requires non-standard SQL. + +[b]Using a format string[/b] +[li]Uses sprintf() +To be written +[code]// Example +$r = q("SELECT * FROM profile WHERE uid = %d", + local_user() +); +[/code][/li] + +[b]Checking bit flags in a where clause[/b] +[li]You must explicitly convert integers to booleans. The easiest way to do this is to compare to 0. +[code]// Example +$r = q("SELECT abook_id, abook_flags, abook_my_perms, abook_their_perms, xchan_hash, xchan_photo_m, xchan_name, xchan_url from abook left join xchan on abook_xchan = xchan_hash where abook_channel = %d and not (abook_flags & %d)>0 ", + intval($uid), + intval(ABOOK_FLAG_SELF) +); +[/code] +[/li] +[li]Turning off a flag +[code]$y = q("update xchan set xchan_flags = (xchan_flags & ~%d) where (xchan_flags & %d)>0 and xchan_hash = '%s'", + intval(XCHAN_FLAGS_ORPHAN), + intval(XCHAN_FLAGS_ORPHAN), + dbesc($rr['hubloc_hash']) +);[/code] +[/li] +[li]Turning on a flag +[code]$y = q("update xchan set xchan_flags = (xchan_flags | %d) where xchan_hash = '%s'", + intval(XCHAN_FLAGS_ORPHAN), + dbesc($rr['hubloc_hash']) +);[/code] +[/li] + +[b]Using relative times (INTERVALs)[/b] +[li]Sometimes you want to compare something, like less than x days old. +[code]// Example +$r = q("SELECT * FROM abook left join xchan on abook_xchan = xchan_hash + WHERE abook_dob > %s + interval %s and abook_dob < %s + interval %s", + db_utcnow(), db_quoteinterval('7 day'), + db_utcnow(), db_quoteinterval('14 day') +);[/code] +[/li] +[b]Paged results[/b] +[li]To be written +[code]// Example +$r = q("SELECT * FROM mail WHERE uid=%d AND $sql_extra ORDER BY created DESC LIMIT %d OFFSET %d", + intval(api_user()), + intval($count), intval($start) +);[/code][/li] + +[b]NULL dates[/b] +[li]To be written +[code]Example[/code][/li] + +[b]Storing binary data[/b] +[li]To be written +[code]// Example +$x = q("update photo set data = '%s', height = %d, width = %d where resource_id = '%s' and uid = %d and scale = 0", + dbescbin($ph->imageString()), + intval($height), + intval($width), + dbesc($resource_id), + intval($page_owner_uid) +);[/code][/li] + +[b]Current timestamp[/b] +[li][code]// Example +$randfunc = db_getfunc('rand'); +$r = q("select xchan_url from xchan left join hubloc on hubloc_hash = xchan_hash where hubloc_connected > %s - interval %s order by $randfunc limit 1", + db_utcnow(), db_quoteinterval('30 day') +);[/code][/li] + +[b]SQL Function and Operator Abstraction[/b] +[li]Sometimes the same function or operator has a different name/symbol in each database. You use db_getfunc('funcname') to look them up. The string is [i]not[/i] case-sensitive; do [i]not[/i] include parens. +[code]// Example +$randfunc = db_getfunc('rand'); +$r = q("select xchan_url from xchan left join hubloc on hubloc_hash = xchan_hash where hubloc_connected > %s - interval %s order by $randfunc limit 1", + db_utcnow(), db_quoteinterval('30 day') +);[/code][/li] + +#include doc/macros/main_footer.bb; \ No newline at end of file diff --git a/include/Contact.php b/include/Contact.php index 20e5e1a1e..f0c7cd737 100644 --- a/include/Contact.php +++ b/include/Contact.php @@ -22,7 +22,7 @@ function rconnect_url($channel_id,$xchan) { if(($r) && ($r[0]['xchan_follow'])) return $r[0]['xchan_follow']; - $r = q("select hubloc_url from hubloc where hubloc_hash = '%s' and ( hubloc_flags & %d ) limit 1", + $r = q("select hubloc_url from hubloc where hubloc_hash = '%s' and ( hubloc_flags & %d )>0 limit 1", dbesc($xchan), intval(HUBLOC_FLAGS_PRIMARY) ); @@ -35,7 +35,7 @@ function rconnect_url($channel_id,$xchan) { function abook_connections($channel_id, $sql_conditions = '') { $r = q("select * from abook left join xchan on abook_xchan = xchan_hash where abook_channel = %d - and not ( abook_flags & %d ) $sql_conditions", + and not ( abook_flags & %d )>0 $sql_conditions", intval($channel_id), intval(ABOOK_FLAG_SELF) ); @@ -44,7 +44,7 @@ function abook_connections($channel_id, $sql_conditions = '') { function abook_self($channel_id) { $r = q("select * from abook left join xchan on abook_xchan = xchan_hash where abook_channel = %d - and ( abook_flags & %d ) limit 1", + and ( abook_flags & %d )>0 limit 1", intval($channel_id), intval(ABOOK_FLAG_SELF) ); @@ -52,7 +52,7 @@ function abook_self($channel_id) { } function channelx_by_nick($nick) { - $r = q("SELECT * FROM channel left join xchan on channel_hash = xchan_hash WHERE channel_address = '%s' and not ( channel_pageflags & %d ) LIMIT 1", + $r = q("SELECT * FROM channel left join xchan on channel_hash = xchan_hash WHERE channel_address = '%s' and not ( channel_pageflags & %d )>0 LIMIT 1", dbesc($nick), intval(PAGE_REMOVED) ); @@ -60,7 +60,7 @@ function channelx_by_nick($nick) { } function channelx_by_hash($hash) { - $r = q("SELECT * FROM channel left join xchan on channel_hash = xchan_hash WHERE channel_hash = '%s' and not ( channel_pageflags & %d ) LIMIT 1", + $r = q("SELECT * FROM channel left join xchan on channel_hash = xchan_hash WHERE channel_hash = '%s' and not ( channel_pageflags & %d )>0 LIMIT 1", dbesc($hash), intval(PAGE_REMOVED) ); @@ -68,7 +68,7 @@ function channelx_by_hash($hash) { } function channelx_by_n($id) { - $r = q("SELECT * FROM channel left join xchan on channel_hash = xchan_hash WHERE channel_id = %d and not ( channel_pageflags & %d ) LIMIT 1", + $r = q("SELECT * FROM channel left join xchan on channel_hash = xchan_hash WHERE channel_id = %d and not ( channel_pageflags & %d )>0 LIMIT 1", dbesc($id), intval(PAGE_REMOVED) ); @@ -128,7 +128,7 @@ function vcard_from_xchan($xchan, $observer = null, $mode = '') { function abook_toggle_flag($abook,$flag) { - $r = q("UPDATE abook set abook_flags = (abook_flags ^ %d) where abook_id = %d and abook_channel = %d limit 1", + $r = q("UPDATE abook set abook_flags = (abook_flags & ~%d) where abook_id = %d and abook_channel = %d", intval($flag), intval($abook['abook_id']), intval($abook['abook_channel']) @@ -138,7 +138,7 @@ function abook_toggle_flag($abook,$flag) { if(($flag === ABOOK_FLAG_ARCHIVED) && ($abook['abook_flags'] & ABOOK_FLAG_ARCHIVED)) { $r = q("update abook set abook_connected = '%s', abook_updated = '%s' - where abook_id = %d and abook_channel = %d limit 1", + where abook_id = %d and abook_channel = %d", dbesc(datetime_convert()), dbesc(datetime_convert()), intval($abook['abook_id']), @@ -173,7 +173,7 @@ function account_remove($account_id,$local = true,$unset_session=true) { // Don't let anybody nuke the only admin account. - $r = q("select account_id from account where (account_roles & %d)", + $r = q("select account_id from account where (account_roles & %d)>0", intval(ACCOUNT_ROLE_ADMIN) ); @@ -201,7 +201,7 @@ function account_remove($account_id,$local = true,$unset_session=true) { } } - $r = q("delete from account where account_id = %d limit 1", + $r = q("delete from account where account_id = %d", intval($account_id) ); @@ -239,7 +239,7 @@ function channel_remove($channel_id, $local = true, $unset_session=true) { channel_r_photos = 0, channel_r_abook = 0, channel_w_stream = 0, channel_w_wall = 0, channel_w_tagwall = 0, channel_w_comment = 0, channel_w_mail = 0, channel_w_photos = 0, channel_w_chat = 0, channel_a_delegate = 0, channel_r_storage = 0, channel_w_storage = 0, channel_r_pages = 0, channel_w_pages = 0, channel_a_republish = 0 - where channel_id = %d limit 1", + where channel_id = %d", dbesc(datetime_convert()), intval(PAGE_REMOVED), intval($channel_id) @@ -275,12 +275,12 @@ 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)>0", dbesc($channel['channel_hash']), dbesc(ABOOK_FLAG_SELF) ); - $r = q("update channel set channel_deleted = '%s', channel_pageflags = (channel_pageflags | %d) where channel_id = %d limit 1", + $r = q("update channel set channel_deleted = '%s', channel_pageflags = (channel_pageflags | %d) where channel_id = %d", dbesc(datetime_convert()), intval(PAGE_REMOVED), intval($channel_id) @@ -296,7 +296,7 @@ function channel_remove($channel_id, $local = true, $unset_session=true) { $hublocs = 0; - $r = q("select hubloc_id from hubloc where hubloc_hash = '%s' and not (hubloc_flags & %d)", + $r = q("select hubloc_id from hubloc where hubloc_hash = '%s' and not (hubloc_flags & %d)>0", dbesc($channel['channel_hash']), intval(HUBLOC_FLAGS_DELETED) ); @@ -335,10 +335,11 @@ function mark_orphan_hubsxchans() { if($dirmode == DIRECTORY_MODE_NORMAL) return; - $r = q("update hubloc set hubloc_status = (hubloc_status | %d) where not (hubloc_status & %d) - and hubloc_network = 'zot' and hubloc_connected < utc_timestamp() - interval 36 day", + $r = q("update hubloc set hubloc_status = (hubloc_status | %d) where not (hubloc_status & %d)>0 + and hubloc_network = 'zot' and hubloc_connected < %s - interval %s", intval(HUBLOC_OFFLINE), - intval(HUBLOC_OFFLINE) + intval(HUBLOC_OFFLINE), + db_utcnow(), db_quoteinterval('36 day') ); // $realm = get_directory_realm(); @@ -354,7 +355,7 @@ function mark_orphan_hubsxchans() { // } - $r = q("select hubloc_id, hubloc_hash from hubloc where (hubloc_status & %d) and not (hubloc_flags & %d)", + $r = q("select hubloc_id, hubloc_hash from hubloc where (hubloc_status & %d)>0 and not (hubloc_flags & %d)>0", intval(HUBLOC_OFFLINE), intval(HUBLOC_FLAGS_ORPHANCHECK) ); @@ -364,7 +365,7 @@ function mark_orphan_hubsxchans() { // see if any other hublocs are still alive for this channel - $x = q("select * from hubloc where hubloc_hash = '%s' and not (hubloc_status & %d)", + $x = q("select * from hubloc where hubloc_hash = '%s' and not (hubloc_status & %d)>0", dbesc($rr['hubloc_hash']), intval(HUBLOC_OFFLINE) ); @@ -372,7 +373,7 @@ function mark_orphan_hubsxchans() { // yes - if the xchan was marked as an orphan, undo it - $y = q("update xchan set xchan_flags = (xchan_flags ^ %d) where (xchan_flags & %d) and xchan_hash = '%s' limit 1", + $y = q("update xchan set xchan_flags = (xchan_flags & ~%d) where (xchan_flags & %d)>0 and xchan_hash = '%s'", intval(XCHAN_FLAGS_ORPHAN), intval(XCHAN_FLAGS_ORPHAN), dbesc($rr['hubloc_hash']) @@ -383,7 +384,7 @@ function mark_orphan_hubsxchans() { // nope - mark the xchan as an orphan - $y = q("update xchan set xchan_flags = (xchan_flags | %d) where xchan_hash = '%s' limit 1", + $y = q("update xchan set xchan_flags = (xchan_flags | %d) where xchan_hash = '%s'", intval(XCHAN_FLAGS_ORPHAN), dbesc($rr['hubloc_hash']) ); @@ -391,7 +392,7 @@ function mark_orphan_hubsxchans() { // mark that we've checked this entry so we don't need to do it again - $y = q("update hubloc set hubloc_flags = (hubloc_flags | %d) where hubloc_id = %d limit 1", + $y = q("update hubloc set hubloc_flags = (hubloc_flags | %d) where hubloc_id = %d", intval(HUBLOC_FLAGS_ORPHANCHECK), dbesc($rr['hubloc_id']) ); @@ -449,7 +450,7 @@ function remove_all_xchan_resources($xchan, $channel_id = 0) { if($dirmode === false || $dirmode == DIRECTORY_MODE_NORMAL) { - $r = q("delete from xchan where xchan_hash = '%s' limit 1", + $r = q("delete from xchan where xchan_hash = '%s'", dbesc($xchan) ); $r = q("delete from hubloc where hubloc_hash = '%s'", @@ -482,7 +483,7 @@ function contact_remove($channel_id, $abook_id) { $archive = get_pconfig($channel_id, 'system','archive_removed_contacts'); if($archive) { - q("update abook set abook_flags = ( abook_flags | %d ) where abook_id = %d and abook_channel = %d limit 1", + q("update abook set abook_flags = ( abook_flags | %d ) where abook_id = %d and abook_channel = %d", intval(ABOOK_FLAG_ARCHIVED), intval($abook_id), intval($channel_id) @@ -514,7 +515,7 @@ function contact_remove($channel_id, $abook_id) { } } - q("delete from abook where abook_id = %d and abook_channel = %d limit 1", + q("delete from abook where abook_id = %d and abook_channel = %d", intval($abook['abook_id']), intval($channel_id) ); @@ -541,7 +542,10 @@ function contact_remove($channel_id, $abook_id) { function random_profile() { - $r = q("select xchan_url from xchan left join hubloc on hubloc_hash = xchan_hash where hubloc_connected > UTC_TIMESTAMP() - interval 30 day order by rand() limit 1"); + $randfunc = db_getfunc('rand'); + $r = q("select xchan_url from xchan left join hubloc on hubloc_hash = xchan_hash where hubloc_connected > %s - interval %s order by $randfunc limit 1", + db_utcnow(), db_quoteinterval('30 day') + ); if($r) return $r[0]['xchan_url']; return ''; diff --git a/include/RedDAV/RedDirectory.php b/include/RedDAV/RedDirectory.php index a46b77f5f..85af0d57f 100644 --- a/include/RedDAV/RedDirectory.php +++ b/include/RedDAV/RedDirectory.php @@ -159,7 +159,7 @@ class RedDirectory extends DAV\Node implements DAV\ICollection, DAV\IQuota { list($parent_path, ) = DAV\URLUtil::splitPath($this->red_path); $new_path = $parent_path . '/' . $name; - $r = q("UPDATE attach SET filename = '%s' WHERE hash = '%s' AND uid = %d LIMIT 1", + $r = q("UPDATE attach SET filename = '%s' WHERE hash = '%s' AND uid = %d", dbesc($name), dbesc($this->folder_hash), intval($this->auth->owner_id) @@ -197,7 +197,7 @@ class RedDirectory extends DAV\Node implements DAV\ICollection, DAV\IQuota { $mimetype = z_mime_content_type($name); - $c = q("SELECT * FROM channel WHERE channel_id = %d AND NOT (channel_pageflags & %d) LIMIT 1", + $c = q("SELECT * FROM channel WHERE channel_id = %d AND NOT (channel_pageflags & %d)>0 LIMIT 1", intval($this->auth->owner_id), intval(PAGE_REMOVED) ); @@ -246,7 +246,7 @@ class RedDirectory extends DAV\Node implements DAV\ICollection, DAV\IQuota { $edited = datetime_convert(); // updates entry with filesize and timestamp - $d = q("UPDATE attach SET filesize = '%s', edited = '%s' WHERE hash = '%s' AND uid = %d LIMIT 1", + $d = q("UPDATE attach SET filesize = '%s', edited = '%s' WHERE hash = '%s' AND uid = %d", dbesc($size), dbesc($edited), dbesc($hash), @@ -254,7 +254,7 @@ class RedDirectory extends DAV\Node implements DAV\ICollection, DAV\IQuota { ); // update the folder's lastmodified timestamp - $e = q("UPDATE attach SET edited = '%s' WHERE hash = '%s' AND uid = %d LIMIT 1", + $e = q("UPDATE attach SET edited = '%s' WHERE hash = '%s' AND uid = %d", dbesc($edited), dbesc($this->folder_hash), intval($c[0]['channel_id']) @@ -293,7 +293,7 @@ class RedDirectory extends DAV\Node implements DAV\ICollection, DAV\IQuota { throw new DAV\Exception\Forbidden('Permission denied.'); } - $r = q("SELECT * FROM channel WHERE channel_id = %d AND NOT (channel_pageflags & %d) LIMIT 1", + $r = q("SELECT * FROM channel WHERE channel_id = %d AND NOT (channel_pageflags & %d)>0 LIMIT 1", intval($this->auth->owner_id), intval(PAGE_REMOVED) ); @@ -362,7 +362,7 @@ class RedDirectory extends DAV\Node implements DAV\ICollection, DAV\IQuota { $channel_name = $path_arr[0]; - $r = q("SELECT channel_id FROM channel WHERE channel_address = '%s' AND NOT ( channel_pageflags & %d ) LIMIT 1", + $r = q("SELECT channel_id FROM channel WHERE channel_address = '%s' AND NOT ( channel_pageflags & %d )>0 LIMIT 1", dbesc($channel_name), intval(PAGE_REMOVED) ); @@ -380,7 +380,7 @@ class RedDirectory extends DAV\Node implements DAV\ICollection, DAV\IQuota { $os_path = ''; for ($x = 1; $x < count($path_arr); $x++) { - $r = q("select id, hash, filename, flags from attach where folder = '%s' and filename = '%s' and uid = %d and (flags & %d)", + $r = q("select id, hash, filename, flags from attach where folder = '%s' and filename = '%s' and uid = %d and (flags & %d)>0", dbesc($folder), dbesc($path_arr[$x]), intval($channel_id), @@ -440,7 +440,7 @@ class RedDirectory extends DAV\Node implements DAV\ICollection, DAV\IQuota { $free = disk_free_space('store'); if ($this->auth->owner_id) { - $c = q("select * from channel where channel_id = %d and not (channel_pageflags & %d) limit 1", + $c = q("select * from channel where channel_id = %d and not (channel_pageflags & %d)>0 limit 1", intval($this->auth->owner_id), intval(PAGE_REMOVED) ); diff --git a/include/RedDAV/RedFile.php b/include/RedDAV/RedFile.php index f96790631..3a5230dc1 100644 --- a/include/RedDAV/RedFile.php +++ b/include/RedDAV/RedFile.php @@ -79,7 +79,7 @@ class RedFile extends DAV\Node implements DAV\IFile { $newName = str_replace('/', '%2F', $newName); - $r = q("UPDATE attach SET filename = '%s' WHERE hash = '%s' AND id = %d LIMIT 1", + $r = q("UPDATE attach SET filename = '%s' WHERE hash = '%s' AND id = %d", dbesc($this->data['filename']), intval($this->data['id']) ); @@ -96,7 +96,7 @@ class RedFile extends DAV\Node implements DAV\IFile { $size = 0; // @todo only 3 values are needed - $c = q("SELECT * FROM channel WHERE channel_id = %d AND NOT (channel_pageflags & %d) LIMIT 1", + $c = q("SELECT * FROM channel WHERE channel_id = %d AND NOT (channel_pageflags & %d)>0 LIMIT 1", intval($this->auth->owner_id), intval(PAGE_REMOVED) ); @@ -113,7 +113,7 @@ class RedFile extends DAV\Node implements DAV\IFile { $size = @filesize($f); logger('filename: ' . $f . ' size: ' . $size, LOGGER_DEBUG); } else { - $r = q("UPDATE attach SET data = '%s' WHERE hash = '%s' AND uid = %d LIMIT 1", + $r = q("UPDATE attach SET data = '%s' WHERE hash = '%s' AND uid = %d", dbesc(stream_get_contents($data)), dbesc($this->data['hash']), intval($this->data['uid']) @@ -131,7 +131,7 @@ class RedFile extends DAV\Node implements DAV\IFile { // returns now() $edited = datetime_convert(); - $d = q("UPDATE attach SET filesize = '%s', edited = '%s' WHERE hash = '%s' AND uid = %d LIMIT 1", + $d = q("UPDATE attach SET filesize = '%s', edited = '%s' WHERE hash = '%s' AND uid = %d", dbesc($size), dbesc($edited), dbesc($this->data['hash']), @@ -139,7 +139,7 @@ class RedFile extends DAV\Node implements DAV\IFile { ); // update the folder's lastmodified timestamp - $e = q("UPDATE attach SET edited = '%s' WHERE hash = '%s' AND uid = %d LIMIT 1", + $e = q("UPDATE attach SET edited = '%s' WHERE hash = '%s' AND uid = %d", dbesc($edited), dbesc($r[0]['folder']), intval($c[0]['channel_id']) diff --git a/include/account.php b/include/account.php index df484e608..8df44acba 100644 --- a/include/account.php +++ b/include/account.php @@ -202,7 +202,7 @@ function create_account($arr) { // Set the parent record to the current record_id if no parent was provided if(! $parent) { - $r = q("update account set account_parent = %d where account_id = %d limit 1", + $r = q("update account set account_parent = %d where account_id = %d", intval($result['account']['account_id']), intval($result['account']['account_id']) ); @@ -367,16 +367,16 @@ function user_allow($hash) { if(! $account) return $ret; - $r = q("DELETE FROM register WHERE hash = '%s' LIMIT 1", + $r = q("DELETE FROM register WHERE hash = '%s'", dbesc($register[0]['hash']) ); - $r = q("update account set account_flags = (account_flags ^ %d) where (account_flags & %d) and account_id = %d limit 1", + $r = q("update account set account_flags = (account_flags & ~%d) where (account_flags & %d)>0 and account_id = %d", intval(ACCOUNT_BLOCKED), intval(ACCOUNT_BLOCKED), intval($register[0]['uid']) ); - $r = q("update account set account_flags = (account_flags ^ %d) where (account_flags & %d) and account_id = %d limit 1", + $r = q("update account set account_flags = (account_flags & ~%d) where (account_flags & %d)>0 and account_id = %d", intval(ACCOUNT_PENDING), intval(ACCOUNT_PENDING), intval($register[0]['uid']) @@ -430,11 +430,11 @@ function user_deny($hash) { if(! $account) return false; - $r = q("DELETE FROM account WHERE account_id = %d LIMIT 1", + $r = q("DELETE FROM account WHERE account_id = %d", intval($register[0]['uid']) ); - $r = q("DELETE FROM `register` WHERE id = %d LIMIT 1", + $r = q("DELETE FROM `register` WHERE id = %d", dbesc($register[0]['id']) ); notice( sprintf(t('Registration revoked for %s'), $account[0]['account_email']) . EOL); @@ -463,21 +463,21 @@ function user_approve($hash) { if(! $account) return $ret; - $r = q("DELETE FROM register WHERE hash = '%s' and password = 'verify' LIMIT 1", + $r = q("DELETE FROM register WHERE hash = '%s' and password = 'verify'", dbesc($register[0]['hash']) ); - $r = q("update account set account_flags = (account_flags ^ %d) where (account_flags & %d) and account_id = %d limit 1", + $r = q("update account set account_flags = (account_flags & ~%d) where (account_flags & %d)>0 and account_id = %d", intval(ACCOUNT_BLOCKED), intval(ACCOUNT_BLOCKED), intval($register[0]['uid']) ); - $r = q("update account set account_flags = (account_flags ^ %d) where (account_flags & %d) and account_id = %d limit 1", + $r = q("update account set account_flags = (account_flags & ~%d) where (account_flags & %d)>0 and account_id = %d", intval(ACCOUNT_PENDING), intval(ACCOUNT_PENDING), intval($register[0]['uid']) ); - $r = q("update account set account_flags = (account_flags ^ %d) where (account_flags & %d) and account_id = %d limit 1", + $r = q("update account set account_flags = (account_flags & ~%d) where (account_flags & %d)>0 and account_id = %d", intval(ACCOUNT_UNVERIFIED), intval(ACCOUNT_UNVERIFIED), intval($register[0]['uid']) @@ -510,11 +510,12 @@ function user_approve($hash) { function downgrade_accounts() { - $r = q("select * from account where not ( account_flags & %d ) + $r = q("select * from account where not ( account_flags & %d )>0 and account_expires != '%s' - and account_expires < UTC_TIMESTAMP() ", + and account_expires < %s ", intval(ACCOUNT_EXPIRED), - dbesc(NULL_DATE) + dbesc(NULL_DATE), + db_getfunc('UTC_TIMESTAMP') ); if(! $r) @@ -527,7 +528,7 @@ function downgrade_accounts() { if(($basic) && ($rr['account_service_class']) && ($rr['account_service_class'] != $basic)) { $x = q("UPDATE account set account_service_class = '%s', account_expires = '%s' - where account_id = %d limit 1", + where account_id = %d", dbesc($basic), dbesc(NULL_DATE), intval($rr['account_id']) @@ -537,7 +538,7 @@ function downgrade_accounts() { logger('downgrade_accounts: Account id ' . $rr['account_id'] . ' downgraded.'); } else { - $x = q("UPDATE account SET account_flags = (account_flags | %d) where account_id = %d limit 1", + $x = q("UPDATE account SET account_flags = (account_flags | %d) where account_id = %d", intval(ACCOUNT_EXPIRED), intval($rr['account_id']) ); diff --git a/include/acl_selectors.php b/include/acl_selectors.php index 5adafff2c..243e7a549 100644 --- a/include/acl_selectors.php +++ b/include/acl_selectors.php @@ -171,7 +171,7 @@ function contact_select($selname, $selclass, $preselected = false, $size = 4, $p $o .= " + {{include file="field_input.tpl" field=$adminmail}} -- cgit v1.2.3 From a2d9dd18821d4e7717438f4addb41ed310819b8b Mon Sep 17 00:00:00 2001 From: Habeas Codice Date: Thu, 13 Nov 2014 13:58:04 -0800 Subject: violates new sql standards missed during merge --- mod/zfinger.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/zfinger.php b/mod/zfinger.php index a1a62dd3f..6f4febc6f 100644 --- a/mod/zfinger.php +++ b/mod/zfinger.php @@ -116,7 +116,7 @@ function zfinger_init(&$a) { } else { // check if it has characteristics of a public forum based on custom permissions. - $t = q("select abook_my_perms from abook where abook_channel = %d and (abook_flags & %d) limit 1", + $t = q("select abook_my_perms from abook where abook_channel = %d and (abook_flags & %d)>0 limit 1", intval($e['channel_id']), intval(ABOOK_FLAG_SELF) ); -- cgit v1.2.3 From ee38bebbd6a641eb953eacf493c085053442d972 Mon Sep 17 00:00:00 2001 From: Habeas Codice Date: Thu, 13 Nov 2014 17:57:21 -0800 Subject: Add bitwise xor to db_getfunc() --- include/dba/dba_driver.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/dba/dba_driver.php b/include/dba/dba_driver.php index ddff80d7c..103dc8fcc 100755 --- a/include/dba/dba_driver.php +++ b/include/dba/dba_driver.php @@ -361,6 +361,10 @@ function db_getfunc($f) { 'regexp'=>array( DBTYPE_MYSQL=>'REGEXP', DBTYPE_POSTGRES=>'~' + ), + '^'=>array( + DBTYPE_MYSQL=>'^', + DBTYPE_POSTGRES=>'#' ) ); $f = strtolower($f); -- cgit v1.2.3