diff options
37 files changed, 2782 insertions, 1484 deletions
diff --git a/Zotlabs/Module/Channel_calendar.php b/Zotlabs/Module/Channel_calendar.php index ad748401f..e513a7f6e 100644 --- a/Zotlabs/Module/Channel_calendar.php +++ b/Zotlabs/Module/Channel_calendar.php @@ -69,20 +69,15 @@ class Channel_calendar extends \Zotlabs\Web\Controller { $finish = datetime_convert('UTC','UTC',$finish); } - - // Don't allow the event to finish before it begins. - // It won't hurt anything, but somebody will file a bug report - // and we'll waste a bunch of time responding to it. Time that - // could've been spent doing something else. - $summary = escape_tags(trim($_POST['summary'])); $desc = escape_tags(trim($_POST['desc'])); $location = escape_tags(trim($_POST['location'])); $type = escape_tags(trim($_POST['type'])); - require_once('include/text.php'); - linkify_tags($desc, local_channel()); - linkify_tags($location, local_channel()); + // Don't allow the event to finish before it begins. + // It won't hurt anything, but somebody will file a bug report + // 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 && !$nofinish) { notice( t('Event can not end before it has started.') . EOL); @@ -131,12 +126,40 @@ class Channel_calendar extends \Zotlabs\Web\Controller { $post_tags = array(); $channel = \App::get_channel(); $ac = $acl->get(); - + + $str_contact_allow = $ac['allow_cid']; + $str_group_allow = $ac['allow_gid']; + $str_contact_deny = $ac['deny_cid']; + $str_group_deny = $ac['deny_gid']; + + $private = $acl->is_private(); + + require_once('include/text.php'); + $results = linkify_tags($desc, local_channel()); + + if($results) { + // Set permissions based on tag replacements + set_linkified_perms($results, $str_contact_allow, $str_group_allow, local_channel(), false, $private); + + foreach($results as $result) { + $success = $result['success']; + if($success['replaced']) { + $post_tags[] = array( + 'uid' => local_channel(), + 'ttype' => $success['termtype'], + 'otype' => TERM_OBJ_POST, + 'term' => $success['term'], + 'url' => $success['url'] + ); + } + } + } + if(strlen($categories)) { $cats = explode(',',$categories); foreach($cats as $cat) { $post_tags[] = array( - 'uid' => $profile_uid, + 'uid' => local_channel(), 'ttype' => TERM_CATEGORY, 'otype' => TERM_OBJ_POST, 'term' => trim($cat), @@ -157,11 +180,11 @@ class Channel_calendar extends \Zotlabs\Web\Controller { $datarray['uid'] = local_channel(); $datarray['account'] = get_account_id(); $datarray['event_xchan'] = $channel['channel_hash']; - $datarray['allow_cid'] = $ac['allow_cid']; - $datarray['allow_gid'] = $ac['allow_gid']; - $datarray['deny_cid'] = $ac['deny_cid']; - $datarray['deny_gid'] = $ac['deny_gid']; - $datarray['private'] = (($acl->is_private()) ? 1 : 0); + $datarray['allow_cid'] = $str_contact_allow; + $datarray['allow_gid'] = $str_group_allow; + $datarray['deny_cid'] = $str_contact_deny; + $datarray['deny_gid'] = $str_group_deny; + $datarray['private'] = intval($private); $datarray['id'] = $event_id; $datarray['created'] = $created; $datarray['edited'] = $edited; @@ -250,8 +273,6 @@ class Channel_calendar extends \Zotlabs\Web\Controller { $mode = 'view'; $export = false; - //$y = 0; - //$m = 0; $ignored = ((x($_REQUEST,'ignored')) ? " and dismissed = " . intval($_REQUEST['ignored']) . " " : ''); if(argc() > 1) { @@ -268,8 +289,6 @@ class Channel_calendar extends \Zotlabs\Web\Controller { } if(argc() > 2 && intval(argv(1)) && intval(argv(2))) { $mode = 'view'; - //$y = intval(argv(1)); - //$m = intval(argv(2)); } if(argc() <= 2) { $mode = 'view'; @@ -296,88 +315,6 @@ class Channel_calendar extends \Zotlabs\Web\Controller { $channel = \App::get_channel(); -/* - // Passed parameters overrides anything found in the DB - if(!x($orig_event)) - $orig_event = array(); - - $n_checked = ((x($orig_event) && $orig_event['nofinish']) ? ' checked="checked" ' : ''); - $a_checked = ((x($orig_event) && $orig_event['adjust']) ? ' checked="checked" ' : ''); - $t_orig = ((x($orig_event)) ? $orig_event['summary'] : ''); - $d_orig = ((x($orig_event)) ? $orig_event['description'] : ''); - $l_orig = ((x($orig_event)) ? $orig_event['location'] : ''); - $eid = ((x($orig_event)) ? $orig_event['id'] : 0); - $event_xchan = ((x($orig_event)) ? $orig_event['event_xchan'] : $channel['channel_hash']); - $mid = ((x($orig_event)) ? $orig_event['mid'] : ''); - - $sdt = ((x($orig_event)) ? $orig_event['dtstart'] : 'now'); - - $fdt = ((x($orig_event)) ? $orig_event['dtend'] : '+1 hour'); - - $tz = date_default_timezone_get(); - if(x($orig_event)) - $tz = (($orig_event['adjust']) ? date_default_timezone_get() : 'UTC'); - - $syear = datetime_convert('UTC', $tz, $sdt, 'Y'); - $smonth = datetime_convert('UTC', $tz, $sdt, 'm'); - $sday = datetime_convert('UTC', $tz, $sdt, 'd'); - $shour = datetime_convert('UTC', $tz, $sdt, 'H'); - $sminute = datetime_convert('UTC', $tz, $sdt, 'i'); - - $stext = datetime_convert('UTC',$tz,$sdt); - $stext = substr($stext,0,14) . "00:00"; - - $fyear = datetime_convert('UTC', $tz, $fdt, 'Y'); - $fmonth = datetime_convert('UTC', $tz, $fdt, 'm'); - $fday = datetime_convert('UTC', $tz, $fdt, 'd'); - $fhour = datetime_convert('UTC', $tz, $fdt, 'H'); - $fminute = datetime_convert('UTC', $tz, $fdt, 'i'); - - $ftext = datetime_convert('UTC',$tz,$fdt); - $ftext = substr($ftext,0,14) . "00:00"; - - $type = ((x($orig_event)) ? $orig_event['etype'] : 'event'); - - $f = get_config('system','event_input_format'); - if(! $f) - $f = 'ymd'; - - $thisyear = datetime_convert('UTC',date_default_timezone_get(),'now','Y'); - $thismonth = datetime_convert('UTC',date_default_timezone_get(),'now','m'); - if(! $y) - $y = intval($thisyear); - if(! $m) - $m = intval($thismonth); - - - // Put some limits on dates. The PHP date functions don't seem to do so well before 1900. - // An upper limit was chosen to keep search engines from exploring links millions of years in the future. - - if($y < 1901) - $y = 1900; - if($y > 2099) - $y = 2100; - - $nextyear = $y; - $nextmonth = $m + 1; - if($nextmonth > 12) { - $nextmonth = 1; - $nextyear ++; - } - - $prevyear = $y; - if($m > 1) - $prevmonth = $m - 1; - else { - $prevmonth = 12; - $prevyear --; - } - - $dim = get_dim($y,$m); - $start = sprintf('%d-%d-%d %d:%d:%d',$y,$m,1,0,0,0); - $finish = sprintf('%d-%d-%d %d:%d:%d',$y,$m,$dim,23,59,59); -*/ - if (argv(1) === 'json'){ if (x($_GET,'start')) $start = $_GET['start']; if (x($_GET,'end')) $finish = $_GET['end']; @@ -422,8 +359,6 @@ class Channel_calendar extends \Zotlabs\Web\Controller { } - //$links = []; - if($r && ! $export) { xchan_query($r); $r = fetch_post_tags($r,true); @@ -431,28 +366,12 @@ class Channel_calendar extends \Zotlabs\Web\Controller { $r = sort_by_date($r); } -/* - if($r) { - foreach($r as $rr) { - $j = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['dtstart'], 'j') : datetime_convert('UTC','UTC',$rr['dtstart'],'j')); - if(! x($links,$j)) - $links[$j] = z_root() . '/' . \App::$cmd . '#link-' . $j; - } - } -*/ - $events = []; - //$last_date = ''; - //$fmt = t('l, F j'); - if($r) { foreach($r as $rr) { - //$j = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['dtstart'], 'j') : datetime_convert('UTC','UTC',$rr['dtstart'],'j')); - //$d = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['dtstart'], $fmt) : datetime_convert('UTC','UTC',$rr['dtstart'],$fmt)); - //$d = day_translate($d); - + $start = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['dtstart'], 'c') : datetime_convert('UTC','UTC',$rr['dtstart'],'c')); if ($rr['nofinish']){ $end = null; @@ -487,53 +406,29 @@ class Channel_calendar extends \Zotlabs\Web\Controller { if(strpos($start, 'T00:00:00') && strpos($end, 'T00:00:00')) $allDay = true; - //$is_first = ($d !== $last_date); - - //$last_date = $d; - $edit = ((local_channel() && $rr['author_xchan'] == get_observer_hash()) ? array(z_root().'/events/'.$rr['event_hash'].'?expandform=1',t('Edit event'),'','') : false); $drop = array(z_root().'/events/drop/'.$rr['event_hash'],t('Delete event'),'',''); - //$title = strip_tags(html_entity_decode(zidify_links(bbcode($rr['summary'])),ENT_QUOTES,'UTF-8')); - //if(! $title) { - // list($title, $_trash) = explode("<br",bbcode($rr['desc']),2); - // $title = strip_tags(html_entity_decode($title,ENT_QUOTES,'UTF-8')); - //} - //$html = format_event_html($rr); - //$rr['desc'] = zidify_links(smilies(bbcode($rr['desc']))); - //$rr['description'] = htmlentities(html2plain(bbcode($rr['description'])),ENT_COMPAT,'UTF-8',false); - //$rr['location'] = zidify_links(smilies(bbcode($rr['location']))); $events[] = array( 'calendar_id' => 'channel_calendar', 'rw' => true, - 'id'=>$rr['id'], 'uri' => $rr['event_hash'], 'start'=> $start, 'end' => $end, 'drop' => $drop, 'allDay' => $allDay, - 'title' => htmlentities($rr['summary'], ENT_COMPAT, 'UTF-8'), - - //'j' => $j, - //'d' => $d, - + 'title' => htmlentities($rr['summary'], ENT_COMPAT, 'UTF-8', false), 'editable' => $edit ? true : false, - - //'is_first'=>$is_first, 'item'=>$rr, - //'html'=>$html, 'plink' => [$rr['plink'], t('Link to source')], - - 'description' => htmlentities($rr['description'], ENT_COMPAT, 'UTF-8'), - 'location' => htmlentities($rr['location'], ENT_COMPAT, 'UTF-8'), - + 'description' => htmlentities($rr['description'], ENT_COMPAT, 'UTF-8', false), + 'location' => htmlentities($rr['location'], ENT_COMPAT, 'UTF-8', false), 'allow_cid' => expand_acl($rr['allow_cid']), 'allow_gid' => expand_acl($rr['allow_gid']), 'deny_cid' => expand_acl($rr['deny_cid']), 'deny_gid' => expand_acl($rr['deny_gid']), - 'categories' => $categories ); } diff --git a/Zotlabs/Module/Like.php b/Zotlabs/Module/Like.php index 3d1f503b6..052d51d43 100644 --- a/Zotlabs/Module/Like.php +++ b/Zotlabs/Module/Like.php @@ -491,7 +491,7 @@ class Like extends \Zotlabs\Web\Controller { $arr['item_flags'] = $item_flags; $arr['item_wall'] = $item_wall; - $arr['parent_mid'] = (($extended_like) ? $mid : $item['mid']); + $arr['parent_mid'] = (($extended_like) ? $arr['mid'] : $item['mid']); $arr['owner_xchan'] = (($extended_like) ? $ch[0]['xchan_hash'] : $thread_owner['xchan_hash']); $arr['author_xchan'] = $observer['xchan_hash']; @@ -546,7 +546,7 @@ class Like extends \Zotlabs\Web\Controller { dbesc($observer['xchan_hash']), dbesc($ch[0]['channel_hash']), intval($post_id), - dbesc($mid), + dbesc($arr['mid']), dbesc($activity), dbesc(($tgttype)? $tgttype : $objtype), dbesc($obj_id), @@ -555,7 +555,7 @@ class Like extends \Zotlabs\Web\Controller { $r = q("select * from likes where liker = '%s' and likee = '%s' and i_mid = '%s' and verb = '%s' and target_type = '%s' and target_id = '%s' ", dbesc($observer['xchan_hash']), dbesc($ch[0]['channel_hash']), - dbesc($mid), + dbesc($arr['mid']), dbesc($activity), dbesc(($tgttype)? $tgttype : $objtype), dbesc($obj_id) diff --git a/Zotlabs/Module/Register.php b/Zotlabs/Module/Register.php index f9d81be0c..bc813f8e1 100644 --- a/Zotlabs/Module/Register.php +++ b/Zotlabs/Module/Register.php @@ -1,10 +1,11 @@ <?php namespace Zotlabs\Module; -require_once('include/channel.php'); +use Zotlabs\Web\Controller; +require_once('include/security.php'); -class Register extends \Zotlabs\Web\Controller { +class Register extends Controller { function init() { @@ -39,7 +40,9 @@ class Register extends \Zotlabs\Web\Controller { function post() { - + + check_form_security_token_redirectOnErr('/register', 'register'); + $max_dailies = intval(get_config('system','max_daily_registrations')); if($max_dailies) { $r = q("select count(account_id) as total from account where account_created > %s - INTERVAL %s", @@ -269,7 +272,8 @@ class Register extends \Zotlabs\Web\Controller { require_once('include/bbcode.php'); $o = replace_macros(get_markup_template('register.tpl'), array( - + + '$form_security_token' => get_form_security_token("register"), '$title' => t('Registration'), '$reg_is' => $registration_is, '$registertext' => bbcode(get_config('system','register_text')), diff --git a/Zotlabs/Render/SmartyInterface.php b/Zotlabs/Render/SmartyInterface.php index 9c9a501c0..a40effecf 100755 --- a/Zotlabs/Render/SmartyInterface.php +++ b/Zotlabs/Render/SmartyInterface.php @@ -2,7 +2,10 @@ namespace Zotlabs\Render; -class SmartyInterface extends \Smarty { +use Smarty; +use App; + +class SmartyInterface extends Smarty { public $filename; @@ -16,26 +19,27 @@ class SmartyInterface extends \Smarty { // The order is thus very important here $template_dirs = array('theme' => "view/theme/$thname/tpl/"); - if( x(\App::$theme_info,"extends") ) + if ( x(App::$theme_info,"extends") ) { $template_dirs = $template_dirs + array('extends' => "view/theme/" . \App::$theme_info["extends"] . "/tpl/"); + } $template_dirs = $template_dirs + array('base' => 'view/tpl/'); $this->setTemplateDir($template_dirs); - $basecompiledir = \App::$config['system']['smarty3_folder']; + $basecompiledir = App::$config['system']['smarty3_folder']; $this->setCompileDir($basecompiledir.'/compiled/'); $this->setConfigDir($basecompiledir.'/config/'); $this->setCacheDir($basecompiledir.'/cache/'); - $this->left_delimiter = \App::get_template_ldelim('smarty3'); - $this->right_delimiter = \App::get_template_rdelim('smarty3'); + $this->left_delimiter = App::get_template_ldelim('smarty3'); + $this->right_delimiter = App::get_template_rdelim('smarty3'); // Don't report errors so verbosely $this->error_reporting = E_ALL & (~E_NOTICE); } function parsed($template = '') { - if($template) { + if ($template) { return $this->fetch('string:' . $template); } return $this->fetch('file:' . $this->filename); diff --git a/Zotlabs/Render/SmartyTemplate.php b/Zotlabs/Render/SmartyTemplate.php index f14d63064..61fb72f8a 100755 --- a/Zotlabs/Render/SmartyTemplate.php +++ b/Zotlabs/Render/SmartyTemplate.php @@ -2,28 +2,33 @@ namespace Zotlabs\Render; +use App; + + class SmartyTemplate implements TemplateEngine { static $name ="smarty3"; - public function __construct(){ + public function __construct() { // Cannot use get_config() here because it is called during installation when there is no DB. // FIXME: this may leak private information such as system pathnames. - $basecompiledir = ((array_key_exists('smarty3_folder',\App::$config['system'])) - ? \App::$config['system']['smarty3_folder'] : ''); - if (!$basecompiledir) $basecompiledir = str_replace('Zotlabs','',dirname(__dir__)) . "/" . TEMPLATE_BUILD_PATH; - if (!is_dir($basecompiledir)) { + $basecompiledir = ((array_key_exists('smarty3_folder', App::$config['system'])) + ? App::$config['system']['smarty3_folder'] : ''); + if (! $basecompiledir) { + $basecompiledir = str_replace('Zotlabs','',dirname(__dir__)) . "/" . TEMPLATE_BUILD_PATH; + } + if (! is_dir($basecompiledir)) { @os_mkdir(TEMPLATE_BUILD_PATH, STORAGE_DEFAULT_PERMISSIONS, true); - if (!is_dir($basecompiledir)) { + if (! is_dir($basecompiledir)) { echo "<b>ERROR:</b> folder <tt>$basecompiledir</tt> does not exist."; killme(); } } - if(!is_writable($basecompiledir)){ + if (! is_writable($basecompiledir)) { echo "<b>ERROR:</b> folder <tt>$basecompiledir</tt> must be writable by webserver."; killme(); } - \App::$config['system']['smarty3_folder'] = $basecompiledir; + App::$config['system']['smarty3_folder'] = $basecompiledir; } // TemplateEngine interface @@ -31,18 +36,18 @@ class SmartyTemplate implements TemplateEngine { public function replace_macros($s, $r) { $template = ''; - // these are available for use in all templates + // macro or macros available for use in all templates $r['$z_baseurl'] = z_root(); $r['$z_server_role'] = \Zotlabs\Lib\System::get_server_role(); $r['$z_techlevel'] = get_account_techlevel(); - if(gettype($s) === 'string') { + if (gettype($s) === 'string') { $template = $s; $s = new SmartyInterface(); } - foreach($r as $key=>$value) { - if($key[0] === '$') { + foreach ($r as $key=>$value) { + if ($key[0] === '$') { $key = substr($key, 1); } $s->assign($key, $value); @@ -50,32 +55,32 @@ class SmartyTemplate implements TemplateEngine { return $s->parsed($template); } - public function get_markup_template($file, $root=''){ + public function get_markup_template($file, $root = '') { $template_file = theme_include($file, $root); - if($template_file) { + if ($template_file) { $template = new SmartyInterface(); $template->filename = $template_file; return $template; } - return ""; + return EMPTY_STR; } - public function get_intltext_template($file, $root='') { - - $lang = \App::$language; - if ($root != '' && substr($root,-1) != '/' ) { - $root .= '/'; - } - foreach (Array( - $root."view/$lang/$file", - $root."view/en/$file", - '' - ) as $template_file) { - if (is_file($template_file)) { break; } - } - if ($template_file=='') {$template_file = theme_include($file,$root);} - if($template_file) { + public function get_intltext_template($file, $root = '') { + + $lang = App::$language; + if ($root != '' && substr($root,-1) != '/' ) { + $root .= '/'; + } + foreach ( [ $root . "view/$lang/$file", $root . "view/en/$file", '' ] as $template_file) { + if (is_file($template_file)) { + break; + } + } + if ($template_file == '') { + $template_file = theme_include($file,$root); + } + if ($template_file) { $template = new SmartyInterface(); $template->filename = $template_file; return $template; @@ -50,7 +50,7 @@ require_once('include/attach.php'); require_once('include/bbcode.php'); define ( 'PLATFORM_NAME', 'hubzilla' ); -define ( 'STD_VERSION', '4.1.3' ); +define ( 'STD_VERSION', '4.3' ); define ( 'ZOT_REVISION', '6.0a' ); define ( 'DB_UPDATE_VERSION', 1234 ); diff --git a/include/bbcode.php b/include/bbcode.php index 33219c67d..70183fda3 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -87,12 +87,11 @@ function nakedoembed($match) { $strip_url = strip_escaped_zids($url); - $o = oembed_fetch_url($strip_url); - - if ($o['type'] == 'error') - return str_replace($url,$strip_url,$match[0]); - - return '[embed]' . $strip_url . '[/embed]'; + // this function no longer performs oembed on naked links + // because they author may have created naked links intentionally. + // Now it just strips zids on naked links. + + return str_replace($url,$strip_url,$match[0]); } function tryzrlaudio($match) { diff --git a/include/dba/dba_driver.php b/include/dba/dba_driver.php index ee0e06a91..cfb208e2d 100755 --- a/include/dba/dba_driver.php +++ b/include/dba/dba_driver.php @@ -485,3 +485,28 @@ function db_columns($table) { return []; } + + +function db_indexes($table) { + + if($table) { + if(ACTIVE_DBTYPE === DBTYPE_POSTGRES) { + $r = q("SELECT indexname from pg_indexes where tablename = '%s'", + dbesc($table) + ); + if($r) { + return ids_to_array($r,'indexname'); + } + } + else { + $r = q("show index from %s", + dbesc($table) + ); + if($r) { + return ids_to_array($r,'Key_name'); + } + } + } + + return []; +} diff --git a/include/oembed.php b/include/oembed.php index 426197c5f..ee9e57c3f 100755 --- a/include/oembed.php +++ b/include/oembed.php @@ -1,6 +1,6 @@ <?php /** @file */ -use Zotlabs\Lib as Zlib; +use Zotlabs\Lib\Cache; function oembed_replacecb($matches){ @@ -133,7 +133,6 @@ function oembed_fetch_url($embedurl){ } } - $txt = null; // we should try to cache this and avoid a lookup on each render @@ -143,10 +142,22 @@ function oembed_fetch_url($embedurl){ $furl = ((local_channel() && $zrl) ? zid($embedurl) : $embedurl); - if($action !== 'block') { - $txt = Zlib\Cache::get('[' . App::$videowidth . '] ' . $furl); + if($action !== 'block' && (! get_config('system','oembed_cache_disable'))) { + $txt = Cache::get('[' . App::$videowidth . '] ' . $furl); } + + if(strpos(strtolower($embedurl),'.pdf') !== false) { + $action = 'allow'; + $j = [ + 'html' => '<object data="' . $embedurl . '" type="application/pdf" style="width: 100%; height: 300px;"></object>', + 'title' => t('View PDF'), + 'type' => 'pdf' + ]; + // set $txt to something so that we don't attempt to fetch what could be a lengthy pdf. + $txt = EMPTY_STR; + } + if(is_null($txt)) { $txt = ""; @@ -215,20 +226,10 @@ function oembed_fetch_url($embedurl){ // save in cache if(! get_config('system','oembed_cache_disable')) - Zlib\Cache::set('[' . App::$videowidth . '] ' . $furl, $txt); + Cache::set('[' . App::$videowidth . '] ' . $furl, $txt); } - if(strpos(strtolower($embedurl),'.pdf') !== false) { - $action = 'allow'; - $j = [ - 'html' => '<object data="' . $embedurl . '" type="application/pdf" style="width: 100%; height: 300px;"></object>', - 'title' => t('View PDF'), - 'type' => 'pdf' - ]; - - } - if(! $j) { $j = json_decode($txt,true); } diff --git a/library/jgrowl/.gitignore b/library/jgrowl/.gitignore new file mode 100644 index 000000000..385e49ef1 --- /dev/null +++ b/library/jgrowl/.gitignore @@ -0,0 +1,5 @@ +.DS_Store +node_modules/ +jGrowl.iml +jGrowl.ipr +jGrowl.iws diff --git a/library/jgrowl/Gruntfile.js b/library/jgrowl/Gruntfile.js new file mode 100644 index 000000000..fed0fceee --- /dev/null +++ b/library/jgrowl/Gruntfile.js @@ -0,0 +1,61 @@ +module.exports = function(grunt) { + + grunt.initConfig({ + pkg: grunt.file.readJSON('package.json'), + uglify: { + options: { + sourceMap: true, + sourceMapName: 'jquery.jgrowl.map' + }, + jgrowl: { + files: { + 'jquery.jgrowl.min.js': ['jquery.jgrowl.js'] + } + } + }, + less: { + jgrowl: { + files: { + "jquery.jgrowl.css": "less/jgrowl.less" + } + } + }, + cssmin: { + jgrowl: { + expand: true, + src: 'jquery.jgrowl.css', + ext: '.jgrowl.min.css' + } + }, + jshint: { + files: ['Gruntfile.js', 'jquery.jgrowl.js'], + options: { + // options here to override JSHint defaults + globals: { + jQuery: true, + console: true, + module: true, + document: true + } + } + }, + watch: { + scripts: { + files: ['jquery.jgrowl.js', 'less/*'], + tasks: ['jshint', 'less', 'cssmin', 'uglify'], + options: { + spawn: false + } + } + } + }); + + grunt.loadNpmTasks('grunt-contrib-uglify'); + grunt.loadNpmTasks('grunt-contrib-cssmin'); + grunt.loadNpmTasks('grunt-contrib-jshint'); + grunt.loadNpmTasks('grunt-contrib-watch'); + grunt.loadNpmTasks('grunt-contrib-less'); + + grunt.registerTask('test', ['jshint']); + grunt.registerTask('default', ['jshint', 'uglify', 'less', 'cssmin']); +}; diff --git a/library/jgrowl/LICENSE b/library/jgrowl/LICENSE new file mode 100644 index 000000000..e70a54a58 --- /dev/null +++ b/library/jgrowl/LICENSE @@ -0,0 +1,7 @@ +Copyright (c) 2012 Stan Lemon + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/library/jgrowl/README b/library/jgrowl/README deleted file mode 100644 index d0f1a62ad..000000000 --- a/library/jgrowl/README +++ /dev/null @@ -1,3 +0,0 @@ -https://github.com/stanlemon/jGrowl - -jGrowl is free and open source, it's distributed under the MIT and GPL licenses diff --git a/library/jgrowl/README.md b/library/jgrowl/README.md new file mode 100644 index 000000000..7dfd85637 --- /dev/null +++ b/library/jgrowl/README.md @@ -0,0 +1,75 @@ +# jGrowl +jGrowl is a jQuery plugin that raises unobtrusive messages within the browser, similar to the way that OS X's Growl Framework works. The idea is simple, deliver notifications to the end user in a noticeable way that doesn't obstruct the work flow and yet keeps the user informed. + +## Installation +jGrowl can be added to your project using package managers like bower and npm or directly into your html using cdnjs, as well as the good old fashioned copy-paste into your project directory. + +Use cdnjs: + +```html +<link rel="stylesheet" type="text/css" href="//cdnjs.cloudflare.com/ajax/libs/jquery-jgrowl/1.4.1/jquery.jgrowl.min.css" /> +<script src="//cdnjs.cloudflare.com/ajax/libs/jquery-jgrowl/1.4.1/jquery.jgrowl.min.js"></script> +``` + +Install with bower + +``` +bower install jgrowl +``` + +Install with npm + +``` +npm install jgrowl +``` + +```js +// Sample 1 +$.jGrowl("Hello world!"); +// Sample 2 +$.jGrowl("Stick this!", { sticky: true }); +// Sample 3 +$.jGrowl("A message with a header", { header: 'Important' }); +// Sample 4 +$.jGrowl("A message that will live a little longer.", { life: 10000 }); +// Sample 5 +$.jGrowl("A message with a beforeOpen callback and a different opening animation.", { + beforeClose: function(e,m) { + alert('About to close this notification!'); + }, + animateOpen: { + height: 'show' + } +}); +``` + +## Configuration Options +| Option | Default | Description | +|------------------|--------------------------------------|------------------------------------------------------------| +| pool | 0 | Limit the number of messages appearing at a given time to the number in the pool. | +| header | empty | Optional header to prefix the message, this is often helpful for associating messages to each other. | +| group | empty | A css class to be applied to notifications when they are created, useful for 'grouping' notifications by a css selector. | +| sticky | false | When set to true a message will stick to the screen until it is intentionally closed by the user. | +| position | top-right | Designates a class which is applied to the jGrowl container and controls its position on the screen. By Default there are five options available, top-left, top-right, bottom-left, bottom-right, center. This must be changed in the defaults before the startup method is called. | +| appendTo | body | The element where our jGrowl messages are appended to. The default is `body` but feel free to define another one. | +| glue | after | Designates whether a jGrowl notification should be appended to the container after all notifications, or whether it should be prepended to the container before all notifications. Options are after or before. | +| theme | default | A CSS class designating custom styling for this particular message, intended for use with jQuery UI. | +| themeState | highlight | A CSS class designating custom styling for this particular message and its state, intended for use with jQuery UI. | +| corners | 10px | If the corners jQuery plugin is include this option specifies the curvature radius to be used for the notifications as they are created. | +| check | 250 | The frequency that jGrowl should check for messages to be scrubbed from the screen.This must be changed in the defaults before the startup method is called. | +| life | 3000 | The lifespan of a non-sticky message on the screen. | +| closeDuration | normal | The animation speed used to close a notification. | +| openDuration | normal | The animation speed used to open a notification. | +| easing | swing | The easing method to be used with the animation for opening and closing a notification. | +| closer | true | Whether or not the close-all button should be used when more then one notification appears on the screen. Optionally this property can be set to a function which will be used as a callback when the close all button is clicked. This must be changed in the defaults before the startup method is called. | +| closeTemplate | × | This content is used for the individual notification close links that are added to the corner of a notification. This must be changed in the defaults before the startup method is called. | +| closerTemplate | <div>[ close all ]</div> | This content is used for the close-all link that is added to the bottom of a jGrowl container when it contains more than one notification. This must be changed in the defaults before the startup method is called. | +| log | function(e,m,o) {} | Callback to be used before anything is done with the notification. This is intended to be used if the user would like to have some type of logging mechanism for all notifications passed to jGrowl. This callback receives the notification's DOM context, the notification's message and its option object. | +| beforeOpen | function(e,m,o) {} | Callback to be used before a new notification is opened. This callback receives the notification's DOM context, the notification's message and its option object. | +| afterOpen | function(e,m,o) {} | Callback to be used after a new notification is opened. This callback receives the notification's DOM context, the notification's message and its option object. | +| open | function(e,m,o) {} | Callback to be used when a new notification is opened. This callback receives the notification's DOM context, the notifications message and its option object. | +| beforeClose | function(e,m,o) {} | Callback to be used before a new notification is closed. This callback receives the notification's DOM context, the notification's message and its option object. | +| close | function(e,m,o) {} | Callback to be used when a new notification is closed. This callback receives the notification's DOM context, the notification's message and its option object. | +| click | function(e,m,o) {} | Callback to be used when a notification is clicked. This callback receives the notification's DOM context, the notification's message and its option object. | +| animateOpen | { opacity: 'show' } | The animation properties to use when opening a new notification (default to fadeOut). | +| animateClose | { opacity: 'hide' } | The animation properties to use when closing a new notification (defaults to fadeIn). | diff --git a/library/jgrowl/bower.json b/library/jgrowl/bower.json new file mode 100644 index 000000000..15cfc754b --- /dev/null +++ b/library/jgrowl/bower.json @@ -0,0 +1,32 @@ +{ + "name": "jGrowl", + "version": "1.4.5", + "homepage": "https://github.com/stanlemon/jGrowl", + "authors": [ + "Stan Lemon <stosh1985@gmail.com>" + ], + "description": "jGrowl is an unobtrusive notification system for web applications.", + "main": [ + "jquery.jgrowl.css", + "jquery.jgrowl.js" + ], + "keywords": [ + "growl", + "jgrowl", + "jquery", + "toaster", + "notification", + "message" + ], + "license": "MIT", + "dependencies": { + "jquery": ">=1.4" + }, + "ignore": [ + "**/.*", + "node_modules", + "bower_components", + "test", + "tests" + ] +} diff --git a/library/jgrowl/examples/appendTo.html b/library/jgrowl/examples/appendTo.html new file mode 100644 index 000000000..3eb0f4d27 --- /dev/null +++ b/library/jgrowl/examples/appendTo.html @@ -0,0 +1,103 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html lang="en-US" xml:lang="en-US" xmlns="http://www.w3.org/1999/xhtml" debug="true"> + <head> + <title>jGrowl Examples</title> + <link rel="stylesheet" href="../jquery.jgrowl.css" type="text/css"/> + <style type="text/css"> + html, + body { + font-family: "Helvetica neue", Helvetica, Arial, sans-serif; + padding: 0; + margin: 0; + } + + h1, h2, h3, h4, h5 { + margin-top: 2px; + margin-bottom: 2px; + } + + .jGrowl .manilla { + background-color: #FFF1C2; + color: navy; + } + + .jGrowl .flora { + background: #E6F7D4 url(flora-notification.png) no-repeat; + -moz-border-radius: 0px; + -webkit-border-radius: 0px; + opacity: 1; + filter: alpha(opacity = 100); + width: 270px; + height: 90px; + padding: 0px; + overflow: hidden; + border-color: #5ab500; + } + + .jGrowl .flora .message { + padding: 5px; + color: #000; + } + + .jGrowl .flora .header { + background: url(flora-header.png) no-repeat; + padding: 5px; + } + + .jGrowl .flora .close { + background: url(flora-close.png) no-repeat; + padding: 5px; + color: transparent; + padding: 0px; + margin: 5px; + width: 17px; + } + + #dummyNav { + position: fixed; + background: green; + width: 100%; + height: 50px; + } + + </style> + <script type="text/javascript" src="http://code.jquery.com/jquery.js"></script> + <script type="text/javascript" src="../jquery.jgrowl.js"></script> + <script type="text/javascript"> + + // In case you don't have firebug... + if(typeof console === "undefined") { + console = { log: function() { } }; + } + + (function($){ + + $(function(){ + + $.jGrowl.defaults.closerTemplate = "<div>[ xxxxx ]</div>"; + $.jGrowl.defaults.appendTo = "div#dummyNav"; + + $.jGrowl("This message is sticky and clickable", { + sticky: true, + click: function(msg) { + alert("You clicked me"); + } + }); + + $.jGrowl("This message is sticky and clickable"); + $.jGrowl("This message is sticky and clickable"); + $.jGrowl("This message is sticky and clickable"); + $.jGrowl("This message is sticky and clickable"); + $.jGrowl("This message is sticky and clickable"); + $.jGrowl("This message is sticky and clickable"); + }); + })(jQuery); + + </script> + </head> + <body> + <div id="dummyNav">I'm the dummy navigation</div> + + <h1>Append To Another DOM-Object</h1> + </body> +</html> diff --git a/library/jgrowl/examples/bootstrap.html b/library/jgrowl/examples/bootstrap.html new file mode 100644 index 000000000..6e069a3b9 --- /dev/null +++ b/library/jgrowl/examples/bootstrap.html @@ -0,0 +1,91 @@ +<!DOCTYPE html> +<html lang="en"> + <head> + <meta charset="utf-8"> + <meta http-equiv="X-UA-Compatible" content="IE=edge"> + <meta name="viewport" content="width=device-width, initial-scale=1"> + <meta name="description" content=""> + <meta name="author" content=""> + + <title>jGrowl and Bootstrap</title> + + <link rel="stylesheet" href="../jquery.jgrowl.css" type="text/css"/> + <link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css"> + + <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries --> + <!--[if lt IE 9]> + <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script> + <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script> + <![endif]--> + + <style> + body { + padding-top: 50px; + } + </style> + </head> + + <body> + <div id="jGrowl-container1" class="jGrowl top-right"></div> + + <div class="navbar navbar-inverse navbar-fixed-top" role="navigation"> + <div class="container"> + <div class="navbar-header"> + <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse"> + <span class="sr-only">Toggle navigation</span> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + </button> + <a class="navbar-brand" href="#">jGrowl</a> + </div> + <div class="collapse navbar-collapse"> + <ul class="nav navbar-nav"> + <li class="active"><a href="#">Home</a></li> + <li><a href="#about">About</a></li> + <li><a href="#contact">Contact</a></li> + </ul> + </div><!--/.nav-collapse --> + </div> + </div> + + <div class="container"> + + <div> + <h1>jGrowl and Bootstrap</h1> + <p class="lead">This is a Bootstrap starter template with jGrowl integrated. As you can see it's extremely easy to make jGrowl look and feel like part of Bootstrap.</p> + </div> + <div id="jGrowl-container2" class="jGrowl"></div> + </div><!-- /.container --> + + + <!-- Bootstrap core JavaScript + ================================================== --> + <!-- Placed at the end of the document so the pages load faster --> + <script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script> + <script src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script> + <script type="text/javascript" src="../jquery.jgrowl.js"></script> + <script type="text/javascript"> + (function($){ + $(function(){ + $.jGrowl.defaults.closerTemplate = '<div class="alert alert-info">Close All</div>'; + + var alertTypes = ['success', 'info', 'warning', 'danger']; + + for (var i=0; i<10; i++) { + setTimeout(function(){ + var alertType = alertTypes[Math.floor(Math.random()*alertTypes.length)]; + + $('#jGrowl-container1').jGrowl({ + header: alertType.substring(0, 1).toUpperCase() + alertType.substring(1) + ' Notification', + message: 'Hello world ', + group: 'alert-' + alertType, + life: 5000 + }); + }, i*2000); + } + }); + })(jQuery); + </script> + </body> +</html> diff --git a/library/jgrowl/examples/jgrowl.html b/library/jgrowl/examples/jgrowl.html new file mode 100755 index 000000000..e10fdd6cb --- /dev/null +++ b/library/jgrowl/examples/jgrowl.html @@ -0,0 +1,171 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html lang="en-US" xml:lang="en-US" xmlns="http://www.w3.org/1999/xhtml" debug="true"> + <head> + <title>jGrowl Examples</title> + <link rel="stylesheet" href="../jquery.jgrowl.css" type="text/css"/> + <style type="text/css"> + body { + font-family: "Helvetica neue", Helvetica, Arial, sans-serif; + } + + h1, h2, h3, h4, h5 { + margin-top: 2px; + margin-bottom: 2px; + } + + .jGrowl .manilla { + background-color: #FFF1C2; + color: navy; + } + + .jGrowl .flora { + background: #E6F7D4 url(flora-notification.png) no-repeat; + -moz-border-radius: 0px; + -webkit-border-radius: 0px; + opacity: 1; + filter: alpha(opacity = 100); + width: 270px; + height: 90px; + padding: 0px; + overflow: hidden; + border-color: #5ab500; + } + + .jGrowl .flora .message { + padding: 5px; + color: #000; + } + + .jGrowl .flora .header { + background: url(flora-header.png) no-repeat; + padding: 5px; + } + + .jGrowl .flora .close { + background: url(flora-close.png) no-repeat; + padding: 5px; + color: transparent; + padding: 0px; + margin: 5px; + width: 17px; + } + + #random { + padding: 20px; + width: 1500px; + background-color: #ff7070; + } + + #logs { + margin-top: 30px; + background-color: #efefef; + border: 1px solid #aaa; + padding: 10px; + } + + </style> + <script type="text/javascript" src="http://code.jquery.com/jquery.js"></script> + <script type="text/javascript" src="../jquery.jgrowl.js"></script> + <script type="text/javascript"> + + // In case you don't have firebug... + if(typeof console === "undefined") { + console = { log: function() { } }; + } + + (function($){ + + $(function(){ + + $.jGrowl.defaults.pool = 5; + + $.jGrowl.defaults.closerTemplate = '<div>hide all notifications</div>'; + + // This value can be true, false or a function to be used as a callback when the closer is clciked + $.jGrowl.defaults.closer = function() { + console.log("Closing everything!", this); + }; + + // A callback for logging notifications. + $.jGrowl.defaults.log = function(e,m,o) { + $('#logs').append("<div><strong>#" + $(e).attr('id') + "</strong> <em>" + (new Date()).getTime() + "</em>: " + m + " (" + o.theme + ")</div>") + } + + $.jGrowl("Sticky notifications don't have an end of life", { sticky: true }); + $.jGrowl("Custom theme, custom animations, header, longer life and a whole bunch of callbacks...", { + header: 'Header', + life: 5000, + theme: 'manilla', + speed: 'slow', + beforeOpen: function(e,m,o) { + console.log("I am going to be opened!", this); + }, + open: function(e,m,o) { + console.log("I have been opened!", this); + }, + beforeClose: function(e,m,o) { + console.log("I am going to be closed!", this); + }, + close: function(e,m,o) { + console.log("I have been closed!", this); + }, + animateOpen: { + height: "show", + width: "show" + }, + animateClose: { + height: "hide", + width: "show" + } + }); + + $.jGrowl("This message will not open because we have a callback that returns false.", { + beforeOpen: function() { + console.log("Going to open a notification, but not really..."); + }, + open: function() { + return false; + } + }); + + $.jGrowl("This message will not close because we have a callback that returns false.", { + beforeClose: function() { + return false; + } + }); + + $('#test1').jGrowl("Testing a custom container.", { + closer: false, + sticky: true, + glue: 'before' + }); + + $('#test1').jGrowl("This will be prepended before the last message.", { + glue: 'before' + }); + + $.jGrowl("This message is sticky and clickable", { + sticky: true, + click: function(msg) { + alert("You clicked me"); + } + }); + }); + })(jQuery); + + </script> + </head> + <body> + <h1>jGrowl Tests</h1> + + <p><a href="javascript:void(0);" onclick="$.jGrowl('One more message...');">Create a new message.</a></p> + + <p><a href="javascript:void(0);" onclick="$('#test1').jGrowl('shutdown');">Shutdown bottom-left container.</a></p> + + <div id="random">An extra wide node, watch as the jGrowl containers stay put in the corners of the screen..</div> + + <div id="logs"><h3>Log:</h3></div> + + <div id="test1" class="bottom-left"></div> + </body> +</html> diff --git a/library/jgrowl/jgrowl.jquery.json b/library/jgrowl/jgrowl.jquery.json new file mode 100644 index 000000000..c5f0756c9 --- /dev/null +++ b/library/jgrowl/jgrowl.jquery.json @@ -0,0 +1,40 @@ +{ + "name": "jgrowl", + "filename": "jquery.jgrowl.min.js", + "title": "jGrowl", + "description": "jGrowl is a jQuery plugin that raises unobtrusive messages within the browser, similar to the way that OS X's Growl Framework works. The idea is simple, deliver notifications to the end user in a noticeable way that doesn't obstruct the work flow and yet keeps the user informed.", + "keywords": [ + "growl", + "jgrowl", + "jquery", + "toaster", + "notification", + "message" + ], + "version": "1.4.3", + "author": { + "name": "Stan Lemon", + "email": "stosh1985@gmail.com", + "url": "http://stanlemon.net" + }, + "maintainers": [ + { + "name": "Stan Lemon", + "email": "stosh1985@gmail.com", + "url": "http://stanlemon.net" + } + ], + "licenses": [ + { + "type": "MIT", + "url": "https://github.com/stanlemon/jGrowl/blob/master/LICENSE" + } + ], + "bugs": "https://github.com/stanlemon/jGrowl/issues", + "homepage": "https://github.com/stanlemon/jGrowl", + "docs": "https://github.com/stanlemon/jGrowl", + "download": "https://github.com/stanlemon/jGrowl/archive/master.zip", + "dependencies": { + "jquery": ">=1.4" + } +} diff --git a/library/jgrowl/jquery.jgrowl.css b/library/jgrowl/jquery.jgrowl.css index ea3948415..4a00b60f7 100644 --- a/library/jgrowl/jquery.jgrowl.css +++ b/library/jgrowl/jquery.jgrowl.css @@ -1 +1,100 @@ -.jGrowl{z-index:9999;color:#fff;font-size:12px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;position:fixed}.jGrowl.top-left{left:0;top:0}.jGrowl.top-right{right:0;top:0}.jGrowl.bottom-left{left:0;bottom:0}.jGrowl.bottom-right{right:0;bottom:0}.jGrowl.center{top:0;width:50%;left:25%}.jGrowl.center .jGrowl-closer,.jGrowl.center .jGrowl-notification{margin-left:auto;margin-right:auto}.jGrowl-notification{background-color:#000;opacity:.9;-ms-filter:alpha(90);filter:alpha(90);zoom:1;width:250px;padding:10px;margin:10px;text-align:left;display:none;border-radius:5px;min-height:40px}.jGrowl-notification .ui-state-highlight,.jGrowl-notification .ui-widget-content .ui-state-highlight,.jGrowl-notification .ui-widget-header .ui-state-highlight{border:1px solid #000;background:#000;color:#fff}.jGrowl-notification .jGrowl-header{font-weight:700;font-size:.85em}.jGrowl-notification .jGrowl-close{background-color:transparent;color:inherit;border:none;z-index:99;float:right;font-weight:700;font-size:1em;cursor:pointer}.jGrowl-closer{background-color:#000;opacity:.9;-ms-filter:alpha(90);filter:alpha(90);zoom:1;width:250px;padding:10px;margin:10px;display:none;border-radius:5px;padding-top:4px;padding-bottom:4px;cursor:pointer;font-size:.9em;font-weight:700;text-align:center}.jGrowl-closer .ui-state-highlight,.jGrowl-closer .ui-widget-content .ui-state-highlight,.jGrowl-closer .ui-widget-header .ui-state-highlight{border:1px solid #000;background:#000;color:#fff}@media print{.jGrowl{display:none}}
\ No newline at end of file +.jGrowl { + z-index: 9999; + color: #ffffff; + font-size: 12px; + font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; + position: fixed; +} +.jGrowl.top-left { + left: 0px; + top: 0px; +} +.jGrowl.top-right { + right: 0px; + top: 0px; +} +.jGrowl.bottom-left { + left: 0px; + bottom: 0px; +} +.jGrowl.bottom-right { + right: 0px; + bottom: 0px; +} +.jGrowl.center { + top: 0px; + width: 50%; + left: 25%; +} +.jGrowl.center .jGrowl-notification, +.jGrowl.center .jGrowl-closer { + margin-left: auto; + margin-right: auto; +} +.jGrowl-notification { + background-color: #000000; + opacity: 0.9; + filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=(0.9*100)); + -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=(0.9*100)); + zoom: 1; + width: 250px; + padding: 10px; + margin: 10px; + text-align: left; + display: none; + border-radius: 5px; + min-height: 40px; +} +.jGrowl-notification .ui-state-highlight, +.jGrowl-notification .ui-widget-content .ui-state-highlight, +.jGrowl-notification .ui-widget-header .ui-state-highlight { + border: 1px solid #000; + background: #000; + color: #fff; +} +.jGrowl-notification .jGrowl-header { + font-weight: bold; + font-size: .85em; +} +.jGrowl-notification .jGrowl-close { + background-color: transparent; + color: inherit; + border: none; + z-index: 99; + float: right; + font-weight: bold; + font-size: 1em; + cursor: pointer; +} +.jGrowl-closer { + background-color: #000000; + opacity: 0.9; + filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=(0.9*100)); + -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=(0.9*100)); + zoom: 1; + width: 250px; + padding: 10px; + margin: 10px; + text-align: left; + display: none; + border-radius: 5px; + padding-top: 4px; + padding-bottom: 4px; + cursor: pointer; + font-size: .9em; + font-weight: bold; + text-align: center; +} +.jGrowl-closer .ui-state-highlight, +.jGrowl-closer .ui-widget-content .ui-state-highlight, +.jGrowl-closer .ui-widget-header .ui-state-highlight { + border: 1px solid #000; + background: #000; + color: #fff; +} +/** Hide jGrowl when printing **/ +@media print { + .jGrowl { + display: none; + } +} diff --git a/library/jgrowl/jquery.jgrowl.js b/library/jgrowl/jquery.jgrowl.js new file mode 100755 index 000000000..d5444d438 --- /dev/null +++ b/library/jgrowl/jquery.jgrowl.js @@ -0,0 +1,399 @@ +/** + * jGrowl 1.4.5 + * + * Dual licensed under the MIT (http://www.opensource.org/licenses/mit-license.php) + * and GPL (http://www.opensource.org/licenses/gpl-license.php) licenses. + * + * Written by Stan Lemon <stosh1985@gmail.com> + * Last updated: 2015.02.01 + * + * jGrowl is a jQuery plugin implementing unobtrusive userland notifications. These + * notifications function similarly to the Growl Framework available for + * Mac OS X (http://growl.info). + * + * To Do: + * - Move library settings to containers and allow them to be changed per container + * + * Changes in 1.4.5 + * - Fixed arguement list for click callback, thanks @timotheeg + * + * Changes in 1.4.4 + * - Revert word-break changes, thanks @curtisgibby + * + * Changes in 1.4.3 + * - Fixed opactiy in LESS for older version of IE + * + * Changes in 1.4.2 + * - Added word-break to less/css + * + * Changes in 1.4.1 + * - Added appendTo option + * - jQuery compatibility updates + * - Add check for closing a notification before it opens + * + * Changes in 1.4.0 + * - Removed IE6 support + * - Added LESS support + * + * Changes in 1.3.0 + * - Added non-vendor border-radius to stylesheet + * - Added grunt for generating minified js and css + * - Added npm package info + * - Added bower package info + * - Updates for jshint + * + * Changes in 1.2.13 + * - Fixed clearing interval when the container shuts down + * + * Changes in 1.2.12 + * - Added compressed versions using UglifyJS and Sqwish + * - Improved README with configuration options explanation + * - Added a source map + * + * Changes in 1.2.11 + * - Fix artifacts left behind by the shutdown method and text-cleanup + * + * Changes in 1.2.10 + * - Fix beforeClose to be called in click event + * + * Changes in 1.2.9 + * - Fixed BC break in jQuery 2.0 beta + * + * Changes in 1.2.8 + * - Fixes for jQuery 1.9 and the MSIE6 check, note that with jQuery 2.0 support + * jGrowl intends to drop support for IE6 altogether + * + * Changes in 1.2.6 + * - Fixed js error when a notification is opening and closing at the same time + * + * Changes in 1.2.5 + * - Changed wrapper jGrowl's options usage to "o" instead of $.jGrowl.defaults + * - Added themeState option to control 'highlight' or 'error' for jQuery UI + * - Ammended some CSS to provide default positioning for nested usage. + * - Changed some CSS to be prefixed with jGrowl- to prevent namespacing issues + * - Added two new options - openDuration and closeDuration to allow + * better control of notification open and close speeds, respectively + * Patch contributed by Jesse Vincet. + * - Added afterOpen callback. Patch contributed by Russel Branca. + * + * Changes in 1.2.4 + * - Fixed IE bug with the close-all button + * - Fixed IE bug with the filter CSS attribute (special thanks to gotwic) + * - Update IE opacity CSS + * - Changed font sizes to use "em", and only set the base style + * + * Changes in 1.2.3 + * - The callbacks no longer use the container as context, instead they use the actual notification + * - The callbacks now receive the container as a parameter after the options parameter + * - beforeOpen and beforeClose now check the return value, if it's false - the notification does + * not continue. The open callback will also halt execution if it returns false. + * - Fixed bug where containers would get confused + * - Expanded the pause functionality to pause an entire container. + * + * Changes in 1.2.2 + * - Notification can now be theme rolled for jQuery UI, special thanks to Jeff Chan! + * + * Changes in 1.2.1 + * - Fixed instance where the interval would fire the close method multiple times. + * - Added CSS to hide from print media + * - Fixed issue with closer button when div { position: relative } is set + * - Fixed leaking issue with multiple containers. Special thanks to Matthew Hanlon! + * + * Changes in 1.2.0 + * - Added message pooling to limit the number of messages appearing at a given time. + * - Closing a notification is now bound to the notification object and triggered by the close button. + * + * Changes in 1.1.2 + * - Added iPhone styled example + * - Fixed possible IE7 bug when determining if the ie6 class shoudl be applied. + * - Added template for the close button, so that it's content could be customized. + * + * Changes in 1.1.1 + * - Fixed CSS styling bug for ie6 caused by a mispelling + * - Changes height restriction on default notifications to min-height + * - Added skinned examples using a variety of images + * - Added the ability to customize the content of the [close all] box + * - Added jTweet, an example of using jGrowl + Twitter + * + * Changes in 1.1.0 + * - Multiple container and instances. + * - Standard $.jGrowl() now wraps $.fn.jGrowl() by first establishing a generic jGrowl container. + * - Instance methods of a jGrowl container can be called by $.fn.jGrowl(methodName) + * - Added glue preferenced, which allows notifications to be inserted before or after nodes in the container + * - Added new log callback which is called before anything is done for the notification + * - Corner's attribute are now applied on an individual notification basis. + * + * Changes in 1.0.4 + * - Various CSS fixes so that jGrowl renders correctly in IE6. + * + * Changes in 1.0.3 + * - Fixed bug with options persisting across notifications + * - Fixed theme application bug + * - Simplified some selectors and manipulations. + * - Added beforeOpen and beforeClose callbacks + * - Reorganized some lines of code to be more readable + * - Removed unnecessary this.defaults context + * - If corners plugin is present, it's now customizable. + * - Customizable open animation. + * - Customizable close animation. + * - Customizable animation easing. + * - Added customizable positioning (top-left, top-right, bottom-left, bottom-right, center) + * + * Changes in 1.0.2 + * - All CSS styling is now external. + * - Added a theme parameter which specifies a secondary class for styling, such + * that notifications can be customized in appearance on a per message basis. + * - Notification life span is now customizable on a per message basis. + * - Added the ability to disable the global closer, enabled by default. + * - Added callbacks for when a notification is opened or closed. + * - Added callback for the global closer. + * - Customizable animation speed. + * - jGrowl now set itself up and tears itself down. + * + * Changes in 1.0.1: + * - Removed dependency on metadata plugin in favor of .data() + * - Namespaced all events + */ +(function($) { + /** jGrowl Wrapper - Establish a base jGrowl Container for compatibility with older releases. **/ + $.jGrowl = function( m , o ) { + // To maintain compatibility with older version that only supported one instance we'll create the base container. + if ( $('#jGrowl').length === 0 ) + $('<div id="jGrowl"></div>').addClass( (o && o.position) ? o.position : $.jGrowl.defaults.position ).appendTo( (o && o.appendTo) ? o.appendTo : $.jGrowl.defaults.appendTo ); + + // Create a notification on the container. + $('#jGrowl').jGrowl(m,o); + }; + + + /** Raise jGrowl Notification on a jGrowl Container **/ + $.fn.jGrowl = function( m , o ) { + // Short hand for passing in just an object to this method + if ( o === undefined && $.isPlainObject(m) ) { + o = m; + m = o.message; + } + + if ( $.isFunction(this.each) ) { + var args = arguments; + + return this.each(function() { + /** Create a jGrowl Instance on the Container if it does not exist **/ + if ( $(this).data('jGrowl.instance') === undefined ) { + $(this).data('jGrowl.instance', $.extend( new $.fn.jGrowl(), { notifications: [], element: null, interval: null } )); + $(this).data('jGrowl.instance').startup( this ); + } + + /** Optionally call jGrowl instance methods, or just raise a normal notification **/ + if ( $.isFunction($(this).data('jGrowl.instance')[m]) ) { + $(this).data('jGrowl.instance')[m].apply( $(this).data('jGrowl.instance') , $.makeArray(args).slice(1) ); + } else { + $(this).data('jGrowl.instance').create( m , o ); + } + }); + } + }; + + $.extend( $.fn.jGrowl.prototype , { + + /** Default JGrowl Settings **/ + defaults: { + pool: 0, + header: '', + group: '', + sticky: false, + position: 'top-right', + appendTo: 'body', + glue: 'after', + theme: 'default', + themeState: 'highlight', + corners: '10px', + check: 250, + life: 3000, + closeDuration: 'normal', + openDuration: 'normal', + easing: 'swing', + closer: true, + closeTemplate: '×', + closerTemplate: '<div>[ close all ]</div>', + log: function() {}, + beforeOpen: function() {}, + afterOpen: function() {}, + open: function() {}, + beforeClose: function() {}, + close: function() {}, + click: function() {}, + animateOpen: { + opacity: 'show' + }, + animateClose: { + opacity: 'hide' + } + }, + + notifications: [], + + /** jGrowl Container Node **/ + element: null, + + /** Interval Function **/ + interval: null, + + /** Create a Notification **/ + create: function( message , options ) { + var o = $.extend({}, this.defaults, options); + + /* To keep backward compatibility with 1.24 and earlier, honor 'speed' if the user has set it */ + if (typeof o.speed !== 'undefined') { + o.openDuration = o.speed; + o.closeDuration = o.speed; + } + + this.notifications.push({ message: message , options: o }); + + o.log.apply( this.element , [this.element,message,o] ); + }, + + render: function( n ) { + var self = this; + var message = n.message; + var o = n.options; + + // Support for jQuery theme-states, if this is not used it displays a widget header + o.themeState = (o.themeState === '') ? '' : 'ui-state-' + o.themeState; + + var notification = $('<div/>') + .addClass('jGrowl-notification alert ' + o.themeState + ' ui-corner-all' + ((o.group !== undefined && o.group !== '') ? ' ' + o.group : '')) + .append($('<button/>').addClass('jGrowl-close').html(o.closeTemplate)) + .append($('<div/>').addClass('jGrowl-header').html(o.header)) + .append($('<div/>').addClass('jGrowl-message').html(message)) + .data("jGrowl", o).addClass(o.theme).children('.jGrowl-close').bind("click.jGrowl", function() { + $(this).parent().trigger('jGrowl.beforeClose'); + return false; + }) + .parent(); + + + /** Notification Actions **/ + $(notification).bind("mouseover.jGrowl", function() { + $('.jGrowl-notification', self.element).data("jGrowl.pause", true); + }).bind("mouseout.jGrowl", function() { + $('.jGrowl-notification', self.element).data("jGrowl.pause", false); + }).bind('jGrowl.beforeOpen', function() { + if ( o.beforeOpen.apply( notification , [notification,message,o,self.element] ) !== false ) { + $(this).trigger('jGrowl.open'); + } + }).bind('jGrowl.open', function() { + if ( o.open.apply( notification , [notification,message,o,self.element] ) !== false ) { + if ( o.glue == 'after' ) { + $('.jGrowl-notification:last', self.element).after(notification); + } else { + $('.jGrowl-notification:first', self.element).before(notification); + } + + $(this).animate(o.animateOpen, o.openDuration, o.easing, function() { + // Fixes some anti-aliasing issues with IE filters. + if ($.support.opacity === false) + this.style.removeAttribute('filter'); + + if ( $(this).data("jGrowl") !== null && typeof $(this).data("jGrowl") !== 'undefined') // Happens when a notification is closing before it's open. + $(this).data("jGrowl").created = new Date(); + + $(this).trigger('jGrowl.afterOpen'); + }); + } + }).bind('jGrowl.afterOpen', function() { + o.afterOpen.apply( notification , [notification,message,o,self.element] ); + }).bind('click', function() { + o.click.apply( notification, [notification,message,o,self.element] ); + }).bind('jGrowl.beforeClose', function() { + if ( o.beforeClose.apply( notification , [notification,message,o,self.element] ) !== false ) + $(this).trigger('jGrowl.close'); + }).bind('jGrowl.close', function() { + // Pause the notification, lest during the course of animation another close event gets called. + $(this).data('jGrowl.pause', true); + $(this).animate(o.animateClose, o.closeDuration, o.easing, function() { + if ( $.isFunction(o.close) ) { + if ( o.close.apply( notification , [notification,message,o,self.element] ) !== false ) + $(this).remove(); + } else { + $(this).remove(); + } + }); + }).trigger('jGrowl.beforeOpen'); + + /** Optional Corners Plugin **/ + if ( o.corners !== '' && $.fn.corner !== undefined ) $(notification).corner( o.corners ); + + /** Add a Global Closer if more than one notification exists **/ + if ($('.jGrowl-notification:parent', self.element).length > 1 && + $('.jGrowl-closer', self.element).length === 0 && this.defaults.closer !== false ) { + $(this.defaults.closerTemplate).addClass('jGrowl-closer ' + this.defaults.themeState + ' ui-corner-all').addClass(this.defaults.theme) + .appendTo(self.element).animate(this.defaults.animateOpen, this.defaults.speed, this.defaults.easing) + .bind("click.jGrowl", function() { + $(this).siblings().trigger("jGrowl.beforeClose"); + + if ( $.isFunction( self.defaults.closer ) ) { + self.defaults.closer.apply( $(this).parent()[0] , [$(this).parent()[0]] ); + } + }); + } + }, + + /** Update the jGrowl Container, removing old jGrowl notifications **/ + update: function() { + $(this.element).find('.jGrowl-notification:parent').each( function() { + if ($(this).data("jGrowl") !== undefined && $(this).data("jGrowl").created !== undefined && + ($(this).data("jGrowl").created.getTime() + parseInt($(this).data("jGrowl").life, 10)) < (new Date()).getTime() && + $(this).data("jGrowl").sticky !== true && + ($(this).data("jGrowl.pause") === undefined || $(this).data("jGrowl.pause") !== true) ) { + + // Pause the notification, lest during the course of animation another close event gets called. + $(this).trigger('jGrowl.beforeClose'); + } + }); + + if (this.notifications.length > 0 && + (this.defaults.pool === 0 || $(this.element).find('.jGrowl-notification:parent').length < this.defaults.pool) ) + this.render( this.notifications.shift() ); + + if ($(this.element).find('.jGrowl-notification:parent').length < 2 ) { + $(this.element).find('.jGrowl-closer').animate(this.defaults.animateClose, this.defaults.speed, this.defaults.easing, function() { + $(this).remove(); + }); + } + }, + + /** Setup the jGrowl Notification Container **/ + startup: function(e) { + this.element = $(e).addClass('jGrowl').append('<div class="jGrowl-notification"></div>'); + this.interval = setInterval( function() { + // some error in chage ^^ + var instance = $(e).data('jGrowl.instance'); + if (undefined !== instance) { + instance.update(); + } + }, parseInt(this.defaults.check, 10)); + }, + + /** Shutdown jGrowl, removing it and clearing the interval **/ + shutdown: function() { + $(this.element).removeClass('jGrowl') + .find('.jGrowl-notification').trigger('jGrowl.close') + .parent().empty() + ; + + clearInterval(this.interval); + }, + + close: function() { + $(this.element).find('.jGrowl-notification').each(function(){ + $(this).trigger('jGrowl.beforeClose'); + }); + } + }); + + /** Reference the Defaults Object for compatibility with older versions of jGrowl **/ + $.jGrowl.defaults = $.fn.jGrowl.prototype.defaults; + +})(jQuery); diff --git a/library/jgrowl/jquery.jgrowl.map b/library/jgrowl/jquery.jgrowl.map index e69de29bb..a04b1e347 100644 --- a/library/jgrowl/jquery.jgrowl.map +++ b/library/jgrowl/jquery.jgrowl.map @@ -0,0 +1 @@ +{"version":3,"file":"jquery.jgrowl.min.js","sources":["jquery.jgrowl.js"],"names":["$","jGrowl","m","o","length","addClass","position","defaults","appendTo","fn","undefined","isPlainObject","message","isFunction","this","each","args","arguments","data","extend","notifications","element","interval","startup","apply","makeArray","slice","create","prototype","pool","header","group","sticky","glue","theme","themeState","corners","check","life","closeDuration","openDuration","easing","closer","closeTemplate","closerTemplate","log","beforeOpen","afterOpen","open","beforeClose","close","click","animateOpen","opacity","animateClose","options","speed","push","render","n","self","notification","append","html","children","bind","parent","trigger","after","before","animate","support","style","removeAttribute","created","Date","remove","corner","siblings","update","find","getTime","parseInt","shift","e","setInterval","instance","shutdown","removeClass","empty","clearInterval","jQuery"],"mappings":"CAsJA,SAAUA,GAETA,EAAEC,OAAS,SAAUC,EAAIC,GAEK,IAAxBH,EAAE,WAAWI,QACjBJ,EAAE,2BAA2BK,SAAWF,GAAKA,EAAEG,SAAYH,EAAEG,SAAWN,EAAEC,OAAOM,SAASD,UAAWE,SAAWL,GAAKA,EAAEK,SAAYL,EAAEK,SAAWR,EAAEC,OAAOM,SAASC,UAGnKR,EAAE,WAAWC,OAAOC,EAAEC,IAKvBH,EAAES,GAAGR,OAAS,SAAUC,EAAIC,GAO3B,GALWO,SAANP,GAAmBH,EAAEW,cAAcT,KACvCC,EAAID,EACJA,EAAIC,EAAES,SAGFZ,EAAEa,WAAWC,KAAKC,MAAQ,CAC9B,GAAIC,GAAOC,SAEX,OAAOH,MAAKC,KAAK,WAEyBL,SAApCV,EAAEc,MAAMI,KAAK,qBACjBlB,EAAEc,MAAMI,KAAK,kBAAmBlB,EAAEmB,OAAQ,GAAInB,GAAES,GAAGR,QAAYmB,iBAAmBC,QAAS,KAAMC,SAAU,QAC3GtB,EAAEc,MAAMI,KAAK,mBAAmBK,QAAST,OAIrCd,EAAEa,WAAWb,EAAEc,MAAMI,KAAK,mBAAmBhB,IACjDF,EAAEc,MAAMI,KAAK,mBAAmBhB,GAAGsB,MAAOxB,EAAEc,MAAMI,KAAK,mBAAqBlB,EAAEyB,UAAUT,GAAMU,MAAM,IAEpG1B,EAAEc,MAAMI,KAAK,mBAAmBS,OAAQzB,EAAIC,OAMhDH,EAAEmB,OAAQnB,EAAES,GAAGR,OAAO2B,WAGrBrB,UACCsB,KAAS,EACTC,OAAW,GACXC,MAAU,GACVC,QAAW,EACX1B,SAAY,YACZE,SAAY,OACZyB,KAAS,QACTC,MAAU,UACVC,WAAc,YACdC,QAAW,OACXC,MAAU,IACVC,KAAS,IACTC,cAAgB,SAChBC,aAAe,SACfC,OAAW,QACXC,QAAW,EACXC,cAAgB,UAChBC,eAAiB,2BACjBC,IAAQ,aACRC,WAAc,aACdC,UAAa,aACbC,KAAS,aACTC,YAAc,aACdC,MAAU,aACVC,MAAU,aACVC,aACCC,QAAU,QAEXC,cACCD,QAAU,SAIZjC,iBAGAC,QAAY,KAGZC,SAAa,KAGbK,OAAQ,SAAUf,EAAU2C,GAC3B,GAAIpD,GAAIH,EAAEmB,UAAWL,KAAKP,SAAUgD,EAGb,oBAAZpD,GAAEqD,QACZrD,EAAEqC,aAAerC,EAAEqD,MACnBrD,EAAEoC,cAAgBpC,EAAEqD,OAGrB1C,KAAKM,cAAcqC,MAAO7C,QAASA,EAAU2C,QAASpD,IAEtDA,EAAE0C,IAAIrB,MAAOV,KAAKO,SAAWP,KAAKO,QAAQT,EAAQT,KAGnDuD,OAAQ,SAAUC,GACjB,GAAIC,GAAO9C,KACPF,EAAU+C,EAAE/C,QACZT,EAAIwD,EAAEJ,OAGVpD,GAAEgC,WAA+B,KAAjBhC,EAAEgC,WAAqB,GAAK,YAAchC,EAAEgC,UAE5D,IAAI0B,GAAe7D,EAAE,UACnBK,SAAS,6BAA+BF,EAAEgC,WAAa,kBAAiCzB,SAAZP,EAAE4B,OAAmC,KAAZ5B,EAAE4B,MAAgB,IAAM5B,EAAE4B,MAAQ,KACvI+B,OAAO9D,EAAE,aAAaK,SAAS,gBAAgB0D,KAAK5D,EAAEwC,gBACtDmB,OAAO9D,EAAE,UAAUK,SAAS,iBAAiB0D,KAAK5D,EAAE2B,SACpDgC,OAAO9D,EAAE,UAAUK,SAAS,kBAAkB0D,KAAKnD,IACnDM,KAAK,SAAUf,GAAGE,SAASF,EAAE+B,OAAO8B,SAAS,iBAAiBC,KAAK,eAAgB,WAEnF,MADAjE,GAAEc,MAAMoD,SAASC,QAAQ,uBAClB,IAEPD,QAIFlE,GAAE6D,GAAcI,KAAK,mBAAoB,WACxCjE,EAAE,uBAAwB4D,EAAKvC,SAASH,KAAK,gBAAgB,KAC3D+C,KAAK,kBAAmB,WAC1BjE,EAAE,uBAAwB4D,EAAKvC,SAASH,KAAK,gBAAgB,KAC3D+C,KAAK,oBAAqB,WACvB9D,EAAE2C,WAAWtB,MAAOqC,GAAgBA,EAAajD,EAAQT,EAAEyD,EAAKvC,aAAe,GACnFrB,EAAEc,MAAMqD,QAAQ,iBAEfF,KAAK,cAAe,WACjB9D,EAAE6C,KAAKxB,MAAOqC,GAAgBA,EAAajD,EAAQT,EAAEyD,EAAKvC,aAAe,IAC9D,SAAVlB,EAAE8B,KACNjC,EAAE,4BAA6B4D,EAAKvC,SAAS+C,MAAMP,GAEnD7D,EAAE,6BAA8B4D,EAAKvC,SAASgD,OAAOR,GAGtD7D,EAAEc,MAAMwD,QAAQnE,EAAEiD,YAAajD,EAAEqC,aAAcrC,EAAEsC,OAAQ,WAEpDzC,EAAEuE,QAAQlB,WAAY,GACzBvC,KAAK0D,MAAMC,gBAAgB,UAEI,OAA3BzE,EAAEc,MAAMI,KAAK,WAAwD,mBAA3BlB,GAAEc,MAAMI,KAAK,YAC3DlB,EAAEc,MAAMI,KAAK,UAAUwD,QAAU,GAAIC,OAEtC3E,EAAEc,MAAMqD,QAAQ,yBAGhBF,KAAK,mBAAoB,WAC3B9D,EAAE4C,UAAUvB,MAAOqC,GAAgBA,EAAajD,EAAQT,EAAEyD,EAAKvC,YAC7D4C,KAAK,QAAS,WAChB9D,EAAEgD,MAAM3B,MAAOqC,GAAeA,EAAajD,EAAQT,EAAEyD,EAAKvC,YACxD4C,KAAK,qBAAsB,WACxB9D,EAAE8C,YAAYzB,MAAOqC,GAAgBA,EAAajD,EAAQT,EAAEyD,EAAKvC,aAAe,GACpFrB,EAAEc,MAAMqD,QAAQ,kBACfF,KAAK,eAAgB,WAEvBjE,EAAEc,MAAMI,KAAK,gBAAgB,GAC7BlB,EAAEc,MAAMwD,QAAQnE,EAAEmD,aAAcnD,EAAEoC,cAAepC,EAAEsC,OAAQ,WACrDzC,EAAEa,WAAWV,EAAE+C,OACd/C,EAAE+C,MAAM1B,MAAOqC,GAAgBA,EAAajD,EAAQT,EAAEyD,EAAKvC,aAAe,GAC9ErB,EAAEc,MAAM8D,SAET5E,EAAEc,MAAM8D,aAGRT,QAAQ,qBAGQ,KAAdhE,EAAEiC,SAAkC1B,SAAhBV,EAAES,GAAGoE,QAAuB7E,EAAE6D,GAAcgB,OAAQ1E,EAAEiC,SAG3EpC,EAAE,8BAA+B4D,EAAKvC,SAASjB,OAAS,GACd,IAA7CJ,EAAE,iBAAkB4D,EAAKvC,SAASjB,QAAgBU,KAAKP,SAASmC,UAAW,GAC3E1C,EAAEc,KAAKP,SAASqC,gBAAgBvC,SAAS,iBAAmBS,KAAKP,SAAS4B,WAAa,kBAAkB9B,SAASS,KAAKP,SAAS2B,OAC9H1B,SAASoD,EAAKvC,SAASiD,QAAQxD,KAAKP,SAAS6C,YAAatC,KAAKP,SAASiD,MAAO1C,KAAKP,SAASkC,QAC7FwB,KAAK,eAAgB,WACrBjE,EAAEc,MAAMgE,WAAWX,QAAQ,sBAEtBnE,EAAEa,WAAY+C,EAAKrD,SAASmC,SAChCkB,EAAKrD,SAASmC,OAAOlB,MAAOxB,EAAEc,MAAMoD,SAAS,IAAMlE,EAAEc,MAAMoD,SAAS,QAOzEa,OAAQ,WACP/E,EAAEc,KAAKO,SAAS2D,KAAK,+BAA+BjE,KAAM,WAC1BL,SAA3BV,EAAEc,MAAMI,KAAK,WAA8DR,SAAnCV,EAAEc,MAAMI,KAAK,UAAUwD,SACjE1E,EAAEc,MAAMI,KAAK,UAAUwD,QAAQO,UAAYC,SAASlF,EAAEc,MAAMI,KAAK,UAAUoB,KAAM,KAAQ,GAAKqC,OAAQM,WACvGjF,EAAEc,MAAMI,KAAK,UAAUc,UAAW,IACAtB,SAAjCV,EAAEc,MAAMI,KAAK,iBAAiClB,EAAEc,MAAMI,KAAK,mBAAoB,IAGhFlB,EAAEc,MAAMqD,QAAQ,wBAIdrD,KAAKM,cAAchB,OAAS,IACP,IAAvBU,KAAKP,SAASsB,MAAc7B,EAAEc,KAAKO,SAAS2D,KAAK,+BAA+B5E,OAASU,KAAKP,SAASsB,OACxGf,KAAK4C,OAAQ5C,KAAKM,cAAc+D,SAE7BnF,EAAEc,KAAKO,SAAS2D,KAAK,+BAA+B5E,OAAS,GAChEJ,EAAEc,KAAKO,SAAS2D,KAAK,kBAAkBV,QAAQxD,KAAKP,SAAS+C,aAAcxC,KAAKP,SAASiD,MAAO1C,KAAKP,SAASkC,OAAQ,WACrHzC,EAAEc,MAAM8D,YAMXrD,QAAS,SAAS6D,GACjBtE,KAAKO,QAAUrB,EAAEoF,GAAG/E,SAAS,UAAUyD,OAAO,2CAC9ChD,KAAKQ,SAAW+D,YAAa,WAE5B,GAAIC,GAAWtF,EAAEoF,GAAGlE,KAAK,kBACrBR,UAAc4E,GACjBA,EAASP,UAERG,SAASpE,KAAKP,SAAS8B,MAAO,MAIlCkD,SAAU,WACTvF,EAAEc,KAAKO,SAASmE,YAAY,UAC1BR,KAAK,wBAAwBb,QAAQ,gBACrCD,SAASuB,QAGXC,cAAc5E,KAAKQ,WAGpB4B,MAAO,WACNlD,EAAEc,KAAKO,SAAS2D,KAAK,wBAAwBjE,KAAK,WACjDf,EAAEc,MAAMqD,QAAQ,2BAMnBnE,EAAEC,OAAOM,SAAWP,EAAES,GAAGR,OAAO2B,UAAUrB,UAExCoF"}
\ No newline at end of file diff --git a/library/jgrowl/jquery.jgrowl.min.css b/library/jgrowl/jquery.jgrowl.min.css new file mode 100644 index 000000000..a12f907e5 --- /dev/null +++ b/library/jgrowl/jquery.jgrowl.min.css @@ -0,0 +1 @@ +.jGrowl{z-index:9999;color:#fff;font-size:12px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;position:fixed}.jGrowl.top-left{left:0;top:0}.jGrowl.top-right{right:0;top:0}.jGrowl.bottom-left{left:0;bottom:0}.jGrowl.bottom-right{right:0;bottom:0}.jGrowl.center{top:0;width:50%;left:25%}.jGrowl.center .jGrowl-closer,.jGrowl.center .jGrowl-notification{margin-left:auto;margin-right:auto}.jGrowl-notification{background-color:#000;opacity:.9;filter:progid:DXImageTransform.Microsoft.Alpha(Opacity=(0.9*100));-ms-filter:progid:DXImageTransform.Microsoft.Alpha(Opacity=(0.9*100));zoom:1;width:250px;padding:10px;margin:10px;text-align:left;display:none;border-radius:5px;min-height:40px}.jGrowl-notification .ui-state-highlight,.jGrowl-notification .ui-widget-content .ui-state-highlight,.jGrowl-notification .ui-widget-header .ui-state-highlight{border:1px solid #000;background:#000;color:#fff}.jGrowl-notification .jGrowl-header{font-weight:700;font-size:.85em}.jGrowl-notification .jGrowl-close{background-color:transparent;color:inherit;border:none;z-index:99;float:right;font-weight:700;font-size:1em;cursor:pointer}.jGrowl-closer{background-color:#000;opacity:.9;filter:progid:DXImageTransform.Microsoft.Alpha(Opacity=(0.9*100));-ms-filter:progid:DXImageTransform.Microsoft.Alpha(Opacity=(0.9*100));zoom:1;width:250px;padding:10px;margin:10px;display:none;border-radius:5px;padding-top:4px;padding-bottom:4px;cursor:pointer;font-size:.9em;font-weight:700;text-align:center}.jGrowl-closer .ui-state-highlight,.jGrowl-closer .ui-widget-content .ui-state-highlight,.jGrowl-closer .ui-widget-header .ui-state-highlight{border:1px solid #000;background:#000;color:#fff}@media print{.jGrowl{display:none}}
\ No newline at end of file diff --git a/library/jgrowl/jquery.jgrowl_minimized.js b/library/jgrowl/jquery.jgrowl.min.js index 7e8b6fb35..418c3db79 100644 --- a/library/jgrowl/jquery.jgrowl_minimized.js +++ b/library/jgrowl/jquery.jgrowl.min.js @@ -1,2 +1,2 @@ -!function(a){a.jGrowl=function(b,c){0===a("#jGrowl").length&&a('<div id="jGrowl"></div>').addClass(c&&c.position?c.position:a.jGrowl.defaults.position).appendTo(c&&c.appendTo?c.appendTo:a.jGrowl.defaults.appendTo),a("#jGrowl").jGrowl(b,c)},a.fn.jGrowl=function(b,c){if(void 0===c&&a.isPlainObject(b)&&(c=b,b=c.message),a.isFunction(this.each)){var d=arguments;return this.each(function(){void 0===a(this).data("jGrowl.instance")&&(a(this).data("jGrowl.instance",a.extend(new a.fn.jGrowl,{notifications:[],element:null,interval:null})),a(this).data("jGrowl.instance").startup(this)),a.isFunction(a(this).data("jGrowl.instance")[b])?a(this).data("jGrowl.instance")[b].apply(a(this).data("jGrowl.instance"),a.makeArray(d).slice(1)):a(this).data("jGrowl.instance").create(b,c)})}},a.extend(a.fn.jGrowl.prototype,{defaults:{pool:0,header:"",group:"",sticky:!1,position:"top-right",appendTo:"body",glue:"after",theme:"default",themeState:"highlight",corners:"10px",check:250,life:3e3,closeDuration:"normal",openDuration:"normal",easing:"swing",closer:!0,closeTemplate:"×",closerTemplate:"<div>[ close all ]</div>",log:function(){},beforeOpen:function(){},afterOpen:function(){},open:function(){},beforeClose:function(){},close:function(){},click:function(){},animateOpen:{opacity:"show"},animateClose:{opacity:"hide"}},notifications:[],element:null,interval:null,create:function(b,c){var d=a.extend({},this.defaults,c);"undefined"!=typeof d.speed&&(d.openDuration=d.speed,d.closeDuration=d.speed),this.notifications.push({message:b,options:d}),d.log.apply(this.element,[this.element,b,d])},render:function(b){var c=this,d=b.message,e=b.options;e.themeState=""===e.themeState?"":"ui-state-"+e.themeState;var f=a("<div/>").addClass("jGrowl-notification alert "+e.themeState+" ui-corner-all"+(void 0!==e.group&&""!==e.group?" "+e.group:"")).append(a("<button/>").addClass("jGrowl-close").html(e.closeTemplate)).append(a("<div/>").addClass("jGrowl-header").html(e.header)).append(a("<div/>").addClass("jGrowl-message").html(d)).data("jGrowl",e).addClass(e.theme).children(".jGrowl-close").bind("click.jGrowl",function(){return a(this).parent().trigger("jGrowl.beforeClose"),!1}).parent();a(f).bind("mouseover.jGrowl",function(){a(".jGrowl-notification",c.element).data("jGrowl.pause",!0)}).bind("mouseout.jGrowl",function(){a(".jGrowl-notification",c.element).data("jGrowl.pause",!1)}).bind("jGrowl.beforeOpen",function(){e.beforeOpen.apply(f,[f,d,e,c.element])!==!1&&a(this).trigger("jGrowl.open")}).bind("jGrowl.open",function(){e.open.apply(f,[f,d,e,c.element])!==!1&&("after"==e.glue?a(".jGrowl-notification:last",c.element).after(f):a(".jGrowl-notification:first",c.element).before(f),a(this).animate(e.animateOpen,e.openDuration,e.easing,function(){a.support.opacity===!1&&this.style.removeAttribute("filter"),null!==a(this).data("jGrowl")&&"undefined"!=typeof a(this).data("jGrowl")&&(a(this).data("jGrowl").created=new Date),a(this).trigger("jGrowl.afterOpen")}))}).bind("jGrowl.afterOpen",function(){e.afterOpen.apply(f,[f,d,e,c.element])}).bind("click",function(){e.click.apply(f,[f.message,e,c.element])}).bind("jGrowl.beforeClose",function(){e.beforeClose.apply(f,[f,d,e,c.element])!==!1&&a(this).trigger("jGrowl.close")}).bind("jGrowl.close",function(){a(this).data("jGrowl.pause",!0),a(this).animate(e.animateClose,e.closeDuration,e.easing,function(){a.isFunction(e.close)?e.close.apply(f,[f,d,e,c.element])!==!1&&a(this).remove():a(this).remove()})}).trigger("jGrowl.beforeOpen"),""!==e.corners&&void 0!==a.fn.corner&&a(f).corner(e.corners),a(".jGrowl-notification:parent",c.element).length>1&&0===a(".jGrowl-closer",c.element).length&&this.defaults.closer!==!1&&a(this.defaults.closerTemplate).addClass("jGrowl-closer "+this.defaults.themeState+" ui-corner-all").addClass(this.defaults.theme).appendTo(c.element).animate(this.defaults.animateOpen,this.defaults.speed,this.defaults.easing).bind("click.jGrowl",function(){a(this).siblings().trigger("jGrowl.beforeClose"),a.isFunction(c.defaults.closer)&&c.defaults.closer.apply(a(this).parent()[0],[a(this).parent()[0]])})},update:function(){a(this.element).find(".jGrowl-notification:parent").each(function(){void 0!==a(this).data("jGrowl")&&void 0!==a(this).data("jGrowl").created&&a(this).data("jGrowl").created.getTime()+parseInt(a(this).data("jGrowl").life,10)<(new Date).getTime()&&a(this).data("jGrowl").sticky!==!0&&(void 0===a(this).data("jGrowl.pause")||a(this).data("jGrowl.pause")!==!0)&&a(this).trigger("jGrowl.beforeClose")}),this.notifications.length>0&&(0===this.defaults.pool||a(this.element).find(".jGrowl-notification:parent").length<this.defaults.pool)&&this.render(this.notifications.shift()),a(this.element).find(".jGrowl-notification:parent").length<2&&a(this.element).find(".jGrowl-closer").animate(this.defaults.animateClose,this.defaults.speed,this.defaults.easing,function(){a(this).remove()})},startup:function(b){this.element=a(b).addClass("jGrowl").append('<div class="jGrowl-notification"></div>'),this.interval=setInterval(function(){a(b).data("jGrowl.instance").update()},parseInt(this.defaults.check,10))},shutdown:function(){a(this.element).removeClass("jGrowl").find(".jGrowl-notification").trigger("jGrowl.close").parent().empty(),clearInterval(this.interval)},close:function(){a(this.element).find(".jGrowl-notification").each(function(){a(this).trigger("jGrowl.beforeClose")})}}),a.jGrowl.defaults=a.fn.jGrowl.prototype.defaults}(jQuery); +!function(a){a.jGrowl=function(b,c){0===a("#jGrowl").length&&a('<div id="jGrowl"></div>').addClass(c&&c.position?c.position:a.jGrowl.defaults.position).appendTo(c&&c.appendTo?c.appendTo:a.jGrowl.defaults.appendTo),a("#jGrowl").jGrowl(b,c)},a.fn.jGrowl=function(b,c){if(void 0===c&&a.isPlainObject(b)&&(c=b,b=c.message),a.isFunction(this.each)){var d=arguments;return this.each(function(){void 0===a(this).data("jGrowl.instance")&&(a(this).data("jGrowl.instance",a.extend(new a.fn.jGrowl,{notifications:[],element:null,interval:null})),a(this).data("jGrowl.instance").startup(this)),a.isFunction(a(this).data("jGrowl.instance")[b])?a(this).data("jGrowl.instance")[b].apply(a(this).data("jGrowl.instance"),a.makeArray(d).slice(1)):a(this).data("jGrowl.instance").create(b,c)})}},a.extend(a.fn.jGrowl.prototype,{defaults:{pool:0,header:"",group:"",sticky:!1,position:"top-right",appendTo:"body",glue:"after",theme:"default",themeState:"highlight",corners:"10px",check:250,life:3e3,closeDuration:"normal",openDuration:"normal",easing:"swing",closer:!0,closeTemplate:"×",closerTemplate:"<div>[ close all ]</div>",log:function(){},beforeOpen:function(){},afterOpen:function(){},open:function(){},beforeClose:function(){},close:function(){},click:function(){},animateOpen:{opacity:"show"},animateClose:{opacity:"hide"}},notifications:[],element:null,interval:null,create:function(b,c){var d=a.extend({},this.defaults,c);"undefined"!=typeof d.speed&&(d.openDuration=d.speed,d.closeDuration=d.speed),this.notifications.push({message:b,options:d}),d.log.apply(this.element,[this.element,b,d])},render:function(b){var c=this,d=b.message,e=b.options;e.themeState=""===e.themeState?"":"ui-state-"+e.themeState;var f=a("<div/>").addClass("jGrowl-notification alert "+e.themeState+" ui-corner-all"+(void 0!==e.group&&""!==e.group?" "+e.group:"")).append(a("<button/>").addClass("jGrowl-close").html(e.closeTemplate)).append(a("<div/>").addClass("jGrowl-header").html(e.header)).append(a("<div/>").addClass("jGrowl-message").html(d)).data("jGrowl",e).addClass(e.theme).children(".jGrowl-close").bind("click.jGrowl",function(){return a(this).parent().trigger("jGrowl.beforeClose"),!1}).parent();a(f).bind("mouseover.jGrowl",function(){a(".jGrowl-notification",c.element).data("jGrowl.pause",!0)}).bind("mouseout.jGrowl",function(){a(".jGrowl-notification",c.element).data("jGrowl.pause",!1)}).bind("jGrowl.beforeOpen",function(){e.beforeOpen.apply(f,[f,d,e,c.element])!==!1&&a(this).trigger("jGrowl.open")}).bind("jGrowl.open",function(){e.open.apply(f,[f,d,e,c.element])!==!1&&("after"==e.glue?a(".jGrowl-notification:last",c.element).after(f):a(".jGrowl-notification:first",c.element).before(f),a(this).animate(e.animateOpen,e.openDuration,e.easing,function(){a.support.opacity===!1&&this.style.removeAttribute("filter"),null!==a(this).data("jGrowl")&&"undefined"!=typeof a(this).data("jGrowl")&&(a(this).data("jGrowl").created=new Date),a(this).trigger("jGrowl.afterOpen")}))}).bind("jGrowl.afterOpen",function(){e.afterOpen.apply(f,[f,d,e,c.element])}).bind("click",function(){e.click.apply(f,[f,d,e,c.element])}).bind("jGrowl.beforeClose",function(){e.beforeClose.apply(f,[f,d,e,c.element])!==!1&&a(this).trigger("jGrowl.close")}).bind("jGrowl.close",function(){a(this).data("jGrowl.pause",!0),a(this).animate(e.animateClose,e.closeDuration,e.easing,function(){a.isFunction(e.close)?e.close.apply(f,[f,d,e,c.element])!==!1&&a(this).remove():a(this).remove()})}).trigger("jGrowl.beforeOpen"),""!==e.corners&&void 0!==a.fn.corner&&a(f).corner(e.corners),a(".jGrowl-notification:parent",c.element).length>1&&0===a(".jGrowl-closer",c.element).length&&this.defaults.closer!==!1&&a(this.defaults.closerTemplate).addClass("jGrowl-closer "+this.defaults.themeState+" ui-corner-all").addClass(this.defaults.theme).appendTo(c.element).animate(this.defaults.animateOpen,this.defaults.speed,this.defaults.easing).bind("click.jGrowl",function(){a(this).siblings().trigger("jGrowl.beforeClose"),a.isFunction(c.defaults.closer)&&c.defaults.closer.apply(a(this).parent()[0],[a(this).parent()[0]])})},update:function(){a(this.element).find(".jGrowl-notification:parent").each(function(){void 0!==a(this).data("jGrowl")&&void 0!==a(this).data("jGrowl").created&&a(this).data("jGrowl").created.getTime()+parseInt(a(this).data("jGrowl").life,10)<(new Date).getTime()&&a(this).data("jGrowl").sticky!==!0&&(void 0===a(this).data("jGrowl.pause")||a(this).data("jGrowl.pause")!==!0)&&a(this).trigger("jGrowl.beforeClose")}),this.notifications.length>0&&(0===this.defaults.pool||a(this.element).find(".jGrowl-notification:parent").length<this.defaults.pool)&&this.render(this.notifications.shift()),a(this.element).find(".jGrowl-notification:parent").length<2&&a(this.element).find(".jGrowl-closer").animate(this.defaults.animateClose,this.defaults.speed,this.defaults.easing,function(){a(this).remove()})},startup:function(b){this.element=a(b).addClass("jGrowl").append('<div class="jGrowl-notification"></div>'),this.interval=setInterval(function(){var c=a(b).data("jGrowl.instance");void 0!==c&&c.update()},parseInt(this.defaults.check,10))},shutdown:function(){a(this.element).removeClass("jGrowl").find(".jGrowl-notification").trigger("jGrowl.close").parent().empty(),clearInterval(this.interval)},close:function(){a(this.element).find(".jGrowl-notification").each(function(){a(this).trigger("jGrowl.beforeClose")})}}),a.jGrowl.defaults=a.fn.jGrowl.prototype.defaults}(jQuery); //# sourceMappingURL=jquery.jgrowl.map
\ No newline at end of file diff --git a/library/jgrowl/less/jgrowl.core.less b/library/jgrowl/less/jgrowl.core.less new file mode 100755 index 000000000..e3f8d4873 --- /dev/null +++ b/library/jgrowl/less/jgrowl.core.less @@ -0,0 +1,101 @@ + +.jGrowl { + z-index: 9999; + color: @jgrowl-color; + font-size: @jgrowl-fontSize; + font-family: @jgrowl-fontFamily; + position: fixed; + + &.top-left { + left: 0px; + top: 0px; + } + + &.top-right { + right: 0px; + top: 0px; + } + + &.bottom-left { + left: 0px; + bottom: 0px; + } + + &.bottom-right { + right: 0px; + bottom: 0px; + } + + &.center { + top: 0px; + width: 50%; + left: 25%; + + .jGrowl-notification, + .jGrowl-closer { + margin-left: auto; + margin-right: auto; + } + } +} + +.notification() { + background-color: @jgrowl-backgroundColor; + opacity: @jgrowl-opacity; + // These are for older versions of Internet Explorer that don't support opacity + filter: e(%("progid:DXImageTransform.Microsoft.Alpha(Opacity=(%d*100))",@jgrowl-opacity)); + -ms-filter: e(%("progid:DXImageTransform.Microsoft.Alpha(Opacity=(%d*100))",@jgrowl-opacity)); + zoom: 1; + width: @jgrowl-width; + padding: 10px; + margin: 10px; + text-align: left; + display: none; + border-radius: @jgrowl-borderRadius; + + .ui-state-highlight, + .ui-widget-content .ui-state-highlight, + .ui-widget-header .ui-state-highlight { + border: 1px solid #000; + background: #000; + color: #fff; + } +} + +.jGrowl-notification { + .notification; + min-height: @jgrowl-height; + + .jGrowl-header { + font-weight: bold; + font-size: .85em; + } + + .jGrowl-close { + background-color: transparent; + color: inherit; + border: none; + z-index: 99; + float: right; + font-weight: bold; + font-size: 1em; + cursor: pointer; + } +} + +.jGrowl-closer { + .notification; + padding-top: 4px; + padding-bottom: 4px; + cursor: pointer; + font-size: .9em; + font-weight: bold; + text-align: center; +} + +/** Hide jGrowl when printing **/ +@media print { + .jGrowl { + display: none; + } +} diff --git a/library/jgrowl/less/jgrowl.less b/library/jgrowl/less/jgrowl.less new file mode 100644 index 000000000..d55478820 --- /dev/null +++ b/library/jgrowl/less/jgrowl.less @@ -0,0 +1,2 @@ +@import "jgrowl.variables.less"; +@import "jgrowl.core.less";
\ No newline at end of file diff --git a/library/jgrowl/less/jgrowl.variables.less b/library/jgrowl/less/jgrowl.variables.less new file mode 100644 index 000000000..ec025cb39 --- /dev/null +++ b/library/jgrowl/less/jgrowl.variables.less @@ -0,0 +1,8 @@ +@jgrowl-width: 250px; +@jgrowl-height: 40px; +@jgrowl-backgroundColor: #000; +@jgrowl-color: #fff; +@jgrowl-fontSize: 12px; +@jgrowl-fontFamily: "Helvetica Neue", Helvetica, Arial, sans-serif; +@jgrowl-opacity: .90; +@jgrowl-borderRadius: 5px;
\ No newline at end of file diff --git a/library/jgrowl/package.json b/library/jgrowl/package.json new file mode 100644 index 000000000..8e523ed84 --- /dev/null +++ b/library/jgrowl/package.json @@ -0,0 +1,23 @@ +{ + "name": "jgrowl", + "version": "1.4.5", + "author": { + "name" : "Stan Lemon", + "email" : "stosh1985@gmail.com", + "url" : "http://stanlemon.net" + }, + "src": "jquery.jgrowl.js", + "style": "jquery.jgrowl.css", + "repository" : { + "type" : "git", + "url" : "http://github.com/stanlemon/jGrowl.git" + }, + "devDependencies": { + "grunt": "~0.4.2", + "grunt-contrib-jshint": "~0.6.3", + "grunt-contrib-uglify": "~0.4.0", + "grunt-contrib-cssmin": "~0.9.0", + "grunt-contrib-less": "~0.11.0", + "grunt-contrib-watch": "~0.6.1" + } +} diff --git a/util/hmessages.po b/util/hmessages.po index 91cc1f191..880cbfe30 100644 --- a/util/hmessages.po +++ b/util/hmessages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 3.9.6\n" +"Project-Id-Version: 4.2RC\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-02-19 10:11+0100\n" +"POT-Creation-Date: 2019-05-13 12:07+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -150,12 +150,12 @@ msgid "Special - Group Repository" msgstr "" #: ../../Zotlabs/Access/PermissionRoles.php:306 -#: ../../Zotlabs/Module/Cdav.php:1227 ../../Zotlabs/Module/Connedit.php:935 +#: ../../Zotlabs/Module/Cdav.php:1335 ../../Zotlabs/Module/Connedit.php:935 #: ../../Zotlabs/Module/Profiles.php:795 ../../include/selectors.php:60 #: ../../include/selectors.php:77 ../../include/selectors.php:115 -#: ../../include/selectors.php:151 ../../include/event.php:1327 -#: ../../include/event.php:1334 ../../include/connections.php:703 -#: ../../include/connections.php:710 +#: ../../include/selectors.php:151 ../../include/event.php:1336 +#: ../../include/event.php:1343 ../../include/connections.php:730 +#: ../../include/connections.php:737 msgid "Other" msgstr "" @@ -169,8 +169,8 @@ msgstr "" #: ../../Zotlabs/Module/Editblock.php:31 ../../Zotlabs/Module/Profile.php:20 #: ../../Zotlabs/Module/Menu.php:91 ../../Zotlabs/Module/Layouts.php:31 #: ../../Zotlabs/Module/Editwebpage.php:32 ../../Zotlabs/Module/Cards.php:42 -#: ../../Zotlabs/Module/Webpages.php:39 ../../Zotlabs/Module/Filestorage.php:51 -#: ../../addon/gallery/Mod_Gallery.php:49 ../../include/channel.php:1253 +#: ../../Zotlabs/Module/Webpages.php:39 ../../Zotlabs/Module/Filestorage.php:53 +#: ../../addon/gallery/Mod_Gallery.php:49 ../../include/channel.php:1319 msgid "Requested profile is not available." msgstr "" @@ -178,14 +178,14 @@ msgstr "" #: ../../Zotlabs/Module/Invite.php:21 ../../Zotlabs/Module/Invite.php:102 #: ../../Zotlabs/Module/Articles.php:88 ../../Zotlabs/Module/Editlayout.php:67 #: ../../Zotlabs/Module/Editlayout.php:90 ../../Zotlabs/Module/Channel.php:168 -#: ../../Zotlabs/Module/Channel.php:335 ../../Zotlabs/Module/Channel.php:374 +#: ../../Zotlabs/Module/Channel.php:331 ../../Zotlabs/Module/Channel.php:370 #: ../../Zotlabs/Module/Settings.php:59 ../../Zotlabs/Module/Locs.php:87 #: ../../Zotlabs/Module/Mitem.php:129 ../../Zotlabs/Module/Events.php:271 #: ../../Zotlabs/Module/Appman.php:87 ../../Zotlabs/Module/Regmod.php:20 #: ../../Zotlabs/Module/Article_edit.php:51 #: ../../Zotlabs/Module/New_channel.php:105 #: ../../Zotlabs/Module/New_channel.php:130 -#: ../../Zotlabs/Module/Sharedwithme.php:16 ../../Zotlabs/Module/Setup.php:209 +#: ../../Zotlabs/Module/Sharedwithme.php:16 ../../Zotlabs/Module/Setup.php:206 #: ../../Zotlabs/Module/Moderate.php:13 #: ../../Zotlabs/Module/Achievements.php:34 ../../Zotlabs/Module/Thing.php:280 #: ../../Zotlabs/Module/Thing.php:300 ../../Zotlabs/Module/Thing.php:341 @@ -196,14 +196,15 @@ msgstr "" #: ../../Zotlabs/Module/Photos.php:69 ../../Zotlabs/Module/Wiki.php:59 #: ../../Zotlabs/Module/Wiki.php:285 ../../Zotlabs/Module/Wiki.php:428 #: ../../Zotlabs/Module/Pdledit.php:34 ../../Zotlabs/Module/Poke.php:157 -#: ../../Zotlabs/Module/Profile_photo.php:302 -#: ../../Zotlabs/Module/Profile_photo.php:315 -#: ../../Zotlabs/Module/Authtest.php:16 ../../Zotlabs/Module/Item.php:376 -#: ../../Zotlabs/Module/Item.php:395 ../../Zotlabs/Module/Item.php:405 -#: ../../Zotlabs/Module/Item.php:1281 ../../Zotlabs/Module/Page.php:34 +#: ../../Zotlabs/Module/Profile_photo.php:336 +#: ../../Zotlabs/Module/Profile_photo.php:349 +#: ../../Zotlabs/Module/Authtest.php:16 ../../Zotlabs/Module/Item.php:397 +#: ../../Zotlabs/Module/Item.php:416 ../../Zotlabs/Module/Item.php:426 +#: ../../Zotlabs/Module/Item.php:1302 ../../Zotlabs/Module/Page.php:34 #: ../../Zotlabs/Module/Page.php:133 ../../Zotlabs/Module/Connedit.php:399 #: ../../Zotlabs/Module/Chat.php:115 ../../Zotlabs/Module/Chat.php:120 #: ../../Zotlabs/Module/Menu.php:129 ../../Zotlabs/Module/Menu.php:140 +#: ../../Zotlabs/Module/Channel_calendar.php:230 #: ../../Zotlabs/Module/Layouts.php:71 ../../Zotlabs/Module/Layouts.php:78 #: ../../Zotlabs/Module/Layouts.php:89 ../../Zotlabs/Module/Cloud.php:40 #: ../../Zotlabs/Module/Defperms.php:181 ../../Zotlabs/Module/Group.php:14 @@ -218,14 +219,15 @@ msgstr "" #: ../../Zotlabs/Module/Editpost.php:17 ../../Zotlabs/Module/Sources.php:80 #: ../../Zotlabs/Module/Like.php:187 ../../Zotlabs/Module/Suggest.php:32 #: ../../Zotlabs/Module/Message.php:18 ../../Zotlabs/Module/Mail.php:146 -#: ../../Zotlabs/Module/Register.php:77 -#: ../../Zotlabs/Module/Cover_photo.php:313 -#: ../../Zotlabs/Module/Cover_photo.php:326 -#: ../../Zotlabs/Module/Display.php:446 ../../Zotlabs/Module/Network.php:19 -#: ../../Zotlabs/Module/Filestorage.php:15 -#: ../../Zotlabs/Module/Filestorage.php:70 -#: ../../Zotlabs/Module/Filestorage.php:96 -#: ../../Zotlabs/Module/Filestorage.php:140 ../../Zotlabs/Module/Common.php:38 +#: ../../Zotlabs/Module/Register.php:80 +#: ../../Zotlabs/Module/Cover_photo.php:347 +#: ../../Zotlabs/Module/Cover_photo.php:360 +#: ../../Zotlabs/Module/Display.php:451 ../../Zotlabs/Module/Network.php:19 +#: ../../Zotlabs/Module/Filestorage.php:17 +#: ../../Zotlabs/Module/Filestorage.php:72 +#: ../../Zotlabs/Module/Filestorage.php:90 +#: ../../Zotlabs/Module/Filestorage.php:113 +#: ../../Zotlabs/Module/Filestorage.php:160 ../../Zotlabs/Module/Common.php:38 #: ../../Zotlabs/Module/Viewconnections.php:28 #: ../../Zotlabs/Module/Viewconnections.php:33 #: ../../Zotlabs/Module/Service_limits.php:11 ../../Zotlabs/Module/Rate.php:113 @@ -235,11 +237,11 @@ msgstr "" #: ../../addon/flashcards/Mod_Flashcards.php:167 #: ../../addon/openid/Mod_Id.php:53 ../../addon/pumpio/pumpio.php:44 #: ../../include/attach.php:150 ../../include/attach.php:199 -#: ../../include/attach.php:272 ../../include/attach.php:381 -#: ../../include/attach.php:395 ../../include/attach.php:402 -#: ../../include/attach.php:484 ../../include/attach.php:1044 -#: ../../include/attach.php:1118 ../../include/attach.php:1283 -#: ../../include/items.php:3781 ../../include/photos.php:27 +#: ../../include/attach.php:272 ../../include/attach.php:380 +#: ../../include/attach.php:394 ../../include/attach.php:401 +#: ../../include/attach.php:483 ../../include/attach.php:1043 +#: ../../include/attach.php:1117 ../../include/attach.php:1280 +#: ../../include/items.php:3801 ../../include/photos.php:27 msgid "Permission denied." msgstr "" @@ -248,7 +250,7 @@ msgstr "" msgid "Block Name" msgstr "" -#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2534 +#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2558 msgid "Blocks" msgstr "" @@ -267,12 +269,13 @@ msgid "Edited" msgstr "" #: ../../Zotlabs/Module/Blocks.php:159 ../../Zotlabs/Module/Articles.php:116 -#: ../../Zotlabs/Module/Cdav.php:1230 ../../Zotlabs/Module/New_channel.php:189 +#: ../../Zotlabs/Module/Cdav.php:1036 ../../Zotlabs/Module/Cdav.php:1338 +#: ../../Zotlabs/Module/New_channel.php:189 #: ../../Zotlabs/Module/Connedit.php:938 ../../Zotlabs/Module/Menu.php:181 #: ../../Zotlabs/Module/Layouts.php:185 ../../Zotlabs/Module/Profiles.php:798 #: ../../Zotlabs/Module/Cards.php:113 ../../Zotlabs/Module/Webpages.php:254 -#: ../../Zotlabs/Storage/Browser.php:276 ../../Zotlabs/Storage/Browser.php:390 -#: ../../Zotlabs/Widget/Cdav.php:128 ../../Zotlabs/Widget/Cdav.php:165 +#: ../../Zotlabs/Storage/Browser.php:282 ../../Zotlabs/Storage/Browser.php:396 +#: ../../Zotlabs/Widget/Cdav.php:140 ../../Zotlabs/Widget/Cdav.php:178 msgid "Create" msgstr "" @@ -280,42 +283,42 @@ msgstr "" #: ../../Zotlabs/Module/Article_edit.php:99 #: ../../Zotlabs/Module/Admin/Profs.php:175 ../../Zotlabs/Module/Thing.php:266 #: ../../Zotlabs/Module/Oauth2.php:194 ../../Zotlabs/Module/Editblock.php:114 -#: ../../Zotlabs/Module/Connections.php:284 -#: ../../Zotlabs/Module/Connections.php:322 -#: ../../Zotlabs/Module/Connections.php:342 ../../Zotlabs/Module/Wiki.php:211 +#: ../../Zotlabs/Module/Connections.php:298 +#: ../../Zotlabs/Module/Connections.php:336 +#: ../../Zotlabs/Module/Connections.php:356 ../../Zotlabs/Module/Wiki.php:211 #: ../../Zotlabs/Module/Wiki.php:384 ../../Zotlabs/Module/Menu.php:175 #: ../../Zotlabs/Module/Layouts.php:193 ../../Zotlabs/Module/Group.php:252 #: ../../Zotlabs/Module/Editwebpage.php:142 #: ../../Zotlabs/Module/Webpages.php:255 ../../Zotlabs/Module/Card_edit.php:99 -#: ../../Zotlabs/Module/Oauth.php:173 ../../Zotlabs/Lib/Apps.php:556 -#: ../../Zotlabs/Lib/ThreadItem.php:147 ../../Zotlabs/Storage/Browser.php:290 -#: ../../Zotlabs/Widget/Cdav.php:126 ../../Zotlabs/Widget/Cdav.php:162 -#: ../../include/channel.php:1352 ../../include/channel.php:1356 +#: ../../Zotlabs/Module/Oauth.php:173 ../../Zotlabs/Lib/Apps.php:557 +#: ../../Zotlabs/Lib/ThreadItem.php:148 ../../Zotlabs/Storage/Browser.php:296 +#: ../../Zotlabs/Widget/Cdav.php:138 ../../Zotlabs/Widget/Cdav.php:175 +#: ../../include/channel.php:1418 ../../include/channel.php:1422 #: ../../include/menu.php:118 msgid "Edit" msgstr "" -#: ../../Zotlabs/Module/Blocks.php:161 ../../Zotlabs/Module/Photos.php:1117 +#: ../../Zotlabs/Module/Blocks.php:161 ../../Zotlabs/Module/Photos.php:1075 #: ../../Zotlabs/Module/Wiki.php:301 ../../Zotlabs/Module/Layouts.php:194 -#: ../../Zotlabs/Module/Webpages.php:256 ../../Zotlabs/Widget/Cdav.php:124 +#: ../../Zotlabs/Module/Webpages.php:256 ../../Zotlabs/Widget/Cdav.php:136 #: ../../addon/hsse/hsse.php:186 ../../include/conversation.php:1392 msgid "Share" msgstr "" #: ../../Zotlabs/Module/Blocks.php:162 ../../Zotlabs/Module/Editlayout.php:138 -#: ../../Zotlabs/Module/Cdav.php:942 ../../Zotlabs/Module/Cdav.php:1232 +#: ../../Zotlabs/Module/Cdav.php:1033 ../../Zotlabs/Module/Cdav.php:1340 #: ../../Zotlabs/Module/Article_edit.php:129 #: ../../Zotlabs/Module/Admin/Accounts.php:175 #: ../../Zotlabs/Module/Admin/Channels.php:149 #: ../../Zotlabs/Module/Admin/Profs.php:176 ../../Zotlabs/Module/Thing.php:267 #: ../../Zotlabs/Module/Oauth2.php:195 ../../Zotlabs/Module/Editblock.php:139 -#: ../../Zotlabs/Module/Connections.php:292 -#: ../../Zotlabs/Module/Photos.php:1220 ../../Zotlabs/Module/Connedit.php:668 +#: ../../Zotlabs/Module/Connections.php:306 +#: ../../Zotlabs/Module/Photos.php:1178 ../../Zotlabs/Module/Connedit.php:668 #: ../../Zotlabs/Module/Connedit.php:940 ../../Zotlabs/Module/Profiles.php:800 #: ../../Zotlabs/Module/Editwebpage.php:167 #: ../../Zotlabs/Module/Webpages.php:257 ../../Zotlabs/Module/Card_edit.php:129 -#: ../../Zotlabs/Module/Oauth.php:174 ../../Zotlabs/Lib/Apps.php:557 -#: ../../Zotlabs/Lib/ThreadItem.php:167 ../../Zotlabs/Storage/Browser.php:291 +#: ../../Zotlabs/Module/Oauth.php:174 ../../Zotlabs/Lib/Apps.php:558 +#: ../../Zotlabs/Lib/ThreadItem.php:168 ../../Zotlabs/Storage/Browser.php:297 #: ../../include/conversation.php:691 ../../include/conversation.php:736 msgid "Delete" msgstr "" @@ -362,26 +365,25 @@ msgid "Invite App" msgstr "" #: ../../Zotlabs/Module/Invite.php:110 ../../Zotlabs/Module/Articles.php:51 -#: ../../Zotlabs/Module/Cdav.php:839 ../../Zotlabs/Module/Cdav.php:848 -#: ../../Zotlabs/Module/Permcats.php:62 ../../Zotlabs/Module/Lang.php:17 -#: ../../Zotlabs/Module/Uexport.php:61 ../../Zotlabs/Module/Pubstream.php:20 -#: ../../Zotlabs/Module/Connect.php:104 ../../Zotlabs/Module/Tokens.php:99 -#: ../../Zotlabs/Module/Oauth2.php:106 ../../Zotlabs/Module/Randprof.php:29 -#: ../../Zotlabs/Module/Mood.php:134 ../../Zotlabs/Module/Bookmarks.php:78 -#: ../../Zotlabs/Module/Wiki.php:52 ../../Zotlabs/Module/Pdledit.php:42 -#: ../../Zotlabs/Module/Poke.php:165 ../../Zotlabs/Module/Chat.php:102 -#: ../../Zotlabs/Module/Notes.php:56 ../../Zotlabs/Module/Affinity.php:52 -#: ../../Zotlabs/Module/Defperms.php:189 ../../Zotlabs/Module/Group.php:106 -#: ../../Zotlabs/Module/Cards.php:51 ../../Zotlabs/Module/Webpages.php:48 -#: ../../Zotlabs/Module/Sources.php:88 ../../Zotlabs/Module/Suggest.php:40 -#: ../../Zotlabs/Module/Probe.php:18 ../../Zotlabs/Module/Oauth.php:100 -#: ../../addon/skeleton/Mod_Skeleton.php:32 +#: ../../Zotlabs/Module/Cdav.php:857 ../../Zotlabs/Module/Permcats.php:62 +#: ../../Zotlabs/Module/Lang.php:17 ../../Zotlabs/Module/Uexport.php:61 +#: ../../Zotlabs/Module/Pubstream.php:20 ../../Zotlabs/Module/Connect.php:104 +#: ../../Zotlabs/Module/Tokens.php:99 ../../Zotlabs/Module/Oauth2.php:106 +#: ../../Zotlabs/Module/Randprof.php:29 ../../Zotlabs/Module/Mood.php:134 +#: ../../Zotlabs/Module/Bookmarks.php:78 ../../Zotlabs/Module/Wiki.php:52 +#: ../../Zotlabs/Module/Pdledit.php:42 ../../Zotlabs/Module/Poke.php:165 +#: ../../Zotlabs/Module/Chat.php:102 ../../Zotlabs/Module/Notes.php:56 +#: ../../Zotlabs/Module/Affinity.php:52 ../../Zotlabs/Module/Defperms.php:189 +#: ../../Zotlabs/Module/Group.php:106 ../../Zotlabs/Module/Cards.php:51 +#: ../../Zotlabs/Module/Webpages.php:48 ../../Zotlabs/Module/Sources.php:88 +#: ../../Zotlabs/Module/Suggest.php:40 ../../Zotlabs/Module/Probe.php:18 +#: ../../Zotlabs/Module/Oauth.php:100 ../../addon/skeleton/Mod_Skeleton.php:32 #: ../../addon/gnusoc/Mod_Gnusoc.php:22 ../../addon/planets/Mod_Planets.php:20 #: ../../addon/wppost/Mod_Wppost.php:41 ../../addon/nsfw/Mod_Nsfw.php:33 #: ../../addon/ijpost/Mod_Ijpost.php:35 ../../addon/dwpost/Mod_Dwpost.php:36 #: ../../addon/gallery/Mod_Gallery.php:58 ../../addon/ljpost/Mod_Ljpost.php:36 #: ../../addon/startpage/Mod_Startpage.php:50 -#: ../../addon/diaspora/Mod_Diaspora.php:55 +#: ../../addon/diaspora/Mod_Diaspora.php:57 #: ../../addon/photocache/Mod_Photocache.php:42 #: ../../addon/rainbowtag/Mod_Rainbowtag.php:21 #: ../../addon/nsabait/Mod_Nsabait.php:20 @@ -449,8 +451,8 @@ msgstr "" #: ../../Zotlabs/Module/Invite.php:168 ../../Zotlabs/Module/Permcats.php:128 #: ../../Zotlabs/Module/Locs.php:121 ../../Zotlabs/Module/Mitem.php:259 #: ../../Zotlabs/Module/Events.php:495 ../../Zotlabs/Module/Appman.php:155 -#: ../../Zotlabs/Module/Import_items.php:129 ../../Zotlabs/Module/Setup.php:308 -#: ../../Zotlabs/Module/Setup.php:349 ../../Zotlabs/Module/Connect.php:124 +#: ../../Zotlabs/Module/Import_items.php:129 ../../Zotlabs/Module/Setup.php:304 +#: ../../Zotlabs/Module/Setup.php:344 ../../Zotlabs/Module/Connect.php:124 #: ../../Zotlabs/Module/Admin/Features.php:66 #: ../../Zotlabs/Module/Admin/Accounts.php:168 #: ../../Zotlabs/Module/Admin/Logs.php:84 @@ -477,10 +479,10 @@ msgstr "" #: ../../Zotlabs/Module/Settings/Display.php:189 #: ../../Zotlabs/Module/Settings/Network.php:61 #: ../../Zotlabs/Module/Tokens.php:188 ../../Zotlabs/Module/Thing.php:326 -#: ../../Zotlabs/Module/Thing.php:379 ../../Zotlabs/Module/Import.php:574 +#: ../../Zotlabs/Module/Thing.php:379 ../../Zotlabs/Module/Import.php:646 #: ../../Zotlabs/Module/Oauth2.php:116 ../../Zotlabs/Module/Cal.php:344 -#: ../../Zotlabs/Module/Mood.php:158 ../../Zotlabs/Module/Photos.php:1097 -#: ../../Zotlabs/Module/Photos.php:1138 ../../Zotlabs/Module/Photos.php:1257 +#: ../../Zotlabs/Module/Mood.php:158 ../../Zotlabs/Module/Photos.php:1055 +#: ../../Zotlabs/Module/Photos.php:1096 ../../Zotlabs/Module/Photos.php:1215 #: ../../Zotlabs/Module/Wiki.php:215 ../../Zotlabs/Module/Pdledit.php:107 #: ../../Zotlabs/Module/Poke.php:217 ../../Zotlabs/Module/Connedit.php:904 #: ../../Zotlabs/Module/Chat.php:211 ../../Zotlabs/Module/Chat.php:250 @@ -488,11 +490,11 @@ msgstr "" #: ../../Zotlabs/Module/Pconfig.php:116 ../../Zotlabs/Module/Affinity.php:87 #: ../../Zotlabs/Module/Defperms.php:265 ../../Zotlabs/Module/Group.php:150 #: ../../Zotlabs/Module/Group.php:166 ../../Zotlabs/Module/Profiles.php:723 -#: ../../Zotlabs/Module/Editpost.php:85 ../../Zotlabs/Module/Sources.php:125 +#: ../../Zotlabs/Module/Editpost.php:86 ../../Zotlabs/Module/Sources.php:125 #: ../../Zotlabs/Module/Sources.php:162 ../../Zotlabs/Module/Xchan.php:15 -#: ../../Zotlabs/Module/Mail.php:431 ../../Zotlabs/Module/Filestorage.php:183 +#: ../../Zotlabs/Module/Mail.php:431 ../../Zotlabs/Module/Filestorage.php:203 #: ../../Zotlabs/Module/Rate.php:166 ../../Zotlabs/Module/Oauth.php:111 -#: ../../Zotlabs/Lib/ThreadItem.php:795 ../../Zotlabs/Widget/Eventstools.php:16 +#: ../../Zotlabs/Lib/ThreadItem.php:796 ../../Zotlabs/Widget/Eventstools.php:16 #: ../../Zotlabs/Widget/Wiki_pages.php:42 #: ../../Zotlabs/Widget/Wiki_pages.php:99 #: ../../view/theme/redbasic_c/php/config.php:95 @@ -507,14 +509,16 @@ msgstr "" #: ../../addon/startpage/Mod_Startpage.php:73 #: ../../addon/diaspora/Mod_Diaspora.php:99 #: ../../addon/photocache/Mod_Photocache.php:67 -#: ../../addon/hzfiles/hzfiles.php:84 ../../addon/mailtest/mailtest.php:100 +#: ../../addon/hzfiles/hzfiles.php:86 ../../addon/mailtest/mailtest.php:100 #: ../../addon/openstreetmap/openstreetmap.php:169 #: ../../addon/fuzzloc/Mod_Fuzzloc.php:56 ../../addon/rtof/Mod_Rtof.php:72 #: ../../addon/jappixmini/Mod_Jappixmini.php:261 -#: ../../addon/channelreputation/channelreputation.php:140 +#: ../../addon/channelreputation/channelreputation.php:142 #: ../../addon/nofed/Mod_Nofed.php:53 ../../addon/redred/Mod_Redred.php:90 -#: ../../addon/logrot/logrot.php:35 ../../addon/frphotos/frphotos.php:97 -#: ../../addon/pubcrawl/Mod_Pubcrawl.php:63 +#: ../../addon/logrot/logrot.php:35 +#: ../../addon/content_import/Mod_content_import.php:142 +#: ../../addon/frphotos/frphotos.php:97 +#: ../../addon/pubcrawl/Mod_Pubcrawl.php:65 #: ../../addon/chords/Mod_Chords.php:60 #: ../../addon/libertree/Mod_Libertree.php:70 #: ../../addon/flattrwidget/Mod_Flattrwidget.php:92 @@ -548,7 +552,7 @@ msgid "Add Article" msgstr "" #: ../../Zotlabs/Module/Articles.php:222 ../../Zotlabs/Lib/Apps.php:324 -#: ../../include/nav.php:512 +#: ../../include/nav.php:514 msgid "Articles" msgstr "" @@ -574,17 +578,17 @@ msgstr "" msgid "Edit Layout" msgstr "" -#: ../../Zotlabs/Module/Editlayout.php:140 ../../Zotlabs/Module/Cdav.php:944 -#: ../../Zotlabs/Module/Cdav.php:1233 ../../Zotlabs/Module/Article_edit.php:131 +#: ../../Zotlabs/Module/Editlayout.php:140 ../../Zotlabs/Module/Cdav.php:1035 +#: ../../Zotlabs/Module/Cdav.php:1341 ../../Zotlabs/Module/Article_edit.php:131 #: ../../Zotlabs/Module/Admin/Addons.php:426 #: ../../Zotlabs/Module/Oauth2.php:117 ../../Zotlabs/Module/Oauth2.php:145 #: ../../Zotlabs/Module/Editblock.php:141 ../../Zotlabs/Module/Wiki.php:368 -#: ../../Zotlabs/Module/Wiki.php:401 ../../Zotlabs/Module/Profile_photo.php:465 +#: ../../Zotlabs/Module/Wiki.php:401 ../../Zotlabs/Module/Profile_photo.php:505 #: ../../Zotlabs/Module/Connedit.php:941 ../../Zotlabs/Module/Fbrowser.php:66 #: ../../Zotlabs/Module/Fbrowser.php:88 ../../Zotlabs/Module/Profiles.php:801 #: ../../Zotlabs/Module/Editwebpage.php:169 -#: ../../Zotlabs/Module/Editpost.php:109 ../../Zotlabs/Module/Filer.php:55 -#: ../../Zotlabs/Module/Cover_photo.php:399 ../../Zotlabs/Module/Tagrm.php:15 +#: ../../Zotlabs/Module/Editpost.php:110 ../../Zotlabs/Module/Filer.php:55 +#: ../../Zotlabs/Module/Cover_photo.php:434 ../../Zotlabs/Module/Tagrm.php:15 #: ../../Zotlabs/Module/Tagrm.php:138 ../../Zotlabs/Module/Card_edit.php:131 #: ../../Zotlabs/Module/Oauth.php:112 ../../Zotlabs/Module/Oauth.php:138 #: ../../addon/hsse/hsse.php:209 ../../addon/hsse/hsse.php:258 @@ -595,9 +599,9 @@ msgstr "" #: ../../Zotlabs/Module/Profperm.php:28 ../../Zotlabs/Module/Subthread.php:86 #: ../../Zotlabs/Module/Import_items.php:120 ../../Zotlabs/Module/Share.php:71 #: ../../Zotlabs/Module/Cloud.php:126 ../../Zotlabs/Module/Group.php:98 -#: ../../Zotlabs/Module/Dreport.php:10 ../../Zotlabs/Module/Dreport.php:79 +#: ../../Zotlabs/Module/Dreport.php:10 ../../Zotlabs/Module/Dreport.php:82 #: ../../Zotlabs/Module/Like.php:301 ../../Zotlabs/Web/WebServer.php:122 -#: ../../addon/redphotos/redphotos.php:119 ../../addon/hzfiles/hzfiles.php:73 +#: ../../addon/redphotos/redphotos.php:119 ../../addon/hzfiles/hzfiles.php:75 #: ../../addon/frphotos/frphotos.php:82 ../../addon/redfiles/redfiles.php:109 #: ../../include/items.php:416 msgid "Permission denied" @@ -611,8 +615,8 @@ msgstr "" msgid "Profile Visibility Editor" msgstr "" -#: ../../Zotlabs/Module/Profperm.php:113 ../../Zotlabs/Lib/Apps.php:359 -#: ../../include/channel.php:1700 +#: ../../Zotlabs/Module/Profperm.php:113 ../../Zotlabs/Lib/Apps.php:361 +#: ../../include/channel.php:1766 msgid "Profile" msgstr "" @@ -625,77 +629,78 @@ msgid "Visible To" msgstr "" #: ../../Zotlabs/Module/Profperm.php:140 -#: ../../Zotlabs/Module/Connections.php:203 +#: ../../Zotlabs/Module/Connections.php:217 msgid "All Connections" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:810 +#: ../../Zotlabs/Module/Cdav.php:765 ../../Zotlabs/Module/Events.php:25 +msgid "Calendar entries imported." +msgstr "" + +#: ../../Zotlabs/Module/Cdav.php:767 ../../Zotlabs/Module/Events.php:27 +msgid "No calendar entries found." +msgstr "" + +#: ../../Zotlabs/Module/Cdav.php:828 msgid "INVALID EVENT DISMISSED!" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:811 +#: ../../Zotlabs/Module/Cdav.php:829 msgid "Summary: " msgstr "" -#: ../../Zotlabs/Module/Cdav.php:811 ../../Zotlabs/Module/Cdav.php:812 -#: ../../Zotlabs/Module/Cdav.php:819 ../../Zotlabs/Module/Embedphotos.php:154 -#: ../../Zotlabs/Module/Photos.php:832 ../../Zotlabs/Module/Photos.php:1296 -#: ../../Zotlabs/Lib/Activity.php:1011 ../../Zotlabs/Lib/Apps.php:1113 -#: ../../Zotlabs/Lib/Apps.php:1197 ../../Zotlabs/Storage/Browser.php:164 +#: ../../Zotlabs/Module/Cdav.php:829 ../../Zotlabs/Module/Cdav.php:830 +#: ../../Zotlabs/Module/Cdav.php:837 ../../Zotlabs/Module/Embedphotos.php:174 +#: ../../Zotlabs/Module/Photos.php:790 ../../Zotlabs/Module/Photos.php:1254 +#: ../../Zotlabs/Lib/Activity.php:1067 ../../Zotlabs/Lib/Apps.php:1114 +#: ../../Zotlabs/Lib/Apps.php:1198 ../../Zotlabs/Storage/Browser.php:164 #: ../../Zotlabs/Widget/Portfolio.php:95 ../../Zotlabs/Widget/Album.php:84 -#: ../../addon/pubcrawl/as.php:959 ../../include/conversation.php:1166 +#: ../../addon/pubcrawl/as.php:1009 ../../include/conversation.php:1166 msgid "Unknown" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:812 +#: ../../Zotlabs/Module/Cdav.php:830 msgid "Date: " msgstr "" -#: ../../Zotlabs/Module/Cdav.php:813 ../../Zotlabs/Module/Cdav.php:820 +#: ../../Zotlabs/Module/Cdav.php:831 ../../Zotlabs/Module/Cdav.php:838 msgid "Reason: " msgstr "" -#: ../../Zotlabs/Module/Cdav.php:818 +#: ../../Zotlabs/Module/Cdav.php:836 msgid "INVALID CARD DISMISSED!" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:819 +#: ../../Zotlabs/Module/Cdav.php:837 msgid "Name: " msgstr "" -#: ../../Zotlabs/Module/Cdav.php:839 -msgid "CalDAV App" -msgstr "" - -#: ../../Zotlabs/Module/Cdav.php:840 -msgid "CalDAV capable calendar" -msgstr "" - -#: ../../Zotlabs/Module/Cdav.php:848 +#: ../../Zotlabs/Module/Cdav.php:857 msgid "CardDAV App" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:849 +#: ../../Zotlabs/Module/Cdav.php:858 msgid "CalDAV capable addressbook" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:913 ../../Zotlabs/Module/Events.php:462 -msgid "Event title" +#: ../../Zotlabs/Module/Cdav.php:921 +#: ../../Zotlabs/Module/Channel_calendar.php:401 +msgid "Link to source" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:914 ../../Zotlabs/Module/Events.php:468 -msgid "Start date and time" +#: ../../Zotlabs/Module/Cdav.php:987 ../../Zotlabs/Module/Events.php:462 +msgid "Event title" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:914 ../../Zotlabs/Module/Cdav.php:915 -msgid "Example: YYYY-MM-DD HH:mm" +#: ../../Zotlabs/Module/Cdav.php:988 ../../Zotlabs/Module/Events.php:468 +msgid "Start date and time" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:915 +#: ../../Zotlabs/Module/Cdav.php:989 msgid "End date and time" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:916 ../../Zotlabs/Module/Events.php:475 +#: ../../Zotlabs/Module/Cdav.php:990 ../../Zotlabs/Module/Events.php:475 #: ../../Zotlabs/Module/Appman.php:145 ../../Zotlabs/Module/Rbmark.php:101 #: ../../addon/rendezvous/rendezvous.php:173 #: ../../addon/cart/submodules/manualcat.php:260 @@ -703,204 +708,221 @@ msgstr "" msgid "Description" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:917 ../../Zotlabs/Module/Locs.php:117 +#: ../../Zotlabs/Module/Cdav.php:991 ../../Zotlabs/Module/Locs.php:117 #: ../../Zotlabs/Module/Events.php:477 ../../Zotlabs/Module/Profiles.php:509 #: ../../Zotlabs/Module/Profiles.php:734 ../../Zotlabs/Module/Pubsites.php:52 #: ../../include/js_strings.php:25 msgid "Location" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:924 ../../Zotlabs/Module/Events.php:690 +#: ../../Zotlabs/Module/Cdav.php:1012 ../../Zotlabs/Module/Events.php:690 #: ../../Zotlabs/Module/Events.php:699 ../../Zotlabs/Module/Cal.php:338 -#: ../../Zotlabs/Module/Cal.php:345 ../../Zotlabs/Module/Photos.php:986 +#: ../../Zotlabs/Module/Cal.php:345 ../../Zotlabs/Module/Photos.php:944 msgid "Previous" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:925 ../../Zotlabs/Module/Events.php:691 -#: ../../Zotlabs/Module/Events.php:700 ../../Zotlabs/Module/Setup.php:263 +#: ../../Zotlabs/Module/Cdav.php:1013 ../../Zotlabs/Module/Events.php:691 +#: ../../Zotlabs/Module/Events.php:700 ../../Zotlabs/Module/Setup.php:260 #: ../../Zotlabs/Module/Cal.php:339 ../../Zotlabs/Module/Cal.php:346 -#: ../../Zotlabs/Module/Photos.php:995 +#: ../../Zotlabs/Module/Photos.php:953 msgid "Next" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:926 ../../Zotlabs/Module/Events.php:701 +#: ../../Zotlabs/Module/Cdav.php:1014 ../../Zotlabs/Module/Events.php:701 #: ../../Zotlabs/Module/Cal.php:347 msgid "Today" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:927 ../../Zotlabs/Module/Events.php:696 +#: ../../Zotlabs/Module/Cdav.php:1015 ../../Zotlabs/Module/Events.php:696 msgid "Month" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:928 ../../Zotlabs/Module/Events.php:697 +#: ../../Zotlabs/Module/Cdav.php:1016 ../../Zotlabs/Module/Events.php:697 msgid "Week" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:929 ../../Zotlabs/Module/Events.php:698 +#: ../../Zotlabs/Module/Cdav.php:1017 ../../Zotlabs/Module/Events.php:698 msgid "Day" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:930 +#: ../../Zotlabs/Module/Cdav.php:1018 msgid "List month" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:931 +#: ../../Zotlabs/Module/Cdav.php:1019 msgid "List week" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:932 +#: ../../Zotlabs/Module/Cdav.php:1020 msgid "List day" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:939 +#: ../../Zotlabs/Module/Cdav.php:1028 msgid "More" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:940 +#: ../../Zotlabs/Module/Cdav.php:1029 msgid "Less" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:941 +#: ../../Zotlabs/Module/Cdav.php:1030 ../../Zotlabs/Module/Cdav.php:1339 +#: ../../Zotlabs/Module/Admin/Addons.php:456 ../../Zotlabs/Module/Oauth2.php:58 +#: ../../Zotlabs/Module/Oauth2.php:144 ../../Zotlabs/Module/Connedit.php:939 +#: ../../Zotlabs/Module/Profiles.php:799 ../../Zotlabs/Module/Oauth.php:53 +#: ../../Zotlabs/Module/Oauth.php:137 ../../Zotlabs/Lib/Apps.php:536 +msgid "Update" +msgstr "" + +#: ../../Zotlabs/Module/Cdav.php:1031 msgid "Select calendar" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:943 +#: ../../Zotlabs/Module/Cdav.php:1032 ../../Zotlabs/Widget/Cdav.php:143 +msgid "Channel Calendars" +msgstr "" + +#: ../../Zotlabs/Module/Cdav.php:1032 ../../Zotlabs/Widget/Cdav.php:129 +#: ../../Zotlabs/Widget/Cdav.php:143 +msgid "CalDAV Calendars" +msgstr "" + +#: ../../Zotlabs/Module/Cdav.php:1034 msgid "Delete all" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:945 +#: ../../Zotlabs/Module/Cdav.php:1037 msgid "Sorry! Editing of recurrent events is not yet implemented." msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1215 ../../Zotlabs/Module/Sharedwithme.php:104 +#: ../../Zotlabs/Module/Cdav.php:1047 ../../Zotlabs/Widget/Appcategories.php:43 +#: ../../include/contact_widgets.php:96 ../../include/contact_widgets.php:139 +#: ../../include/contact_widgets.php:184 ../../include/taxonomy.php:409 +#: ../../include/taxonomy.php:491 ../../include/taxonomy.php:511 +#: ../../include/taxonomy.php:532 +msgid "Categories" +msgstr "" + +#: ../../Zotlabs/Module/Cdav.php:1323 ../../Zotlabs/Module/Sharedwithme.php:104 #: ../../Zotlabs/Module/Admin/Channels.php:159 #: ../../Zotlabs/Module/Oauth2.php:118 ../../Zotlabs/Module/Oauth2.php:146 #: ../../Zotlabs/Module/Wiki.php:218 ../../Zotlabs/Module/Connedit.php:923 #: ../../Zotlabs/Module/Chat.php:259 ../../Zotlabs/Module/Group.php:154 #: ../../Zotlabs/Module/Oauth.php:113 ../../Zotlabs/Module/Oauth.php:139 #: ../../Zotlabs/Lib/NativeWikiPage.php:561 -#: ../../Zotlabs/Storage/Browser.php:285 +#: ../../Zotlabs/Storage/Browser.php:291 #: ../../Zotlabs/Widget/Wiki_page_history.php:22 #: ../../addon/rendezvous/rendezvous.php:172 msgid "Name" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1216 ../../Zotlabs/Module/Connedit.php:924 +#: ../../Zotlabs/Module/Cdav.php:1324 ../../Zotlabs/Module/Connedit.php:924 msgid "Organisation" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1217 ../../Zotlabs/Module/Connedit.php:925 +#: ../../Zotlabs/Module/Cdav.php:1325 ../../Zotlabs/Module/Connedit.php:925 msgid "Title" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1218 ../../Zotlabs/Module/Connedit.php:926 +#: ../../Zotlabs/Module/Cdav.php:1326 ../../Zotlabs/Module/Connedit.php:926 #: ../../Zotlabs/Module/Profiles.php:786 msgid "Phone" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1219 +#: ../../Zotlabs/Module/Cdav.php:1327 #: ../../Zotlabs/Module/Admin/Accounts.php:171 #: ../../Zotlabs/Module/Admin/Accounts.php:183 #: ../../Zotlabs/Module/Connedit.php:927 ../../Zotlabs/Module/Profiles.php:787 #: ../../addon/openid/MysqlProvider.php:56 #: ../../addon/openid/MysqlProvider.php:57 ../../addon/rtof/Mod_Rtof.php:57 -#: ../../addon/redred/Mod_Redred.php:71 ../../include/network.php:1721 +#: ../../addon/redred/Mod_Redred.php:71 ../../include/network.php:1731 msgid "Email" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1220 ../../Zotlabs/Module/Connedit.php:928 +#: ../../Zotlabs/Module/Cdav.php:1328 ../../Zotlabs/Module/Connedit.php:928 #: ../../Zotlabs/Module/Profiles.php:788 msgid "Instant messenger" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1221 ../../Zotlabs/Module/Connedit.php:929 +#: ../../Zotlabs/Module/Cdav.php:1329 ../../Zotlabs/Module/Connedit.php:929 #: ../../Zotlabs/Module/Profiles.php:789 msgid "Website" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1222 ../../Zotlabs/Module/Locs.php:118 +#: ../../Zotlabs/Module/Cdav.php:1330 ../../Zotlabs/Module/Locs.php:118 #: ../../Zotlabs/Module/Admin/Channels.php:160 #: ../../Zotlabs/Module/Connedit.php:930 ../../Zotlabs/Module/Profiles.php:502 #: ../../Zotlabs/Module/Profiles.php:790 msgid "Address" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1223 ../../Zotlabs/Module/Connedit.php:931 +#: ../../Zotlabs/Module/Cdav.php:1331 ../../Zotlabs/Module/Connedit.php:931 #: ../../Zotlabs/Module/Profiles.php:791 msgid "Note" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1224 ../../Zotlabs/Module/Connedit.php:932 -#: ../../Zotlabs/Module/Profiles.php:792 ../../include/event.php:1320 -#: ../../include/connections.php:696 +#: ../../Zotlabs/Module/Cdav.php:1332 ../../Zotlabs/Module/Connedit.php:932 +#: ../../Zotlabs/Module/Profiles.php:792 ../../include/event.php:1329 +#: ../../include/connections.php:723 msgid "Mobile" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1225 ../../Zotlabs/Module/Connedit.php:933 -#: ../../Zotlabs/Module/Profiles.php:793 ../../include/event.php:1321 -#: ../../include/connections.php:697 +#: ../../Zotlabs/Module/Cdav.php:1333 ../../Zotlabs/Module/Connedit.php:933 +#: ../../Zotlabs/Module/Profiles.php:793 ../../include/event.php:1330 +#: ../../include/connections.php:724 msgid "Home" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1226 ../../Zotlabs/Module/Connedit.php:934 -#: ../../Zotlabs/Module/Profiles.php:794 ../../include/event.php:1324 -#: ../../include/connections.php:700 +#: ../../Zotlabs/Module/Cdav.php:1334 ../../Zotlabs/Module/Connedit.php:934 +#: ../../Zotlabs/Module/Profiles.php:794 ../../include/event.php:1333 +#: ../../include/connections.php:727 msgid "Work" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1228 ../../Zotlabs/Module/Connedit.php:936 +#: ../../Zotlabs/Module/Cdav.php:1336 ../../Zotlabs/Module/Connedit.php:936 #: ../../Zotlabs/Module/Profiles.php:796 #: ../../addon/jappixmini/Mod_Jappixmini.php:216 msgid "Add Contact" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1229 ../../Zotlabs/Module/Connedit.php:937 +#: ../../Zotlabs/Module/Cdav.php:1337 ../../Zotlabs/Module/Connedit.php:937 #: ../../Zotlabs/Module/Profiles.php:797 msgid "Add Field" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1231 ../../Zotlabs/Module/Admin/Addons.php:456 -#: ../../Zotlabs/Module/Oauth2.php:58 ../../Zotlabs/Module/Oauth2.php:144 -#: ../../Zotlabs/Module/Connedit.php:939 ../../Zotlabs/Module/Profiles.php:799 -#: ../../Zotlabs/Module/Oauth.php:53 ../../Zotlabs/Module/Oauth.php:137 -#: ../../Zotlabs/Lib/Apps.php:535 -msgid "Update" -msgstr "" - -#: ../../Zotlabs/Module/Cdav.php:1234 ../../Zotlabs/Module/Connedit.php:942 +#: ../../Zotlabs/Module/Cdav.php:1342 ../../Zotlabs/Module/Connedit.php:942 msgid "P.O. Box" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1235 ../../Zotlabs/Module/Connedit.php:943 +#: ../../Zotlabs/Module/Cdav.php:1343 ../../Zotlabs/Module/Connedit.php:943 msgid "Additional" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1236 ../../Zotlabs/Module/Connedit.php:944 +#: ../../Zotlabs/Module/Cdav.php:1344 ../../Zotlabs/Module/Connedit.php:944 msgid "Street" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1237 ../../Zotlabs/Module/Connedit.php:945 +#: ../../Zotlabs/Module/Cdav.php:1345 ../../Zotlabs/Module/Connedit.php:945 msgid "Locality" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1238 ../../Zotlabs/Module/Connedit.php:946 +#: ../../Zotlabs/Module/Cdav.php:1346 ../../Zotlabs/Module/Connedit.php:946 msgid "Region" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1239 ../../Zotlabs/Module/Connedit.php:947 +#: ../../Zotlabs/Module/Cdav.php:1347 ../../Zotlabs/Module/Connedit.php:947 msgid "ZIP Code" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1240 ../../Zotlabs/Module/Connedit.php:948 +#: ../../Zotlabs/Module/Cdav.php:1348 ../../Zotlabs/Module/Connedit.php:948 #: ../../Zotlabs/Module/Profiles.php:757 msgid "Country" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1287 +#: ../../Zotlabs/Module/Cdav.php:1395 msgid "Default Calendar" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1297 +#: ../../Zotlabs/Module/Cdav.php:1406 msgid "Default Addressbook" msgstr "" @@ -930,7 +952,7 @@ msgid "" "connections." msgstr "" -#: ../../Zotlabs/Module/Permcats.php:112 ../../Zotlabs/Lib/Apps.php:372 +#: ../../Zotlabs/Module/Permcats.php:112 ../../Zotlabs/Lib/Apps.php:373 msgid "Permission Categories" msgstr "" @@ -990,7 +1012,7 @@ msgstr "" msgid "Reset form" msgstr "" -#: ../../Zotlabs/Module/Channel.php:476 ../../Zotlabs/Module/Display.php:373 +#: ../../Zotlabs/Module/Channel.php:472 ../../Zotlabs/Module/Display.php:378 msgid "" "You must enable javascript for your browser to be able to view this content." msgstr "" @@ -1077,18 +1099,18 @@ msgstr "" msgid "You have got no unseen posts..." msgstr "" -#: ../../Zotlabs/Module/Search.php:17 ../../Zotlabs/Module/Photos.php:558 +#: ../../Zotlabs/Module/Search.php:17 ../../Zotlabs/Module/Photos.php:516 #: ../../Zotlabs/Module/Ratings.php:83 ../../Zotlabs/Module/Directory.php:67 #: ../../Zotlabs/Module/Directory.php:72 ../../Zotlabs/Module/Display.php:29 #: ../../Zotlabs/Module/Viewconnections.php:23 msgid "Public access denied." msgstr "" -#: ../../Zotlabs/Module/Search.php:44 ../../Zotlabs/Module/Connections.php:338 -#: ../../Zotlabs/Lib/Apps.php:350 ../../Zotlabs/Widget/Sitesearch.php:31 -#: ../../Zotlabs/Widget/Activity_filter.php:151 ../../include/text.php:1084 -#: ../../include/text.php:1096 ../../include/acl_selectors.php:118 -#: ../../include/nav.php:183 +#: ../../Zotlabs/Module/Search.php:44 ../../Zotlabs/Module/Connections.php:352 +#: ../../Zotlabs/Lib/Apps.php:352 ../../Zotlabs/Widget/Sitesearch.php:31 +#: ../../Zotlabs/Widget/Activity_filter.php:151 ../../include/text.php:1103 +#: ../../include/text.php:1115 ../../include/acl_selectors.php:118 +#: ../../include/nav.php:186 msgid "Search" msgstr "" @@ -1110,7 +1132,7 @@ msgstr "" msgid "The unmoderated public stream of this hub" msgstr "" -#: ../../Zotlabs/Module/Pubstream.php:109 ../../Zotlabs/Lib/Apps.php:374 +#: ../../Zotlabs/Module/Pubstream.php:109 ../../Zotlabs/Lib/Apps.php:375 #: ../../Zotlabs/Widget/Notifications.php:142 msgid "Public Stream" msgstr "" @@ -1237,18 +1259,18 @@ msgstr "" #: ../../Zotlabs/Module/Removeme.php:63 ../../Zotlabs/Module/Admin/Site.php:255 #: ../../Zotlabs/Module/Settings/Channel.php:309 #: ../../Zotlabs/Module/Settings/Display.php:89 -#: ../../Zotlabs/Module/Import.php:563 ../../Zotlabs/Module/Import.php:567 -#: ../../Zotlabs/Module/Import.php:568 ../../Zotlabs/Module/Api.php:99 -#: ../../Zotlabs/Module/Photos.php:712 ../../Zotlabs/Module/Wiki.php:227 +#: ../../Zotlabs/Module/Import.php:635 ../../Zotlabs/Module/Import.php:639 +#: ../../Zotlabs/Module/Import.php:640 ../../Zotlabs/Module/Api.php:99 +#: ../../Zotlabs/Module/Photos.php:670 ../../Zotlabs/Module/Wiki.php:227 #: ../../Zotlabs/Module/Wiki.php:228 ../../Zotlabs/Module/Connedit.php:406 #: ../../Zotlabs/Module/Connedit.php:796 ../../Zotlabs/Module/Menu.php:162 #: ../../Zotlabs/Module/Menu.php:221 ../../Zotlabs/Module/Defperms.php:197 #: ../../Zotlabs/Module/Profiles.php:681 ../../Zotlabs/Module/Sources.php:124 #: ../../Zotlabs/Module/Sources.php:159 -#: ../../Zotlabs/Module/Filestorage.php:178 -#: ../../Zotlabs/Module/Filestorage.php:186 ../../Zotlabs/Lib/Libzotdir.php:162 +#: ../../Zotlabs/Module/Filestorage.php:198 +#: ../../Zotlabs/Module/Filestorage.php:206 ../../Zotlabs/Lib/Libzotdir.php:162 #: ../../Zotlabs/Lib/Libzotdir.php:163 ../../Zotlabs/Lib/Libzotdir.php:165 -#: ../../Zotlabs/Storage/Browser.php:405 ../../boot.php:1634 +#: ../../Zotlabs/Storage/Browser.php:411 ../../boot.php:1635 #: ../../view/theme/redbasic_c/php/config.php:100 #: ../../view/theme/redbasic_c/php/config.php:115 #: ../../view/theme/redbasic/php/config.php:99 @@ -1261,8 +1283,11 @@ msgstr "" #: ../../addon/jappixmini/Mod_Jappixmini.php:199 #: ../../addon/jappixmini/Mod_Jappixmini.php:203 #: ../../addon/jappixmini/Mod_Jappixmini.php:207 -#: ../../addon/channelreputation/channelreputation.php:108 +#: ../../addon/channelreputation/channelreputation.php:110 #: ../../addon/nofed/Mod_Nofed.php:42 ../../addon/redred/Mod_Redred.php:63 +#: ../../addon/content_import/Mod_content_import.php:137 +#: ../../addon/content_import/Mod_content_import.php:138 +#: ../../addon/pubcrawl/Mod_Pubcrawl.php:45 #: ../../addon/libertree/Mod_Libertree.php:59 #: ../../addon/statusnet/Mod_Statusnet.php:260 #: ../../addon/statusnet/Mod_Statusnet.php:282 @@ -1294,17 +1319,17 @@ msgstr "" #: ../../Zotlabs/Module/Removeme.php:63 ../../Zotlabs/Module/Admin/Site.php:257 #: ../../Zotlabs/Module/Settings/Channel.php:309 #: ../../Zotlabs/Module/Settings/Display.php:89 -#: ../../Zotlabs/Module/Import.php:563 ../../Zotlabs/Module/Import.php:567 -#: ../../Zotlabs/Module/Import.php:568 ../../Zotlabs/Module/Api.php:98 -#: ../../Zotlabs/Module/Photos.php:712 ../../Zotlabs/Module/Wiki.php:227 +#: ../../Zotlabs/Module/Import.php:635 ../../Zotlabs/Module/Import.php:639 +#: ../../Zotlabs/Module/Import.php:640 ../../Zotlabs/Module/Api.php:98 +#: ../../Zotlabs/Module/Photos.php:670 ../../Zotlabs/Module/Wiki.php:227 #: ../../Zotlabs/Module/Wiki.php:228 ../../Zotlabs/Module/Connedit.php:406 #: ../../Zotlabs/Module/Menu.php:162 ../../Zotlabs/Module/Menu.php:221 #: ../../Zotlabs/Module/Defperms.php:197 ../../Zotlabs/Module/Profiles.php:681 #: ../../Zotlabs/Module/Sources.php:124 ../../Zotlabs/Module/Sources.php:159 -#: ../../Zotlabs/Module/Filestorage.php:178 -#: ../../Zotlabs/Module/Filestorage.php:186 ../../Zotlabs/Lib/Libzotdir.php:162 +#: ../../Zotlabs/Module/Filestorage.php:198 +#: ../../Zotlabs/Module/Filestorage.php:206 ../../Zotlabs/Lib/Libzotdir.php:162 #: ../../Zotlabs/Lib/Libzotdir.php:163 ../../Zotlabs/Lib/Libzotdir.php:165 -#: ../../Zotlabs/Storage/Browser.php:405 ../../boot.php:1634 +#: ../../Zotlabs/Storage/Browser.php:411 ../../boot.php:1635 #: ../../view/theme/redbasic_c/php/config.php:100 #: ../../view/theme/redbasic_c/php/config.php:115 #: ../../view/theme/redbasic/php/config.php:99 @@ -1317,8 +1342,11 @@ msgstr "" #: ../../addon/jappixmini/Mod_Jappixmini.php:199 #: ../../addon/jappixmini/Mod_Jappixmini.php:203 #: ../../addon/jappixmini/Mod_Jappixmini.php:207 -#: ../../addon/channelreputation/channelreputation.php:108 +#: ../../addon/channelreputation/channelreputation.php:110 #: ../../addon/nofed/Mod_Nofed.php:42 ../../addon/redred/Mod_Redred.php:63 +#: ../../addon/content_import/Mod_content_import.php:137 +#: ../../addon/content_import/Mod_content_import.php:138 +#: ../../addon/pubcrawl/Mod_Pubcrawl.php:45 #: ../../addon/libertree/Mod_Libertree.php:59 #: ../../addon/statusnet/Mod_Statusnet.php:260 #: ../../addon/statusnet/Mod_Statusnet.php:282 @@ -1424,34 +1452,35 @@ msgstr "" msgid "Link text" msgstr "" -#: ../../Zotlabs/Module/Events.php:25 -msgid "Calendar entries imported." -msgstr "" - -#: ../../Zotlabs/Module/Events.php:27 -msgid "No calendar entries found." -msgstr "" - #: ../../Zotlabs/Module/Events.php:110 +#: ../../Zotlabs/Module/Channel_calendar.php:87 msgid "Event can not end before it has started." msgstr "" #: ../../Zotlabs/Module/Events.php:112 ../../Zotlabs/Module/Events.php:121 #: ../../Zotlabs/Module/Events.php:143 +#: ../../Zotlabs/Module/Channel_calendar.php:89 +#: ../../Zotlabs/Module/Channel_calendar.php:97 +#: ../../Zotlabs/Module/Channel_calendar.php:114 msgid "Unable to generate preview." msgstr "" #: ../../Zotlabs/Module/Events.php:119 +#: ../../Zotlabs/Module/Channel_calendar.php:95 msgid "Event title and start time are required." msgstr "" #: ../../Zotlabs/Module/Events.php:141 ../../Zotlabs/Module/Events.php:265 +#: ../../Zotlabs/Module/Channel_calendar.php:112 +#: ../../Zotlabs/Module/Channel_calendar.php:224 msgid "Event not found." msgstr "" -#: ../../Zotlabs/Module/Events.php:260 ../../Zotlabs/Module/Tagger.php:73 -#: ../../Zotlabs/Module/Like.php:394 ../../include/conversation.php:119 -#: ../../include/text.php:2094 ../../include/event.php:1165 +#: ../../Zotlabs/Module/Events.php:260 +#: ../../Zotlabs/Module/Channel_calendar.php:219 +#: ../../Zotlabs/Module/Tagger.php:73 ../../Zotlabs/Module/Like.php:394 +#: ../../include/conversation.php:119 ../../include/text.php:2118 +#: ../../include/event.php:1169 msgid "event" msgstr "" @@ -1512,8 +1541,8 @@ msgstr "" msgid "Edit Location" msgstr "" -#: ../../Zotlabs/Module/Events.php:480 ../../Zotlabs/Module/Photos.php:1139 -#: ../../Zotlabs/Module/Webpages.php:262 ../../Zotlabs/Lib/ThreadItem.php:805 +#: ../../Zotlabs/Module/Events.php:480 ../../Zotlabs/Module/Photos.php:1097 +#: ../../Zotlabs/Module/Webpages.php:262 ../../Zotlabs/Lib/ThreadItem.php:806 #: ../../addon/hsse/hsse.php:153 ../../include/conversation.php:1359 msgid "Preview" msgstr "" @@ -1536,19 +1565,22 @@ msgid "l, F j" msgstr "" #: ../../Zotlabs/Module/Events.php:635 +#: ../../Zotlabs/Module/Channel_calendar.php:385 msgid "Edit event" msgstr "" #: ../../Zotlabs/Module/Events.php:637 +#: ../../Zotlabs/Module/Channel_calendar.php:387 msgid "Delete event" msgstr "" #: ../../Zotlabs/Module/Events.php:663 ../../Zotlabs/Module/Cal.php:314 -#: ../../include/text.php:1913 +#: ../../include/text.php:1937 msgid "Link to Source" msgstr "" #: ../../Zotlabs/Module/Events.php:670 +#: ../../Zotlabs/Module/Channel_calendar.php:415 msgid "calendar" msgstr "" @@ -1561,7 +1593,7 @@ msgid "Create Event" msgstr "" #: ../../Zotlabs/Module/Events.php:692 ../../Zotlabs/Module/Cal.php:340 -#: ../../include/channel.php:1703 +#: ../../include/channel.php:1769 msgid "Export" msgstr "" @@ -1570,6 +1602,7 @@ msgid "Event removed" msgstr "" #: ../../Zotlabs/Module/Events.php:735 +#: ../../Zotlabs/Module/Channel_calendar.php:448 msgid "Failed to remove event" msgstr "" @@ -1634,17 +1667,17 @@ msgid "Hub not found." msgstr "" #: ../../Zotlabs/Module/Subthread.php:112 ../../Zotlabs/Module/Tagger.php:69 -#: ../../Zotlabs/Module/Like.php:392 ../../Zotlabs/Lib/Activity.php:1959 +#: ../../Zotlabs/Module/Like.php:392 ../../Zotlabs/Lib/Activity.php:2019 #: ../../addon/redphotos/redphotohelper.php:71 -#: ../../addon/diaspora/Receiver.php:1551 ../../addon/pubcrawl/as.php:1504 -#: ../../include/conversation.php:116 ../../include/text.php:2091 +#: ../../addon/diaspora/Receiver.php:1565 ../../addon/pubcrawl/as.php:1558 +#: ../../include/conversation.php:116 ../../include/text.php:2115 msgid "photo" msgstr "" #: ../../Zotlabs/Module/Subthread.php:112 ../../Zotlabs/Module/Like.php:392 -#: ../../Zotlabs/Lib/Activity.php:1959 ../../addon/diaspora/Receiver.php:1551 -#: ../../addon/pubcrawl/as.php:1504 ../../include/conversation.php:144 -#: ../../include/text.php:2097 +#: ../../Zotlabs/Lib/Activity.php:2019 ../../addon/diaspora/Receiver.php:1565 +#: ../../addon/pubcrawl/as.php:1558 ../../include/conversation.php:144 +#: ../../include/text.php:2121 msgid "status" msgstr "" @@ -1674,8 +1707,8 @@ msgid "Insert web link" msgstr "" #: ../../Zotlabs/Module/Article_edit.php:117 -#: ../../Zotlabs/Module/Editblock.php:129 ../../Zotlabs/Module/Photos.php:713 -#: ../../Zotlabs/Module/Photos.php:1083 ../../Zotlabs/Module/Card_edit.php:117 +#: ../../Zotlabs/Module/Editblock.php:129 ../../Zotlabs/Module/Photos.php:671 +#: ../../Zotlabs/Module/Photos.php:1041 ../../Zotlabs/Module/Card_edit.php:117 #: ../../addon/hsse/hsse.php:221 ../../include/conversation.php:1427 msgid "Title (optional)" msgstr "" @@ -1684,16 +1717,16 @@ msgstr "" msgid "Edit Article" msgstr "" -#: ../../Zotlabs/Module/Import_items.php:48 ../../Zotlabs/Module/Import.php:66 +#: ../../Zotlabs/Module/Import_items.php:48 ../../Zotlabs/Module/Import.php:68 msgid "Nothing to import." msgstr "" -#: ../../Zotlabs/Module/Import_items.php:72 ../../Zotlabs/Module/Import.php:81 -#: ../../Zotlabs/Module/Import.php:97 +#: ../../Zotlabs/Module/Import_items.php:72 ../../Zotlabs/Module/Import.php:83 +#: ../../Zotlabs/Module/Import.php:99 msgid "Unable to download data from old server" msgstr "" -#: ../../Zotlabs/Module/Import_items.php:77 ../../Zotlabs/Module/Import.php:104 +#: ../../Zotlabs/Module/Import_items.php:77 ../../Zotlabs/Module/Import.php:106 msgid "Imported file is empty." msgstr "" @@ -1715,7 +1748,7 @@ msgid "Use this form to import existing posts and content from an export file." msgstr "" #: ../../Zotlabs/Module/Import_items.php:127 -#: ../../Zotlabs/Module/Import.php:557 +#: ../../Zotlabs/Module/Import.php:629 msgid "File to Upload" msgstr "" @@ -1727,7 +1760,7 @@ msgstr "" #: ../../Zotlabs/Module/New_channel.php:157 #: ../../Zotlabs/Module/New_channel.php:164 #: ../../Zotlabs/Module/Connedit.php:869 ../../Zotlabs/Module/Defperms.php:256 -#: ../../Zotlabs/Widget/Notifications.php:162 ../../include/nav.php:323 +#: ../../Zotlabs/Widget/Notifications.php:162 ../../include/nav.php:326 msgid "Loading" msgstr "" @@ -1755,13 +1788,13 @@ msgid "Channel name" msgstr "" #: ../../Zotlabs/Module/New_channel.php:177 -#: ../../Zotlabs/Module/Register.php:260 +#: ../../Zotlabs/Module/Register.php:263 msgid "Choose a short nickname" msgstr "" #: ../../Zotlabs/Module/New_channel.php:178 #: ../../Zotlabs/Module/Settings/Channel.php:535 -#: ../../Zotlabs/Module/Register.php:261 +#: ../../Zotlabs/Module/Register.php:264 msgid "Channel role and privacy" msgstr "" @@ -1772,7 +1805,7 @@ msgid "" msgstr "" #: ../../Zotlabs/Module/New_channel.php:178 -#: ../../Zotlabs/Module/Register.php:261 +#: ../../Zotlabs/Module/Register.php:264 msgid "Read more about channel permission roles" msgstr "" @@ -1851,12 +1884,12 @@ msgid "NEW" msgstr "" #: ../../Zotlabs/Module/Sharedwithme.php:106 -#: ../../Zotlabs/Storage/Browser.php:287 ../../include/text.php:1496 +#: ../../Zotlabs/Storage/Browser.php:293 ../../include/text.php:1515 msgid "Size" msgstr "" #: ../../Zotlabs/Module/Sharedwithme.php:107 -#: ../../Zotlabs/Storage/Browser.php:288 +#: ../../Zotlabs/Storage/Browser.php:294 msgid "Last Modified" msgstr "" @@ -1868,408 +1901,408 @@ msgstr "" msgid "Remove this file" msgstr "" -#: ../../Zotlabs/Module/Setup.php:170 +#: ../../Zotlabs/Module/Setup.php:167 msgid "$Projectname Server - Setup" msgstr "" -#: ../../Zotlabs/Module/Setup.php:174 +#: ../../Zotlabs/Module/Setup.php:171 msgid "Could not connect to database." msgstr "" -#: ../../Zotlabs/Module/Setup.php:178 +#: ../../Zotlabs/Module/Setup.php:175 msgid "" "Could not connect to specified site URL. Possible SSL certificate or DNS " "issue." msgstr "" -#: ../../Zotlabs/Module/Setup.php:185 +#: ../../Zotlabs/Module/Setup.php:182 msgid "Could not create table." msgstr "" -#: ../../Zotlabs/Module/Setup.php:191 +#: ../../Zotlabs/Module/Setup.php:188 msgid "Your site database has been installed." msgstr "" -#: ../../Zotlabs/Module/Setup.php:197 +#: ../../Zotlabs/Module/Setup.php:194 msgid "" "You may need to import the file \"install/schema_xxx.sql\" manually using a " "database client." msgstr "" -#: ../../Zotlabs/Module/Setup.php:198 ../../Zotlabs/Module/Setup.php:262 -#: ../../Zotlabs/Module/Setup.php:761 +#: ../../Zotlabs/Module/Setup.php:195 ../../Zotlabs/Module/Setup.php:259 +#: ../../Zotlabs/Module/Setup.php:766 msgid "Please see the file \"install/INSTALL.txt\"." msgstr "" -#: ../../Zotlabs/Module/Setup.php:259 +#: ../../Zotlabs/Module/Setup.php:256 msgid "System check" msgstr "" -#: ../../Zotlabs/Module/Setup.php:264 +#: ../../Zotlabs/Module/Setup.php:261 msgid "Check again" msgstr "" -#: ../../Zotlabs/Module/Setup.php:286 +#: ../../Zotlabs/Module/Setup.php:282 msgid "Database connection" msgstr "" -#: ../../Zotlabs/Module/Setup.php:287 +#: ../../Zotlabs/Module/Setup.php:283 msgid "" "In order to install $Projectname we need to know how to connect to your " "database." msgstr "" -#: ../../Zotlabs/Module/Setup.php:288 +#: ../../Zotlabs/Module/Setup.php:284 msgid "" "Please contact your hosting provider or site administrator if you have " "questions about these settings." msgstr "" -#: ../../Zotlabs/Module/Setup.php:289 +#: ../../Zotlabs/Module/Setup.php:285 msgid "" "The database you specify below should already exist. If it does not, please " "create it before continuing." msgstr "" -#: ../../Zotlabs/Module/Setup.php:293 +#: ../../Zotlabs/Module/Setup.php:289 msgid "Database Server Name" msgstr "" -#: ../../Zotlabs/Module/Setup.php:293 +#: ../../Zotlabs/Module/Setup.php:289 msgid "Default is 127.0.0.1" msgstr "" -#: ../../Zotlabs/Module/Setup.php:294 +#: ../../Zotlabs/Module/Setup.php:290 msgid "Database Port" msgstr "" -#: ../../Zotlabs/Module/Setup.php:294 +#: ../../Zotlabs/Module/Setup.php:290 msgid "Communication port number - use 0 for default" msgstr "" -#: ../../Zotlabs/Module/Setup.php:295 +#: ../../Zotlabs/Module/Setup.php:291 msgid "Database Login Name" msgstr "" -#: ../../Zotlabs/Module/Setup.php:296 +#: ../../Zotlabs/Module/Setup.php:292 msgid "Database Login Password" msgstr "" -#: ../../Zotlabs/Module/Setup.php:297 +#: ../../Zotlabs/Module/Setup.php:293 msgid "Database Name" msgstr "" -#: ../../Zotlabs/Module/Setup.php:298 +#: ../../Zotlabs/Module/Setup.php:294 msgid "Database Type" msgstr "" -#: ../../Zotlabs/Module/Setup.php:300 ../../Zotlabs/Module/Setup.php:341 +#: ../../Zotlabs/Module/Setup.php:296 ../../Zotlabs/Module/Setup.php:336 msgid "Site administrator email address" msgstr "" -#: ../../Zotlabs/Module/Setup.php:300 ../../Zotlabs/Module/Setup.php:341 +#: ../../Zotlabs/Module/Setup.php:296 ../../Zotlabs/Module/Setup.php:336 msgid "" "Your account email address must match this in order to use the web admin " "panel." msgstr "" -#: ../../Zotlabs/Module/Setup.php:301 ../../Zotlabs/Module/Setup.php:343 +#: ../../Zotlabs/Module/Setup.php:297 ../../Zotlabs/Module/Setup.php:338 msgid "Website URL" msgstr "" -#: ../../Zotlabs/Module/Setup.php:301 ../../Zotlabs/Module/Setup.php:343 +#: ../../Zotlabs/Module/Setup.php:297 ../../Zotlabs/Module/Setup.php:338 msgid "Please use SSL (https) URL if available." msgstr "" -#: ../../Zotlabs/Module/Setup.php:302 ../../Zotlabs/Module/Setup.php:345 +#: ../../Zotlabs/Module/Setup.php:298 ../../Zotlabs/Module/Setup.php:340 msgid "Please select a default timezone for your website" msgstr "" -#: ../../Zotlabs/Module/Setup.php:330 +#: ../../Zotlabs/Module/Setup.php:325 msgid "Site settings" msgstr "" -#: ../../Zotlabs/Module/Setup.php:384 -msgid "PHP version 5.5 or greater is required." +#: ../../Zotlabs/Module/Setup.php:379 +msgid "PHP version 7.1 or greater is required." msgstr "" -#: ../../Zotlabs/Module/Setup.php:385 +#: ../../Zotlabs/Module/Setup.php:380 msgid "PHP version" msgstr "" -#: ../../Zotlabs/Module/Setup.php:401 +#: ../../Zotlabs/Module/Setup.php:396 msgid "Could not find a command line version of PHP in the web server PATH." msgstr "" -#: ../../Zotlabs/Module/Setup.php:402 +#: ../../Zotlabs/Module/Setup.php:397 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 "" -#: ../../Zotlabs/Module/Setup.php:406 +#: ../../Zotlabs/Module/Setup.php:401 msgid "PHP executable path" msgstr "" -#: ../../Zotlabs/Module/Setup.php:406 +#: ../../Zotlabs/Module/Setup.php:401 msgid "" "Enter full path to php executable. You can leave this blank to continue the " "installation." msgstr "" -#: ../../Zotlabs/Module/Setup.php:411 +#: ../../Zotlabs/Module/Setup.php:406 msgid "Command line PHP" msgstr "" -#: ../../Zotlabs/Module/Setup.php:421 +#: ../../Zotlabs/Module/Setup.php:416 msgid "" "Unable to check command line PHP, as shell_exec() is disabled. This is " "required." msgstr "" -#: ../../Zotlabs/Module/Setup.php:424 +#: ../../Zotlabs/Module/Setup.php:420 msgid "" "The command line version of PHP on your system does not have " "\"register_argc_argv\" enabled." msgstr "" -#: ../../Zotlabs/Module/Setup.php:425 +#: ../../Zotlabs/Module/Setup.php:421 msgid "This is required for message delivery to work." msgstr "" -#: ../../Zotlabs/Module/Setup.php:428 +#: ../../Zotlabs/Module/Setup.php:424 msgid "PHP register_argc_argv" msgstr "" -#: ../../Zotlabs/Module/Setup.php:448 +#: ../../Zotlabs/Module/Setup.php:444 msgid "" "This is not sufficient to upload larger images or files. You should be able " "to upload at least 4 MB at once." msgstr "" -#: ../../Zotlabs/Module/Setup.php:450 +#: ../../Zotlabs/Module/Setup.php:446 #, php-format msgid "" "Your max allowed total upload size is set to %s. Maximum size of one file to " "upload is set to %s. You are allowed to upload up to %d files at once." msgstr "" -#: ../../Zotlabs/Module/Setup.php:456 +#: ../../Zotlabs/Module/Setup.php:452 msgid "You can adjust these settings in the server php.ini file." msgstr "" -#: ../../Zotlabs/Module/Setup.php:458 +#: ../../Zotlabs/Module/Setup.php:454 msgid "PHP upload limits" msgstr "" -#: ../../Zotlabs/Module/Setup.php:481 +#: ../../Zotlabs/Module/Setup.php:477 msgid "" "Error: the \"openssl_pkey_new\" function on this system is not able to " "generate encryption keys" msgstr "" -#: ../../Zotlabs/Module/Setup.php:482 +#: ../../Zotlabs/Module/Setup.php:478 msgid "" "If running under Windows, please see \"http://www.php.net/manual/en/openssl." "installation.php\"." msgstr "" -#: ../../Zotlabs/Module/Setup.php:485 +#: ../../Zotlabs/Module/Setup.php:481 msgid "Generate encryption keys" msgstr "" -#: ../../Zotlabs/Module/Setup.php:502 +#: ../../Zotlabs/Module/Setup.php:498 msgid "libCurl PHP module" msgstr "" -#: ../../Zotlabs/Module/Setup.php:503 +#: ../../Zotlabs/Module/Setup.php:499 msgid "GD graphics PHP module" msgstr "" -#: ../../Zotlabs/Module/Setup.php:504 +#: ../../Zotlabs/Module/Setup.php:500 msgid "OpenSSL PHP module" msgstr "" -#: ../../Zotlabs/Module/Setup.php:505 +#: ../../Zotlabs/Module/Setup.php:501 msgid "PDO database PHP module" msgstr "" -#: ../../Zotlabs/Module/Setup.php:506 +#: ../../Zotlabs/Module/Setup.php:502 msgid "mb_string PHP module" msgstr "" -#: ../../Zotlabs/Module/Setup.php:507 +#: ../../Zotlabs/Module/Setup.php:503 msgid "xml PHP module" msgstr "" -#: ../../Zotlabs/Module/Setup.php:508 +#: ../../Zotlabs/Module/Setup.php:504 msgid "zip PHP module" msgstr "" -#: ../../Zotlabs/Module/Setup.php:512 ../../Zotlabs/Module/Setup.php:514 +#: ../../Zotlabs/Module/Setup.php:508 ../../Zotlabs/Module/Setup.php:510 msgid "Apache mod_rewrite module" msgstr "" -#: ../../Zotlabs/Module/Setup.php:512 +#: ../../Zotlabs/Module/Setup.php:508 msgid "" "Error: Apache webserver mod-rewrite module is required but not installed." msgstr "" -#: ../../Zotlabs/Module/Setup.php:518 ../../Zotlabs/Module/Setup.php:521 +#: ../../Zotlabs/Module/Setup.php:514 ../../Zotlabs/Module/Setup.php:517 msgid "exec" msgstr "" -#: ../../Zotlabs/Module/Setup.php:518 +#: ../../Zotlabs/Module/Setup.php:514 msgid "" "Error: exec is required but is either not installed or has been disabled in " "php.ini" msgstr "" -#: ../../Zotlabs/Module/Setup.php:524 ../../Zotlabs/Module/Setup.php:527 +#: ../../Zotlabs/Module/Setup.php:520 ../../Zotlabs/Module/Setup.php:523 msgid "shell_exec" msgstr "" -#: ../../Zotlabs/Module/Setup.php:524 +#: ../../Zotlabs/Module/Setup.php:520 msgid "" "Error: shell_exec is required but is either not installed or has been " "disabled in php.ini" msgstr "" -#: ../../Zotlabs/Module/Setup.php:532 +#: ../../Zotlabs/Module/Setup.php:528 msgid "Error: libCURL PHP module required but not installed." msgstr "" -#: ../../Zotlabs/Module/Setup.php:536 +#: ../../Zotlabs/Module/Setup.php:532 msgid "" "Error: GD PHP module with JPEG support or ImageMagick graphics library " "required but not installed." msgstr "" -#: ../../Zotlabs/Module/Setup.php:540 +#: ../../Zotlabs/Module/Setup.php:536 msgid "Error: openssl PHP module required but not installed." msgstr "" -#: ../../Zotlabs/Module/Setup.php:546 +#: ../../Zotlabs/Module/Setup.php:542 msgid "" "Error: PDO database PHP module missing a driver for either mysql or pgsql." msgstr "" -#: ../../Zotlabs/Module/Setup.php:551 +#: ../../Zotlabs/Module/Setup.php:547 msgid "Error: PDO database PHP module required but not installed." msgstr "" -#: ../../Zotlabs/Module/Setup.php:555 +#: ../../Zotlabs/Module/Setup.php:551 msgid "Error: mb_string PHP module required but not installed." msgstr "" -#: ../../Zotlabs/Module/Setup.php:559 +#: ../../Zotlabs/Module/Setup.php:555 msgid "Error: xml PHP module required for DAV but not installed." msgstr "" -#: ../../Zotlabs/Module/Setup.php:563 +#: ../../Zotlabs/Module/Setup.php:559 msgid "Error: zip PHP module required but not installed." msgstr "" -#: ../../Zotlabs/Module/Setup.php:582 ../../Zotlabs/Module/Setup.php:591 +#: ../../Zotlabs/Module/Setup.php:578 ../../Zotlabs/Module/Setup.php:587 msgid ".htconfig.php is writable" msgstr "" -#: ../../Zotlabs/Module/Setup.php:587 +#: ../../Zotlabs/Module/Setup.php:583 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 "" -#: ../../Zotlabs/Module/Setup.php:588 +#: ../../Zotlabs/Module/Setup.php:584 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 "" -#: ../../Zotlabs/Module/Setup.php:589 +#: ../../Zotlabs/Module/Setup.php:585 msgid "Please see install/INSTALL.txt for additional information." msgstr "" -#: ../../Zotlabs/Module/Setup.php:605 +#: ../../Zotlabs/Module/Setup.php:601 msgid "" "This software uses the Smarty3 template engine to render its web views. " "Smarty3 compiles templates to PHP to speed up rendering." msgstr "" -#: ../../Zotlabs/Module/Setup.php:606 +#: ../../Zotlabs/Module/Setup.php:602 #, php-format msgid "" "In order to store these compiled templates, the web server needs to have " "write access to the directory %s under the top level web folder." msgstr "" -#: ../../Zotlabs/Module/Setup.php:607 ../../Zotlabs/Module/Setup.php:628 +#: ../../Zotlabs/Module/Setup.php:603 ../../Zotlabs/Module/Setup.php:624 msgid "" "Please ensure that the user that your web server runs as (e.g. www-data) has " "write access to this folder." msgstr "" -#: ../../Zotlabs/Module/Setup.php:608 +#: ../../Zotlabs/Module/Setup.php:604 #, 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 "" -#: ../../Zotlabs/Module/Setup.php:611 +#: ../../Zotlabs/Module/Setup.php:607 #, php-format msgid "%s is writable" msgstr "" -#: ../../Zotlabs/Module/Setup.php:627 +#: ../../Zotlabs/Module/Setup.php:623 msgid "" "This software uses the store directory to save uploaded files. The web " "server needs to have write access to the store directory under the top level " "web folder" msgstr "" -#: ../../Zotlabs/Module/Setup.php:631 +#: ../../Zotlabs/Module/Setup.php:627 msgid "store is writable" msgstr "" -#: ../../Zotlabs/Module/Setup.php:663 +#: ../../Zotlabs/Module/Setup.php:659 msgid "" "SSL certificate cannot be validated. Fix certificate or disable https access " "to this site." msgstr "" -#: ../../Zotlabs/Module/Setup.php:664 +#: ../../Zotlabs/Module/Setup.php:660 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 "" -#: ../../Zotlabs/Module/Setup.php:665 +#: ../../Zotlabs/Module/Setup.php:661 msgid "" "This restriction is incorporated because public posts from you may for " "example contain references to images on your own hub." msgstr "" -#: ../../Zotlabs/Module/Setup.php:666 +#: ../../Zotlabs/Module/Setup.php:662 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 "" -#: ../../Zotlabs/Module/Setup.php:667 +#: ../../Zotlabs/Module/Setup.php:663 msgid "" "This can cause usability issues elsewhere (not just on your own site) so we " "must insist on this requirement." msgstr "" -#: ../../Zotlabs/Module/Setup.php:668 +#: ../../Zotlabs/Module/Setup.php:664 msgid "" "Providers are available that issue free certificates which are browser-valid." msgstr "" -#: ../../Zotlabs/Module/Setup.php:670 +#: ../../Zotlabs/Module/Setup.php:665 msgid "" "If you are confident that the certificate is valid and signed by a trusted " "authority, check to see if you have failed to install an intermediate cert. " @@ -2277,36 +2310,36 @@ msgid "" "server communications." msgstr "" -#: ../../Zotlabs/Module/Setup.php:672 +#: ../../Zotlabs/Module/Setup.php:667 msgid "SSL certificate validation" msgstr "" -#: ../../Zotlabs/Module/Setup.php:678 +#: ../../Zotlabs/Module/Setup.php:673 msgid "" "Url rewrite in .htaccess is not working. Check your server configuration." "Test: " msgstr "" -#: ../../Zotlabs/Module/Setup.php:681 +#: ../../Zotlabs/Module/Setup.php:676 msgid "Url rewrite is working" msgstr "" -#: ../../Zotlabs/Module/Setup.php:695 +#: ../../Zotlabs/Module/Setup.php:689 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 "" -#: ../../Zotlabs/Module/Setup.php:719 ../../addon/rendezvous/rendezvous.php:401 +#: ../../Zotlabs/Module/Setup.php:718 ../../addon/rendezvous/rendezvous.php:401 msgid "Errors encountered creating database tables." msgstr "" -#: ../../Zotlabs/Module/Setup.php:759 +#: ../../Zotlabs/Module/Setup.php:764 msgid "<h1>What next?</h1>" msgstr "" -#: ../../Zotlabs/Module/Setup.php:760 +#: ../../Zotlabs/Module/Setup.php:765 msgid "" "IMPORTANT: You will need to [manually] setup a scheduled task for the poller." msgstr "" @@ -2414,42 +2447,66 @@ msgid "Manage Additional Features" msgstr "" #: ../../Zotlabs/Module/Admin/Dbsync.php:19 +#: ../../Zotlabs/Module/Admin/Dbsync.php:59 msgid "Update has been marked successful" msgstr "" -#: ../../Zotlabs/Module/Admin/Dbsync.php:31 +#: ../../Zotlabs/Module/Admin/Dbsync.php:32 #, php-format -msgid "Executing %s failed. Check system logs." +msgid "Verification of update %s failed. Check system logs." msgstr "" -#: ../../Zotlabs/Module/Admin/Dbsync.php:34 +#: ../../Zotlabs/Module/Admin/Dbsync.php:35 +#: ../../Zotlabs/Module/Admin/Dbsync.php:74 #, php-format msgid "Update %s was successfully applied." msgstr "" -#: ../../Zotlabs/Module/Admin/Dbsync.php:38 +#: ../../Zotlabs/Module/Admin/Dbsync.php:39 #, php-format -msgid "Update %s did not return a status. Unknown if it succeeded." +msgid "Verifying update %s did not return a status. Unknown if it succeeded." msgstr "" -#: ../../Zotlabs/Module/Admin/Dbsync.php:41 +#: ../../Zotlabs/Module/Admin/Dbsync.php:42 +#, php-format +msgid "Update %s does not contain a verification function." +msgstr "" + +#: ../../Zotlabs/Module/Admin/Dbsync.php:46 +#: ../../Zotlabs/Module/Admin/Dbsync.php:81 #, php-format msgid "Update function %s could not be found." msgstr "" -#: ../../Zotlabs/Module/Admin/Dbsync.php:59 +#: ../../Zotlabs/Module/Admin/Dbsync.php:71 +#, php-format +msgid "Executing update procedure %s failed. Check system logs." +msgstr "" + +#: ../../Zotlabs/Module/Admin/Dbsync.php:78 +#, php-format +msgid "" +"Update %s did not return a status. It cannot be determined if it was " +"successful." +msgstr "" + +#: ../../Zotlabs/Module/Admin/Dbsync.php:99 msgid "Failed Updates" msgstr "" -#: ../../Zotlabs/Module/Admin/Dbsync.php:61 +#: ../../Zotlabs/Module/Admin/Dbsync.php:101 msgid "Mark success (if update was manually applied)" msgstr "" -#: ../../Zotlabs/Module/Admin/Dbsync.php:62 +#: ../../Zotlabs/Module/Admin/Dbsync.php:102 +msgid "Attempt to verify this update if a verification procedure exists" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Dbsync.php:103 msgid "Attempt to execute this update step automatically" msgstr "" -#: ../../Zotlabs/Module/Admin/Dbsync.php:67 +#: ../../Zotlabs/Module/Admin/Dbsync.php:108 msgid "No failed updates." msgstr "" @@ -2471,7 +2528,7 @@ msgstr[1] "" msgid "Account not found" msgstr "" -#: ../../Zotlabs/Module/Admin/Accounts.php:91 ../../include/channel.php:2562 +#: ../../Zotlabs/Module/Admin/Accounts.php:91 ../../include/channel.php:2632 #, php-format msgid "Account '%s' deleted" msgstr "" @@ -2523,7 +2580,7 @@ msgid "No registrations." msgstr "" #: ../../Zotlabs/Module/Admin/Accounts.php:173 -#: ../../Zotlabs/Module/Connections.php:306 ../../include/conversation.php:735 +#: ../../Zotlabs/Module/Connections.php:320 ../../include/conversation.php:735 msgid "Approve" msgstr "" @@ -2680,7 +2737,7 @@ msgstr "" msgid "Disallow Code" msgstr "" -#: ../../Zotlabs/Module/Admin/Channels.php:154 ../../include/nav.php:421 +#: ../../Zotlabs/Module/Admin/Channels.php:154 ../../include/nav.php:423 msgid "Channel" msgstr "" @@ -2711,8 +2768,8 @@ msgstr "" #: ../../Zotlabs/Module/Admin/Themes.php:72 #: ../../Zotlabs/Module/Admin/Addons.php:259 ../../Zotlabs/Module/Thing.php:94 #: ../../Zotlabs/Module/Viewsrc.php:25 ../../Zotlabs/Module/Display.php:45 -#: ../../Zotlabs/Module/Display.php:450 ../../Zotlabs/Module/Filestorage.php:24 -#: ../../Zotlabs/Module/Admin.php:62 ../../include/items.php:3693 +#: ../../Zotlabs/Module/Display.php:455 ../../Zotlabs/Module/Filestorage.php:26 +#: ../../Zotlabs/Module/Admin.php:62 ../../include/items.php:3713 msgid "Item not found." msgstr "" @@ -2741,9 +2798,9 @@ msgid "Toggle" msgstr "" #: ../../Zotlabs/Module/Admin/Themes.php:125 -#: ../../Zotlabs/Module/Admin/Addons.php:344 ../../Zotlabs/Lib/Apps.php:336 +#: ../../Zotlabs/Module/Admin/Addons.php:344 ../../Zotlabs/Lib/Apps.php:338 #: ../../Zotlabs/Widget/Newmember.php:53 -#: ../../Zotlabs/Widget/Settings_menu.php:61 ../../include/nav.php:97 +#: ../../Zotlabs/Widget/Settings_menu.php:61 ../../include/nav.php:101 msgid "Settings" msgstr "" @@ -2771,7 +2828,7 @@ msgstr "" #: ../../Zotlabs/Module/Admin/Site.php:187 #: ../../view/theme/redbasic_c/php/config.php:15 -#: ../../view/theme/redbasic/php/config.php:15 ../../include/text.php:3210 +#: ../../view/theme/redbasic/php/config.php:15 ../../include/text.php:3218 msgid "Default" msgstr "" @@ -2827,7 +2884,7 @@ msgid "Site" msgstr "" #: ../../Zotlabs/Module/Admin/Site.php:290 -#: ../../Zotlabs/Module/Register.php:273 +#: ../../Zotlabs/Module/Register.php:277 msgid "Registration" msgstr "" @@ -3278,7 +3335,7 @@ msgstr "" msgid "Install new repo" msgstr "" -#: ../../Zotlabs/Module/Admin/Addons.php:425 ../../Zotlabs/Lib/Apps.php:535 +#: ../../Zotlabs/Module/Admin/Addons.php:425 ../../Zotlabs/Lib/Apps.php:536 msgid "Install" msgstr "" @@ -3299,7 +3356,9 @@ msgid "Switch branch" msgstr "" #: ../../Zotlabs/Module/Admin/Addons.php:458 -#: ../../Zotlabs/Module/Photos.php:1035 ../../Zotlabs/Module/Tagrm.php:137 +#: ../../Zotlabs/Module/Photos.php:993 +#: ../../Zotlabs/Module/Profile_photo.php:499 +#: ../../Zotlabs/Module/Cover_photo.php:430 ../../Zotlabs/Module/Tagrm.php:137 #: ../../addon/superblock/Mod_Superblock.php:91 msgid "Remove" msgstr "" @@ -3347,8 +3406,8 @@ msgstr "" #: ../../Zotlabs/Module/Admin/Profs.php:114 ../../Zotlabs/Module/Rbmark.php:32 #: ../../Zotlabs/Module/Rbmark.php:104 ../../Zotlabs/Module/Filer.php:53 #: ../../Zotlabs/Widget/Notes.php:23 -#: ../../addon/queueworker/Mod_Queueworker.php:102 ../../include/text.php:1085 -#: ../../include/text.php:1097 +#: ../../addon/queueworker/Mod_Queueworker.php:102 ../../include/text.php:1104 +#: ../../include/text.php:1116 msgid "Save" msgstr "" @@ -3658,7 +3717,7 @@ msgstr "" msgid "Basic Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:499 ../../include/channel.php:1577 +#: ../../Zotlabs/Module/Settings/Channel.php:499 ../../include/channel.php:1643 msgid "Full Name:" msgstr "" @@ -3992,7 +4051,7 @@ msgid "Events Settings" msgstr "" #: ../../Zotlabs/Module/Settings/Calendar.php:39 -msgid "CalDAV Settings" +msgid "Calendar Settings" msgstr "" #: ../../Zotlabs/Module/Settings/Conversation.php:22 @@ -4218,22 +4277,22 @@ msgstr "" msgid "Stream Settings" msgstr "" -#: ../../Zotlabs/Module/Embedphotos.php:148 ../../Zotlabs/Module/Photos.php:826 -#: ../../Zotlabs/Module/Photos.php:1374 ../../Zotlabs/Widget/Portfolio.php:87 +#: ../../Zotlabs/Module/Embedphotos.php:168 ../../Zotlabs/Module/Photos.php:784 +#: ../../Zotlabs/Module/Photos.php:1332 ../../Zotlabs/Widget/Portfolio.php:87 #: ../../Zotlabs/Widget/Album.php:78 msgid "View Photo" msgstr "" -#: ../../Zotlabs/Module/Embedphotos.php:164 ../../Zotlabs/Module/Photos.php:857 +#: ../../Zotlabs/Module/Embedphotos.php:184 ../../Zotlabs/Module/Photos.php:815 #: ../../Zotlabs/Widget/Portfolio.php:108 ../../Zotlabs/Widget/Album.php:95 msgid "Edit Album" msgstr "" -#: ../../Zotlabs/Module/Embedphotos.php:166 ../../Zotlabs/Module/Photos.php:727 -#: ../../Zotlabs/Module/Profile_photo.php:459 -#: ../../Zotlabs/Module/Cover_photo.php:395 -#: ../../Zotlabs/Storage/Browser.php:392 ../../Zotlabs/Widget/Cdav.php:133 -#: ../../Zotlabs/Widget/Cdav.php:169 ../../Zotlabs/Widget/Portfolio.php:110 +#: ../../Zotlabs/Module/Embedphotos.php:186 ../../Zotlabs/Module/Photos.php:685 +#: ../../Zotlabs/Module/Profile_photo.php:498 +#: ../../Zotlabs/Module/Cover_photo.php:429 +#: ../../Zotlabs/Storage/Browser.php:398 ../../Zotlabs/Widget/Cdav.php:146 +#: ../../Zotlabs/Widget/Cdav.php:182 ../../Zotlabs/Widget/Portfolio.php:110 #: ../../Zotlabs/Widget/Album.php:97 msgid "Upload" msgstr "" @@ -4351,9 +4410,9 @@ msgid "URL for photo of thing (optional)" msgstr "" #: ../../Zotlabs/Module/Thing.php:319 ../../Zotlabs/Module/Thing.php:372 -#: ../../Zotlabs/Module/Photos.php:717 ../../Zotlabs/Module/Photos.php:1086 +#: ../../Zotlabs/Module/Photos.php:675 ../../Zotlabs/Module/Photos.php:1044 #: ../../Zotlabs/Module/Connedit.php:690 ../../Zotlabs/Module/Chat.php:243 -#: ../../Zotlabs/Module/Filestorage.php:170 ../../include/acl_selectors.php:123 +#: ../../Zotlabs/Module/Filestorage.php:190 ../../include/acl_selectors.php:123 msgid "Permissions" msgstr "" @@ -4373,56 +4432,56 @@ msgstr "" msgid "Connection added." msgstr "" -#: ../../Zotlabs/Module/Import.php:155 +#: ../../Zotlabs/Module/Import.php:157 #, php-format msgid "Your service plan only allows %d channels." msgstr "" -#: ../../Zotlabs/Module/Import.php:182 +#: ../../Zotlabs/Module/Import.php:184 msgid "No channel. Import failed." msgstr "" -#: ../../Zotlabs/Module/Import.php:522 +#: ../../Zotlabs/Module/Import.php:594 #: ../../addon/diaspora/import_diaspora.php:141 msgid "Import completed." msgstr "" -#: ../../Zotlabs/Module/Import.php:550 +#: ../../Zotlabs/Module/Import.php:622 msgid "You must be logged in to use this feature." msgstr "" -#: ../../Zotlabs/Module/Import.php:555 +#: ../../Zotlabs/Module/Import.php:627 msgid "Import Channel" msgstr "" -#: ../../Zotlabs/Module/Import.php:556 +#: ../../Zotlabs/Module/Import.php:628 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." msgstr "" -#: ../../Zotlabs/Module/Import.php:558 +#: ../../Zotlabs/Module/Import.php:630 msgid "Or provide the old server/hub details" msgstr "" -#: ../../Zotlabs/Module/Import.php:560 +#: ../../Zotlabs/Module/Import.php:632 msgid "Your old identity address (xyz@example.com)" msgstr "" -#: ../../Zotlabs/Module/Import.php:561 +#: ../../Zotlabs/Module/Import.php:633 msgid "Your old login email address" msgstr "" -#: ../../Zotlabs/Module/Import.php:562 +#: ../../Zotlabs/Module/Import.php:634 msgid "Your old login password" msgstr "" -#: ../../Zotlabs/Module/Import.php:563 +#: ../../Zotlabs/Module/Import.php:635 msgid "Import a few months of posts if possible (limited by available memory" msgstr "" -#: ../../Zotlabs/Module/Import.php:565 +#: ../../Zotlabs/Module/Import.php:637 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 " @@ -4430,25 +4489,25 @@ msgid "" "location for files, photos, and media." msgstr "" -#: ../../Zotlabs/Module/Import.php:567 +#: ../../Zotlabs/Module/Import.php:639 msgid "Make this hub my primary location" msgstr "" -#: ../../Zotlabs/Module/Import.php:568 +#: ../../Zotlabs/Module/Import.php:640 msgid "Move this channel (disable all previous locations)" msgstr "" -#: ../../Zotlabs/Module/Import.php:569 +#: ../../Zotlabs/Module/Import.php:641 msgid "Use this channel nickname instead of the one provided" msgstr "" -#: ../../Zotlabs/Module/Import.php:569 +#: ../../Zotlabs/Module/Import.php:641 msgid "" "Leave blank to keep your existing channel nickname. You will be randomly " "assigned a similar nickname if either name is already allocated on this site." msgstr "" -#: ../../Zotlabs/Module/Import.php:571 +#: ../../Zotlabs/Module/Import.php:643 msgid "" "This process may take several minutes to complete. Please submit the form " "only once and leave this page open until finished." @@ -4458,16 +4517,16 @@ msgstr "" msgid "Authentication failed." msgstr "" -#: ../../Zotlabs/Module/Rmagic.php:93 ../../boot.php:1630 -#: ../../include/channel.php:2405 +#: ../../Zotlabs/Module/Rmagic.php:93 ../../boot.php:1631 +#: ../../include/channel.php:2475 msgid "Remote Authentication" msgstr "" -#: ../../Zotlabs/Module/Rmagic.php:94 ../../include/channel.php:2406 +#: ../../Zotlabs/Module/Rmagic.php:94 ../../include/channel.php:2476 msgid "Enter your channel address (e.g. channel@example.com)" msgstr "" -#: ../../Zotlabs/Module/Rmagic.php:95 ../../include/channel.php:2407 +#: ../../Zotlabs/Module/Rmagic.php:95 ../../include/channel.php:2477 msgid "Authenticate" msgstr "" @@ -4560,7 +4619,7 @@ msgstr "" msgid "Permissions denied." msgstr "" -#: ../../Zotlabs/Module/Cal.php:343 ../../include/text.php:2558 +#: ../../Zotlabs/Module/Cal.php:343 ../../include/text.php:2573 msgid "Import" msgstr "" @@ -4632,36 +4691,36 @@ msgstr "" msgid "Set your current mood and tell your friends" msgstr "" -#: ../../Zotlabs/Module/Mood.php:154 ../../Zotlabs/Lib/Apps.php:347 +#: ../../Zotlabs/Module/Mood.php:154 ../../Zotlabs/Lib/Apps.php:349 msgid "Mood" msgstr "" #: ../../Zotlabs/Module/Connections.php:58 #: ../../Zotlabs/Module/Connections.php:115 -#: ../../Zotlabs/Module/Connections.php:259 +#: ../../Zotlabs/Module/Connections.php:273 msgid "Active" msgstr "" #: ../../Zotlabs/Module/Connections.php:63 -#: ../../Zotlabs/Module/Connections.php:167 -#: ../../Zotlabs/Module/Connections.php:264 +#: ../../Zotlabs/Module/Connections.php:181 +#: ../../Zotlabs/Module/Connections.php:278 msgid "Blocked" msgstr "" #: ../../Zotlabs/Module/Connections.php:68 -#: ../../Zotlabs/Module/Connections.php:174 -#: ../../Zotlabs/Module/Connections.php:263 +#: ../../Zotlabs/Module/Connections.php:188 +#: ../../Zotlabs/Module/Connections.php:277 msgid "Ignored" msgstr "" #: ../../Zotlabs/Module/Connections.php:73 -#: ../../Zotlabs/Module/Connections.php:188 -#: ../../Zotlabs/Module/Connections.php:262 +#: ../../Zotlabs/Module/Connections.php:202 +#: ../../Zotlabs/Module/Connections.php:276 msgid "Hidden" msgstr "" #: ../../Zotlabs/Module/Connections.php:78 -#: ../../Zotlabs/Module/Connections.php:181 +#: ../../Zotlabs/Module/Connections.php:195 msgid "Archived/Unreachable" msgstr "" @@ -4677,121 +4736,121 @@ msgstr "" msgid "All" msgstr "" -#: ../../Zotlabs/Module/Connections.php:143 +#: ../../Zotlabs/Module/Connections.php:157 msgid "Active Connections" msgstr "" -#: ../../Zotlabs/Module/Connections.php:146 +#: ../../Zotlabs/Module/Connections.php:160 msgid "Show active connections" msgstr "" -#: ../../Zotlabs/Module/Connections.php:150 +#: ../../Zotlabs/Module/Connections.php:164 #: ../../Zotlabs/Widget/Notifications.php:84 msgid "New Connections" msgstr "" -#: ../../Zotlabs/Module/Connections.php:153 +#: ../../Zotlabs/Module/Connections.php:167 msgid "Show pending (new) connections" msgstr "" -#: ../../Zotlabs/Module/Connections.php:170 +#: ../../Zotlabs/Module/Connections.php:184 msgid "Only show blocked connections" msgstr "" -#: ../../Zotlabs/Module/Connections.php:177 +#: ../../Zotlabs/Module/Connections.php:191 msgid "Only show ignored connections" msgstr "" -#: ../../Zotlabs/Module/Connections.php:184 +#: ../../Zotlabs/Module/Connections.php:198 msgid "Only show archived/unreachable connections" msgstr "" -#: ../../Zotlabs/Module/Connections.php:191 +#: ../../Zotlabs/Module/Connections.php:205 msgid "Only show hidden connections" msgstr "" -#: ../../Zotlabs/Module/Connections.php:206 +#: ../../Zotlabs/Module/Connections.php:220 msgid "Show all connections" msgstr "" -#: ../../Zotlabs/Module/Connections.php:260 +#: ../../Zotlabs/Module/Connections.php:274 msgid "Pending approval" msgstr "" -#: ../../Zotlabs/Module/Connections.php:261 +#: ../../Zotlabs/Module/Connections.php:275 msgid "Archived" msgstr "" -#: ../../Zotlabs/Module/Connections.php:265 +#: ../../Zotlabs/Module/Connections.php:279 msgid "Not connected at this location" msgstr "" -#: ../../Zotlabs/Module/Connections.php:282 +#: ../../Zotlabs/Module/Connections.php:296 #, php-format msgid "%1$s [%2$s]" msgstr "" -#: ../../Zotlabs/Module/Connections.php:283 +#: ../../Zotlabs/Module/Connections.php:297 msgid "Edit connection" msgstr "" -#: ../../Zotlabs/Module/Connections.php:285 +#: ../../Zotlabs/Module/Connections.php:299 msgid "Delete connection" msgstr "" -#: ../../Zotlabs/Module/Connections.php:294 +#: ../../Zotlabs/Module/Connections.php:308 msgid "Channel address" msgstr "" -#: ../../Zotlabs/Module/Connections.php:296 ../../include/features.php:313 +#: ../../Zotlabs/Module/Connections.php:310 ../../include/features.php:321 msgid "Network" msgstr "" -#: ../../Zotlabs/Module/Connections.php:299 +#: ../../Zotlabs/Module/Connections.php:313 msgid "Call" msgstr "" -#: ../../Zotlabs/Module/Connections.php:301 +#: ../../Zotlabs/Module/Connections.php:315 msgid "Status" msgstr "" -#: ../../Zotlabs/Module/Connections.php:303 +#: ../../Zotlabs/Module/Connections.php:317 msgid "Connected" msgstr "" -#: ../../Zotlabs/Module/Connections.php:305 +#: ../../Zotlabs/Module/Connections.php:319 msgid "Approve connection" msgstr "" -#: ../../Zotlabs/Module/Connections.php:307 +#: ../../Zotlabs/Module/Connections.php:321 msgid "Ignore connection" msgstr "" -#: ../../Zotlabs/Module/Connections.php:308 +#: ../../Zotlabs/Module/Connections.php:322 #: ../../Zotlabs/Module/Connedit.php:644 msgid "Ignore" msgstr "" -#: ../../Zotlabs/Module/Connections.php:309 +#: ../../Zotlabs/Module/Connections.php:323 msgid "Recent activity" msgstr "" -#: ../../Zotlabs/Module/Connections.php:334 ../../Zotlabs/Lib/Apps.php:330 -#: ../../include/text.php:991 ../../include/features.php:125 +#: ../../Zotlabs/Module/Connections.php:348 ../../Zotlabs/Lib/Apps.php:332 +#: ../../include/text.php:1010 ../../include/features.php:125 msgid "Connections" msgstr "" -#: ../../Zotlabs/Module/Connections.php:339 +#: ../../Zotlabs/Module/Connections.php:353 msgid "Search your connections" msgstr "" -#: ../../Zotlabs/Module/Connections.php:340 +#: ../../Zotlabs/Module/Connections.php:354 msgid "Connections search" msgstr "" -#: ../../Zotlabs/Module/Connections.php:341 -#: ../../Zotlabs/Module/Directory.php:405 -#: ../../Zotlabs/Module/Directory.php:410 ../../include/contact_widgets.php:23 +#: ../../Zotlabs/Module/Connections.php:355 +#: ../../Zotlabs/Module/Directory.php:416 +#: ../../Zotlabs/Module/Directory.php:421 ../../include/contact_widgets.php:23 msgid "Find" msgstr "" @@ -4859,198 +4918,198 @@ msgstr "" msgid "Delete Album" msgstr "" -#: ../../Zotlabs/Module/Photos.php:174 ../../Zotlabs/Module/Photos.php:1098 +#: ../../Zotlabs/Module/Photos.php:174 ../../Zotlabs/Module/Photos.php:1056 msgid "Delete Photo" msgstr "" -#: ../../Zotlabs/Module/Photos.php:569 +#: ../../Zotlabs/Module/Photos.php:527 msgid "No photos selected" msgstr "" -#: ../../Zotlabs/Module/Photos.php:618 +#: ../../Zotlabs/Module/Photos.php:576 msgid "Access to this item is restricted." msgstr "" -#: ../../Zotlabs/Module/Photos.php:661 +#: ../../Zotlabs/Module/Photos.php:619 #, php-format msgid "%1$.2f MB of %2$.2f MB photo storage used." msgstr "" -#: ../../Zotlabs/Module/Photos.php:664 +#: ../../Zotlabs/Module/Photos.php:622 #, php-format msgid "%1$.2f MB photo storage used." msgstr "" -#: ../../Zotlabs/Module/Photos.php:706 +#: ../../Zotlabs/Module/Photos.php:664 msgid "Upload Photos" msgstr "" -#: ../../Zotlabs/Module/Photos.php:710 +#: ../../Zotlabs/Module/Photos.php:668 msgid "Enter an album name" msgstr "" -#: ../../Zotlabs/Module/Photos.php:711 +#: ../../Zotlabs/Module/Photos.php:669 msgid "or select an existing album (doubleclick)" msgstr "" -#: ../../Zotlabs/Module/Photos.php:712 +#: ../../Zotlabs/Module/Photos.php:670 msgid "Create a status post for this upload" msgstr "" -#: ../../Zotlabs/Module/Photos.php:714 +#: ../../Zotlabs/Module/Photos.php:672 msgid "Description (optional)" msgstr "" -#: ../../Zotlabs/Module/Photos.php:800 +#: ../../Zotlabs/Module/Photos.php:758 msgid "Show Newest First" msgstr "" -#: ../../Zotlabs/Module/Photos.php:802 +#: ../../Zotlabs/Module/Photos.php:760 msgid "Show Oldest First" msgstr "" -#: ../../Zotlabs/Module/Photos.php:859 ../../Zotlabs/Module/Photos.php:1405 +#: ../../Zotlabs/Module/Photos.php:817 ../../Zotlabs/Module/Photos.php:1363 msgid "Add Photos" msgstr "" -#: ../../Zotlabs/Module/Photos.php:907 +#: ../../Zotlabs/Module/Photos.php:865 msgid "Permission denied. Access to this item may be restricted." msgstr "" -#: ../../Zotlabs/Module/Photos.php:909 +#: ../../Zotlabs/Module/Photos.php:867 msgid "Photo not available" msgstr "" -#: ../../Zotlabs/Module/Photos.php:967 +#: ../../Zotlabs/Module/Photos.php:925 msgid "Use as profile photo" msgstr "" -#: ../../Zotlabs/Module/Photos.php:968 +#: ../../Zotlabs/Module/Photos.php:926 msgid "Use as cover photo" msgstr "" -#: ../../Zotlabs/Module/Photos.php:975 +#: ../../Zotlabs/Module/Photos.php:933 msgid "Private Photo" msgstr "" -#: ../../Zotlabs/Module/Photos.php:990 +#: ../../Zotlabs/Module/Photos.php:948 msgid "View Full Size" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1072 +#: ../../Zotlabs/Module/Photos.php:1030 msgid "Edit photo" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1074 +#: ../../Zotlabs/Module/Photos.php:1032 msgid "Rotate CW (right)" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1075 +#: ../../Zotlabs/Module/Photos.php:1033 msgid "Rotate CCW (left)" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1078 +#: ../../Zotlabs/Module/Photos.php:1036 msgid "Move photo to album" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1079 +#: ../../Zotlabs/Module/Photos.php:1037 msgid "Enter a new album name" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1080 +#: ../../Zotlabs/Module/Photos.php:1038 msgid "or select an existing one (doubleclick)" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1085 +#: ../../Zotlabs/Module/Photos.php:1043 msgid "Add a Tag" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1093 +#: ../../Zotlabs/Module/Photos.php:1051 msgid "Example: @bob, @Barbara_Jensen, @jim@example.com" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1096 +#: ../../Zotlabs/Module/Photos.php:1054 msgid "Flag as adult in album view" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1115 ../../Zotlabs/Lib/ThreadItem.php:306 +#: ../../Zotlabs/Module/Photos.php:1073 ../../Zotlabs/Lib/ThreadItem.php:307 msgid "I like this (toggle)" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1116 ../../Zotlabs/Lib/ThreadItem.php:307 +#: ../../Zotlabs/Module/Photos.php:1074 ../../Zotlabs/Lib/ThreadItem.php:308 msgid "I don't like this (toggle)" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1118 ../../Zotlabs/Lib/ThreadItem.php:469 +#: ../../Zotlabs/Module/Photos.php:1076 ../../Zotlabs/Lib/ThreadItem.php:469 #: ../../include/conversation.php:787 msgid "Please wait" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1135 ../../Zotlabs/Module/Photos.php:1254 -#: ../../Zotlabs/Lib/ThreadItem.php:792 +#: ../../Zotlabs/Module/Photos.php:1093 ../../Zotlabs/Module/Photos.php:1212 +#: ../../Zotlabs/Lib/ThreadItem.php:793 msgid "This is you" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1137 ../../Zotlabs/Module/Photos.php:1256 -#: ../../Zotlabs/Lib/ThreadItem.php:794 ../../include/js_strings.php:6 +#: ../../Zotlabs/Module/Photos.php:1095 ../../Zotlabs/Module/Photos.php:1214 +#: ../../Zotlabs/Lib/ThreadItem.php:795 ../../include/js_strings.php:6 msgid "Comment" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1154 ../../include/conversation.php:619 +#: ../../Zotlabs/Module/Photos.php:1112 ../../include/conversation.php:619 msgctxt "title" msgid "Likes" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1154 ../../include/conversation.php:619 +#: ../../Zotlabs/Module/Photos.php:1112 ../../include/conversation.php:619 msgctxt "title" msgid "Dislikes" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1155 ../../include/conversation.php:620 +#: ../../Zotlabs/Module/Photos.php:1113 ../../include/conversation.php:620 msgctxt "title" msgid "Agree" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1155 ../../include/conversation.php:620 +#: ../../Zotlabs/Module/Photos.php:1113 ../../include/conversation.php:620 msgctxt "title" msgid "Disagree" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1155 ../../include/conversation.php:620 +#: ../../Zotlabs/Module/Photos.php:1113 ../../include/conversation.php:620 msgctxt "title" msgid "Abstain" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1156 ../../include/conversation.php:621 +#: ../../Zotlabs/Module/Photos.php:1114 ../../include/conversation.php:621 msgctxt "title" msgid "Attending" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1156 ../../include/conversation.php:621 +#: ../../Zotlabs/Module/Photos.php:1114 ../../include/conversation.php:621 msgctxt "title" msgid "Not attending" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1156 ../../include/conversation.php:621 +#: ../../Zotlabs/Module/Photos.php:1114 ../../include/conversation.php:621 msgctxt "title" msgid "Might attend" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1173 ../../Zotlabs/Module/Photos.php:1185 -#: ../../Zotlabs/Lib/ThreadItem.php:231 ../../Zotlabs/Lib/ThreadItem.php:243 +#: ../../Zotlabs/Module/Photos.php:1131 ../../Zotlabs/Module/Photos.php:1143 +#: ../../Zotlabs/Lib/ThreadItem.php:232 ../../Zotlabs/Lib/ThreadItem.php:244 msgid "View all" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1177 ../../Zotlabs/Lib/ThreadItem.php:235 -#: ../../include/conversation.php:1702 ../../include/channel.php:1595 -#: ../../include/taxonomy.php:661 +#: ../../Zotlabs/Module/Photos.php:1135 ../../Zotlabs/Lib/ThreadItem.php:236 +#: ../../include/conversation.php:1702 ../../include/channel.php:1661 +#: ../../include/taxonomy.php:659 msgctxt "noun" msgid "Like" msgid_plural "Likes" msgstr[0] "" msgstr[1] "" -#: ../../Zotlabs/Module/Photos.php:1182 ../../Zotlabs/Lib/ThreadItem.php:240 +#: ../../Zotlabs/Module/Photos.php:1140 ../../Zotlabs/Lib/ThreadItem.php:241 #: ../../include/conversation.php:1705 msgctxt "noun" msgid "Dislike" @@ -5058,35 +5117,36 @@ msgid_plural "Dislikes" msgstr[0] "" msgstr[1] "" -#: ../../Zotlabs/Module/Photos.php:1288 +#: ../../Zotlabs/Module/Photos.php:1246 msgid "Photo Tools" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1297 +#: ../../Zotlabs/Module/Photos.php:1255 msgid "In This Photo:" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1302 +#: ../../Zotlabs/Module/Photos.php:1260 msgid "Map" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1310 ../../Zotlabs/Lib/ThreadItem.php:457 +#: ../../Zotlabs/Module/Photos.php:1268 ../../Zotlabs/Lib/ThreadItem.php:457 msgctxt "noun" msgid "Likes" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1311 ../../Zotlabs/Lib/ThreadItem.php:458 +#: ../../Zotlabs/Module/Photos.php:1269 ../../Zotlabs/Lib/ThreadItem.php:458 msgctxt "noun" msgid "Dislikes" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1316 ../../Zotlabs/Lib/ThreadItem.php:463 +#: ../../Zotlabs/Module/Photos.php:1274 ../../Zotlabs/Lib/ThreadItem.php:463 +#: ../../addon/channelreputation/channelreputation.php:230 #: ../../include/acl_selectors.php:125 msgid "Close" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1389 ../../Zotlabs/Module/Photos.php:1402 -#: ../../Zotlabs/Module/Photos.php:1403 ../../include/photos.php:670 +#: ../../Zotlabs/Module/Photos.php:1347 ../../Zotlabs/Module/Photos.php:1360 +#: ../../Zotlabs/Module/Photos.php:1361 ../../include/photos.php:667 msgid "Recent Photos" msgstr "" @@ -5123,7 +5183,7 @@ msgid "Error downloading wiki: " msgstr "" #: ../../Zotlabs/Module/Wiki.php:206 ../../Zotlabs/Widget/Wiki_list.php:15 -#: ../../include/nav.php:536 +#: ../../include/nav.php:538 msgid "Wikis" msgstr "" @@ -5147,22 +5207,22 @@ msgstr "" #: ../../Zotlabs/Module/Wiki.php:217 ../../Zotlabs/Module/Wiki.php:371 #: ../../Zotlabs/Widget/Wiki_pages.php:38 #: ../../Zotlabs/Widget/Wiki_pages.php:95 ../../addon/mdpost/mdpost.php:41 -#: ../../include/text.php:1955 +#: ../../include/text.php:1979 msgid "Markdown" msgstr "" #: ../../Zotlabs/Module/Wiki.php:217 ../../Zotlabs/Module/Wiki.php:371 #: ../../Zotlabs/Widget/Wiki_pages.php:38 -#: ../../Zotlabs/Widget/Wiki_pages.php:95 ../../include/text.php:1953 +#: ../../Zotlabs/Widget/Wiki_pages.php:95 ../../include/text.php:1977 msgid "BBcode" msgstr "" #: ../../Zotlabs/Module/Wiki.php:217 ../../Zotlabs/Widget/Wiki_pages.php:38 -#: ../../Zotlabs/Widget/Wiki_pages.php:95 ../../include/text.php:1956 +#: ../../Zotlabs/Widget/Wiki_pages.php:95 ../../include/text.php:1980 msgid "Text" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:219 ../../Zotlabs/Storage/Browser.php:286 +#: ../../Zotlabs/Module/Wiki.php:219 ../../Zotlabs/Storage/Browser.php:292 msgid "Type" msgstr "" @@ -5228,44 +5288,44 @@ msgstr "" msgid "Embed an image from your albums" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:402 ../../Zotlabs/Module/Profile_photo.php:466 -#: ../../Zotlabs/Module/Cover_photo.php:400 ../../addon/hsse/hsse.php:210 +#: ../../Zotlabs/Module/Wiki.php:402 ../../Zotlabs/Module/Profile_photo.php:506 +#: ../../Zotlabs/Module/Cover_photo.php:435 ../../addon/hsse/hsse.php:210 #: ../../addon/hsse/hsse.php:257 ../../include/conversation.php:1416 #: ../../include/conversation.php:1463 msgid "OK" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:403 ../../Zotlabs/Module/Profile_photo.php:467 -#: ../../Zotlabs/Module/Cover_photo.php:401 ../../addon/hsse/hsse.php:139 +#: ../../Zotlabs/Module/Wiki.php:403 ../../Zotlabs/Module/Profile_photo.php:507 +#: ../../Zotlabs/Module/Cover_photo.php:436 ../../addon/hsse/hsse.php:139 #: ../../include/conversation.php:1342 msgid "Choose images to embed" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:404 ../../Zotlabs/Module/Profile_photo.php:468 -#: ../../Zotlabs/Module/Cover_photo.php:402 ../../addon/hsse/hsse.php:140 +#: ../../Zotlabs/Module/Wiki.php:404 ../../Zotlabs/Module/Profile_photo.php:508 +#: ../../Zotlabs/Module/Cover_photo.php:437 ../../addon/hsse/hsse.php:140 #: ../../include/conversation.php:1343 msgid "Choose an album" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:405 ../../Zotlabs/Module/Profile_photo.php:469 -#: ../../Zotlabs/Module/Cover_photo.php:403 +#: ../../Zotlabs/Module/Wiki.php:405 ../../Zotlabs/Module/Profile_photo.php:509 +#: ../../Zotlabs/Module/Cover_photo.php:438 msgid "Choose a different album" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:406 ../../Zotlabs/Module/Profile_photo.php:470 -#: ../../Zotlabs/Module/Cover_photo.php:404 ../../addon/hsse/hsse.php:142 +#: ../../Zotlabs/Module/Wiki.php:406 ../../Zotlabs/Module/Profile_photo.php:510 +#: ../../Zotlabs/Module/Cover_photo.php:439 ../../addon/hsse/hsse.php:142 #: ../../include/conversation.php:1345 msgid "Error getting album list" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:407 ../../Zotlabs/Module/Profile_photo.php:471 -#: ../../Zotlabs/Module/Cover_photo.php:405 ../../addon/hsse/hsse.php:143 +#: ../../Zotlabs/Module/Wiki.php:407 ../../Zotlabs/Module/Profile_photo.php:511 +#: ../../Zotlabs/Module/Cover_photo.php:440 ../../addon/hsse/hsse.php:143 #: ../../include/conversation.php:1346 msgid "Error getting photo link" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:408 ../../Zotlabs/Module/Profile_photo.php:472 -#: ../../Zotlabs/Module/Cover_photo.php:406 ../../addon/hsse/hsse.php:144 +#: ../../Zotlabs/Module/Wiki.php:408 ../../Zotlabs/Module/Profile_photo.php:512 +#: ../../Zotlabs/Module/Cover_photo.php:441 ../../addon/hsse/hsse.php:144 #: ../../include/conversation.php:1347 msgid "Error getting album" msgstr "" @@ -5326,7 +5386,7 @@ msgstr "" msgid "You must be authenticated." msgstr "" -#: ../../Zotlabs/Module/Share.php:103 ../../Zotlabs/Lib/Activity.php:1473 +#: ../../Zotlabs/Module/Share.php:103 ../../Zotlabs/Lib/Activity.php:1529 #, php-format msgid "🔁 Repeated %1$s's %2$s" msgstr "" @@ -5391,7 +5451,7 @@ msgstr "" msgid "Poke somebody in your addressbook" msgstr "" -#: ../../Zotlabs/Module/Poke.php:199 ../../Zotlabs/Lib/Apps.php:348 +#: ../../Zotlabs/Module/Poke.php:199 ../../Zotlabs/Lib/Apps.php:350 #: ../../include/conversation.php:1098 msgid "Poke" msgstr "" @@ -5420,109 +5480,109 @@ msgstr "" msgid "Make this post private" msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:66 -#: ../../Zotlabs/Module/Cover_photo.php:57 +#: ../../Zotlabs/Module/Profile_photo.php:91 +#: ../../Zotlabs/Module/Cover_photo.php:83 msgid "Image uploaded but image cropping failed." msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:120 -#: ../../Zotlabs/Module/Profile_photo.php:248 +#: ../../Zotlabs/Module/Profile_photo.php:145 +#: ../../Zotlabs/Module/Profile_photo.php:282 #: ../../include/photo/photo_driver.php:367 msgid "Profile Photos" msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:142 -#: ../../Zotlabs/Module/Cover_photo.php:191 +#: ../../Zotlabs/Module/Profile_photo.php:164 +#: ../../Zotlabs/Module/Cover_photo.php:210 msgid "Image resize failed." msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:218 +#: ../../Zotlabs/Module/Profile_photo.php:252 #: ../../addon/openclipatar/openclipatar.php:298 msgid "" "Shift-reload the page or clear browser cache if the new photo does not " "display immediately." msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:225 -#: ../../Zotlabs/Module/Cover_photo.php:205 ../../include/photos.php:196 +#: ../../Zotlabs/Module/Profile_photo.php:259 +#: ../../Zotlabs/Module/Cover_photo.php:239 ../../include/photos.php:196 msgid "Unable to process image" msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:260 -#: ../../Zotlabs/Module/Cover_photo.php:229 +#: ../../Zotlabs/Module/Profile_photo.php:294 +#: ../../Zotlabs/Module/Cover_photo.php:263 msgid "Image upload failed." msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:279 -#: ../../Zotlabs/Module/Cover_photo.php:246 +#: ../../Zotlabs/Module/Profile_photo.php:313 +#: ../../Zotlabs/Module/Cover_photo.php:280 msgid "Unable to process image." msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:343 -#: ../../Zotlabs/Module/Profile_photo.php:390 -#: ../../Zotlabs/Module/Cover_photo.php:339 -#: ../../Zotlabs/Module/Cover_photo.php:354 +#: ../../Zotlabs/Module/Profile_photo.php:377 +#: ../../Zotlabs/Module/Profile_photo.php:429 +#: ../../Zotlabs/Module/Cover_photo.php:373 +#: ../../Zotlabs/Module/Cover_photo.php:388 msgid "Photo not available." msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:454 +#: ../../Zotlabs/Module/Profile_photo.php:493 msgid "" "Your default profile photo is visible to anybody on the internet. Profile " "photos for alternate profiles will inherit the permissions of the profile" msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:454 +#: ../../Zotlabs/Module/Profile_photo.php:493 msgid "" "Your profile photo is visible to anybody on the internet and may be " "distributed to other websites." msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:456 -#: ../../Zotlabs/Module/Cover_photo.php:392 +#: ../../Zotlabs/Module/Profile_photo.php:495 +#: ../../Zotlabs/Module/Cover_photo.php:426 msgid "Upload File:" msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:457 -#: ../../Zotlabs/Module/Cover_photo.php:393 +#: ../../Zotlabs/Module/Profile_photo.php:496 +#: ../../Zotlabs/Module/Cover_photo.php:427 msgid "Select a profile:" msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:458 +#: ../../Zotlabs/Module/Profile_photo.php:497 msgid "Use Photo for Profile" msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:458 +#: ../../Zotlabs/Module/Profile_photo.php:497 msgid "Change Profile Photo" msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:459 +#: ../../Zotlabs/Module/Profile_photo.php:498 msgid "Use" msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:463 -#: ../../Zotlabs/Module/Profile_photo.php:464 -#: ../../Zotlabs/Module/Cover_photo.php:397 -#: ../../Zotlabs/Module/Cover_photo.php:398 +#: ../../Zotlabs/Module/Profile_photo.php:503 +#: ../../Zotlabs/Module/Profile_photo.php:504 +#: ../../Zotlabs/Module/Cover_photo.php:432 +#: ../../Zotlabs/Module/Cover_photo.php:433 msgid "Use a photo from your albums" msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:474 -#: ../../Zotlabs/Module/Cover_photo.php:409 +#: ../../Zotlabs/Module/Profile_photo.php:514 +#: ../../Zotlabs/Module/Cover_photo.php:444 msgid "Select existing photo" msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:493 -#: ../../Zotlabs/Module/Cover_photo.php:426 +#: ../../Zotlabs/Module/Profile_photo.php:533 +#: ../../Zotlabs/Module/Cover_photo.php:461 msgid "Crop Image" msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:494 -#: ../../Zotlabs/Module/Cover_photo.php:427 +#: ../../Zotlabs/Module/Profile_photo.php:534 +#: ../../Zotlabs/Module/Cover_photo.php:462 msgid "Please adjust the image cropping for optimum viewing." msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:496 -#: ../../Zotlabs/Module/Cover_photo.php:429 +#: ../../Zotlabs/Module/Profile_photo.php:536 +#: ../../Zotlabs/Module/Cover_photo.php:464 msgid "Done Editing" msgstr "" @@ -5534,36 +5594,36 @@ msgstr "" msgid "Online" msgstr "" -#: ../../Zotlabs/Module/Item.php:341 +#: ../../Zotlabs/Module/Item.php:362 msgid "Unable to locate original post." msgstr "" -#: ../../Zotlabs/Module/Item.php:628 +#: ../../Zotlabs/Module/Item.php:649 msgid "Empty post discarded." msgstr "" -#: ../../Zotlabs/Module/Item.php:1037 +#: ../../Zotlabs/Module/Item.php:1058 msgid "Duplicate post suppressed." msgstr "" -#: ../../Zotlabs/Module/Item.php:1182 +#: ../../Zotlabs/Module/Item.php:1203 msgid "System error. Post not saved." msgstr "" -#: ../../Zotlabs/Module/Item.php:1218 +#: ../../Zotlabs/Module/Item.php:1239 msgid "Your comment is awaiting approval." msgstr "" -#: ../../Zotlabs/Module/Item.php:1335 +#: ../../Zotlabs/Module/Item.php:1356 msgid "Unable to obtain post information from database." msgstr "" -#: ../../Zotlabs/Module/Item.php:1342 +#: ../../Zotlabs/Module/Item.php:1363 #, php-format msgid "You have reached your limit of %1$.0f top level posts." msgstr "" -#: ../../Zotlabs/Module/Item.php:1349 +#: ../../Zotlabs/Module/Item.php:1370 #, php-format msgid "You have reached your limit of %1$.0f webpages." msgstr "" @@ -5610,7 +5670,7 @@ msgstr "" #: ../../Zotlabs/Module/Page.php:136 ../../Zotlabs/Module/Block.php:77 #: ../../Zotlabs/Module/Display.php:140 ../../Zotlabs/Module/Display.php:157 -#: ../../Zotlabs/Module/Display.php:174 +#: ../../Zotlabs/Module/Display.php:174 ../../Zotlabs/Module/Display.php:180 #: ../../Zotlabs/Lib/NativeWikiPage.php:521 ../../Zotlabs/Web/Router.php:185 #: ../../addon/chess/Mod_Chess.php:447 ../../include/help.php:132 msgid "Page not found." @@ -5664,9 +5724,9 @@ msgstr "" msgid "Connection has been removed." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:608 ../../Zotlabs/Lib/Apps.php:341 +#: ../../Zotlabs/Module/Connedit.php:608 ../../Zotlabs/Lib/Apps.php:343 #: ../../addon/openclipatar/openclipatar.php:57 -#: ../../include/conversation.php:1038 ../../include/nav.php:106 +#: ../../include/conversation.php:1038 ../../include/nav.php:110 msgid "View Profile" msgstr "" @@ -5838,7 +5898,7 @@ msgstr "" msgid "Connection Default Permissions" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:867 ../../include/items.php:4308 +#: ../../Zotlabs/Module/Connedit.php:867 ../../include/items.php:4328 #, php-format msgid "Connection: %s" msgstr "" @@ -5976,7 +6036,7 @@ msgid "Please enter a link URL:" msgstr "" #: ../../Zotlabs/Module/Chat.php:221 ../../Zotlabs/Module/Mail.php:294 -#: ../../Zotlabs/Module/Mail.php:436 ../../Zotlabs/Lib/ThreadItem.php:809 +#: ../../Zotlabs/Module/Mail.php:436 ../../Zotlabs/Lib/ThreadItem.php:810 #: ../../addon/hsse/hsse.php:255 ../../include/conversation.php:1461 msgid "Encrypt text" msgstr "" @@ -6010,13 +6070,13 @@ msgstr "" msgid "min" msgstr "" -#: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:342 -#: ../../include/features.php:383 ../../include/nav.php:444 +#: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:344 +#: ../../include/features.php:383 ../../include/nav.php:446 msgid "Photos" msgstr "" -#: ../../Zotlabs/Module/Fbrowser.php:85 ../../Zotlabs/Lib/Apps.php:337 -#: ../../Zotlabs/Storage/Browser.php:272 ../../include/nav.php:452 +#: ../../Zotlabs/Module/Fbrowser.php:85 ../../Zotlabs/Lib/Apps.php:339 +#: ../../Zotlabs/Storage/Browser.php:278 ../../include/nav.php:454 msgid "Files" msgstr "" @@ -6056,7 +6116,7 @@ msgstr "" msgid "Submit and proceed" msgstr "" -#: ../../Zotlabs/Module/Menu.php:170 ../../include/text.php:2535 +#: ../../Zotlabs/Module/Menu.php:170 ../../include/text.php:2559 msgid "Menus" msgstr "" @@ -6108,12 +6168,12 @@ msgstr "" msgid "Allow bookmarks" msgstr "" -#: ../../Zotlabs/Module/Layouts.php:184 ../../include/text.php:2536 +#: ../../Zotlabs/Module/Layouts.php:184 ../../include/text.php:2560 msgid "Layouts" msgstr "" -#: ../../Zotlabs/Module/Layouts.php:186 ../../Zotlabs/Lib/Apps.php:345 -#: ../../include/nav.php:168 ../../include/nav.php:319 +#: ../../Zotlabs/Module/Layouts.php:186 ../../Zotlabs/Lib/Apps.php:347 +#: ../../include/nav.php:172 ../../include/nav.php:322 #: ../../include/help.php:117 ../../include/help.php:125 msgid "Help" msgstr "" @@ -6180,12 +6240,12 @@ msgid "Post not found." msgstr "" #: ../../Zotlabs/Module/Tagger.php:77 ../../include/markdown.php:200 -#: ../../include/bbcode.php:343 +#: ../../include/bbcode.php:362 msgid "post" msgstr "" #: ../../Zotlabs/Module/Tagger.php:79 ../../include/conversation.php:146 -#: ../../include/text.php:2099 +#: ../../include/text.php:2123 msgid "comment" msgstr "" @@ -6304,7 +6364,7 @@ msgid "Could not create privacy group." msgstr "" #: ../../Zotlabs/Module/Group.php:61 ../../Zotlabs/Module/Group.php:213 -#: ../../include/items.php:4275 +#: ../../include/items.php:4295 msgid "Privacy group not found." msgstr "" @@ -6321,8 +6381,8 @@ msgid "Management of privacy groups" msgstr "" #: ../../Zotlabs/Module/Group.php:141 ../../Zotlabs/Module/Group.php:153 -#: ../../Zotlabs/Lib/Apps.php:361 ../../Zotlabs/Lib/Group.php:324 -#: ../../Zotlabs/Widget/Activity_filter.php:41 ../../include/nav.php:95 +#: ../../Zotlabs/Lib/Apps.php:363 ../../Zotlabs/Lib/Group.php:324 +#: ../../Zotlabs/Widget/Activity_filter.php:41 ../../include/nav.php:99 #: ../../include/group.php:320 msgid "Privacy Groups" msgstr "" @@ -6467,7 +6527,7 @@ msgid "View this profile" msgstr "" #: ../../Zotlabs/Module/Profiles.php:725 ../../Zotlabs/Module/Profiles.php:824 -#: ../../include/channel.php:1375 +#: ../../include/channel.php:1441 msgid "Edit visibility" msgstr "" @@ -6479,7 +6539,7 @@ msgstr "" msgid "Change cover photo" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:728 ../../include/channel.php:1345 +#: ../../Zotlabs/Module/Profiles.php:728 ../../include/channel.php:1411 msgid "Change profile photo" msgstr "" @@ -6645,12 +6705,12 @@ msgstr "" msgid "Communications" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:820 ../../include/channel.php:1371 +#: ../../Zotlabs/Module/Profiles.php:820 ../../include/channel.php:1437 msgid "Profile Image" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:830 ../../include/channel.php:1352 -#: ../../include/nav.php:109 +#: ../../Zotlabs/Module/Profiles.php:830 ../../include/channel.php:1418 +#: ../../include/nav.php:113 msgid "Edit Profiles" msgstr "" @@ -6729,8 +6789,8 @@ msgstr "" msgid "Create a new channel" msgstr "" -#: ../../Zotlabs/Module/Manage.php:170 ../../Zotlabs/Lib/Apps.php:334 -#: ../../include/nav.php:92 +#: ../../Zotlabs/Module/Manage.php:170 ../../Zotlabs/Lib/Apps.php:336 +#: ../../include/nav.php:96 msgid "Channel Manager" msgstr "" @@ -6777,7 +6837,7 @@ msgid "Add Card" msgstr "" #: ../../Zotlabs/Module/Cards.php:207 ../../Zotlabs/Lib/Apps.php:325 -#: ../../include/nav.php:501 +#: ../../include/nav.php:503 msgid "Cards" msgstr "" @@ -6797,7 +6857,7 @@ msgstr "" msgid "Administrator" msgstr "" -#: ../../Zotlabs/Module/Siteinfo.php:28 ../../Zotlabs/Module/Register.php:236 +#: ../../Zotlabs/Module/Siteinfo.php:28 ../../Zotlabs/Module/Register.php:239 msgid "Terms of Service" msgstr "" @@ -6876,8 +6936,8 @@ msgstr "" msgid "Export selected" msgstr "" -#: ../../Zotlabs/Module/Webpages.php:252 ../../Zotlabs/Lib/Apps.php:338 -#: ../../include/nav.php:524 +#: ../../Zotlabs/Module/Webpages.php:252 ../../Zotlabs/Lib/Apps.php:340 +#: ../../include/nav.php:526 msgid "Webpages" msgstr "" @@ -6950,73 +7010,73 @@ msgstr "" msgid "Item is not editable" msgstr "" -#: ../../Zotlabs/Module/Editpost.php:108 ../../Zotlabs/Module/Rpost.php:144 +#: ../../Zotlabs/Module/Editpost.php:109 ../../Zotlabs/Module/Rpost.php:144 msgid "Edit post" msgstr "" -#: ../../Zotlabs/Module/Dreport.php:56 +#: ../../Zotlabs/Module/Dreport.php:59 msgid "Invalid message" msgstr "" -#: ../../Zotlabs/Module/Dreport.php:90 +#: ../../Zotlabs/Module/Dreport.php:93 msgid "no results" msgstr "" -#: ../../Zotlabs/Module/Dreport.php:104 +#: ../../Zotlabs/Module/Dreport.php:107 msgid "channel sync processed" msgstr "" -#: ../../Zotlabs/Module/Dreport.php:108 +#: ../../Zotlabs/Module/Dreport.php:111 msgid "queued" msgstr "" -#: ../../Zotlabs/Module/Dreport.php:112 +#: ../../Zotlabs/Module/Dreport.php:115 msgid "posted" msgstr "" -#: ../../Zotlabs/Module/Dreport.php:116 +#: ../../Zotlabs/Module/Dreport.php:119 msgid "accepted for delivery" msgstr "" -#: ../../Zotlabs/Module/Dreport.php:120 +#: ../../Zotlabs/Module/Dreport.php:123 msgid "updated" msgstr "" -#: ../../Zotlabs/Module/Dreport.php:123 +#: ../../Zotlabs/Module/Dreport.php:126 msgid "update ignored" msgstr "" -#: ../../Zotlabs/Module/Dreport.php:126 +#: ../../Zotlabs/Module/Dreport.php:129 msgid "permission denied" msgstr "" -#: ../../Zotlabs/Module/Dreport.php:130 +#: ../../Zotlabs/Module/Dreport.php:133 msgid "recipient not found" msgstr "" -#: ../../Zotlabs/Module/Dreport.php:133 +#: ../../Zotlabs/Module/Dreport.php:136 msgid "mail recalled" msgstr "" -#: ../../Zotlabs/Module/Dreport.php:136 +#: ../../Zotlabs/Module/Dreport.php:139 msgid "duplicate mail received" msgstr "" -#: ../../Zotlabs/Module/Dreport.php:139 +#: ../../Zotlabs/Module/Dreport.php:142 msgid "mail delivered" msgstr "" -#: ../../Zotlabs/Module/Dreport.php:159 +#: ../../Zotlabs/Module/Dreport.php:162 #, php-format msgid "Delivery report for %1$s" msgstr "" -#: ../../Zotlabs/Module/Dreport.php:162 ../../Zotlabs/Widget/Wiki_pages.php:41 +#: ../../Zotlabs/Module/Dreport.php:166 ../../Zotlabs/Widget/Wiki_pages.php:41 #: ../../Zotlabs/Widget/Wiki_pages.php:98 msgid "Options" msgstr "" -#: ../../Zotlabs/Module/Dreport.php:163 +#: ../../Zotlabs/Module/Dreport.php:167 msgid "Redeliver" msgstr "" @@ -7044,7 +7104,7 @@ msgstr "" msgid "*" msgstr "" -#: ../../Zotlabs/Module/Sources.php:107 ../../Zotlabs/Lib/Apps.php:366 +#: ../../Zotlabs/Module/Sources.php:107 ../../Zotlabs/Lib/Apps.php:367 msgid "Channel Sources" msgstr "" @@ -7148,15 +7208,15 @@ msgstr "" msgid "Previous action reversed." msgstr "" -#: ../../Zotlabs/Module/Like.php:447 ../../Zotlabs/Lib/Activity.php:1994 -#: ../../addon/diaspora/Receiver.php:1491 ../../addon/pubcrawl/as.php:1540 +#: ../../Zotlabs/Module/Like.php:447 ../../Zotlabs/Lib/Activity.php:2054 +#: ../../addon/diaspora/Receiver.php:1505 ../../addon/pubcrawl/as.php:1594 #: ../../include/conversation.php:160 #, php-format msgid "%1$s likes %2$s's %3$s" msgstr "" -#: ../../Zotlabs/Module/Like.php:449 ../../Zotlabs/Lib/Activity.php:1996 -#: ../../addon/pubcrawl/as.php:1542 ../../include/conversation.php:163 +#: ../../Zotlabs/Module/Like.php:449 ../../Zotlabs/Lib/Activity.php:2056 +#: ../../addon/pubcrawl/as.php:1596 ../../include/conversation.php:163 #, php-format msgid "%1$s doesn't like %2$s's %3$s" msgstr "" @@ -7176,17 +7236,17 @@ msgstr "" msgid "%1$s abstains from a decision on %2$s's %3$s" msgstr "" -#: ../../Zotlabs/Module/Like.php:457 ../../addon/diaspora/Receiver.php:2137 +#: ../../Zotlabs/Module/Like.php:457 ../../addon/diaspora/Receiver.php:2151 #, php-format msgid "%1$s is attending %2$s's %3$s" msgstr "" -#: ../../Zotlabs/Module/Like.php:459 ../../addon/diaspora/Receiver.php:2139 +#: ../../Zotlabs/Module/Like.php:459 ../../addon/diaspora/Receiver.php:2153 #, php-format msgid "%1$s is not attending %2$s's %3$s" msgstr "" -#: ../../Zotlabs/Module/Like.php:461 ../../addon/diaspora/Receiver.php:2141 +#: ../../Zotlabs/Module/Like.php:461 ../../addon/diaspora/Receiver.php:2155 #, php-format msgid "%1$s may attend %2$s's %3$s" msgstr "" @@ -7199,119 +7259,119 @@ msgstr "" msgid "Thank you." msgstr "" -#: ../../Zotlabs/Module/Directory.php:110 +#: ../../Zotlabs/Module/Directory.php:116 msgid "No default suggestions were found." msgstr "" -#: ../../Zotlabs/Module/Directory.php:259 +#: ../../Zotlabs/Module/Directory.php:270 #, php-format msgid "%d rating" msgid_plural "%d ratings" msgstr[0] "" msgstr[1] "" -#: ../../Zotlabs/Module/Directory.php:270 +#: ../../Zotlabs/Module/Directory.php:281 msgid "Gender: " msgstr "" -#: ../../Zotlabs/Module/Directory.php:272 +#: ../../Zotlabs/Module/Directory.php:283 msgid "Status: " msgstr "" -#: ../../Zotlabs/Module/Directory.php:274 +#: ../../Zotlabs/Module/Directory.php:285 msgid "Homepage: " msgstr "" -#: ../../Zotlabs/Module/Directory.php:323 ../../include/channel.php:1620 +#: ../../Zotlabs/Module/Directory.php:334 ../../include/channel.php:1686 msgid "Age:" msgstr "" -#: ../../Zotlabs/Module/Directory.php:328 ../../include/channel.php:1447 -#: ../../include/event.php:58 ../../include/event.php:90 +#: ../../Zotlabs/Module/Directory.php:339 ../../include/channel.php:1513 +#: ../../include/event.php:61 ../../include/event.php:93 msgid "Location:" msgstr "" -#: ../../Zotlabs/Module/Directory.php:334 +#: ../../Zotlabs/Module/Directory.php:345 msgid "Description:" msgstr "" -#: ../../Zotlabs/Module/Directory.php:339 ../../include/channel.php:1649 +#: ../../Zotlabs/Module/Directory.php:350 ../../include/channel.php:1715 msgid "Hometown:" msgstr "" -#: ../../Zotlabs/Module/Directory.php:341 ../../include/channel.php:1655 +#: ../../Zotlabs/Module/Directory.php:352 ../../include/channel.php:1721 msgid "About:" msgstr "" -#: ../../Zotlabs/Module/Directory.php:342 ../../Zotlabs/Module/Suggest.php:71 -#: ../../Zotlabs/Widget/Follow.php:32 ../../Zotlabs/Widget/Suggestions.php:44 -#: ../../include/conversation.php:1058 ../../include/channel.php:1432 +#: ../../Zotlabs/Module/Directory.php:353 ../../Zotlabs/Module/Suggest.php:71 +#: ../../Zotlabs/Widget/Follow.php:32 ../../Zotlabs/Widget/Suggestions.php:46 +#: ../../include/conversation.php:1058 ../../include/channel.php:1498 #: ../../include/connections.php:110 msgid "Connect" msgstr "" -#: ../../Zotlabs/Module/Directory.php:343 +#: ../../Zotlabs/Module/Directory.php:354 msgid "Public Forum:" msgstr "" -#: ../../Zotlabs/Module/Directory.php:346 +#: ../../Zotlabs/Module/Directory.php:357 msgid "Keywords: " msgstr "" -#: ../../Zotlabs/Module/Directory.php:349 +#: ../../Zotlabs/Module/Directory.php:360 msgid "Don't suggest" msgstr "" -#: ../../Zotlabs/Module/Directory.php:351 +#: ../../Zotlabs/Module/Directory.php:362 msgid "Common connections (estimated):" msgstr "" -#: ../../Zotlabs/Module/Directory.php:400 +#: ../../Zotlabs/Module/Directory.php:411 msgid "Global Directory" msgstr "" -#: ../../Zotlabs/Module/Directory.php:400 +#: ../../Zotlabs/Module/Directory.php:411 msgid "Local Directory" msgstr "" -#: ../../Zotlabs/Module/Directory.php:406 +#: ../../Zotlabs/Module/Directory.php:417 msgid "Finding:" msgstr "" -#: ../../Zotlabs/Module/Directory.php:409 ../../Zotlabs/Module/Suggest.php:79 +#: ../../Zotlabs/Module/Directory.php:420 ../../Zotlabs/Module/Suggest.php:79 #: ../../include/contact_widgets.php:24 msgid "Channel Suggestions" msgstr "" -#: ../../Zotlabs/Module/Directory.php:411 +#: ../../Zotlabs/Module/Directory.php:422 msgid "next page" msgstr "" -#: ../../Zotlabs/Module/Directory.php:411 +#: ../../Zotlabs/Module/Directory.php:422 msgid "previous page" msgstr "" -#: ../../Zotlabs/Module/Directory.php:412 +#: ../../Zotlabs/Module/Directory.php:423 msgid "Sort options" msgstr "" -#: ../../Zotlabs/Module/Directory.php:413 +#: ../../Zotlabs/Module/Directory.php:424 msgid "Alphabetic" msgstr "" -#: ../../Zotlabs/Module/Directory.php:414 +#: ../../Zotlabs/Module/Directory.php:425 msgid "Reverse Alphabetic" msgstr "" -#: ../../Zotlabs/Module/Directory.php:415 +#: ../../Zotlabs/Module/Directory.php:426 msgid "Newest to Oldest" msgstr "" -#: ../../Zotlabs/Module/Directory.php:416 +#: ../../Zotlabs/Module/Directory.php:427 msgid "Oldest to Newest" msgstr "" -#: ../../Zotlabs/Module/Directory.php:433 +#: ../../Zotlabs/Module/Directory.php:444 msgid "No entries (some entries may be hidden)." msgstr "" @@ -7339,7 +7399,7 @@ msgid "" "hours." msgstr "" -#: ../../Zotlabs/Module/Suggest.php:73 ../../Zotlabs/Widget/Suggestions.php:46 +#: ../../Zotlabs/Module/Suggest.php:73 ../../Zotlabs/Widget/Suggestions.php:48 msgid "Ignore/Hide" msgstr "" @@ -7488,19 +7548,19 @@ msgstr "" msgid "Rate" msgstr "" -#: ../../Zotlabs/Module/Impel.php:43 ../../include/bbcode.php:269 +#: ../../Zotlabs/Module/Impel.php:43 ../../include/bbcode.php:288 msgid "webpage" msgstr "" -#: ../../Zotlabs/Module/Impel.php:48 ../../include/bbcode.php:275 +#: ../../Zotlabs/Module/Impel.php:48 ../../include/bbcode.php:294 msgid "block" msgstr "" -#: ../../Zotlabs/Module/Impel.php:53 ../../include/bbcode.php:272 +#: ../../Zotlabs/Module/Impel.php:53 ../../include/bbcode.php:291 msgid "layout" msgstr "" -#: ../../Zotlabs/Module/Impel.php:60 ../../include/bbcode.php:278 +#: ../../Zotlabs/Module/Impel.php:60 ../../include/bbcode.php:297 msgid "menu" msgstr "" @@ -7538,7 +7598,7 @@ msgstr "" msgid "or select an existing folder (doubleclick)" msgstr "" -#: ../../Zotlabs/Module/Filer.php:54 ../../Zotlabs/Lib/ThreadItem.php:181 +#: ../../Zotlabs/Module/Filer.php:54 ../../Zotlabs/Lib/ThreadItem.php:182 msgid "Save to Folder" msgstr "" @@ -7550,161 +7610,161 @@ msgstr "" msgid "Perform diagnostics on remote channels" msgstr "" -#: ../../Zotlabs/Module/Register.php:49 +#: ../../Zotlabs/Module/Register.php:52 msgid "Maximum daily site registrations exceeded. Please try again tomorrow." msgstr "" -#: ../../Zotlabs/Module/Register.php:55 +#: ../../Zotlabs/Module/Register.php:58 msgid "" "Please indicate acceptance of the Terms of Service. Registration failed." msgstr "" -#: ../../Zotlabs/Module/Register.php:89 +#: ../../Zotlabs/Module/Register.php:92 msgid "Passwords do not match." msgstr "" -#: ../../Zotlabs/Module/Register.php:132 +#: ../../Zotlabs/Module/Register.php:135 msgid "Registration successful. Continue to create your first channel..." msgstr "" -#: ../../Zotlabs/Module/Register.php:135 +#: ../../Zotlabs/Module/Register.php:138 msgid "" "Registration successful. Please check your email for validation instructions." msgstr "" -#: ../../Zotlabs/Module/Register.php:142 +#: ../../Zotlabs/Module/Register.php:145 msgid "Your registration is pending approval by the site owner." msgstr "" -#: ../../Zotlabs/Module/Register.php:145 +#: ../../Zotlabs/Module/Register.php:148 msgid "Your registration can not be processed." msgstr "" -#: ../../Zotlabs/Module/Register.php:192 +#: ../../Zotlabs/Module/Register.php:195 msgid "Registration on this hub is disabled." msgstr "" -#: ../../Zotlabs/Module/Register.php:201 +#: ../../Zotlabs/Module/Register.php:204 msgid "Registration on this hub is by approval only." msgstr "" -#: ../../Zotlabs/Module/Register.php:202 ../../Zotlabs/Module/Register.php:211 +#: ../../Zotlabs/Module/Register.php:205 ../../Zotlabs/Module/Register.php:214 msgid "<a href=\"pubsites\">Register at another affiliated hub.</a>" msgstr "" -#: ../../Zotlabs/Module/Register.php:210 +#: ../../Zotlabs/Module/Register.php:213 msgid "Registration on this hub is by invitation only." msgstr "" -#: ../../Zotlabs/Module/Register.php:221 +#: ../../Zotlabs/Module/Register.php:224 msgid "" "This site has exceeded the number of allowed daily account registrations. " "Please try again tomorrow." msgstr "" -#: ../../Zotlabs/Module/Register.php:242 +#: ../../Zotlabs/Module/Register.php:245 #, php-format msgid "I accept the %s for this website" msgstr "" -#: ../../Zotlabs/Module/Register.php:249 +#: ../../Zotlabs/Module/Register.php:252 #, php-format msgid "I am over %s years of age and accept the %s for this website" msgstr "" -#: ../../Zotlabs/Module/Register.php:254 +#: ../../Zotlabs/Module/Register.php:257 msgid "Your email address" msgstr "" -#: ../../Zotlabs/Module/Register.php:255 +#: ../../Zotlabs/Module/Register.php:258 msgid "Choose a password" msgstr "" -#: ../../Zotlabs/Module/Register.php:256 +#: ../../Zotlabs/Module/Register.php:259 msgid "Please re-enter your password" msgstr "" -#: ../../Zotlabs/Module/Register.php:257 +#: ../../Zotlabs/Module/Register.php:260 msgid "Please enter your invitation code" msgstr "" -#: ../../Zotlabs/Module/Register.php:258 +#: ../../Zotlabs/Module/Register.php:261 msgid "Your Name" msgstr "" -#: ../../Zotlabs/Module/Register.php:258 +#: ../../Zotlabs/Module/Register.php:261 msgid "Real names are preferred." msgstr "" -#: ../../Zotlabs/Module/Register.php:260 +#: ../../Zotlabs/Module/Register.php:263 #, php-format msgid "" "Your nickname will be used to create an easy to remember channel address e." "g. nickname%s" msgstr "" -#: ../../Zotlabs/Module/Register.php:261 +#: ../../Zotlabs/Module/Register.php:264 msgid "" "Select a channel permission role for your usage needs and privacy " "requirements." msgstr "" -#: ../../Zotlabs/Module/Register.php:262 +#: ../../Zotlabs/Module/Register.php:265 msgid "no" msgstr "" -#: ../../Zotlabs/Module/Register.php:262 +#: ../../Zotlabs/Module/Register.php:265 msgid "yes" msgstr "" -#: ../../Zotlabs/Module/Register.php:289 ../../boot.php:1609 -#: ../../include/nav.php:156 +#: ../../Zotlabs/Module/Register.php:293 ../../boot.php:1610 +#: ../../include/nav.php:160 msgid "Register" msgstr "" -#: ../../Zotlabs/Module/Register.php:290 +#: ../../Zotlabs/Module/Register.php:294 msgid "" "This site requires email verification. After completing this form, please " "check your email for further instructions." msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:168 -#: ../../Zotlabs/Module/Cover_photo.php:218 +#: ../../Zotlabs/Module/Cover_photo.php:194 +#: ../../Zotlabs/Module/Cover_photo.php:252 msgid "Cover Photos" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:269 ../../include/items.php:4652 +#: ../../Zotlabs/Module/Cover_photo.php:303 ../../include/items.php:4672 msgid "female" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:270 ../../include/items.php:4653 +#: ../../Zotlabs/Module/Cover_photo.php:304 ../../include/items.php:4673 #, php-format msgid "%1$s updated her %2$s" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:271 ../../include/items.php:4654 +#: ../../Zotlabs/Module/Cover_photo.php:305 ../../include/items.php:4674 msgid "male" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:272 ../../include/items.php:4655 +#: ../../Zotlabs/Module/Cover_photo.php:306 ../../include/items.php:4675 #, php-format msgid "%1$s updated his %2$s" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:274 ../../include/items.php:4657 +#: ../../Zotlabs/Module/Cover_photo.php:308 ../../include/items.php:4677 #, php-format msgid "%1$s updated their %2$s" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:276 ../../include/channel.php:2137 +#: ../../Zotlabs/Module/Cover_photo.php:310 ../../include/channel.php:2207 msgid "cover photo" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:390 +#: ../../Zotlabs/Module/Cover_photo.php:424 msgid "Your cover photo may be visible to anybody on the internet" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:394 +#: ../../Zotlabs/Module/Cover_photo.php:428 msgid "Change Cover Photo" msgstr "" @@ -7712,7 +7772,7 @@ msgstr "" msgid "Documentation Search" msgstr "" -#: ../../Zotlabs/Module/Help.php:80 ../../include/nav.php:434 +#: ../../Zotlabs/Module/Help.php:80 ../../include/nav.php:436 msgid "About" msgstr "" @@ -7736,11 +7796,11 @@ msgstr "" msgid "Contents" msgstr "" -#: ../../Zotlabs/Module/Display.php:391 +#: ../../Zotlabs/Module/Display.php:396 msgid "Article" msgstr "" -#: ../../Zotlabs/Module/Display.php:443 +#: ../../Zotlabs/Module/Display.php:448 msgid "Item has been removed." msgstr "" @@ -7790,48 +7850,48 @@ msgstr "" msgid "Welcome to %s" msgstr "" -#: ../../Zotlabs/Module/Filestorage.php:79 -msgid "Permission Denied." +#: ../../Zotlabs/Module/Filestorage.php:103 +msgid "File not found." msgstr "" -#: ../../Zotlabs/Module/Filestorage.php:112 -msgid "File not found." +#: ../../Zotlabs/Module/Filestorage.php:152 +msgid "Permission Denied." msgstr "" -#: ../../Zotlabs/Module/Filestorage.php:165 +#: ../../Zotlabs/Module/Filestorage.php:185 msgid "Edit file permissions" msgstr "" -#: ../../Zotlabs/Module/Filestorage.php:177 +#: ../../Zotlabs/Module/Filestorage.php:197 msgid "Set/edit permissions" msgstr "" -#: ../../Zotlabs/Module/Filestorage.php:178 +#: ../../Zotlabs/Module/Filestorage.php:198 msgid "Include all files and sub folders" msgstr "" -#: ../../Zotlabs/Module/Filestorage.php:179 +#: ../../Zotlabs/Module/Filestorage.php:199 msgid "Return to file list" msgstr "" -#: ../../Zotlabs/Module/Filestorage.php:181 +#: ../../Zotlabs/Module/Filestorage.php:201 msgid "Copy/paste this code to attach file to a post" msgstr "" -#: ../../Zotlabs/Module/Filestorage.php:182 +#: ../../Zotlabs/Module/Filestorage.php:202 msgid "Copy/paste this URL to link file from a web page" msgstr "" -#: ../../Zotlabs/Module/Filestorage.php:184 +#: ../../Zotlabs/Module/Filestorage.php:204 msgid "Share this file" msgstr "" -#: ../../Zotlabs/Module/Filestorage.php:185 +#: ../../Zotlabs/Module/Filestorage.php:205 msgid "Show URL to this file" msgstr "" -#: ../../Zotlabs/Module/Filestorage.php:186 -#: ../../Zotlabs/Storage/Browser.php:405 +#: ../../Zotlabs/Module/Filestorage.php:206 +#: ../../Zotlabs/Storage/Browser.php:411 msgid "Show in your contacts shared folder" msgstr "" @@ -7969,7 +8029,7 @@ msgid "" "Password reset failed." msgstr "" -#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1638 +#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1639 msgid "Password Reset" msgstr "" @@ -8052,35 +8112,35 @@ msgstr "" msgid "Mark all seen" msgstr "" -#: ../../Zotlabs/Lib/Activity.php:1458 +#: ../../Zotlabs/Lib/Activity.php:1514 #, php-format msgid "Likes %1$s's %2$s" msgstr "" -#: ../../Zotlabs/Lib/Activity.php:1461 +#: ../../Zotlabs/Lib/Activity.php:1517 #, php-format msgid "Doesn't like %1$s's %2$s" msgstr "" -#: ../../Zotlabs/Lib/Activity.php:1464 +#: ../../Zotlabs/Lib/Activity.php:1520 #, php-format msgid "Will attend %1$s's %2$s" msgstr "" -#: ../../Zotlabs/Lib/Activity.php:1467 +#: ../../Zotlabs/Lib/Activity.php:1523 #, php-format msgid "Will not attend %1$s's %2$s" msgstr "" -#: ../../Zotlabs/Lib/Activity.php:1470 +#: ../../Zotlabs/Lib/Activity.php:1526 #, php-format msgid "May attend %1$s's %2$s" msgstr "" -#: ../../Zotlabs/Lib/Activity.php:1806 ../../Zotlabs/Lib/Activity.php:2003 -#: ../../widget/Netselect/Netselect.php:42 ../../addon/pubcrawl/as.php:1214 -#: ../../addon/pubcrawl/as.php:1369 ../../addon/pubcrawl/as.php:1549 -#: ../../include/network.php:1720 +#: ../../Zotlabs/Lib/Activity.php:1865 ../../Zotlabs/Lib/Activity.php:2063 +#: ../../widget/Netselect/Netselect.php:42 ../../addon/pubcrawl/as.php:1268 +#: ../../addon/pubcrawl/as.php:1423 ../../addon/pubcrawl/as.php:1603 +#: ../../include/network.php:1730 msgid "ActivityPub" msgstr "" @@ -8128,163 +8188,170 @@ msgstr "" msgid "Report Bug" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:328 ../../include/nav.php:490 +#: ../../Zotlabs/Lib/Apps.php:328 ../../include/nav.php:492 msgid "Bookmarks" msgstr "" #: ../../Zotlabs/Lib/Apps.php:329 ../../Zotlabs/Widget/Chatroom_list.php:16 -#: ../../include/nav.php:477 ../../include/nav.php:480 +#: ../../include/nav.php:479 ../../include/nav.php:482 msgid "Chatrooms" msgstr "" +#: ../../Zotlabs/Lib/Apps.php:330 +msgid "Content Filter" +msgstr "" + #: ../../Zotlabs/Lib/Apps.php:331 +#: ../../addon/content_import/Mod_content_import.php:135 +msgid "Content Import" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:333 msgid "Remote Diagnostics" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:332 ../../include/features.php:365 +#: ../../Zotlabs/Lib/Apps.php:334 msgid "Suggest Channels" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:333 ../../boot.php:1629 ../../include/nav.php:118 -#: ../../include/nav.php:122 +#: ../../Zotlabs/Lib/Apps.php:335 ../../boot.php:1630 ../../include/nav.php:122 +#: ../../include/nav.php:126 msgid "Login" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:335 +#: ../../Zotlabs/Lib/Apps.php:337 msgid "Stream" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:339 ../../include/nav.php:539 +#: ../../Zotlabs/Lib/Apps.php:341 ../../include/nav.php:541 msgid "Wiki" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:340 ../../include/features.php:96 +#: ../../Zotlabs/Lib/Apps.php:342 ../../include/features.php:96 msgid "Channel Home" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:343 ../../include/features.php:269 -msgid "Events" +#: ../../Zotlabs/Lib/Apps.php:345 ../../Zotlabs/Storage/Browser.php:140 +#: ../../include/features.php:82 ../../include/nav.php:465 +#: ../../include/nav.php:468 +msgid "Calendar" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:344 ../../include/features.php:176 +#: ../../Zotlabs/Lib/Apps.php:346 ../../include/features.php:184 msgid "Directory" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:346 +#: ../../Zotlabs/Lib/Apps.php:348 msgid "Mail" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:349 +#: ../../Zotlabs/Lib/Apps.php:351 msgid "Chat" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:351 +#: ../../Zotlabs/Lib/Apps.php:353 msgid "Probe" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:352 +#: ../../Zotlabs/Lib/Apps.php:354 msgid "Suggest" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:353 +#: ../../Zotlabs/Lib/Apps.php:355 msgid "Random Channel" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:354 +#: ../../Zotlabs/Lib/Apps.php:356 msgid "Invite" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:355 ../../Zotlabs/Widget/Admin.php:26 +#: ../../Zotlabs/Lib/Apps.php:357 ../../Zotlabs/Widget/Admin.php:26 msgid "Features" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:356 ../../addon/openid/MysqlProvider.php:69 +#: ../../Zotlabs/Lib/Apps.php:358 ../../addon/openid/MysqlProvider.php:69 msgid "Language" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:357 +#: ../../Zotlabs/Lib/Apps.php:359 msgid "Post" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:358 ../../addon/openid/MysqlProvider.php:58 +#: ../../Zotlabs/Lib/Apps.php:360 ../../addon/openid/MysqlProvider.php:58 #: ../../addon/openid/MysqlProvider.php:59 #: ../../addon/openid/MysqlProvider.php:60 msgid "Profile Photo" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:360 ../../include/features.php:397 +#: ../../Zotlabs/Lib/Apps.php:362 ../../include/features.php:397 msgid "Profiles" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:362 +#: ../../Zotlabs/Lib/Apps.php:364 msgid "Notifications" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:363 +#: ../../Zotlabs/Lib/Apps.php:365 msgid "Order Apps" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:364 ../../include/features.php:82 -msgid "CalDAV" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:365 +#: ../../Zotlabs/Lib/Apps.php:366 msgid "CardDAV" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:367 +#: ../../Zotlabs/Lib/Apps.php:368 msgid "Guest Access" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:368 ../../Zotlabs/Widget/Notes.php:21 +#: ../../Zotlabs/Lib/Apps.php:369 ../../Zotlabs/Widget/Notes.php:21 msgid "Notes" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:369 +#: ../../Zotlabs/Lib/Apps.php:370 msgid "OAuth Apps Manager" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:370 +#: ../../Zotlabs/Lib/Apps.php:371 msgid "OAuth2 Apps Manager" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:371 +#: ../../Zotlabs/Lib/Apps.php:372 msgid "PDL Editor" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:373 +#: ../../Zotlabs/Lib/Apps.php:374 msgid "Premium Channel" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:375 +#: ../../Zotlabs/Lib/Apps.php:376 msgid "My Chatrooms" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:376 +#: ../../Zotlabs/Lib/Apps.php:377 msgid "Channel Export" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:553 +#: ../../Zotlabs/Lib/Apps.php:554 msgid "Purchase" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:558 +#: ../../Zotlabs/Lib/Apps.php:559 msgid "Undelete" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:567 +#: ../../Zotlabs/Lib/Apps.php:568 msgid "Add to app-tray" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:568 +#: ../../Zotlabs/Lib/Apps.php:569 msgid "Remove from app-tray" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:569 +#: ../../Zotlabs/Lib/Apps.php:570 msgid "Pin to navbar" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:570 +#: ../../Zotlabs/Lib/Apps.php:571 msgid "Unpin from navbar" msgstr "" @@ -8381,8 +8448,8 @@ msgstr "" msgid "Compare" msgstr "" -#: ../../Zotlabs/Lib/NativeWikiPage.php:603 ../../include/bbcode.php:735 -#: ../../include/bbcode.php:905 +#: ../../Zotlabs/Lib/NativeWikiPage.php:603 ../../include/bbcode.php:754 +#: ../../include/bbcode.php:924 msgid "Different viewers will see this text differently" msgstr "" @@ -8517,7 +8584,7 @@ msgstr "" msgid "Room is full" msgstr "" -#: ../../Zotlabs/Lib/Libsync.php:733 ../../include/zot.php:2591 +#: ../../Zotlabs/Lib/Libsync.php:733 ../../include/zot.php:2611 #, php-format msgid "Unable to verify site signature for %s" msgstr "" @@ -8526,8 +8593,8 @@ msgstr "" msgid "$Projectname Notification" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:61 ../../addon/diaspora/util.php:313 -#: ../../addon/diaspora/util.php:326 ../../addon/diaspora/p.php:48 +#: ../../Zotlabs/Lib/Enotify.php:61 ../../addon/diaspora/util.php:336 +#: ../../addon/diaspora/util.php:349 ../../addon/diaspora/p.php:48 msgid "$projectname" msgstr "" @@ -8797,161 +8864,181 @@ msgstr "" msgid "Wiki files deleted successfully" msgstr "" -#: ../../Zotlabs/Lib/DB_Upgrade.php:83 +#: ../../Zotlabs/Lib/DB_Upgrade.php:67 +msgid "Source code of failed update: " +msgstr "" + +#: ../../Zotlabs/Lib/DB_Upgrade.php:88 #, php-format msgid "Update Error at %s" msgstr "" -#: ../../Zotlabs/Lib/DB_Upgrade.php:89 +#: ../../Zotlabs/Lib/DB_Upgrade.php:94 #, php-format msgid "Update %s failed. See error logs." msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:102 ../../include/conversation.php:700 +#: ../../Zotlabs/Lib/ThreadItem.php:103 ../../include/conversation.php:700 msgid "Private Message" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:129 +#: ../../Zotlabs/Lib/ThreadItem.php:130 msgid "Privacy conflict. Discretion advised." msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:171 ../../Zotlabs/Storage/Browser.php:280 +#: ../../Zotlabs/Lib/ThreadItem.php:172 ../../Zotlabs/Storage/Browser.php:286 msgid "Admin Delete" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:177 ../../include/conversation.php:690 +#: ../../Zotlabs/Lib/ThreadItem.php:178 ../../include/conversation.php:690 msgid "Select" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:202 +#: ../../Zotlabs/Lib/ThreadItem.php:203 msgid "I will attend" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:202 +#: ../../Zotlabs/Lib/ThreadItem.php:203 msgid "I will not attend" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:202 +#: ../../Zotlabs/Lib/ThreadItem.php:203 msgid "I might attend" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:212 +#: ../../Zotlabs/Lib/ThreadItem.php:213 msgid "I agree" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:212 +#: ../../Zotlabs/Lib/ThreadItem.php:213 msgid "I disagree" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:212 +#: ../../Zotlabs/Lib/ThreadItem.php:213 msgid "I abstain" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:266 ../../include/conversation.php:695 +#: ../../Zotlabs/Lib/ThreadItem.php:267 ../../include/conversation.php:695 msgid "Toggle Star Status" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:277 ../../include/conversation.php:707 +#: ../../Zotlabs/Lib/ThreadItem.php:278 ../../include/conversation.php:707 msgid "Message signature validated" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:278 ../../include/conversation.php:708 +#: ../../Zotlabs/Lib/ThreadItem.php:279 ../../include/conversation.php:708 msgid "Message signature incorrect" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:286 +#: ../../Zotlabs/Lib/ThreadItem.php:287 msgid "Add Tag" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:290 ../../include/conversation.php:891 +#: ../../Zotlabs/Lib/ThreadItem.php:291 ../../include/conversation.php:891 msgid "Conversation Tools" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:306 ../../include/taxonomy.php:575 +#: ../../Zotlabs/Lib/ThreadItem.php:307 ../../include/taxonomy.php:573 msgid "like" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:307 ../../include/taxonomy.php:576 +#: ../../Zotlabs/Lib/ThreadItem.php:308 ../../include/taxonomy.php:574 msgid "dislike" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:317 +#: ../../Zotlabs/Lib/ThreadItem.php:309 +msgid "Reply on this comment" +msgstr "" + +#: ../../Zotlabs/Lib/ThreadItem.php:309 +msgid "reply" +msgstr "" + +#: ../../Zotlabs/Lib/ThreadItem.php:309 +msgid "Reply to" +msgstr "" + +#: ../../Zotlabs/Lib/ThreadItem.php:319 msgid "Share This" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:317 +#: ../../Zotlabs/Lib/ThreadItem.php:319 msgid "share" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:327 +#: ../../Zotlabs/Lib/ThreadItem.php:329 msgid "Delivery Report" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:347 +#: ../../Zotlabs/Lib/ThreadItem.php:348 #, php-format msgid "%d comment" msgid_plural "%d comments" msgstr[0] "" msgstr[1] "" -#: ../../Zotlabs/Lib/ThreadItem.php:381 ../../Zotlabs/Lib/ThreadItem.php:382 +#: ../../Zotlabs/Lib/ThreadItem.php:380 ../../Zotlabs/Lib/ThreadItem.php:381 #, php-format msgid "View %s's profile - %s" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:385 +#: ../../Zotlabs/Lib/ThreadItem.php:384 msgid "to" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:386 +#: ../../Zotlabs/Lib/ThreadItem.php:385 msgid "via" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:387 +#: ../../Zotlabs/Lib/ThreadItem.php:386 msgid "Wall-to-Wall" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:388 +#: ../../Zotlabs/Lib/ThreadItem.php:387 msgid "via Wall-To-Wall:" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:402 ../../include/conversation.php:766 +#: ../../Zotlabs/Lib/ThreadItem.php:401 ../../include/conversation.php:766 #, php-format msgid "from %s" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:405 ../../include/conversation.php:769 +#: ../../Zotlabs/Lib/ThreadItem.php:404 ../../include/conversation.php:769 #, php-format msgid "last edited: %s" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:406 ../../include/conversation.php:770 +#: ../../Zotlabs/Lib/ThreadItem.php:405 ../../include/conversation.php:770 #, php-format msgid "Expires: %s" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:414 +#: ../../Zotlabs/Lib/ThreadItem.php:413 msgid "Attend" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:415 +#: ../../Zotlabs/Lib/ThreadItem.php:414 msgid "Attendance Options" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:416 +#: ../../Zotlabs/Lib/ThreadItem.php:415 msgid "Vote" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:417 +#: ../../Zotlabs/Lib/ThreadItem.php:416 msgid "Voting Options" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:439 +#: ../../Zotlabs/Lib/ThreadItem.php:431 +msgid "Go to previous comment" +msgstr "" + +#: ../../Zotlabs/Lib/ThreadItem.php:440 #: ../../addon/bookmarker/bookmarker.php:38 msgid "Save Bookmarks" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:440 +#: ../../Zotlabs/Lib/ThreadItem.php:441 msgid "Add to Calendar" msgstr "" @@ -8959,62 +9046,62 @@ msgstr "" msgid "This is an unsaved preview" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:501 ../../include/js_strings.php:7 +#: ../../Zotlabs/Lib/ThreadItem.php:502 ../../include/js_strings.php:7 #, php-format msgid "%s show all" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:796 ../../addon/hsse/hsse.php:200 +#: ../../Zotlabs/Lib/ThreadItem.php:797 ../../addon/hsse/hsse.php:200 #: ../../include/conversation.php:1406 msgid "Bold" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:797 ../../addon/hsse/hsse.php:201 +#: ../../Zotlabs/Lib/ThreadItem.php:798 ../../addon/hsse/hsse.php:201 #: ../../include/conversation.php:1407 msgid "Italic" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:798 ../../addon/hsse/hsse.php:202 +#: ../../Zotlabs/Lib/ThreadItem.php:799 ../../addon/hsse/hsse.php:202 #: ../../include/conversation.php:1408 msgid "Underline" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:799 ../../addon/hsse/hsse.php:203 +#: ../../Zotlabs/Lib/ThreadItem.php:800 ../../addon/hsse/hsse.php:203 #: ../../include/conversation.php:1409 msgid "Quote" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:800 ../../addon/hsse/hsse.php:204 +#: ../../Zotlabs/Lib/ThreadItem.php:801 ../../addon/hsse/hsse.php:204 #: ../../include/conversation.php:1410 msgid "Code" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:801 +#: ../../Zotlabs/Lib/ThreadItem.php:802 msgid "Image" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:802 ../../addon/hsse/hsse.php:205 +#: ../../Zotlabs/Lib/ThreadItem.php:803 ../../addon/hsse/hsse.php:205 #: ../../include/conversation.php:1411 msgid "Attach/Upload file" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:803 +#: ../../Zotlabs/Lib/ThreadItem.php:804 msgid "Insert Link" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:804 +#: ../../Zotlabs/Lib/ThreadItem.php:805 msgid "Video" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:814 +#: ../../Zotlabs/Lib/ThreadItem.php:815 msgid "Your full name (required)" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:815 +#: ../../Zotlabs/Lib/ThreadItem.php:816 msgid "Your email address (required)" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:816 +#: ../../Zotlabs/Lib/ThreadItem.php:817 msgid "Your website URL (optional)" msgstr "" @@ -9030,11 +9117,11 @@ msgstr "" msgid "Welcome %s. Remote authentication successful." msgstr "" -#: ../../Zotlabs/Storage/Browser.php:107 ../../Zotlabs/Storage/Browser.php:289 +#: ../../Zotlabs/Storage/Browser.php:107 ../../Zotlabs/Storage/Browser.php:295 msgid "parent" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:131 ../../include/text.php:2941 +#: ../../Zotlabs/Storage/Browser.php:131 ../../include/text.php:2950 msgid "Collection" msgstr "" @@ -9046,11 +9133,6 @@ msgstr "" msgid "Addressbook" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:140 ../../include/nav.php:463 -#: ../../include/nav.php:466 -msgid "Calendar" -msgstr "" - #: ../../Zotlabs/Storage/Browser.php:143 msgid "Schedule Inbox" msgstr "" @@ -9059,41 +9141,41 @@ msgstr "" msgid "Schedule Outbox" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:273 +#: ../../Zotlabs/Storage/Browser.php:279 msgid "Total" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:275 +#: ../../Zotlabs/Storage/Browser.php:281 msgid "Shared" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:277 +#: ../../Zotlabs/Storage/Browser.php:283 msgid "Add Files" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:361 +#: ../../Zotlabs/Storage/Browser.php:367 #, php-format msgid "You are using %1$s of your available file storage." msgstr "" -#: ../../Zotlabs/Storage/Browser.php:366 +#: ../../Zotlabs/Storage/Browser.php:372 #, php-format msgid "You are using %1$s of %2$s available file storage. (%3$s%)" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:377 +#: ../../Zotlabs/Storage/Browser.php:383 msgid "WARNING:" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:389 +#: ../../Zotlabs/Storage/Browser.php:395 msgid "Create new folder" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:391 +#: ../../Zotlabs/Storage/Browser.php:397 msgid "Upload file" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:404 +#: ../../Zotlabs/Storage/Browser.php:410 msgid "Drop files here to immediately upload" msgstr "" @@ -9116,78 +9198,70 @@ msgstr "" msgid "Read-only" msgstr "" -#: ../../Zotlabs/Widget/Cdav.php:117 -msgid "My Calendars" +#: ../../Zotlabs/Widget/Cdav.php:127 +msgid "Channel Calendar" msgstr "" -#: ../../Zotlabs/Widget/Cdav.php:119 -msgid "Shared Calendars" +#: ../../Zotlabs/Widget/Cdav.php:131 +msgid "Shared CalDAV Calendars" msgstr "" -#: ../../Zotlabs/Widget/Cdav.php:123 +#: ../../Zotlabs/Widget/Cdav.php:135 msgid "Share this calendar" msgstr "" -#: ../../Zotlabs/Widget/Cdav.php:125 +#: ../../Zotlabs/Widget/Cdav.php:137 msgid "Calendar name and color" msgstr "" -#: ../../Zotlabs/Widget/Cdav.php:127 -msgid "Create new calendar" +#: ../../Zotlabs/Widget/Cdav.php:139 +msgid "Create new CalDAV calendar" msgstr "" -#: ../../Zotlabs/Widget/Cdav.php:129 +#: ../../Zotlabs/Widget/Cdav.php:141 msgid "Calendar Name" msgstr "" -#: ../../Zotlabs/Widget/Cdav.php:130 +#: ../../Zotlabs/Widget/Cdav.php:142 msgid "Calendar Tools" msgstr "" -#: ../../Zotlabs/Widget/Cdav.php:131 +#: ../../Zotlabs/Widget/Cdav.php:144 msgid "Import calendar" msgstr "" -#: ../../Zotlabs/Widget/Cdav.php:132 +#: ../../Zotlabs/Widget/Cdav.php:145 msgid "Select a calendar to import to" msgstr "" -#: ../../Zotlabs/Widget/Cdav.php:159 +#: ../../Zotlabs/Widget/Cdav.php:172 msgid "Addressbooks" msgstr "" -#: ../../Zotlabs/Widget/Cdav.php:161 +#: ../../Zotlabs/Widget/Cdav.php:174 msgid "Addressbook name" msgstr "" -#: ../../Zotlabs/Widget/Cdav.php:163 +#: ../../Zotlabs/Widget/Cdav.php:176 msgid "Create new addressbook" msgstr "" -#: ../../Zotlabs/Widget/Cdav.php:164 +#: ../../Zotlabs/Widget/Cdav.php:177 msgid "Addressbook Name" msgstr "" -#: ../../Zotlabs/Widget/Cdav.php:166 +#: ../../Zotlabs/Widget/Cdav.php:179 msgid "Addressbook Tools" msgstr "" -#: ../../Zotlabs/Widget/Cdav.php:167 +#: ../../Zotlabs/Widget/Cdav.php:180 msgid "Import addressbook" msgstr "" -#: ../../Zotlabs/Widget/Cdav.php:168 +#: ../../Zotlabs/Widget/Cdav.php:181 msgid "Select an addressbook to import to" msgstr "" -#: ../../Zotlabs/Widget/Appcategories.php:43 -#: ../../include/contact_widgets.php:96 ../../include/contact_widgets.php:139 -#: ../../include/contact_widgets.php:184 ../../include/taxonomy.php:409 -#: ../../include/taxonomy.php:491 ../../include/taxonomy.php:511 -#: ../../include/taxonomy.php:532 -msgid "Categories" -msgstr "" - #: ../../Zotlabs/Widget/Appcategories.php:46 ../../Zotlabs/Widget/Filer.php:31 #: ../../widget/Netselect/Netselect.php:26 ../../include/contact_widgets.php:56 #: ../../include/contact_widgets.php:99 ../../include/contact_widgets.php:142 @@ -9300,7 +9374,7 @@ msgstr "" #: ../../Zotlabs/Widget/Activity_filter.php:137 #: ../../Zotlabs/Widget/Filer.php:28 ../../include/contact_widgets.php:53 -#: ../../include/features.php:325 +#: ../../include/features.php:333 msgid "Saved Folders" msgstr "" @@ -9377,7 +9451,7 @@ msgstr "" msgid "Remove term" msgstr "" -#: ../../Zotlabs/Widget/Savedsearch.php:83 ../../include/features.php:317 +#: ../../Zotlabs/Widget/Savedsearch.php:83 ../../include/features.php:325 msgid "Saved Searches" msgstr "" @@ -9402,11 +9476,11 @@ msgstr "" msgid "Tasks" msgstr "" -#: ../../Zotlabs/Widget/Suggestions.php:51 +#: ../../Zotlabs/Widget/Suggestions.php:53 msgid "Suggestions" msgstr "" -#: ../../Zotlabs/Widget/Suggestions.php:52 +#: ../../Zotlabs/Widget/Suggestions.php:54 msgid "See more..." msgstr "" @@ -9467,7 +9541,7 @@ msgstr "" msgid "Upload cover photo" msgstr "" -#: ../../Zotlabs/Widget/Newmember.php:35 ../../include/nav.php:111 +#: ../../Zotlabs/Widget/Newmember.php:35 ../../include/nav.php:115 msgid "Edit your profile" msgstr "" @@ -9527,7 +9601,7 @@ msgstr "" msgid "DB updates" msgstr "" -#: ../../Zotlabs/Widget/Admin.php:55 ../../include/nav.php:189 +#: ../../Zotlabs/Widget/Admin.php:55 ../../include/nav.php:192 msgid "Admin" msgstr "" @@ -9690,67 +9764,67 @@ msgstr "" msgid "Network/Protocol" msgstr "" -#: ../../widget/Netselect/Netselect.php:28 ../../include/network.php:1724 +#: ../../widget/Netselect/Netselect.php:28 ../../include/network.php:1734 msgid "Zot" msgstr "" -#: ../../widget/Netselect/Netselect.php:31 ../../include/network.php:1722 +#: ../../widget/Netselect/Netselect.php:31 ../../include/network.php:1732 msgid "Diaspora" msgstr "" -#: ../../widget/Netselect/Netselect.php:33 ../../include/network.php:1715 -#: ../../include/network.php:1716 +#: ../../widget/Netselect/Netselect.php:33 ../../include/network.php:1725 +#: ../../include/network.php:1726 msgid "Friendica" msgstr "" -#: ../../widget/Netselect/Netselect.php:38 ../../include/network.php:1717 +#: ../../widget/Netselect/Netselect.php:38 ../../include/network.php:1727 msgid "OStatus" msgstr "" -#: ../../boot.php:1608 +#: ../../boot.php:1609 msgid "Create an account to access services and applications" msgstr "" -#: ../../boot.php:1628 ../../include/nav.php:103 ../../include/nav.php:132 -#: ../../include/nav.php:151 +#: ../../boot.php:1629 ../../include/nav.php:107 ../../include/nav.php:136 +#: ../../include/nav.php:155 msgid "Logout" msgstr "" -#: ../../boot.php:1632 +#: ../../boot.php:1633 msgid "Login/Email" msgstr "" -#: ../../boot.php:1633 +#: ../../boot.php:1634 msgid "Password" msgstr "" -#: ../../boot.php:1634 +#: ../../boot.php:1635 msgid "Remember me" msgstr "" -#: ../../boot.php:1637 +#: ../../boot.php:1638 msgid "Forgot your password?" msgstr "" -#: ../../boot.php:2433 +#: ../../boot.php:2434 #, php-format msgid "[$Projectname] Website SSL error for %s" msgstr "" -#: ../../boot.php:2438 +#: ../../boot.php:2439 msgid "Website SSL certificate is not valid. Please correct." msgstr "" -#: ../../boot.php:2554 +#: ../../boot.php:2555 #, php-format msgid "[$Projectname] Cron tasks not running on %s" msgstr "" -#: ../../boot.php:2559 +#: ../../boot.php:2560 msgid "Cron/Scheduled tasks not running." msgstr "" -#: ../../boot.php:2560 ../../include/datetime.php:238 +#: ../../boot.php:2561 ../../include/datetime.php:238 msgid "never" msgstr "" @@ -10097,8 +10171,8 @@ msgstr "" msgid "Page to load after image selection." msgstr "" -#: ../../addon/openclipatar/openclipatar.php:58 ../../include/channel.php:1356 -#: ../../include/nav.php:111 +#: ../../addon/openclipatar/openclipatar.php:58 ../../include/channel.php:1422 +#: ../../include/nav.php:115 msgid "Edit Profile" msgstr "" @@ -10595,7 +10669,7 @@ msgstr "" msgid "IRC Chatroom" msgstr "" -#: ../../addon/gallery/gallery.php:38 ../../addon/gallery/Mod_Gallery.php:135 +#: ../../addon/gallery/gallery.php:38 ../../addon/gallery/Mod_Gallery.php:136 msgid "Gallery" msgstr "" @@ -10718,12 +10792,12 @@ msgid "Login failed." msgstr "" #: ../../addon/openid/Mod_Id.php:85 ../../include/selectors.php:60 -#: ../../include/selectors.php:77 ../../include/channel.php:1536 +#: ../../include/selectors.php:77 ../../include/channel.php:1602 msgid "Male" msgstr "" #: ../../addon/openid/Mod_Id.php:87 ../../include/selectors.php:60 -#: ../../include/selectors.php:77 ../../include/channel.php:1534 +#: ../../include/selectors.php:77 ../../include/channel.php:1600 msgid "Female" msgstr "" @@ -10918,23 +10992,23 @@ msgstr "" msgid "declared undying love for" msgstr "" -#: ../../addon/diaspora/Receiver.php:1495 +#: ../../addon/diaspora/Receiver.php:1509 #, php-format msgid "%1$s dislikes %2$s's %3$s" msgstr "" -#: ../../addon/diaspora/Mod_Diaspora.php:40 +#: ../../addon/diaspora/Mod_Diaspora.php:42 msgid "Diaspora Protocol Settings updated." msgstr "" -#: ../../addon/diaspora/Mod_Diaspora.php:49 +#: ../../addon/diaspora/Mod_Diaspora.php:51 msgid "" "The diaspora protocol does not support location independence. Connections " "you make within that network may be unreachable from alternate channel " "locations." msgstr "" -#: ../../addon/diaspora/Mod_Diaspora.php:55 +#: ../../addon/diaspora/Mod_Diaspora.php:57 msgid "Diaspora Protocol App" msgstr "" @@ -11090,23 +11164,25 @@ msgstr "" msgid "Gravatar settings updated." msgstr "" -#: ../../addon/hzfiles/hzfiles.php:79 +#: ../../addon/hzfiles/hzfiles.php:81 msgid "Hubzilla File Storage Import" msgstr "" -#: ../../addon/hzfiles/hzfiles.php:80 +#: ../../addon/hzfiles/hzfiles.php:82 msgid "This will import all your cloud files from another server." msgstr "" -#: ../../addon/hzfiles/hzfiles.php:81 +#: ../../addon/hzfiles/hzfiles.php:83 msgid "Hubzilla Server base URL" msgstr "" -#: ../../addon/hzfiles/hzfiles.php:82 +#: ../../addon/hzfiles/hzfiles.php:84 +#: ../../addon/content_import/Mod_content_import.php:140 msgid "Since modified date yyyy-mm-dd" msgstr "" -#: ../../addon/hzfiles/hzfiles.php:83 +#: ../../addon/hzfiles/hzfiles.php:85 +#: ../../addon/content_import/Mod_content_import.php:141 msgid "Until modified date yyyy-mm-dd" msgstr "" @@ -11277,8 +11353,8 @@ msgstr "" msgid "Provides a Facebook-like chat using Jappix Mini" msgstr "" -#: ../../addon/jappixmini/Mod_Jappixmini.php:157 ../../include/channel.php:1452 -#: ../../include/channel.php:1623 +#: ../../addon/jappixmini/Mod_Jappixmini.php:157 ../../include/channel.php:1518 +#: ../../include/channel.php:1689 msgid "Status:" msgstr "" @@ -11328,105 +11404,114 @@ msgstr "" msgid "Jappixmini Settings" msgstr "" -#: ../../addon/upgrade_info/upgrade_info.php:43 -msgid "Your channel has been upgraded to the latest $Projectname version." +#: ../../addon/upgrade_info/upgrade_info.php:48 +msgid "Your channel has been upgraded to $Projectname version" msgstr "" -#: ../../addon/upgrade_info/upgrade_info.php:44 -msgid "" -"To improve usability, we have converted some features into installable stand-" -"alone apps." +#: ../../addon/upgrade_info/upgrade_info.php:50 +msgid "Please have a look at the" msgstr "" -#: ../../addon/upgrade_info/upgrade_info.php:45 -msgid "Please visit the $Projectname" +#: ../../addon/upgrade_info/upgrade_info.php:52 +msgid "git history" msgstr "" -#: ../../addon/upgrade_info/upgrade_info.php:46 -msgid "app store" +#: ../../addon/upgrade_info/upgrade_info.php:54 +msgid "change log" msgstr "" -#: ../../addon/upgrade_info/upgrade_info.php:47 -msgid "and install possibly missing apps." +#: ../../addon/upgrade_info/upgrade_info.php:55 +msgid "for further infos." msgstr "" -#: ../../addon/upgrade_info/upgrade_info.php:52 +#: ../../addon/upgrade_info/upgrade_info.php:60 msgid "Upgrade Info" msgstr "" -#: ../../addon/upgrade_info/upgrade_info.php:56 +#: ../../addon/upgrade_info/upgrade_info.php:64 msgid "Do not show this again" msgstr "" -#: ../../addon/channelreputation/channelreputation.php:98 -#: ../../addon/channelreputation/channelreputation.php:99 +#: ../../addon/channelreputation/channelreputation.php:100 +#: ../../addon/channelreputation/channelreputation.php:101 #: ../../addon/cart/myshop.php:141 ../../addon/cart/myshop.php:177 #: ../../addon/cart/myshop.php:211 ../../addon/cart/myshop.php:259 #: ../../addon/cart/myshop.php:294 ../../addon/cart/myshop.php:317 msgid "Access Denied" msgstr "" -#: ../../addon/channelreputation/channelreputation.php:106 +#: ../../addon/channelreputation/channelreputation.php:108 msgid "Enable Community Moderation" msgstr "" -#: ../../addon/channelreputation/channelreputation.php:114 +#: ../../addon/channelreputation/channelreputation.php:116 msgid "Reputation automatically given to new members" msgstr "" -#: ../../addon/channelreputation/channelreputation.php:115 +#: ../../addon/channelreputation/channelreputation.php:117 msgid "Reputation will never fall below this value" msgstr "" -#: ../../addon/channelreputation/channelreputation.php:116 +#: ../../addon/channelreputation/channelreputation.php:118 msgid "Minimum reputation before posting is allowed" msgstr "" -#: ../../addon/channelreputation/channelreputation.php:117 +#: ../../addon/channelreputation/channelreputation.php:119 msgid "Minimum reputation before commenting is allowed" msgstr "" -#: ../../addon/channelreputation/channelreputation.php:118 +#: ../../addon/channelreputation/channelreputation.php:120 msgid "Minimum reputation before a member is able to moderate other posts" msgstr "" -#: ../../addon/channelreputation/channelreputation.php:119 +#: ../../addon/channelreputation/channelreputation.php:121 msgid "" "Max ratio of moderator's reputation that can be added to/deducted from " "reputation of person being moderated" msgstr "" -#: ../../addon/channelreputation/channelreputation.php:120 +#: ../../addon/channelreputation/channelreputation.php:122 msgid "Reputation \"cost\" to post" msgstr "" -#: ../../addon/channelreputation/channelreputation.php:121 +#: ../../addon/channelreputation/channelreputation.php:123 msgid "Reputation \"cost\" to comment" msgstr "" -#: ../../addon/channelreputation/channelreputation.php:122 +#: ../../addon/channelreputation/channelreputation.php:124 msgid "" "Reputation automatically recovers at this rate per hour until it reaches " "minimum_to_post" msgstr "" -#: ../../addon/channelreputation/channelreputation.php:123 +#: ../../addon/channelreputation/channelreputation.php:125 msgid "" "When minimum_to_moderate > reputation > minimum_to_post reputation recovers " "at this rate per hour" msgstr "" -#: ../../addon/channelreputation/channelreputation.php:137 +#: ../../addon/channelreputation/channelreputation.php:139 msgid "Community Moderation Settings" msgstr "" -#: ../../addon/channelreputation/channelreputation.php:365 -msgid "Can moderate reputation on my channel." +#: ../../addon/channelreputation/channelreputation.php:229 +msgid "Channel Reputation" msgstr "" -#: ../../addon/channelreputation/channelreputation.php:549 -#: ../../addon/channelreputation/channelreputation.php:552 -msgid "Channel Reputation" +#: ../../addon/channelreputation/channelreputation.php:233 +msgid "An Error has occurred." +msgstr "" + +#: ../../addon/channelreputation/channelreputation.php:251 +msgid "Upvote" +msgstr "" + +#: ../../addon/channelreputation/channelreputation.php:252 +msgid "Downvote" +msgstr "" + +#: ../../addon/channelreputation/channelreputation.php:374 +msgid "Can moderate reputation on my channel." msgstr "" #: ../../addon/superblock/superblock.php:337 @@ -11536,6 +11621,53 @@ msgstr "" msgid "Number of logfiles to retain" msgstr "" +#: ../../addon/content_import/Mod_content_import.php:27 +msgid "No server specified" +msgstr "" + +#: ../../addon/content_import/Mod_content_import.php:73 +msgid "Posts imported" +msgstr "" + +#: ../../addon/content_import/Mod_content_import.php:113 +msgid "Files imported" +msgstr "" + +#: ../../addon/content_import/Mod_content_import.php:122 +msgid "" +"This addon app copies existing content and file storage to a cloned/copied " +"channel. Once the app is installed, visit the newly installed app. This will " +"allow you to set the location of your original channel and an optional date " +"range of files/conversations to copy." +msgstr "" + +#: ../../addon/content_import/Mod_content_import.php:136 +msgid "" +"This will import all your conversations and cloud files from a cloned " +"channel on another server. This may take a while if you have lots of posts " +"and or files." +msgstr "" + +#: ../../addon/content_import/Mod_content_import.php:137 +msgid "Include posts" +msgstr "" + +#: ../../addon/content_import/Mod_content_import.php:137 +msgid "Conversations, Articles, Cards, and other posted content" +msgstr "" + +#: ../../addon/content_import/Mod_content_import.php:138 +msgid "Include files" +msgstr "" + +#: ../../addon/content_import/Mod_content_import.php:138 +msgid "Files, Photos and other cloud storage" +msgstr "" + +#: ../../addon/content_import/Mod_content_import.php:139 +msgid "Original Server base URL" +msgstr "" + #: ../../addon/frphotos/frphotos.php:92 msgid "Friendica Photo Album Import" msgstr "" @@ -11647,25 +11779,25 @@ msgstr "" msgid "Activitypub Protocol App" msgstr "" -#: ../../addon/pubcrawl/Mod_Pubcrawl.php:48 +#: ../../addon/pubcrawl/Mod_Pubcrawl.php:50 msgid "Deliver to ActivityPub recipients in privacy groups" msgstr "" -#: ../../addon/pubcrawl/Mod_Pubcrawl.php:48 +#: ../../addon/pubcrawl/Mod_Pubcrawl.php:50 msgid "" "May result in a large number of mentions and expose all the members of your " "privacy group" msgstr "" -#: ../../addon/pubcrawl/Mod_Pubcrawl.php:52 +#: ../../addon/pubcrawl/Mod_Pubcrawl.php:54 msgid "Send multi-media HTML articles" msgstr "" -#: ../../addon/pubcrawl/Mod_Pubcrawl.php:52 +#: ../../addon/pubcrawl/Mod_Pubcrawl.php:54 msgid "Not supported by some microblog services such as Mastodon" msgstr "" -#: ../../addon/pubcrawl/Mod_Pubcrawl.php:60 +#: ../../addon/pubcrawl/Mod_Pubcrawl.php:62 msgid "Activitypub Protocol" msgstr "" @@ -12055,7 +12187,7 @@ msgstr "" msgid "Error creating new game." msgstr "" -#: ../../addon/chess/Mod_Chess.php:306 ../../include/channel.php:1207 +#: ../../addon/chess/Mod_Chess.php:306 ../../include/channel.php:1273 msgid "Requested channel is not available." msgstr "" @@ -12067,7 +12199,7 @@ msgstr "" msgid "You must select a local channel /chess/channelname" msgstr "" -#: ../../addon/chess/chess.php:642 +#: ../../addon/chess/chess.php:645 msgid "Enable notifications" msgstr "" @@ -13016,11 +13148,11 @@ msgstr "" msgid "Hermaphrodite" msgstr "" -#: ../../include/selectors.php:60 ../../include/channel.php:1540 +#: ../../include/selectors.php:60 ../../include/channel.php:1606 msgid "Neuter" msgstr "" -#: ../../include/selectors.php:60 ../../include/channel.php:1542 +#: ../../include/selectors.php:60 ../../include/channel.php:1608 msgid "Non-specific" msgstr "" @@ -13220,8 +13352,8 @@ msgstr "" msgid "%1$s poked %2$s" msgstr "" -#: ../../include/conversation.php:251 ../../include/text.php:1176 -#: ../../include/text.php:1180 +#: ../../include/conversation.php:251 ../../include/text.php:1195 +#: ../../include/text.php:1199 msgid "poked" msgstr "" @@ -13375,373 +13507,373 @@ msgid "" "Cannot create a duplicate channel identifier on this system. Import failed." msgstr "" -#: ../../include/import.php:117 +#: ../../include/import.php:118 msgid "Cloned channel not found. Import failed." msgstr "" -#: ../../include/text.php:501 +#: ../../include/text.php:520 msgid "prev" msgstr "" -#: ../../include/text.php:503 +#: ../../include/text.php:522 msgid "first" msgstr "" -#: ../../include/text.php:532 +#: ../../include/text.php:551 msgid "last" msgstr "" -#: ../../include/text.php:535 +#: ../../include/text.php:554 msgid "next" msgstr "" -#: ../../include/text.php:553 +#: ../../include/text.php:572 msgid "older" msgstr "" -#: ../../include/text.php:555 +#: ../../include/text.php:574 msgid "newer" msgstr "" -#: ../../include/text.php:979 +#: ../../include/text.php:998 msgid "No connections" msgstr "" -#: ../../include/text.php:1011 +#: ../../include/text.php:1030 #, php-format msgid "View all %s connections" msgstr "" -#: ../../include/text.php:1073 +#: ../../include/text.php:1092 #, php-format msgid "Network: %s" msgstr "" -#: ../../include/text.php:1176 ../../include/text.php:1180 +#: ../../include/text.php:1195 ../../include/text.php:1199 msgid "poke" msgstr "" -#: ../../include/text.php:1181 +#: ../../include/text.php:1200 msgid "ping" msgstr "" -#: ../../include/text.php:1181 +#: ../../include/text.php:1200 msgid "pinged" msgstr "" -#: ../../include/text.php:1182 +#: ../../include/text.php:1201 msgid "prod" msgstr "" -#: ../../include/text.php:1182 +#: ../../include/text.php:1201 msgid "prodded" msgstr "" -#: ../../include/text.php:1183 +#: ../../include/text.php:1202 msgid "slap" msgstr "" -#: ../../include/text.php:1183 +#: ../../include/text.php:1202 msgid "slapped" msgstr "" -#: ../../include/text.php:1184 +#: ../../include/text.php:1203 msgid "finger" msgstr "" -#: ../../include/text.php:1184 +#: ../../include/text.php:1203 msgid "fingered" msgstr "" -#: ../../include/text.php:1185 +#: ../../include/text.php:1204 msgid "rebuff" msgstr "" -#: ../../include/text.php:1185 +#: ../../include/text.php:1204 msgid "rebuffed" msgstr "" -#: ../../include/text.php:1208 +#: ../../include/text.php:1227 msgid "happy" msgstr "" -#: ../../include/text.php:1209 +#: ../../include/text.php:1228 msgid "sad" msgstr "" -#: ../../include/text.php:1210 +#: ../../include/text.php:1229 msgid "mellow" msgstr "" -#: ../../include/text.php:1211 +#: ../../include/text.php:1230 msgid "tired" msgstr "" -#: ../../include/text.php:1212 +#: ../../include/text.php:1231 msgid "perky" msgstr "" -#: ../../include/text.php:1213 +#: ../../include/text.php:1232 msgid "angry" msgstr "" -#: ../../include/text.php:1214 +#: ../../include/text.php:1233 msgid "stupefied" msgstr "" -#: ../../include/text.php:1215 +#: ../../include/text.php:1234 msgid "puzzled" msgstr "" -#: ../../include/text.php:1216 +#: ../../include/text.php:1235 msgid "interested" msgstr "" -#: ../../include/text.php:1217 +#: ../../include/text.php:1236 msgid "bitter" msgstr "" -#: ../../include/text.php:1218 +#: ../../include/text.php:1237 msgid "cheerful" msgstr "" -#: ../../include/text.php:1219 +#: ../../include/text.php:1238 msgid "alive" msgstr "" -#: ../../include/text.php:1220 +#: ../../include/text.php:1239 msgid "annoyed" msgstr "" -#: ../../include/text.php:1221 +#: ../../include/text.php:1240 msgid "anxious" msgstr "" -#: ../../include/text.php:1222 +#: ../../include/text.php:1241 msgid "cranky" msgstr "" -#: ../../include/text.php:1223 +#: ../../include/text.php:1242 msgid "disturbed" msgstr "" -#: ../../include/text.php:1224 +#: ../../include/text.php:1243 msgid "frustrated" msgstr "" -#: ../../include/text.php:1225 +#: ../../include/text.php:1244 msgid "depressed" msgstr "" -#: ../../include/text.php:1226 +#: ../../include/text.php:1245 msgid "motivated" msgstr "" -#: ../../include/text.php:1227 +#: ../../include/text.php:1246 msgid "relaxed" msgstr "" -#: ../../include/text.php:1228 +#: ../../include/text.php:1247 msgid "surprised" msgstr "" -#: ../../include/text.php:1416 ../../include/js_strings.php:95 +#: ../../include/text.php:1435 ../../include/js_strings.php:96 msgid "Monday" msgstr "" -#: ../../include/text.php:1416 ../../include/js_strings.php:96 +#: ../../include/text.php:1435 ../../include/js_strings.php:97 msgid "Tuesday" msgstr "" -#: ../../include/text.php:1416 ../../include/js_strings.php:97 +#: ../../include/text.php:1435 ../../include/js_strings.php:98 msgid "Wednesday" msgstr "" -#: ../../include/text.php:1416 ../../include/js_strings.php:98 +#: ../../include/text.php:1435 ../../include/js_strings.php:99 msgid "Thursday" msgstr "" -#: ../../include/text.php:1416 ../../include/js_strings.php:99 +#: ../../include/text.php:1435 ../../include/js_strings.php:100 msgid "Friday" msgstr "" -#: ../../include/text.php:1416 ../../include/js_strings.php:100 +#: ../../include/text.php:1435 ../../include/js_strings.php:101 msgid "Saturday" msgstr "" -#: ../../include/text.php:1416 ../../include/js_strings.php:94 +#: ../../include/text.php:1435 ../../include/js_strings.php:95 msgid "Sunday" msgstr "" -#: ../../include/text.php:1420 ../../include/js_strings.php:70 +#: ../../include/text.php:1439 ../../include/js_strings.php:71 msgid "January" msgstr "" -#: ../../include/text.php:1420 ../../include/js_strings.php:71 +#: ../../include/text.php:1439 ../../include/js_strings.php:72 msgid "February" msgstr "" -#: ../../include/text.php:1420 ../../include/js_strings.php:72 +#: ../../include/text.php:1439 ../../include/js_strings.php:73 msgid "March" msgstr "" -#: ../../include/text.php:1420 ../../include/js_strings.php:73 +#: ../../include/text.php:1439 ../../include/js_strings.php:74 msgid "April" msgstr "" -#: ../../include/text.php:1420 +#: ../../include/text.php:1439 msgid "May" msgstr "" -#: ../../include/text.php:1420 ../../include/js_strings.php:75 +#: ../../include/text.php:1439 ../../include/js_strings.php:76 msgid "June" msgstr "" -#: ../../include/text.php:1420 ../../include/js_strings.php:76 +#: ../../include/text.php:1439 ../../include/js_strings.php:77 msgid "July" msgstr "" -#: ../../include/text.php:1420 ../../include/js_strings.php:77 +#: ../../include/text.php:1439 ../../include/js_strings.php:78 msgid "August" msgstr "" -#: ../../include/text.php:1420 ../../include/js_strings.php:78 +#: ../../include/text.php:1439 ../../include/js_strings.php:79 msgid "September" msgstr "" -#: ../../include/text.php:1420 ../../include/js_strings.php:79 +#: ../../include/text.php:1439 ../../include/js_strings.php:80 msgid "October" msgstr "" -#: ../../include/text.php:1420 ../../include/js_strings.php:80 +#: ../../include/text.php:1439 ../../include/js_strings.php:81 msgid "November" msgstr "" -#: ../../include/text.php:1420 ../../include/js_strings.php:81 +#: ../../include/text.php:1439 ../../include/js_strings.php:82 msgid "December" msgstr "" -#: ../../include/text.php:1494 +#: ../../include/text.php:1513 msgid "Unknown Attachment" msgstr "" -#: ../../include/text.php:1496 ../../include/feedutils.php:858 +#: ../../include/text.php:1515 ../../include/feedutils.php:858 msgid "unknown" msgstr "" -#: ../../include/text.php:1532 +#: ../../include/text.php:1551 msgid "remove category" msgstr "" -#: ../../include/text.php:1606 +#: ../../include/text.php:1625 msgid "remove from file" msgstr "" -#: ../../include/text.php:1765 ../../include/message.php:13 +#: ../../include/text.php:1789 ../../include/message.php:13 msgid "Download binary/encrypted content" msgstr "" -#: ../../include/text.php:1935 ../../include/language.php:423 +#: ../../include/text.php:1959 ../../include/language.php:423 msgid "default" msgstr "" -#: ../../include/text.php:1943 +#: ../../include/text.php:1967 msgid "Page layout" msgstr "" -#: ../../include/text.php:1943 +#: ../../include/text.php:1967 msgid "You can create your own with the layouts tool" msgstr "" -#: ../../include/text.php:1954 +#: ../../include/text.php:1978 msgid "HTML" msgstr "" -#: ../../include/text.php:1957 +#: ../../include/text.php:1981 msgid "Comanche Layout" msgstr "" -#: ../../include/text.php:1962 +#: ../../include/text.php:1986 msgid "PHP" msgstr "" -#: ../../include/text.php:1971 +#: ../../include/text.php:1995 msgid "Page content type" msgstr "" -#: ../../include/text.php:2104 +#: ../../include/text.php:2128 msgid "activity" msgstr "" -#: ../../include/text.php:2205 +#: ../../include/text.php:2229 msgid "a-z, 0-9, -, and _ only" msgstr "" -#: ../../include/text.php:2531 +#: ../../include/text.php:2555 msgid "Design Tools" msgstr "" -#: ../../include/text.php:2537 +#: ../../include/text.php:2561 msgid "Pages" msgstr "" -#: ../../include/text.php:2559 +#: ../../include/text.php:2574 msgid "Import website..." msgstr "" -#: ../../include/text.php:2560 +#: ../../include/text.php:2575 msgid "Select folder to import" msgstr "" -#: ../../include/text.php:2561 +#: ../../include/text.php:2576 msgid "Import from a zipped folder:" msgstr "" -#: ../../include/text.php:2562 +#: ../../include/text.php:2577 msgid "Import from cloud files:" msgstr "" -#: ../../include/text.php:2563 +#: ../../include/text.php:2578 msgid "/cloud/channel/path/to/folder" msgstr "" -#: ../../include/text.php:2564 +#: ../../include/text.php:2579 msgid "Enter path to website files" msgstr "" -#: ../../include/text.php:2565 +#: ../../include/text.php:2580 msgid "Select folder" msgstr "" -#: ../../include/text.php:2566 +#: ../../include/text.php:2581 msgid "Export website..." msgstr "" -#: ../../include/text.php:2567 +#: ../../include/text.php:2582 msgid "Export to a zip file" msgstr "" -#: ../../include/text.php:2568 +#: ../../include/text.php:2583 msgid "website.zip" msgstr "" -#: ../../include/text.php:2569 +#: ../../include/text.php:2584 msgid "Enter a name for the zip file." msgstr "" -#: ../../include/text.php:2570 +#: ../../include/text.php:2585 msgid "Export to cloud files" msgstr "" -#: ../../include/text.php:2571 +#: ../../include/text.php:2586 msgid "/path/to/export/folder" msgstr "" -#: ../../include/text.php:2572 +#: ../../include/text.php:2587 msgid "Enter a path to a cloud files destination." msgstr "" -#: ../../include/text.php:2573 +#: ../../include/text.php:2588 msgid "Specify folder" msgstr "" @@ -13789,7 +13921,7 @@ msgstr "" msgid "View all %d common connections" msgstr "" -#: ../../include/markdown.php:198 ../../include/bbcode.php:347 +#: ../../include/markdown.php:198 ../../include/bbcode.php:366 #, php-format msgid "%1$s wrote the following %2$s %3$s" msgstr "" @@ -13814,19 +13946,19 @@ msgstr "" msgid "Channel was deleted and no longer exists." msgstr "" -#: ../../include/follow.php:165 +#: ../../include/follow.php:166 msgid "Remote channel or protocol unavailable." msgstr "" -#: ../../include/follow.php:188 +#: ../../include/follow.php:190 msgid "Channel discovery failed." msgstr "" -#: ../../include/follow.php:200 +#: ../../include/follow.php:202 msgid "Protocol disabled." msgstr "" -#: ../../include/follow.php:211 +#: ../../include/follow.php:213 msgid "Cannot connect to yourself." msgstr "" @@ -13939,192 +14071,196 @@ msgstr "" msgid " channel name" msgstr "" -#: ../../include/js_strings.php:41 +#: ../../include/js_strings.php:36 +msgid "Back to reply" +msgstr "" + +#: ../../include/js_strings.php:42 #, php-format msgid "%d minutes" msgid_plural "%d minutes" msgstr[0] "" msgstr[1] "" -#: ../../include/js_strings.php:42 +#: ../../include/js_strings.php:43 #, php-format msgid "about %d hours" msgid_plural "about %d hours" msgstr[0] "" msgstr[1] "" -#: ../../include/js_strings.php:43 +#: ../../include/js_strings.php:44 #, php-format msgid "%d days" msgid_plural "%d days" msgstr[0] "" msgstr[1] "" -#: ../../include/js_strings.php:44 +#: ../../include/js_strings.php:45 #, php-format msgid "%d months" msgid_plural "%d months" msgstr[0] "" msgstr[1] "" -#: ../../include/js_strings.php:45 +#: ../../include/js_strings.php:46 #, php-format msgid "%d years" msgid_plural "%d years" msgstr[0] "" msgstr[1] "" -#: ../../include/js_strings.php:50 +#: ../../include/js_strings.php:51 msgid "timeago.prefixAgo" msgstr "" -#: ../../include/js_strings.php:51 +#: ../../include/js_strings.php:52 msgid "timeago.prefixFromNow" msgstr "" -#: ../../include/js_strings.php:52 +#: ../../include/js_strings.php:53 msgid "timeago.suffixAgo" msgstr "" -#: ../../include/js_strings.php:53 +#: ../../include/js_strings.php:54 msgid "timeago.suffixFromNow" msgstr "" -#: ../../include/js_strings.php:56 +#: ../../include/js_strings.php:57 msgid "less than a minute" msgstr "" -#: ../../include/js_strings.php:57 +#: ../../include/js_strings.php:58 msgid "about a minute" msgstr "" -#: ../../include/js_strings.php:59 +#: ../../include/js_strings.php:60 msgid "about an hour" msgstr "" -#: ../../include/js_strings.php:61 +#: ../../include/js_strings.php:62 msgid "a day" msgstr "" -#: ../../include/js_strings.php:63 +#: ../../include/js_strings.php:64 msgid "about a month" msgstr "" -#: ../../include/js_strings.php:65 +#: ../../include/js_strings.php:66 msgid "about a year" msgstr "" -#: ../../include/js_strings.php:67 +#: ../../include/js_strings.php:68 msgid " " msgstr "" -#: ../../include/js_strings.php:68 +#: ../../include/js_strings.php:69 msgid "timeago.numbers" msgstr "" -#: ../../include/js_strings.php:74 +#: ../../include/js_strings.php:75 msgctxt "long" msgid "May" msgstr "" -#: ../../include/js_strings.php:82 +#: ../../include/js_strings.php:83 msgid "Jan" msgstr "" -#: ../../include/js_strings.php:83 +#: ../../include/js_strings.php:84 msgid "Feb" msgstr "" -#: ../../include/js_strings.php:84 +#: ../../include/js_strings.php:85 msgid "Mar" msgstr "" -#: ../../include/js_strings.php:85 +#: ../../include/js_strings.php:86 msgid "Apr" msgstr "" -#: ../../include/js_strings.php:86 +#: ../../include/js_strings.php:87 msgctxt "short" msgid "May" msgstr "" -#: ../../include/js_strings.php:87 +#: ../../include/js_strings.php:88 msgid "Jun" msgstr "" -#: ../../include/js_strings.php:88 +#: ../../include/js_strings.php:89 msgid "Jul" msgstr "" -#: ../../include/js_strings.php:89 +#: ../../include/js_strings.php:90 msgid "Aug" msgstr "" -#: ../../include/js_strings.php:90 +#: ../../include/js_strings.php:91 msgid "Sep" msgstr "" -#: ../../include/js_strings.php:91 +#: ../../include/js_strings.php:92 msgid "Oct" msgstr "" -#: ../../include/js_strings.php:92 +#: ../../include/js_strings.php:93 msgid "Nov" msgstr "" -#: ../../include/js_strings.php:93 +#: ../../include/js_strings.php:94 msgid "Dec" msgstr "" -#: ../../include/js_strings.php:101 +#: ../../include/js_strings.php:102 msgid "Sun" msgstr "" -#: ../../include/js_strings.php:102 +#: ../../include/js_strings.php:103 msgid "Mon" msgstr "" -#: ../../include/js_strings.php:103 +#: ../../include/js_strings.php:104 msgid "Tue" msgstr "" -#: ../../include/js_strings.php:104 +#: ../../include/js_strings.php:105 msgid "Wed" msgstr "" -#: ../../include/js_strings.php:105 +#: ../../include/js_strings.php:106 msgid "Thu" msgstr "" -#: ../../include/js_strings.php:106 +#: ../../include/js_strings.php:107 msgid "Fri" msgstr "" -#: ../../include/js_strings.php:107 +#: ../../include/js_strings.php:108 msgid "Sat" msgstr "" -#: ../../include/js_strings.php:108 +#: ../../include/js_strings.php:109 msgctxt "calendar" msgid "today" msgstr "" -#: ../../include/js_strings.php:109 +#: ../../include/js_strings.php:110 msgctxt "calendar" msgid "month" msgstr "" -#: ../../include/js_strings.php:110 +#: ../../include/js_strings.php:111 msgctxt "calendar" msgid "week" msgstr "" -#: ../../include/js_strings.php:111 +#: ../../include/js_strings.php:112 msgctxt "calendar" msgid "day" msgstr "" -#: ../../include/js_strings.php:112 +#: ../../include/js_strings.php:113 msgctxt "calendar" msgid "All day" msgstr "" @@ -14168,7 +14304,7 @@ msgstr "" msgid "%1$s has an updated %2$s, changing %3$s." msgstr "" -#: ../../include/attach.php:267 ../../include/attach.php:376 +#: ../../include/attach.php:267 ../../include/attach.php:375 msgid "Item was not found." msgstr "" @@ -14176,135 +14312,135 @@ msgstr "" msgid "Unknown error." msgstr "" -#: ../../include/attach.php:569 +#: ../../include/attach.php:568 msgid "No source file." msgstr "" -#: ../../include/attach.php:591 +#: ../../include/attach.php:590 msgid "Cannot locate file to replace" msgstr "" -#: ../../include/attach.php:610 +#: ../../include/attach.php:609 msgid "Cannot locate file to revise/update" msgstr "" -#: ../../include/attach.php:752 +#: ../../include/attach.php:751 #, php-format msgid "File exceeds size limit of %d" msgstr "" -#: ../../include/attach.php:773 +#: ../../include/attach.php:772 #, php-format msgid "You have reached your limit of %1$.0f Mbytes attachment storage." msgstr "" -#: ../../include/attach.php:955 +#: ../../include/attach.php:954 msgid "File upload failed. Possible system limit or action terminated." msgstr "" -#: ../../include/attach.php:984 +#: ../../include/attach.php:983 msgid "Stored file could not be verified. Upload failed." msgstr "" -#: ../../include/attach.php:1058 ../../include/attach.php:1074 +#: ../../include/attach.php:1057 ../../include/attach.php:1073 msgid "Path not available." msgstr "" -#: ../../include/attach.php:1123 ../../include/attach.php:1288 +#: ../../include/attach.php:1122 ../../include/attach.php:1285 msgid "Empty pathname" msgstr "" -#: ../../include/attach.php:1149 +#: ../../include/attach.php:1148 msgid "duplicate filename or path" msgstr "" -#: ../../include/attach.php:1174 +#: ../../include/attach.php:1173 msgid "Path not found." msgstr "" -#: ../../include/attach.php:1242 +#: ../../include/attach.php:1241 msgid "mkdir failed." msgstr "" -#: ../../include/attach.php:1246 +#: ../../include/attach.php:1245 msgid "database storage failed." msgstr "" -#: ../../include/attach.php:1294 +#: ../../include/attach.php:1291 msgid "Empty path" msgstr "" -#: ../../include/security.php:541 +#: ../../include/security.php:607 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/items.php:955 ../../include/items.php:1015 +#: ../../include/items.php:965 ../../include/items.php:1025 msgid "(Unknown)" msgstr "" -#: ../../include/items.php:1203 +#: ../../include/items.php:1213 msgid "Visible to anybody on the internet." msgstr "" -#: ../../include/items.php:1205 +#: ../../include/items.php:1215 msgid "Visible to you only." msgstr "" -#: ../../include/items.php:1207 +#: ../../include/items.php:1217 msgid "Visible to anybody in this network." msgstr "" -#: ../../include/items.php:1209 +#: ../../include/items.php:1219 msgid "Visible to anybody authenticated." msgstr "" -#: ../../include/items.php:1211 +#: ../../include/items.php:1221 #, php-format msgid "Visible to anybody on %s." msgstr "" -#: ../../include/items.php:1213 +#: ../../include/items.php:1223 msgid "Visible to all connections." msgstr "" -#: ../../include/items.php:1215 +#: ../../include/items.php:1225 msgid "Visible to approved connections." msgstr "" -#: ../../include/items.php:1217 +#: ../../include/items.php:1227 msgid "Visible to specific connections." msgstr "" -#: ../../include/items.php:4291 +#: ../../include/items.php:4311 msgid "Privacy group is empty." msgstr "" -#: ../../include/items.php:4298 +#: ../../include/items.php:4318 #, php-format msgid "Privacy group: %s" msgstr "" -#: ../../include/items.php:4310 +#: ../../include/items.php:4330 msgid "Connection not found." msgstr "" -#: ../../include/items.php:4659 +#: ../../include/items.php:4679 msgid "profile photo" msgstr "" -#: ../../include/items.php:4851 +#: ../../include/items.php:4871 #, php-format msgid "[Edited %s]" msgstr "" -#: ../../include/items.php:4851 +#: ../../include/items.php:4871 msgctxt "edit_activity" msgid "Post" msgstr "" -#: ../../include/items.php:4851 +#: ../../include/items.php:4871 msgctxt "edit_activity" msgid "Comment" msgstr "" @@ -14341,196 +14477,196 @@ msgstr "" msgid "Unable to retrieve modified identity" msgstr "" -#: ../../include/channel.php:1353 +#: ../../include/channel.php:1419 msgid "Create New Profile" msgstr "" -#: ../../include/channel.php:1374 +#: ../../include/channel.php:1440 msgid "Visible to everybody" msgstr "" -#: ../../include/channel.php:1451 ../../include/channel.php:1579 +#: ../../include/channel.php:1517 ../../include/channel.php:1645 msgid "Gender:" msgstr "" -#: ../../include/channel.php:1453 ../../include/channel.php:1647 +#: ../../include/channel.php:1519 ../../include/channel.php:1713 msgid "Homepage:" msgstr "" -#: ../../include/channel.php:1454 +#: ../../include/channel.php:1520 msgid "Online Now" msgstr "" -#: ../../include/channel.php:1507 +#: ../../include/channel.php:1573 msgid "Change your profile photo" msgstr "" -#: ../../include/channel.php:1538 +#: ../../include/channel.php:1604 msgid "Trans" msgstr "" -#: ../../include/channel.php:1584 +#: ../../include/channel.php:1650 msgid "Like this channel" msgstr "" -#: ../../include/channel.php:1608 +#: ../../include/channel.php:1674 msgid "j F, Y" msgstr "" -#: ../../include/channel.php:1609 +#: ../../include/channel.php:1675 msgid "j F" msgstr "" -#: ../../include/channel.php:1616 +#: ../../include/channel.php:1682 msgid "Birthday:" msgstr "" -#: ../../include/channel.php:1629 +#: ../../include/channel.php:1695 #, php-format msgid "for %1$d %2$s" msgstr "" -#: ../../include/channel.php:1641 +#: ../../include/channel.php:1707 msgid "Tags:" msgstr "" -#: ../../include/channel.php:1645 +#: ../../include/channel.php:1711 msgid "Sexual Preference:" msgstr "" -#: ../../include/channel.php:1651 +#: ../../include/channel.php:1717 msgid "Political Views:" msgstr "" -#: ../../include/channel.php:1653 +#: ../../include/channel.php:1719 msgid "Religion:" msgstr "" -#: ../../include/channel.php:1657 +#: ../../include/channel.php:1723 msgid "Hobbies/Interests:" msgstr "" -#: ../../include/channel.php:1659 +#: ../../include/channel.php:1725 msgid "Likes:" msgstr "" -#: ../../include/channel.php:1661 +#: ../../include/channel.php:1727 msgid "Dislikes:" msgstr "" -#: ../../include/channel.php:1663 +#: ../../include/channel.php:1729 msgid "Contact information and Social Networks:" msgstr "" -#: ../../include/channel.php:1665 +#: ../../include/channel.php:1731 msgid "My other channels:" msgstr "" -#: ../../include/channel.php:1667 +#: ../../include/channel.php:1733 msgid "Musical interests:" msgstr "" -#: ../../include/channel.php:1669 +#: ../../include/channel.php:1735 msgid "Books, literature:" msgstr "" -#: ../../include/channel.php:1671 +#: ../../include/channel.php:1737 msgid "Television:" msgstr "" -#: ../../include/channel.php:1673 +#: ../../include/channel.php:1739 msgid "Film/dance/culture/entertainment:" msgstr "" -#: ../../include/channel.php:1675 +#: ../../include/channel.php:1741 msgid "Love/Romance:" msgstr "" -#: ../../include/channel.php:1677 +#: ../../include/channel.php:1743 msgid "Work/employment:" msgstr "" -#: ../../include/channel.php:1679 +#: ../../include/channel.php:1745 msgid "School/education:" msgstr "" -#: ../../include/channel.php:1702 +#: ../../include/channel.php:1768 msgid "Like this thing" msgstr "" -#: ../../include/event.php:28 ../../include/event.php:75 +#: ../../include/event.php:31 ../../include/event.php:78 msgid "l F d, Y \\@ g:i A" msgstr "" -#: ../../include/event.php:36 ../../include/event.php:79 +#: ../../include/event.php:39 ../../include/event.php:82 msgid "Starts:" msgstr "" -#: ../../include/event.php:46 ../../include/event.php:83 +#: ../../include/event.php:49 ../../include/event.php:86 msgid "Finishes:" msgstr "" -#: ../../include/event.php:1020 +#: ../../include/event.php:1023 msgid "This event has been added to your calendar." msgstr "" -#: ../../include/event.php:1239 +#: ../../include/event.php:1244 msgid "Not specified" msgstr "" -#: ../../include/event.php:1240 +#: ../../include/event.php:1245 msgid "Needs Action" msgstr "" -#: ../../include/event.php:1241 +#: ../../include/event.php:1246 msgid "Completed" msgstr "" -#: ../../include/event.php:1242 +#: ../../include/event.php:1247 msgid "In Process" msgstr "" -#: ../../include/event.php:1243 +#: ../../include/event.php:1248 msgid "Cancelled" msgstr "" -#: ../../include/event.php:1322 ../../include/connections.php:698 +#: ../../include/event.php:1331 ../../include/connections.php:725 msgid "Home, Voice" msgstr "" -#: ../../include/event.php:1323 ../../include/connections.php:699 +#: ../../include/event.php:1332 ../../include/connections.php:726 msgid "Home, Fax" msgstr "" -#: ../../include/event.php:1325 ../../include/connections.php:701 +#: ../../include/event.php:1334 ../../include/connections.php:728 msgid "Work, Voice" msgstr "" -#: ../../include/event.php:1326 ../../include/connections.php:702 +#: ../../include/event.php:1335 ../../include/connections.php:729 msgid "Work, Fax" msgstr "" -#: ../../include/network.php:1718 +#: ../../include/network.php:1728 msgid "GNU-Social" msgstr "" -#: ../../include/network.php:1719 +#: ../../include/network.php:1729 msgid "RSS/Atom" msgstr "" -#: ../../include/network.php:1723 +#: ../../include/network.php:1733 msgid "Facebook" msgstr "" -#: ../../include/network.php:1725 +#: ../../include/network.php:1735 msgid "LinkedIn" msgstr "" -#: ../../include/network.php:1726 +#: ../../include/network.php:1736 msgid "XMPP/IM" msgstr "" -#: ../../include/network.php:1727 +#: ../../include/network.php:1737 msgid "MySpace" msgstr "" @@ -14567,90 +14703,90 @@ msgid "" "permissions set who is allowed to view the post." msgstr "" -#: ../../include/bbcode.php:200 ../../include/bbcode.php:1190 -#: ../../include/bbcode.php:1193 ../../include/bbcode.php:1198 -#: ../../include/bbcode.php:1201 ../../include/bbcode.php:1204 -#: ../../include/bbcode.php:1207 ../../include/bbcode.php:1212 -#: ../../include/bbcode.php:1215 ../../include/bbcode.php:1220 -#: ../../include/bbcode.php:1223 ../../include/bbcode.php:1226 -#: ../../include/bbcode.php:1229 +#: ../../include/bbcode.php:219 ../../include/bbcode.php:1211 +#: ../../include/bbcode.php:1214 ../../include/bbcode.php:1219 +#: ../../include/bbcode.php:1222 ../../include/bbcode.php:1225 +#: ../../include/bbcode.php:1228 ../../include/bbcode.php:1233 +#: ../../include/bbcode.php:1236 ../../include/bbcode.php:1241 +#: ../../include/bbcode.php:1244 ../../include/bbcode.php:1247 +#: ../../include/bbcode.php:1250 msgid "Image/photo" msgstr "" -#: ../../include/bbcode.php:239 ../../include/bbcode.php:1240 +#: ../../include/bbcode.php:258 ../../include/bbcode.php:1261 msgid "Encrypted content" msgstr "" -#: ../../include/bbcode.php:255 +#: ../../include/bbcode.php:274 #, php-format msgid "Install %1$s element %2$s" msgstr "" -#: ../../include/bbcode.php:259 +#: ../../include/bbcode.php:278 #, php-format msgid "" "This post contains an installable %s element, however you lack permissions " "to install it on this site." msgstr "" -#: ../../include/bbcode.php:339 +#: ../../include/bbcode.php:358 msgid "card" msgstr "" -#: ../../include/bbcode.php:341 +#: ../../include/bbcode.php:360 msgid "article" msgstr "" -#: ../../include/bbcode.php:424 ../../include/bbcode.php:432 +#: ../../include/bbcode.php:443 ../../include/bbcode.php:451 msgid "Click to open/close" msgstr "" -#: ../../include/bbcode.php:432 +#: ../../include/bbcode.php:451 msgid "spoiler" msgstr "" -#: ../../include/bbcode.php:445 +#: ../../include/bbcode.php:464 msgid "View article" msgstr "" -#: ../../include/bbcode.php:445 +#: ../../include/bbcode.php:464 msgid "View summary" msgstr "" -#: ../../include/bbcode.php:1178 +#: ../../include/bbcode.php:1199 msgid "$1 wrote:" msgstr "" -#: ../../include/oembed.php:226 +#: ../../include/oembed.php:153 msgid "View PDF" msgstr "" -#: ../../include/oembed.php:356 +#: ../../include/oembed.php:357 msgid " by " msgstr "" -#: ../../include/oembed.php:357 +#: ../../include/oembed.php:358 msgid " on " msgstr "" -#: ../../include/oembed.php:386 +#: ../../include/oembed.php:387 msgid "Embedded content" msgstr "" -#: ../../include/oembed.php:395 +#: ../../include/oembed.php:396 msgid "Embedding disabled" msgstr "" -#: ../../include/zid.php:351 +#: ../../include/zid.php:363 #, php-format msgid "OpenWebAuth: %1$s welcomes %2$s" msgstr "" -#: ../../include/features.php:86 ../../include/features.php:273 +#: ../../include/features.php:86 ../../include/features.php:281 msgid "Start calendar week on Monday" msgstr "" -#: ../../include/features.php:87 ../../include/features.php:274 +#: ../../include/features.php:87 ../../include/features.php:282 msgid "Default is Sunday" msgstr "" @@ -14722,171 +14858,179 @@ msgstr "" msgid "Ability to mark special posts with a star indicator" msgstr "" -#: ../../include/features.php:180 +#: ../../include/features.php:174 +msgid "Reply on comment" +msgstr "" + +#: ../../include/features.php:175 +msgid "Ability to reply on selected comment" +msgstr "" + +#: ../../include/features.php:188 msgid "Advanced Directory Search" msgstr "" -#: ../../include/features.php:181 +#: ../../include/features.php:189 msgid "Allows creation of complex directory search queries" msgstr "" -#: ../../include/features.php:190 +#: ../../include/features.php:198 msgid "Editor" msgstr "" -#: ../../include/features.php:194 +#: ../../include/features.php:202 msgid "Post Categories" msgstr "" -#: ../../include/features.php:195 +#: ../../include/features.php:203 msgid "Add categories to your posts" msgstr "" -#: ../../include/features.php:203 +#: ../../include/features.php:211 msgid "Large Photos" msgstr "" -#: ../../include/features.php:204 +#: ../../include/features.php:212 msgid "" "Include large (1024px) photo thumbnails in posts. If not enabled, use small " "(640px) photo thumbnails" msgstr "" -#: ../../include/features.php:211 +#: ../../include/features.php:219 msgid "Even More Encryption" msgstr "" -#: ../../include/features.php:212 +#: ../../include/features.php:220 msgid "" "Allow optional encryption of content end-to-end with a shared secret key" msgstr "" -#: ../../include/features.php:219 +#: ../../include/features.php:227 msgid "Enable Voting Tools" msgstr "" -#: ../../include/features.php:220 +#: ../../include/features.php:228 msgid "Provide a class of post which others can vote on" msgstr "" -#: ../../include/features.php:227 +#: ../../include/features.php:235 msgid "Disable Comments" msgstr "" -#: ../../include/features.php:228 +#: ../../include/features.php:236 msgid "Provide the option to disable comments for a post" msgstr "" -#: ../../include/features.php:235 +#: ../../include/features.php:243 msgid "Delayed Posting" msgstr "" -#: ../../include/features.php:236 +#: ../../include/features.php:244 msgid "Allow posts to be published at a later date" msgstr "" -#: ../../include/features.php:243 +#: ../../include/features.php:251 msgid "Content Expiration" msgstr "" -#: ../../include/features.php:244 +#: ../../include/features.php:252 msgid "Remove posts/comments and/or private messages at a future time" msgstr "" -#: ../../include/features.php:251 +#: ../../include/features.php:259 msgid "Suppress Duplicate Posts/Comments" msgstr "" -#: ../../include/features.php:252 +#: ../../include/features.php:260 msgid "" "Prevent posts with identical content to be published with less than two " "minutes in between submissions." msgstr "" -#: ../../include/features.php:259 +#: ../../include/features.php:267 msgid "Auto-save drafts of posts and comments" msgstr "" -#: ../../include/features.php:260 +#: ../../include/features.php:268 msgid "" "Automatically saves post and comment drafts in local browser storage to help " "prevent accidental loss of compositions" msgstr "" -#: ../../include/features.php:281 +#: ../../include/features.php:277 +msgid "Events" +msgstr "" + +#: ../../include/features.php:289 msgid "Smart Birthdays" msgstr "" -#: ../../include/features.php:282 +#: ../../include/features.php:290 msgid "" "Make birthday events timezone aware in case your friends are scattered " "across the planet." msgstr "" -#: ../../include/features.php:289 +#: ../../include/features.php:297 msgid "Event Timezone Selection" msgstr "" -#: ../../include/features.php:290 +#: ../../include/features.php:298 msgid "Allow event creation in timezones other than your own." msgstr "" -#: ../../include/features.php:299 +#: ../../include/features.php:307 msgid "Manage" msgstr "" -#: ../../include/features.php:303 +#: ../../include/features.php:311 msgid "Navigation Channel Select" msgstr "" -#: ../../include/features.php:304 +#: ../../include/features.php:312 msgid "Change channels directly from within the navigation dropdown menu" msgstr "" -#: ../../include/features.php:318 +#: ../../include/features.php:326 msgid "Save search terms for re-use" msgstr "" -#: ../../include/features.php:326 +#: ../../include/features.php:334 msgid "Ability to file posts under folders" msgstr "" -#: ../../include/features.php:333 +#: ../../include/features.php:341 msgid "Alternate Stream Order" msgstr "" -#: ../../include/features.php:334 +#: ../../include/features.php:342 msgid "" "Ability to order the stream by last post date, last comment date or " "unthreaded activities" msgstr "" -#: ../../include/features.php:341 +#: ../../include/features.php:349 msgid "Contact Filter" msgstr "" -#: ../../include/features.php:342 +#: ../../include/features.php:350 msgid "Ability to display only posts of a selected contact" msgstr "" -#: ../../include/features.php:349 +#: ../../include/features.php:357 msgid "Forum Filter" msgstr "" -#: ../../include/features.php:350 +#: ../../include/features.php:358 msgid "Ability to display only posts of a specific forum" msgstr "" -#: ../../include/features.php:357 +#: ../../include/features.php:365 msgid "Personal Posts Filter" msgstr "" -#: ../../include/features.php:358 -msgid "Ability to display only posts that you've interacted on" -msgstr "" - #: ../../include/features.php:366 -msgid "Show friend and connection suggestions" +msgid "Ability to display only posts that you've interacted on" msgstr "" #: ../../include/features.php:387 @@ -14925,31 +15069,31 @@ msgstr "" msgid "Trending" msgstr "" -#: ../../include/taxonomy.php:552 +#: ../../include/taxonomy.php:550 msgid "Keywords" msgstr "" -#: ../../include/taxonomy.php:573 +#: ../../include/taxonomy.php:571 msgid "have" msgstr "" -#: ../../include/taxonomy.php:573 +#: ../../include/taxonomy.php:571 msgid "has" msgstr "" -#: ../../include/taxonomy.php:574 +#: ../../include/taxonomy.php:572 msgid "want" msgstr "" -#: ../../include/taxonomy.php:574 +#: ../../include/taxonomy.php:572 msgid "wants" msgstr "" -#: ../../include/taxonomy.php:575 +#: ../../include/taxonomy.php:573 msgid "likes" msgstr "" -#: ../../include/taxonomy.php:576 +#: ../../include/taxonomy.php:574 msgid "dislikes" msgstr "" @@ -14973,51 +15117,51 @@ msgstr "" msgid "Invitation could not be verified." msgstr "" -#: ../../include/account.php:158 +#: ../../include/account.php:156 msgid "Please enter the required information." msgstr "" -#: ../../include/account.php:225 +#: ../../include/account.php:223 msgid "Failed to store account information." msgstr "" -#: ../../include/account.php:314 +#: ../../include/account.php:311 #, php-format msgid "Registration confirmation for %s" msgstr "" -#: ../../include/account.php:385 +#: ../../include/account.php:380 #, php-format msgid "Registration request at %s" msgstr "" -#: ../../include/account.php:407 +#: ../../include/account.php:402 msgid "your registration password" msgstr "" -#: ../../include/account.php:413 ../../include/account.php:475 +#: ../../include/account.php:408 ../../include/account.php:471 #, php-format msgid "Registration details for %s" msgstr "" -#: ../../include/account.php:486 +#: ../../include/account.php:482 msgid "Account approved." msgstr "" -#: ../../include/account.php:526 +#: ../../include/account.php:522 #, php-format msgid "Registration revoked for %s" msgstr "" -#: ../../include/account.php:805 ../../include/account.php:807 +#: ../../include/account.php:803 ../../include/account.php:805 msgid "Click here to upgrade." msgstr "" -#: ../../include/account.php:813 +#: ../../include/account.php:811 msgid "This action exceeds the limits set by your subscription plan." msgstr "" -#: ../../include/account.php:818 +#: ../../include/account.php:816 msgid "This action is not available under your subscription plan." msgstr "" @@ -15102,115 +15246,115 @@ msgstr "" msgid "Happy Birthday %1$s" msgstr "" -#: ../../include/nav.php:86 +#: ../../include/nav.php:90 msgid "Remote authentication" msgstr "" -#: ../../include/nav.php:86 +#: ../../include/nav.php:90 msgid "Click to authenticate to your home hub" msgstr "" -#: ../../include/nav.php:92 +#: ../../include/nav.php:96 msgid "Manage your channels" msgstr "" -#: ../../include/nav.php:95 +#: ../../include/nav.php:99 msgid "Manage your privacy groups" msgstr "" -#: ../../include/nav.php:97 +#: ../../include/nav.php:101 msgid "Account/Channel Settings" msgstr "" -#: ../../include/nav.php:103 ../../include/nav.php:132 +#: ../../include/nav.php:107 ../../include/nav.php:136 msgid "End this session" msgstr "" -#: ../../include/nav.php:106 +#: ../../include/nav.php:110 msgid "Your profile page" msgstr "" -#: ../../include/nav.php:109 +#: ../../include/nav.php:113 msgid "Manage/Edit profiles" msgstr "" -#: ../../include/nav.php:118 ../../include/nav.php:122 +#: ../../include/nav.php:122 ../../include/nav.php:126 msgid "Sign in" msgstr "" -#: ../../include/nav.php:149 +#: ../../include/nav.php:153 msgid "Take me home" msgstr "" -#: ../../include/nav.php:151 +#: ../../include/nav.php:155 msgid "Log me out of this site" msgstr "" -#: ../../include/nav.php:156 +#: ../../include/nav.php:160 msgid "Create an account" msgstr "" -#: ../../include/nav.php:168 +#: ../../include/nav.php:172 msgid "Help and documentation" msgstr "" -#: ../../include/nav.php:183 +#: ../../include/nav.php:186 msgid "Search site @name, !forum, #tag, ?docs, content" msgstr "" -#: ../../include/nav.php:189 +#: ../../include/nav.php:192 msgid "Site Setup and Configuration" msgstr "" -#: ../../include/nav.php:329 +#: ../../include/nav.php:332 msgid "@name, !forum, #tag, ?doc, content" msgstr "" -#: ../../include/nav.php:330 +#: ../../include/nav.php:333 msgid "Please wait..." msgstr "" -#: ../../include/nav.php:336 +#: ../../include/nav.php:339 msgid "Add Apps" msgstr "" -#: ../../include/nav.php:337 +#: ../../include/nav.php:340 msgid "Arrange Apps" msgstr "" -#: ../../include/nav.php:338 +#: ../../include/nav.php:341 msgid "Toggle System Apps" msgstr "" -#: ../../include/nav.php:424 +#: ../../include/nav.php:426 msgid "Status Messages and Posts" msgstr "" -#: ../../include/nav.php:437 +#: ../../include/nav.php:439 msgid "Profile Details" msgstr "" -#: ../../include/nav.php:447 ../../include/photos.php:669 +#: ../../include/nav.php:449 ../../include/photos.php:666 msgid "Photo Albums" msgstr "" -#: ../../include/nav.php:455 +#: ../../include/nav.php:457 msgid "Files and Storage" msgstr "" -#: ../../include/nav.php:493 +#: ../../include/nav.php:495 msgid "Saved Bookmarks" msgstr "" -#: ../../include/nav.php:504 +#: ../../include/nav.php:506 msgid "View Cards" msgstr "" -#: ../../include/nav.php:515 +#: ../../include/nav.php:517 msgid "View Articles" msgstr "" -#: ../../include/nav.php:527 +#: ../../include/nav.php:529 msgid "View Webpages" msgstr "" @@ -15223,21 +15367,21 @@ msgstr "" msgid "Image file is empty." msgstr "" -#: ../../include/photos.php:327 +#: ../../include/photos.php:324 msgid "Photo storage failed." msgstr "" -#: ../../include/photos.php:376 +#: ../../include/photos.php:373 msgid "a new photo" msgstr "" -#: ../../include/photos.php:380 +#: ../../include/photos.php:377 #, php-format msgctxt "photo_upload" msgid "%1$s posted %2$s to %3$s" msgstr "" -#: ../../include/photos.php:674 +#: ../../include/photos.php:671 msgid "Upload New Photos" msgstr "" @@ -15245,7 +15389,7 @@ msgstr "" msgid "Invalid data packet" msgstr "" -#: ../../include/zot.php:4288 +#: ../../include/zot.php:4308 msgid "invalid target signature" msgstr "" diff --git a/view/js/main.js b/view/js/main.js index 48159e6e8..e91bd914d 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -1161,7 +1161,7 @@ function doreply(parent, ident, owner, hint) { function doscroll(parent, hidden) { var x = '#hide-comments-outer-' + hidden.toString(); - var back = $('.back-to-reply'); + var back = $('#back-to-reply'); if(back.length == 0) var pos = $(window).scrollTop(); else @@ -1177,11 +1177,11 @@ function doscroll(parent, hidden) { back.remove(); var id = $('[data-mid="' + parent + '"]'); $('html, body').animate({scrollTop:(id.offset().top) - 50}, 'slow'); - $('<a href="javascript:doscrollback(' + pos + ');" class="back-to-reply" title="' + aStr['to_reply'] + '"><i class="fa fa-angle-double-down float-right"> </i></a>').insertBefore('#wall-item-info-' + id.attr('id').replace(/\D/g,'')); + $('<a href="javascript:doscrollback(' + pos + ');" id="back-to-reply" class="float-right" title="' + aStr['to_reply'] + '"><i class="fa fa-angle-double-down"> </i></a>').insertBefore('#wall-item-info-' + id.attr('id').replace(/\D/g,'')); } function doscrollback(pos) { - $('.back-to-reply').remove(); + $('#back-to-reply').remove(); $(window).scrollTop(pos); } diff --git a/view/js/mod_cdav.js b/view/js/mod_cdav.js new file mode 100644 index 000000000..31ce87f7a --- /dev/null +++ b/view/js/mod_cdav.js @@ -0,0 +1,4 @@ +$(document).ready(function() { + $('#id_description').editor_autocomplete(baseurl + "/acl"); + $('textarea').bbco_autocomplete('bbcode'); +}); diff --git a/view/php/theme_init.php b/view/php/theme_init.php index 73e559c45..d683a3b58 100644 --- a/view/php/theme_init.php +++ b/view/php/theme_init.php @@ -21,7 +21,7 @@ head_add_js('autocomplete.js'); head_add_js('/library/jquery.timeago.js'); head_add_js('/library/readmore.js/readmore.js'); head_add_js('/library/sticky-kit/sticky-kit.min.js'); -head_add_js('/library/jgrowl/jquery.jgrowl_minimized.js'); +head_add_js('/library/jgrowl/jquery.jgrowl.min.js'); head_add_js('/library/cryptojs/components/core-min.js'); head_add_js('/library/cryptojs/rollups/aes.js'); head_add_js('/library/cryptojs/rollups/rabbit.js'); diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index eceff51c7..54f1af69d 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -28,7 +28,7 @@ {{/if}} <div class="p-2 clearfix wall-item-head{{if $item.is_new && !$item.title && !$item.event && !$item.is_comment && !$item.photo}} wall-item-head-new rounded-top{{/if}}" > {{if $item.thr_parent}} - <a href="javascript:doscroll('{{$item.thr_parent}}',{{$item.parent}});" title="{{$item.top_hint}}"><i class="fa fa-angle-double-up float-right"> </i></a> + <a href="javascript:doscroll('{{$item.thr_parent}}',{{$item.parent}});" title="{{$item.top_hint}}" class="float-right"><i class="fa fa-angle-double-up"> </i></a> {{/if}} <div class="wall-item-info" id="wall-item-info-{{$item.id}}" > <div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}} h-card p-author" id="wall-item-photo-wrapper-{{$item.id}}"> diff --git a/view/tpl/peoplefind.tpl b/view/tpl/peoplefind.tpl index 206be694e..bbcc0b85b 100755 --- a/view/tpl/peoplefind.tpl +++ b/view/tpl/peoplefind.tpl @@ -4,7 +4,7 @@ <div class="input-group form-group"> <input class="form-control" type="text" name="search" title="{{$hint}}{{if $advanced_search}}{{$advanced_hint}}{{/if}}" placeholder="{{$desc}}" /> <div class="input-group-append"> - <button class="btn btn-outline-secondary" type="submit" name="submit"><i class="fa fa-fw fa-search"></i></button> + <button class="btn btn-sm btn-outline-secondary" type="submit" name="submit"><i class="fa fa-fw fa-search"></i></button> </div> </div> </form> diff --git a/view/tpl/register.tpl b/view/tpl/register.tpl index 33ca46ba1..1054c7567 100755 --- a/view/tpl/register.tpl +++ b/view/tpl/register.tpl @@ -4,6 +4,7 @@ </div> <div class="section-content-wrapper"> <form action="register" method="post" id="register-form"> + <input type='hidden' name='form_security_token' value='{{$form_security_token}}'> {{if $reg_is}} <div class="section-content-warning-wrapper"> <div id="register-desc" class="descriptive-paragraph">{{$reg_is}}</div> diff --git a/view/tpl/searchbox.tpl b/view/tpl/searchbox.tpl index 2fcf3e374..0ff526847 100644 --- a/view/tpl/searchbox.tpl +++ b/view/tpl/searchbox.tpl @@ -3,9 +3,9 @@ <div id="{{$id}}" class="input-group"> <input class="form-control" type="text" name="search" id="search-text" value="{{$s}}" onclick="this.submit();" /> <div class="input-group-append"> - <button type="submit" name="submit" class="btn btn-outline-secondary" id="search-submit" value="{{$search_label}}"><i class="fa fa-search"></i></button> + <button type="submit" name="submit" class="btn btn-sm btn-outline-secondary" id="search-submit" value="{{$search_label}}"><i class="fa fa-search"></i></button> {{if $savedsearch}} - <button type="submit" name="searchsave" class="btn btn-outline-secondary" id="search-save" value="{{$save_label}}"><i class="fa fa-floppy-o"></i></button> + <button type="submit" name="searchsave" class="btn btn-sm btn-outline-secondary" id="search-save" value="{{$save_label}}"><i class="fa fa-floppy-o"></i></button> {{/if}} </div> </div> diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl index 4a4db03eb..8556d8bad 100644 --- a/view/tpl/wiki.tpl +++ b/view/tpl/wiki.tpl @@ -68,7 +68,7 @@ <div class="input-group"> <input class="form-control" name="{{$commitMsg.0}}" id="id_{{$commitMsg.0}}" type="text" value="{{$commitMsg.2}}"{{if $commitMsg.5}} {{$commitMsg.5}}{{/if}}> <div class="input-group-append"> - <button id="save-page" type="button" class="btn btn-primary disabled">Save</button> + <button id="save-page" type="button" class="btn btn-sm btn-primary disabled">Save</button> </div> </div> </div> |