diff options
| author | Mario Vavti <mario@mariovavti.com> | 2016-08-03 21:17:08 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2016-08-03 21:17:08 +0200 |
| commit | b959641ca82d45f641a803b58dcfb91a90274956 (patch) | |
| tree | fa658a7f3a8ab4f862e503ad2113fc24bffd0304 | |
| parent | c50bfa07ca3a456d69d73988f42e58e3282879e9 (diff) | |
| parent | 416adeb169f16fd25f7dbf54232451d8647cc999 (diff) | |
| download | volse-hubzilla-b959641ca82d45f641a803b58dcfb91a90274956.tar.gz volse-hubzilla-b959641ca82d45f641a803b58dcfb91a90274956.tar.bz2 volse-hubzilla-b959641ca82d45f641a803b58dcfb91a90274956.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
37 files changed, 4429 insertions, 3237 deletions
diff --git a/Zotlabs/Daemon/Cron.php b/Zotlabs/Daemon/Cron.php index c6e82b13a..c66b62f55 100644 --- a/Zotlabs/Daemon/Cron.php +++ b/Zotlabs/Daemon/Cron.php @@ -64,12 +64,16 @@ class Cron { // delete expired access tokens - q("delete from atoken where atoken_expires != '%s' && atoken_expires < %s", + $r = q("select atoken_id from atoken where atoken_expires != '%s' && atoken_expires < %s", dbesc(NULL_DATE), db_utcnow() ); - - + if($r) { + require_once('include/security.php'); + foreach($r as $rr) { + atoken_delete($rr['atoken_id']); + } + } // Ensure that every channel pings a directory server once a month. This way we can discover // channels and sites that quietly vanished and prevent the directory from accumulating stale diff --git a/Zotlabs/Module/Impel.php b/Zotlabs/Module/Impel.php index 735c311d0..197d9f859 100644 --- a/Zotlabs/Module/Impel.php +++ b/Zotlabs/Module/Impel.php @@ -88,7 +88,11 @@ class Impel extends \Zotlabs\Web\Controller { foreach($j['items'] as $it) { $mitem = array(); + $mitem['mitem_link'] = str_replace('[channelurl]',z_root() . '/channel/' . $channel['channel_address'],$it['link']); + $mitem['mitem_link'] = str_replace('[pageurl]',z_root() . '/page/' . $channel['channel_address'],$it['link']); + $mitem['mitem_link'] = str_replace('[cloudurl]',z_root() . '/cloud/' . $channel['channel_address'],$it['link']); $mitem['mitem_link'] = str_replace('[baseurl]',z_root(),$it['link']); + $mitem['mitem_desc'] = escape_tags($it['desc']); $mitem['mitem_order'] = intval($it['order']); if(is_array($it['flags'])) { diff --git a/Zotlabs/Module/Like.php b/Zotlabs/Module/Like.php index 170349509..dd0bc99d4 100644 --- a/Zotlabs/Module/Like.php +++ b/Zotlabs/Module/Like.php @@ -495,6 +495,8 @@ class Like extends \Zotlabs\Web\Controller { $arr['deny_gid'] = $deny_gid; $arr['item_private'] = $private; + call_hooks('post_local',$arr); + $post = item_store($arr); $post_id = $post['item_id']; diff --git a/Zotlabs/Module/Menu.php b/Zotlabs/Module/Menu.php index e98053f8c..1dec65c1f 100644 --- a/Zotlabs/Module/Menu.php +++ b/Zotlabs/Module/Menu.php @@ -65,7 +65,7 @@ class Menu extends \Zotlabs\Web\Controller { - function get() { + function get() { $uid = local_channel(); @@ -81,7 +81,7 @@ class Menu extends \Zotlabs\Web\Controller { if(argc() == 1) { - + $channel = (($sys) ? $sys : \App::get_channel()); // list menus $x = menu_list($uid); @@ -89,7 +89,7 @@ class Menu extends \Zotlabs\Web\Controller { for($y = 0; $y < count($x); $y ++) { $m = menu_fetch($x[$y]['menu_name'],$uid,get_observer_hash()); if($m) - $x[$y]['element'] = '[element]' . base64url_encode(json_encode(menu_element($m))) . '[/element]'; + $x[$y]['element'] = '[element]' . base64url_encode(json_encode(menu_element($channel,$m))) . '[/element]'; $x[$y]['bookmark'] = (($x[$y]['menu_flags'] & MENU_BOOKMARK) ? true : false); } } diff --git a/Zotlabs/Module/Ping.php b/Zotlabs/Module/Ping.php index 5cbf45daa..e01c3b49a 100644 --- a/Zotlabs/Module/Ping.php +++ b/Zotlabs/Module/Ping.php @@ -173,7 +173,7 @@ class Ping extends \Zotlabs\Web\Controller { ); break; case 'all_events': - $r = q("update event set `dimissed` = 1 where `dismissed` = 0 and uid = %d AND dtstart < '%s' AND dtstart > '%s' ", + $r = q("update event set `dismissed` = 1 where `dismissed` = 0 and uid = %d AND dtstart < '%s' AND dtstart > '%s' ", intval(local_channel()), dbesc(datetime_convert('UTC', date_default_timezone_get(), 'now + ' . intval($evdays) . ' days')), dbesc(datetime_convert('UTC', date_default_timezone_get(), 'now - 1 days')) diff --git a/Zotlabs/Module/Settings.php b/Zotlabs/Module/Settings.php index af3a25c60..57a0aa535 100644 --- a/Zotlabs/Module/Settings.php +++ b/Zotlabs/Module/Settings.php @@ -2,7 +2,7 @@ namespace Zotlabs\Module; /** @file */ require_once('include/zot.php'); - +require_once('include/security.php'); class Settings extends \Zotlabs\Web\Controller { @@ -145,7 +145,7 @@ class Settings extends \Zotlabs\Web\Controller { return; } if($atoken_id) { - $r = q("update atoken set atoken_name = '%s', atoken_token = '%s' atoken_expires = '%s' + $r = q("update atoken set atoken_name = '%s', atoken_token = '%s', atoken_expires = '%s' where atoken_id = %d and atoken_uid = %d", dbesc($name), dbesc($token), @@ -164,7 +164,23 @@ class Settings extends \Zotlabs\Web\Controller { dbesc($expires) ); } + + $atoken_xchan = substr($channel['channel_hash'],0,16) . '.' . $name; + + $all_perms = \Zotlabs\Access\Permissions::Perms(); + + if($all_perms) { + foreach($all_perms as $perm => $desc) { + if(array_key_exists('perms_' . $perm, $_POST)) { + set_abconfig($channel['channel_id'],$atoken_xchan,'my_perms',$perm,intval($_POST['perms_' . $perm])); + } + else { + set_abconfig($channel['channel_id'],$atoken_xchan,'my_perms',$perm,0); + } + } + } + info( t('Token saved.') . EOL); return; } @@ -270,7 +286,7 @@ class Settings extends \Zotlabs\Web\Controller { $email = ((x($_POST,'email')) ? trim(notags($_POST['email'])) : ''); $account = \App::get_account(); if($email != $account['account_email']) { - if(! valid_email($email)) + if(! valid_email($email)) $errs[] = t('Not valid email.'); $adm = trim(get_config('system','admin_email')); if(($adm) && (strcasecmp($email,$adm) == 0)) { @@ -378,7 +394,7 @@ class Settings extends \Zotlabs\Web\Controller { intval(local_channel()) ); } - else { + else { $role_permissions = \Zotlabs\Access\PermissionRoles::role_perms($_POST['permissions_role']); if(! $role_permissions) { notice('Permissions category could not be found.'); @@ -765,6 +781,8 @@ class Settings extends \Zotlabs\Web\Controller { if((argc() > 1) && (argv(1) === 'tokens')) { $atoken = null; + $atoken_xchan = ''; + if(argc() > 2) { $id = argv(2); @@ -773,23 +791,56 @@ class Settings extends \Zotlabs\Web\Controller { intval(local_channel()) ); - if($atoken) + if($atoken) { $atoken = $atoken[0]; + $atoken_xchan = substr($channel['channel_hash'],0,16) . '.' . $atoken['atoken_name']; + } if($atoken && argc() > 3 && argv(3) === 'drop') { - $r = q("delete from atoken where atoken_id = %d", - intval($id) - ); + atoken_delete($id); + $atoken = null; + $atoken_xchan = ''; } } + $t = q("select * from atoken where atoken_uid = %d", intval(local_channel()) ); - $desc = t('Use this form to create temporary access identifiers to share things with non-members. These identities may be used in Access Control Lists and visitors may login using these credentials to access the private content.'); + $desc = t('Use this form to create temporary access identifiers to share things with non-members. These identities may be used in Access Control Lists and visitors may login using these credentials to access private content.'); $desc2 = t('You may also provide <em>dropbox</em> style access links to friends and associates by adding the Login Password to any specific site URL as shown. Examples:'); + $global_perms = \Zotlabs\Access\Permissions::Perms(); + + $existing = get_all_perms(local_channel(),(($atoken_xchan) ? $atoken_xchan : '')); + + if($atoken_xchan) { + $theirs = q("select * from abconfig where chan = %d and xchan = '%s' and cat = 'their_perms'", + intval(local_channel()), + dbesc($atoken_xchan) + ); + $their_perms = array(); + if($theirs) { + foreach($theirs as $t) { + $their_perms[$t['k']] = $t['v']; + } + } + } + foreach($global_perms as $k => $v) { + $thisperm = get_abconfig(local_channel(),$contact['abook_xchan'],'my_perms',$k); +//fixme + + $checkinherited = \Zotlabs\Access\PermissionLimits::Get(local_channel(),$k); + + if($existing[$k]) + $thisperm = "1"; + + $perms[] = array('perms_' . $k, $v, ((array_key_exists($k,$their_perms)) ? intval($their_perms[$k]) : ''),$thisperm, 1, (($checkinherited & PERMS_SPECIFIC) ? '' : '1'), '', $checkinherited); + } + + + $tpl = get_markup_template("settings_tokens.tpl"); $o .= replace_macros($tpl, array( '$form_security_token' => get_form_security_token("settings_tokens"), @@ -803,6 +854,13 @@ class Settings extends \Zotlabs\Web\Controller { '$name' => array('name', t('Login Name') . ' <span class="required">*</span>', (($atoken) ? $atoken['atoken_name'] : ''),''), '$token'=> array('token', t('Login Password') . ' <span class="required">*</span>',(($atoken) ? $atoken['atoken_token'] : autoname(8)), ''), '$expires'=> array('expires', t('Expires (yyyy-mm-dd)'), (($atoken['atoken_expires'] && $atoken['atoken_expires'] != NULL_DATE) ? datetime_convert('UTC',date_default_timezone_get(),$atoken['atoken_expires']) : ''), ''), + '$them' => t('Their Settings'), + '$me' => t('My Settings'), + '$perms' => $perms, + '$inherited' => t('inherited'), + '$notself' => '1', + '$permlbl' => t('Individual Permissions'), + '$permnote' => t('Some permissions may be inherited from your channel\'s <a href="settings"><strong>privacy settings</strong></a>, which have higher priority than individual settings. You can <strong>not</strong> change those settings here.'), '$submit' => t('Submit') )); return $o; diff --git a/Zotlabs/Module/Webpages.php b/Zotlabs/Module/Webpages.php index cc0a01cce..d3199f223 100644 --- a/Zotlabs/Module/Webpages.php +++ b/Zotlabs/Module/Webpages.php @@ -45,7 +45,29 @@ class Webpages extends \Zotlabs\Web\Controller { $observer = \App::get_observer(); $channel = \App::get_channel(); - + + switch ($_SESSION['action']) { + case 'import': + $_SESSION['action'] = null; + $o .= replace_macros(get_markup_template('webpage_import.tpl'), array( + '$title' => t('Import Webpage Elements'), + '$importbtn' => t('Import selected'), + '$action' => 'import', + '$pages' => $_SESSION['pages'], + '$layouts' => $_SESSION['layouts'], + '$blocks' => $_SESSION['blocks'], + )); + return $o; + + case 'importselected': + $_SESSION['action'] = null; + break; + default : + $_SESSION['action'] = null; + break; + } + + if(\App::$is_sys && is_site_admin()) { $sys = get_sys_channel(); if($sys && intval($sys['channel_id'])) { @@ -209,4 +231,165 @@ class Webpages extends \Zotlabs\Web\Controller { return $o; } + function post() { + + $action = $_REQUEST['action']; + if( $action ){ + switch ($action) { + case 'scan': + + // the state of this variable tracks whether website files have been scanned (null, true, false) + $cloud = null; + + // Website files are to be imported from an uploaded zip file + if(($_FILES) && array_key_exists('zip_file',$_FILES) && isset($_POST['w_upload'])) { + $source = $_FILES["zip_file"]["tmp_name"]; + $type = $_FILES["zip_file"]["type"]; + $okay = false; + $accepted_types = array('application/zip', 'application/x-zip-compressed', 'multipart/x-zip', 'application/x-compressed'); + foreach ($accepted_types as $mime_type) { + if ($mime_type == $type) { + $okay = true; + break; + } + } + if(!$okay) { + notice( t('Invalid file type.') . EOL); + return; + } + $zip = new \ZipArchive(); + if ($zip->open($source) === true) { + $tmp_folder_name = random_string(5); + $website = dirname($source) . '/' . $tmp_folder_name; + $zip->extractTo($website); // change this to the correct site path + $zip->close(); + @unlink($source); // delete the compressed file now that the content has been extracted + $cloud = false; + } else { + notice( t('Error opening zip file') . EOL); + return null; + } + } + + // Website files are to be imported from the channel cloud files + if (($_POST) && array_key_exists('path',$_POST) && isset($_POST['cloudsubmit'])) { + + $channel = \App::get_channel(); + $dirpath = get_dirpath_by_cloudpath($channel, $_POST['path']); + if(!$dirpath) { + notice( t('Invalid folder path.') . EOL); + return null; + } + $cloud = true; + + } + + // If the website files were uploaded or specified in the cloud files, then $cloud + // should be either true or false + if ($cloud !== null) { + require_once('include/import.php'); + $elements = []; + if($cloud) { + $path = $_POST['path']; + } else { + $path = $website; + } + $elements['pages'] = scan_webpage_elements($path, 'page', $cloud); + $elements['layouts'] = scan_webpage_elements($path, 'layout', $cloud); + $elements['blocks'] = scan_webpage_elements($path, 'block', $cloud); + $_SESSION['blocks'] = $elements['blocks']; + $_SESSION['layouts'] = $elements['layouts']; + $_SESSION['pages'] = $elements['pages']; + if(!(empty($elements['pages']) && empty($elements['blocks']) && empty($elements['layouts']))) { + //info( t('Webpages elements detected.') . EOL); + $_SESSION['action'] = 'import'; + } else { + notice( t('No webpage elements detected.') . EOL); + $_SESSION['action'] = null; + } + + } + + // If the website elements were imported from a zip file, delete the temporary decompressed files + if ($cloud === false && $website && $elements) { + rrmdir($website); // Delete the temporary decompressed files + } + + break; + + case 'importselected': + require_once('include/import.php'); + $channel = \App::get_channel(); + + // Import layout first so that pages that reference new layouts will find + // the mid of layout items in the database + + // Obtain the user-selected layouts to import and import them + $checkedlayouts = $_POST['layout']; + $layouts = []; + if (!empty($checkedlayouts)) { + foreach ($checkedlayouts as $name) { + foreach ($_SESSION['layouts'] as &$layout) { + if ($layout['name'] === $name) { + $layout['import'] = 1; + $layoutstoimport[] = $layout; + } + } + } + foreach ($layoutstoimport as $elementtoimport) { + $layouts[] = import_webpage_element($elementtoimport, $channel, 'layout'); + } + } + $_SESSION['import_layouts'] = $layouts; + + // Obtain the user-selected blocks to import and import them + $checkedblocks = $_POST['block']; + $blocks = []; + if (!empty($checkedblocks)) { + foreach ($checkedblocks as $name) { + foreach ($_SESSION['blocks'] as &$block) { + if ($block['name'] === $name) { + $block['import'] = 1; + $blockstoimport[] = $block; + } + } + } + foreach ($blockstoimport as $elementtoimport) { + $blocks[] = import_webpage_element($elementtoimport, $channel, 'block'); + } + } + $_SESSION['import_blocks'] = $blocks; + + // Obtain the user-selected pages to import and import them + $checkedpages = $_POST['page']; + $pages = []; + if (!empty($checkedpages)) { + foreach ($checkedpages as $pagelink) { + foreach ($_SESSION['pages'] as &$page) { + if ($page['pagelink'] === $pagelink) { + $page['import'] = 1; + $pagestoimport[] = $page; + } + } + } + foreach ($pagestoimport as $elementtoimport) { + $pages[] = import_webpage_element($elementtoimport, $channel, 'page'); + } + } + $_SESSION['import_pages'] = $pages; + if(!(empty($_SESSION['import_pages']) && empty($_SESSION['import_blocks']) && empty($_SESSION['import_layouts']))) { + info( t('Import complete.') . EOL); + } + break; + + default : + break; + } + } + + + + + } + } diff --git a/Zotlabs/Storage/Directory.php b/Zotlabs/Storage/Directory.php index 0860f99a1..15e06e28f 100644 --- a/Zotlabs/Storage/Directory.php +++ b/Zotlabs/Storage/Directory.php @@ -371,6 +371,7 @@ class Directory extends DAV\Node implements DAV\ICollection, DAV\IQuota { ); if ($r) { + require_once('include/attach.php'); $result = attach_mkdir($r[0], $this->auth->observer, array('filename' => $name, 'folder' => $this->folder_hash)); if($result['success']) { diff --git a/doc/context/en/webpages/help.html b/doc/context/en/webpages/help.html new file mode 100644 index 000000000..af57ee88a --- /dev/null +++ b/doc/context/en/webpages/help.html @@ -0,0 +1,8 @@ +<dl class="dl-horizontal"> + <dt>General</dt> + <dd>You can create modular, identity-aware websites composed of shareable elements. </dd> + <dt>Pages</dt> + <dd>This page lists your "pages", which are assigned URLs where people can visit your site. The structure of pages are typically described by an associated <b>layout</b>, and their content is constructed from a collection of <b>blocks</b>.</dd> + <dt><a href='#' onclick='contextualHelpFocus("#website-import-tools", 1); return false;' title="Click to highlight element...">Website import tool</a></dt> + <dd>The website import tool allows you import multiple webpage elements (pages, layouts, blocks) either from an uploaded zip file or from an existing cloud files folder. <a target="_blank" href="help/webpages">Read more...</a></dd> +</dl>
\ No newline at end of file diff --git a/doc/webpage-element-import.md b/doc/webpage-element-import.md new file mode 100644 index 000000000..4330227c2 --- /dev/null +++ b/doc/webpage-element-import.md @@ -0,0 +1,94 @@ +## <a href="#webpage-element-import"></a>Webpage element import + +There are two methods of importing webpage elements: uploading a zip file or +referencing a local cloud files folder. Both methods require that the webpage +elements are specified using a specific folder structure. The import tool makes +it possible to import all the elements necessary to construct an entire website +or set of websites. The goal is to accommodate external development of webpages +as well as tools to simplify and automate deployment on a hub. + +### Folder structure +Element definitions must be stored in the repo root under folders called + + /pages/ + /blocks/ + /layouts/ + + +Each element of these types must be defined in an individual subfolder using two files: one JSON-formatted file for the metadata and one plain text file for the element content. + +### Page elements +Page element metadata is specified in a JSON-formatted file called `page.json` with the following properties: + + * title + * pagelink + * mimetype + * layout + * contentfile + +**Example** + +Files: + + /pages/my-page/page.json + /pages/my-page/my-page.bbcode + +Content of `page.json`: + + { + "title": "My Page", + "pagelink": "mypage", + "mimetype": "text/bbcode", + "layout": "my-layout", + "contentfile": "my-page.bbcode" + } + + +### Layout elements +Layout element metadata is specified in a JSON-formatted file called `layout.json` with the following properties: + + * name + * description + * contentfile + +**Example** + +Files: + + /layouts/my-layout/layout.json + /layouts/my-layout/my-layout.bbcode + +Content of `layout.json`: + + { + "name": "my-layout", + "description": "Layout for my project page", + "contentfile": "my-layout.bbcode" + } + + +### Block elements +Block element metadata is specified in a JSON-formatted file called `block.json` with the following properties: + + * name + * title + * mimetype + * contentfile + +**Example** + +Files: + + /blocks/my-block/block.json + /blocks/my-block/my-block.html + +Content of `block.json`: + + + { + "name": "my-block", + "title": "", + "mimetype": "text/html", + "contentfile": "my-block.html" + } +
\ No newline at end of file diff --git a/doc/webpages.bb b/doc/webpages.bb index 6b3a800cb..2b909dc63 100644 --- a/doc/webpages.bb +++ b/doc/webpages.bb @@ -9,6 +9,9 @@ The "page link title" box allows a user to specify the "pagelinkt Beneath the page creation box, a list of existing pages will appear with an "edit" link. Clicking this will take you to an editor, similar to that of the post editor, where you can make changes to your webpages.
+See also:
+
+[zrl=[baseurl]/help/webpage-element-import]Webpage element import tool[/zrl]
[b]Using Blocks[/b]
diff --git a/doc/Webpages.md b/doc/webpages.md index 801a9a3a0..05c16f2bb 100644 --- a/doc/Webpages.md +++ b/doc/webpages.md @@ -13,4 +13,5 @@ Beneath the page creation box, a list of existing pages will appear with an "edi If you are the admin of a site, you can specify a channel whose webpages we will use at key points around the site. Presently, the only place this is implemented is the home page. If you specify the channel "admin" and then the channel called "admin" creates a webpage called "home", we will display it's content on your websites home page. We expect this functionality to be extended to other areas in future. +#include doc/webpage-element-import.md; #include doc/macros/main_footer.bb; diff --git a/include/api.php b/include/api.php index f52b03240..2587a72bb 100644 --- a/include/api.php +++ b/include/api.php @@ -13,7 +13,7 @@ require_once('include/api_auth.php'); /* * - * Red API. Loosely based on and possibly compatible with a Twitter-Like API but all similarities end there. + * Hubzilla API. Loosely based on and possibly compatible with Twitter-Like (v1.0) API but all similarities end there. * */ diff --git a/include/attach.php b/include/attach.php index 7123d59fe..f3fb12293 100644 --- a/include/attach.php +++ b/include/attach.php @@ -1911,3 +1911,70 @@ function get_attach_binname($s) { } return $p; } + + +function get_dirpath_by_cloudpath($channel, $path) { + + // Warning: Do not edit the following line. The first symbol is UTF-8 ＠ + $path = str_replace('@','@',notags(trim($path))); + + $h = @parse_url($path); + + if(! $h || !x($h, 'path')) { + return null; + } + if(substr($h['path'],-1,1) === '/') { + $h['path'] = substr($h['path'],0,-1); + } + if(substr($h['path'],0,1) === '/') { + $h['path'] = substr($h['path'],1); + } + $folders = explode('/', $h['path']); + $f = array_shift($folders); + + $nick = $channel['channel_address']; + //check to see if the absolute path was provided (/cloud/channelname/path/to/folder) + if($f === 'cloud' ) { + $g = array_shift($folders); + if( $g !== $nick) { + // if nick does not follow "cloud", then the top level folder must be called "cloud" + // and the given path must be relative to "/cloud/channelname/". + $folders = array_unshift(array_unshift($folders, $g), $f); + } + } else { + array_unshift($folders, $f); + } + $clouddir = 'store/' . $nick . '/' ; + $subdir = '/'; + $valid = true; + while($folders && $valid && is_dir($clouddir . $subdir) && is_readable($clouddir . $subdir)) { + $valid = false; + $f = array_shift($folders); + $items = array_diff(scandir($clouddir . $subdir), array('.', '..')); // hashed names + foreach($items as $item) { + $filename = find_filename_by_hash($channel['channel_id'], $item); + if($filename === $f) { + $subdir .= $item . '/'; + $valid = true; + } + } + } + if(!$valid) { + return null; + } else { + return $clouddir . $subdir; + } + + +} + +function get_filename_by_cloudname($cloudname, $channel, $storepath) { + $items = array_diff(scandir($storepath), array('.', '..')); // hashed names + foreach($items as $item) { + $filename = find_filename_by_hash($channel['channel_id'], $item); + if($filename === $cloudname) { + return $item; + } + } + return null; +}
\ No newline at end of file diff --git a/include/auth.php b/include/auth.php index f3592cee3..fdcecec36 100644 --- a/include/auth.php +++ b/include/auth.php @@ -57,6 +57,7 @@ function account_verify_password($login, $pass) { ); if($x) { $ret['xchan'] = atoken_xchan($x[0]); + atoken_create_xchan($ret['xchan']); return $ret; } } diff --git a/include/channel.php b/include/channel.php index 88dd818e6..c07cd14e2 100644 --- a/include/channel.php +++ b/include/channel.php @@ -640,19 +640,10 @@ function identity_basic_export($channel_id, $items = false) { for($y = 0; $y < count($x); $y ++) { $m = menu_fetch($x[$y]['menu_name'],$channel_id,$ret['channel']['channel_hash']); if($m) - $ret['menu'][] = menu_element($m); + $ret['menu'][] = menu_element($ret['channel'],$m); } } - $x = menu_list($channel_id); - if($x) { - $ret['menu'] = array(); - for($y = 0; $y < count($x); $y ++) { - $m = menu_fetch($x[$y]['menu_name'],$channel_id,$ret['channel']['channel_hash']); - if($m) - $ret['menu'][] = menu_element($m); - } - } $addon = array('channel_id' => $channel_id,'data' => $ret); call_hooks('identity_basic_export',$addon); diff --git a/include/connections.php b/include/connections.php index 9f55820cc..4f685388c 100644 --- a/include/connections.php +++ b/include/connections.php @@ -566,6 +566,7 @@ function contact_remove($channel_id, $abook_id) { drop_item($rr['id'],false); } } + q("delete from abook where abook_id = %d and abook_channel = %d", intval($abook['abook_id']), @@ -588,6 +589,11 @@ function contact_remove($channel_id, $abook_id) { intval($channel_id) ); + $r = q("delete from abconfig where chan = %d and xchan = '%s'", + intval($channel_id), + dbesc($abook['abook_xchan']) + ); + return true; } diff --git a/include/import.php b/include/import.php index 42c902a0a..5bbed828f 100644 --- a/include/import.php +++ b/include/import.php @@ -784,7 +784,11 @@ function import_menus($channel,$menus) { foreach($menu['items'] as $it) { $mitem = array(); + $mitem['mitem_link'] = str_replace('[channelurl]',z_root() . '/channel/' . $channel['channel_address'],$it['link']); + $mitem['mitem_link'] = str_replace('[pageurl]',z_root() . '/page/' . $channel['channel_address'],$it['link']); + $mitem['mitem_link'] = str_replace('[cloudurl]',z_root() . '/cloud/' . $channel['channel_address'],$it['link']); $mitem['mitem_link'] = str_replace('[baseurl]',z_root(),$it['link']); + $mitem['mitem_desc'] = escape_tags($it['desc']); $mitem['mitem_order'] = intval($it['order']); if(is_array($it['flags'])) { @@ -864,7 +868,12 @@ function sync_menus($channel,$menus) { foreach($menu['items'] as $it) { $mitem = array(); + + $mitem['mitem_link'] = str_replace('[channelurl]',z_root() . '/channel/' . $channel['channel_address'],$it['link']); + $mitem['mitem_link'] = str_replace('[pageurl]',z_root() . '/page/' . $channel['channel_address'],$it['link']); + $mitem['mitem_link'] = str_replace('[cloudurl]',z_root() . '/cloud/' . $channel['channel_address'],$it['link']); $mitem['mitem_link'] = str_replace('[baseurl]',z_root(),$it['link']); + $mitem['mitem_desc'] = escape_tags($it['desc']); $mitem['mitem_order'] = intval($it['order']); if(is_array($it['flags'])) { @@ -1246,3 +1255,216 @@ function convert_oldfields(&$arr,$old,$new) { unset($arr[$old]); } } + +function scan_webpage_elements($path, $type, $cloud = false) { + $channel = \App::get_channel(); + $dirtoscan = $path; + switch ($type) { + case 'page': + $dirtoscan .= '/pages/'; + $json_filename = 'page.json'; + break; + case 'layout': + $dirtoscan .= '/layouts/'; + $json_filename = 'layout.json'; + break; + case 'block': + $dirtoscan .= '/blocks/'; + $json_filename = 'block.json'; + break; + default : + return array(); + } + if($cloud) { + $dirtoscan = get_dirpath_by_cloudpath($channel, $dirtoscan); + } + $elements = []; + if (is_dir($dirtoscan)) { + $dirlist = scandir($dirtoscan); + if ($dirlist) { + foreach ($dirlist as $element) { + if ($element === '.' || $element === '..') { + continue; + } + $folder = $dirtoscan . '/' . $element; + if (is_dir($folder)) { + if($cloud) { + $jsonfilepath = $folder . '/' . get_filename_by_cloudname($json_filename, $channel, $folder); + } else { + $jsonfilepath = $folder . '/' . $json_filename; + } + if (is_file($jsonfilepath)) { + $metadata = json_decode(file_get_contents($jsonfilepath), true); + if($cloud) { + $contentfilename = get_filename_by_cloudname($metadata['contentfile'], $channel, $folder); + $metadata['path'] = $folder . '/' . $contentfilename; + } else { + $contentfilename = $metadata['contentfile']; + $metadata['path'] = $folder . '/' . $contentfilename; + } + if ($metadata['contentfile'] === '') { + logger('Invalid ' . $type . ' content file'); + return false; + } + $content = file_get_contents($folder . '/' . $contentfilename); + if (!$content) { + logger('Failed to get file content for ' . $metadata['contentfile']); + return false; + } + $elements[] = $metadata; + } + } + } + } + } + return $elements; + } + + + function import_webpage_element($element, $channel, $type) { + + $arr = array(); // construct information for the webpage element item table record + + switch ($type) { + // + // PAGES + // + case 'page': + $arr['item_type'] = ITEM_TYPE_WEBPAGE; + $namespace = 'WEBPAGE'; + $name = $element['pagelink']; + if($name) { + require_once('library/urlify/URLify.php'); + $name = strtolower(\URLify::transliterate($name)); + } + $arr['title'] = $element['title']; + $arr['term'] = $element['term']; + $arr['layout_mid'] = ''; // by default there is no layout associated with the page + // If a layout was specified, find it in the database and get its info. If + // it does not exist, leave layout_mid empty + if($element['layout'] !== '') { + $liid = q("select iid from iconfig where k = 'PDL' and v = '%s' and cat = 'system'", + dbesc($element['layout']) + ); + if($liid) { + $linfo = q("select mid from item where id = %d", + intval($liid[0]['iid']) + ); + $arr['layout_mid'] = $linfo[0]['mid']; + } + } + break; + // + // LAYOUTS + // + case 'layout': + $arr['item_type'] = ITEM_TYPE_PDL; + $namespace = 'PDL'; + $name = $element['name']; + $arr['title'] = $element['description']; + $arr['term'] = $element['term']; + break; + // + // BLOCKS + // + case 'block': + $arr['item_type'] = ITEM_TYPE_BLOCK; + $namespace = 'BUILDBLOCK'; + $name = $element['name']; + $arr['title'] = $element['title']; + + break; + default : + return null; // return null if invalid element type + } + + $arr['uid'] = $channel['channel_id']; + $arr['aid'] = $channel['channel_account_id']; + + // Check if an item already exists based on the name + $iid = q("select iid from iconfig where k = '" . $namespace . "' and v = '%s' and cat = 'system'", + dbesc($name) + ); + if($iid) { // If the item does exist, get the item metadata + $iteminfo = q("select mid,created,edited from item where id = %d", + intval($iid[0]['iid']) + ); + $arr['mid'] = $arr['parent_mid'] = $iteminfo[0]['mid']; + $arr['created'] = $iteminfo[0]['created']; + $arr['edited'] = (($element['edited']) ? datetime_convert('UTC', 'UTC', $element['edited']) : datetime_convert()); + } else { // otherwise, generate the creation times and unique id + $arr['created'] = (($element['created']) ? datetime_convert('UTC', 'UTC', $element['created']) : datetime_convert()); + $arr['edited'] = datetime_convert('UTC', 'UTC', '0000-00-00 00:00:00'); + $arr['mid'] = $arr['parent_mid'] = item_message_id(); + } + // Import the actual element content + $arr['body'] = file_get_contents($element['path']); + // The element owner is the channel importing the elements + $arr['owner_xchan'] = get_observer_hash(); + // The author is either the owner or whomever was specified + $arr['author_xchan'] = (($element['author_xchan']) ? $element['author_xchan'] : get_observer_hash()); + // Import mimetype if it is a valid mimetype for the element + $mimetypes = [ 'text/bbcode', + 'text/html', + 'text/markdown', + 'text/plain', + 'application/x-pdl', + 'application/x-php' + ]; + // Blocks and pages can have any mimetype, but layouts must be text/bbcode + if((in_array($element['mimetype'], $mimetypes)) && ($type === 'page' || $type === 'block') ) { + $arr['mimetype'] = $element['mimetype']; + } else { + $arr['mimetype'] = 'text/bbcode'; + } + + // Verify ability to use html or php!!! + $execflag = false; + if ($arr['mimetype'] === 'application/x-php') { + $z = q("select account_id, account_roles, channel_pageflags from account " + . "left join channel on channel_account_id = account_id where channel_id = %d limit 1", + intval(local_channel()) + ); + + if ($z && (($z[0]['account_roles'] & ACCOUNT_ROLE_ALLOWCODE) || ($z[0]['channel_pageflags'] & PAGE_ALLOWCODE))) { + $execflag = true; + } + } + + $z = q("select * from iconfig where v = '%s' and k = '%s' and cat = 'service' limit 1", + dbesc($name), + dbesc($namespace) + ); + + $i = q("select id, edited, item_deleted from item where mid = '%s' and uid = %d limit 1", + dbesc($arr['mid']), + intval(local_channel()) + ); + $remote_id = 0; + if ($z && $i) { + $remote_id = $z[0]['id']; + $arr['id'] = $i[0]['id']; + // don't update if it has the same timestamp as the original + if ($arr['edited'] > $i[0]['edited']) + $x = item_store_update($arr, $execflag); + } else { + if (($i) && (intval($i[0]['item_deleted']))) { + // was partially deleted already, finish it off + q("delete from item where mid = '%s' and uid = %d", + dbesc($arr['mid']), + intval(local_channel()) + ); + } + $x = item_store($arr, $execflag); + } + if ($x['success']) { + $item_id = $x['item_id']; + update_remote_id($channel, $item_id, $arr['item_type'], $name, $namespace, $remote_id, $arr['mid']); + $element['import_success'] = 1; + } else { + $element['import_success'] = 0; + } + + return $element; + +} diff --git a/include/items.php b/include/items.php index 178fb30d6..5bd0b0968 100755 --- a/include/items.php +++ b/include/items.php @@ -421,7 +421,7 @@ function post_activity_item($arr) { $arr['deny_cid'] = ((x($arr,'deny_cid')) ? $arr['deny_cid'] : $channel['channel_deny_cid']); $arr['deny_gid'] = ((x($arr,'deny_gid')) ? $arr['deny_gid'] : $channel['channel_deny_gid']); - $arr['comment_policy'] = map_scope(\Zotlabs\Access/PermissionLimits::Get($channel['channel_id'],'post_comments')); + $arr['comment_policy'] = map_scope(\Zotlabs\Access\PermissionLimits::Get($channel['channel_id'],'post_comments')); if ((! $arr['plink']) && (intval($arr['item_thread_top']))) { $arr['plink'] = z_root() . '/channel/' . $channel['channel_address'] . '/?f=&mid=' . $arr['mid']; diff --git a/include/menu.php b/include/menu.php index e8f1d8eb8..3b0180d37 100644 --- a/include/menu.php +++ b/include/menu.php @@ -25,7 +25,7 @@ function menu_fetch($name,$uid,$observer_xchan) { return null; } -function menu_element($menu) { +function menu_element($channel,$menu) { $arr = array(); $arr['type'] = 'menu'; @@ -46,7 +46,12 @@ function menu_element($menu) { $arr['items'] = array(); foreach($menu['items'] as $it) { $entry = array(); + + $entry['link'] = str_replace(z_root() . '/channel/' . $channel['channel_address'],'[channelurl]',$it['mitem_link']); + $entry['link'] = str_replace(z_root() . '/page/' . $channel['channel_address'],'[pageurl]',$it['mitem_link']); + $entry['link'] = str_replace(z_root() . '/cloud/' . $channel['channel_address'],'[cloudurl]',$it['mitem_link']); $entry['link'] = str_replace(z_root(),'[baseurl]',$it['mitem_link']); + $entry['desc'] = $it['mitem_desc']; $entry['order'] = $it['mitem_order']; if($it['mitem_flags']) { @@ -389,12 +394,13 @@ function menu_del_item($menu_id,$uid,$item_id) { function menu_sync_packet($uid,$observer_hash,$menu_id,$delete = false) { $r = menu_fetch_id($menu_id,$uid); + $c = channelx_by_n($uid); if($r) { $m = menu_fetch($r['menu_name'],$uid,$observer_hash); if($m) { if($delete) $m['menu_delete'] = 1; - build_sync_packet($uid,array('menu' => array(menu_element($m)))); + build_sync_packet($uid,array('menu' => array(menu_element($c,$m)))); } } } diff --git a/include/permissions.php b/include/permissions.php index 638bedb24..637193973 100644 --- a/include/permissions.php +++ b/include/permissions.php @@ -1,4 +1,7 @@ <?php + +require_once('include/security.php'); + /** * @file include/permissions.php * @@ -119,10 +122,21 @@ function get_all_perms($uid, $observer_xchan, $internal_use = true) { dbesc($observer_xchan) ); if(! $x) { - // not in address book, see if they've got an xchan - $y = q("select xchan_network from xchan where xchan_hash = '%s' limit 1", - dbesc($observer_xchan) - ); + // see if they've got a guest access token; these are treated as connections + $y = atoken_abook($uid,$observer_xchan); + if($y) + $x = array($y); + + if(! $x) { + // not in address book and no guest token, see if they've got an xchan + // these *may* have individual (PERMS_SPECIFIC) permissions, but are not connections + $y = q("select xchan_network from xchan where xchan_hash = '%s' limit 1", + dbesc($observer_xchan) + ); + if($y) { + $x = array(pseudo_abook($y[0])); + } + } } $abook_checked = true; @@ -184,7 +198,7 @@ function get_all_perms($uid, $observer_xchan, $internal_use = true) { // If we're still here, we have an observer, check the network. if($channel_perm & PERMS_NETWORK) { - if(($x && $x[0]['xchan_network'] === 'zot') || ($y && $y[0]['xchan_network'] === 'zot')) { + if($x && $x[0]['xchan_network'] === 'zot') { $ret[$perm_name] = true; continue; } @@ -232,6 +246,12 @@ function get_all_perms($uid, $observer_xchan, $internal_use = true) { // They're a contact, so they have permission if($channel_perm & PERMS_CONTACTS) { + // it was a fake abook entry, not really a connection + if(array_key_exists('abook_pseudo',$x[0]) && intval($x[0]['abook_pseudo'])) { + $ret[$perm_name] = false; + continue; + } + $ret[$perm_name] = true; continue; } @@ -328,10 +348,21 @@ function perm_is_allowed($uid, $observer_xchan, $permission) { return false; if(! $x) { - // not in address book, see if they've got an xchan - $y = q("select xchan_network from xchan where xchan_hash = '%s' limit 1", - dbesc($observer_xchan) - ); + // see if they've got a guest access token + $y = atoken_abook($uid,$observer_xchan); + if($y) + $x = array($y); + + if(! $x) { + // not in address book and no guest token, see if they've got an xchan + $y = q("select xchan_network from xchan where xchan_hash = '%s' limit 1", + dbesc($observer_xchan) + ); + if($y) { + $x = array(pseudo_abook($y[0])); + } + } + } $abperms = load_abconfig($uid,$observer_xchan,'my_perms'); } @@ -401,6 +432,10 @@ function perm_is_allowed($uid, $observer_xchan, $permission) { // They're a contact, so they have permission if($channel_perm & PERMS_CONTACTS) { + // it was a fake abook entry, not really a connection + if(array_key_exists('abook_pseudo',$x[0]) && intval($x[0]['abook_pseudo'])) { + return false; + } return true; } diff --git a/include/security.php b/include/security.php index c67a1b400..83bf51bc0 100644 --- a/include/security.php +++ b/include/security.php @@ -108,6 +108,7 @@ function atoken_xchan($atoken) { 'xchan_name' => $atoken['atoken_name'], 'xchan_addr' => t('guest:') . $atoken['atoken_name'] . '@' . \App::get_hostname(), 'xchan_network' => 'unknown', + 'xchan_url' => z_root(), 'xchan_hidden' => 1, 'xchan_photo_mimetype' => 'image/jpeg', 'xchan_photo_l' => get_default_profile_photo(300), @@ -119,6 +120,105 @@ function atoken_xchan($atoken) { return null; } +function atoken_delete($atoken_id) { + + $r = q("select * from atoken where atoken_id = %d", + intval($atoken_id) + ); + if(! $r) + return; + + $c = q("select channel_id, channel_hash from channel where channel_id = %d", + intval($r[0]['atoken_uid']) + ); + if(! $c) + return; + + $atoken_xchan = substr($c[0]['channel_hash'],0,16) . '.' . $r[0]['atoken_name']; + + q("delete from atoken where atoken_id = %d", + intval($atoken_id) + ); + q("delete from abconfig where chan = %d and xchan = '%s'", + intval($c[0]['channel_id']), + dbesc($atoken_xchan) + ); +} + + + +// in order for atoken logins to create content (such as posts) they need a stored xchan. +// we'll create one on the first atoken_login; it can't really ever go away but perhaps +// @fixme we should set xchan_deleted if it's expired or removed + +function atoken_create_xchan($xchan) { + + $r = q("select xchan_hash from xchan where xchan_hash = '%s'", + dbesc($xchan['xchan_hash']) + ); + if($r) + return; + + $r = q("insert into xchan ( xchan_hash, xchan_guid, xchan_addr, xchan_url, xchan_name, xchan_network, xchan_photo_mimetype, xchan_photo_l, xchan_photo_m, xchan_photo_s ) + values ('%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s') ", + dbesc($xchan['xchan_hash']), + dbesc($xchan['xchan_hash']), + dbesc($xchan['xchan_addr']), + dbesc($xchan['xchan_url']), + dbesc($xchan['xchan_name']), + dbesc($xchan['xchan_network']), + dbesc($xchan['xchan_photo_mimetype']), + dbesc($xchan['xchan_photo_l']), + dbesc($xchan['xchan_photo_m']), + dbesc($xchan['xchan_photo_s']) + ); + + return true; +} + +function atoken_abook($uid,$xchan_hash) { + + if(substr($xchan_hash,16,1) != '.') + return false; + + $r = q("select channel_hash from channel where channel_id = %d limit 1", + intval($uid) + ); + + if(! $r) + return false; + + $x = q("select * from atoken where atoken_uid = %d and atoken_name = '%s'", + intval($uid), + dbesc(substr($xchan_hash,17)) + ); + + if($x) { + $xchan = atoken_xchan($x[0]); + $xchan['abook_blocked'] = 0; + $xchan['abook_ignored'] = 0; + $xchan['abook_pending'] = 0; + return $xchan; + } + + return false; + +} + + +function pseudo_abook($xchan) { + if(! $xchan) + return false; + + // set abook_pseudo to flag that we aren't really connected. + + $xchan['abook_pseudo'] = 1; + $xchan['abook_blocked'] = 0; + $xchan['abook_ignored'] = 0; + $xchan['abook_pending'] = 0; + return $xchan; + +} /** @@ -396,7 +496,7 @@ function public_permissions_sql($observer_hash) { * In this implementation, a security token is reusable (if the user submits a form, goes back and resubmits the form, maybe with small changes; * or if the security token is used for ajax-calls that happen several times), but only valid for a certain amout of time (3hours). * The "typename" seperates the security tokens of different types of forms. This could be relevant in the following case: - * A security token is used to protekt a link from CSRF (e.g. the "delete this profile"-link). + * A security token is used to protekt a link from CSRF (e.g. the "delete this profile"-link). * If the new page contains by any chance external elements, then the used security token is exposed by the referrer. * Actually, important actions should not be triggered by Links / GET-Requests at all, but somethimes they still are, * so this mechanism brings in some damage control (the attacker would be able to forge a request to a form of this type, but not to forms of other types). diff --git a/include/text.php b/include/text.php index 6d7d0ed8d..d283bb41f 100644 --- a/include/text.php +++ b/include/text.php @@ -2242,6 +2242,34 @@ function design_tools() { )); } +/** + * @brief Creates website import tools menu + * + * @return string + */ +function website_import_tools() { + + $channel = App::get_channel(); + $sys = false; + + if(App::$is_sys && is_site_admin()) { + require_once('include/channel.php'); + $channel = get_sys_channel(); + $sys = true; + } + + return replace_macros(get_markup_template('website_import_tools.tpl'), array( + '$title' => t('Import'), + '$import_label' => t('Import website...'), + '$import_placeholder' => t('Select folder to import'), + '$file_upload_text' => t('Import from a zipped folder:'), + '$file_import_text' => t('Import from cloud files:'), + '$desc' => t('/cloud/channel/path/to/folder'), + '$hint' => t('Enter path to website files'), + '$select' => t('Select folder'), + )); +} + /* case insensitive in_array() */ function in_arrayi($needle, $haystack) { diff --git a/include/widgets.php b/include/widgets.php index 3516e82da..5477dc1e4 100644 --- a/include/widgets.php +++ b/include/widgets.php @@ -779,6 +779,20 @@ function widget_design_tools($arr) { return design_tools(); } +function widget_website_import_tools($arr) { + + // mod menu doesn't load a profile. For any modules which load a profile, check it. + // otherwise local_channel() is sufficient for permissions. + + if(App::$profile['profile_uid']) + if((App::$profile['profile_uid'] != local_channel()) && (! App::$is_sys)) + return ''; + + if(! local_channel()) + return ''; + + return website_import_tools(); +} function widget_findpeople($arr) { return findpeople_widget(); diff --git a/library/asn1.php b/library/asn1.php index e84398bf6..6ab8c6210 100644 --- a/library/asn1.php +++ b/library/asn1.php @@ -159,7 +159,7 @@ class ASN_BASE { } $length = $tempLength; } - $data = substr($string, $p, $length); + $data = substr($string, $p, intval($length)); $parsed[] = self::parseASNData($type, $data, $level, $maxLevels); $p = $p + $length; } diff --git a/util/hmessages.po b/util/hmessages.po index 5dd687799..adcd924de 100644 --- a/util/hmessages.po +++ b/util/hmessages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-07-22 00:02-0700\n" +"POT-Creation-Date: 2016-07-29 00:02-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -199,8 +199,8 @@ msgid "Unknown" msgstr "" #: ../../Zotlabs/Storage/Browser.php:226 ../../Zotlabs/Module/Fbrowser.php:85 -#: ../../Zotlabs/Lib/Apps.php:217 ../../include/nav.php:93 -#: ../../include/conversation.php:1654 +#: ../../Zotlabs/Lib/Apps.php:217 ../../include/conversation.php:1654 +#: ../../include/nav.php:93 msgid "Files" msgstr "" @@ -212,24 +212,24 @@ msgstr "" msgid "Shared" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:230 ../../Zotlabs/Storage/Browser.php:306 -#: ../../Zotlabs/Module/Layouts.php:184 ../../Zotlabs/Module/Menu.php:118 -#: ../../Zotlabs/Module/New_channel.php:142 -#: ../../Zotlabs/Module/Blocks.php:159 ../../Zotlabs/Module/Webpages.php:193 +#: ../../Zotlabs/Storage/Browser.php:230 ../../Zotlabs/Storage/Browser.php:321 +#: ../../Zotlabs/Module/Menu.php:118 ../../Zotlabs/Module/New_channel.php:142 +#: ../../Zotlabs/Module/Blocks.php:159 ../../Zotlabs/Module/Layouts.php:184 +#: ../../Zotlabs/Module/Webpages.php:193 msgid "Create" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:231 ../../Zotlabs/Storage/Browser.php:308 -#: ../../Zotlabs/Module/Cover_photo.php:357 +#: ../../Zotlabs/Storage/Browser.php:231 ../../Zotlabs/Storage/Browser.php:323 #: ../../Zotlabs/Module/Photos.php:823 ../../Zotlabs/Module/Photos.php:1362 +#: ../../Zotlabs/Module/Cover_photo.php:357 #: ../../Zotlabs/Module/Profile_photo.php:390 #: ../../Zotlabs/Module/Embedphotos.php:159 ../../include/widgets.php:1612 msgid "Upload" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:235 ../../Zotlabs/Module/Chat.php:247 -#: ../../Zotlabs/Module/Admin.php:1223 ../../Zotlabs/Module/Settings.php:646 -#: ../../Zotlabs/Module/Settings.php:672 +#: ../../Zotlabs/Storage/Browser.php:235 ../../Zotlabs/Module/Settings.php:646 +#: ../../Zotlabs/Module/Settings.php:672 ../../Zotlabs/Module/Chat.php:247 +#: ../../Zotlabs/Module/Admin.php:1223 #: ../../Zotlabs/Module/Sharedwithme.php:99 msgid "Name" msgstr "" @@ -248,75 +248,74 @@ msgstr "" msgid "Last Modified" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:240 ../../Zotlabs/Module/Editpost.php:84 +#: ../../Zotlabs/Storage/Browser.php:240 #: ../../Zotlabs/Module/Connections.php:290 #: ../../Zotlabs/Module/Connections.php:310 +#: ../../Zotlabs/Module/Editblock.php:109 #: ../../Zotlabs/Module/Editlayout.php:114 #: ../../Zotlabs/Module/Editwebpage.php:145 -#: ../../Zotlabs/Module/Layouts.php:192 ../../Zotlabs/Module/Menu.php:112 -#: ../../Zotlabs/Module/Admin.php:2113 ../../Zotlabs/Module/Blocks.php:160 -#: ../../Zotlabs/Module/Editblock.php:109 -#: ../../Zotlabs/Module/Settings.php:706 ../../Zotlabs/Module/Thing.php:260 -#: ../../Zotlabs/Module/Webpages.php:194 ../../Zotlabs/Lib/Apps.php:341 -#: ../../Zotlabs/Lib/ThreadItem.php:106 ../../include/page_widgets.php:9 -#: ../../include/page_widgets.php:39 ../../include/channel.php:976 -#: ../../include/channel.php:980 ../../include/menu.php:108 +#: ../../Zotlabs/Module/Editpost.php:84 ../../Zotlabs/Module/Settings.php:706 +#: ../../Zotlabs/Module/Menu.php:112 ../../Zotlabs/Module/Admin.php:2113 +#: ../../Zotlabs/Module/Blocks.php:160 ../../Zotlabs/Module/Layouts.php:192 +#: ../../Zotlabs/Module/Thing.php:260 ../../Zotlabs/Module/Webpages.php:194 +#: ../../Zotlabs/Lib/Apps.php:341 ../../Zotlabs/Lib/ThreadItem.php:106 +#: ../../include/channel.php:976 ../../include/channel.php:980 +#: ../../include/page_widgets.php:9 ../../include/page_widgets.php:39 +#: ../../include/menu.php:108 msgid "Edit" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:241 ../../Zotlabs/Module/Connedit.php:602 +#: ../../Zotlabs/Storage/Browser.php:241 ../../Zotlabs/Module/Photos.php:1171 #: ../../Zotlabs/Module/Connections.php:263 +#: ../../Zotlabs/Module/Editblock.php:134 #: ../../Zotlabs/Module/Editlayout.php:137 #: ../../Zotlabs/Module/Editwebpage.php:169 ../../Zotlabs/Module/Group.php:177 -#: ../../Zotlabs/Module/Photos.php:1171 ../../Zotlabs/Module/Admin.php:1039 -#: ../../Zotlabs/Module/Admin.php:1213 ../../Zotlabs/Module/Admin.php:2114 -#: ../../Zotlabs/Module/Blocks.php:162 ../../Zotlabs/Module/Editblock.php:134 -#: ../../Zotlabs/Module/Settings.php:707 ../../Zotlabs/Module/Thing.php:261 -#: ../../Zotlabs/Module/Webpages.php:196 ../../Zotlabs/Lib/Apps.php:342 -#: ../../Zotlabs/Lib/ThreadItem.php:126 ../../include/conversation.php:660 +#: ../../Zotlabs/Module/Connedit.php:602 ../../Zotlabs/Module/Settings.php:707 +#: ../../Zotlabs/Module/Admin.php:1039 ../../Zotlabs/Module/Admin.php:1213 +#: ../../Zotlabs/Module/Admin.php:2114 ../../Zotlabs/Module/Blocks.php:162 +#: ../../Zotlabs/Module/Thing.php:261 ../../Zotlabs/Module/Webpages.php:196 +#: ../../Zotlabs/Lib/Apps.php:342 ../../Zotlabs/Lib/ThreadItem.php:126 +#: ../../include/conversation.php:660 msgid "Delete" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:285 +#: ../../Zotlabs/Storage/Browser.php:301 #, php-format msgid "You are using %1$s of your available file storage." msgstr "" -#: ../../Zotlabs/Storage/Browser.php:290 +#: ../../Zotlabs/Storage/Browser.php:306 #, php-format msgid "You are using %1$s of %2$s available file storage. (%3$s%)" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:302 +#: ../../Zotlabs/Storage/Browser.php:317 msgid "WARNING:" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:305 +#: ../../Zotlabs/Storage/Browser.php:320 msgid "Create new folder" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:307 +#: ../../Zotlabs/Storage/Browser.php:322 msgid "Upload file" msgstr "" -#: ../../Zotlabs/Web/WebServer.php:127 ../../Zotlabs/Module/Dreport.php:10 -#: ../../Zotlabs/Module/Dreport.php:66 ../../Zotlabs/Module/Group.php:72 -#: ../../Zotlabs/Module/Like.php:283 ../../Zotlabs/Module/Import_items.php:114 -#: ../../Zotlabs/Module/Profperm.php:28 ../../Zotlabs/Module/Subthread.php:62 -#: ../../include/items.php:384 -msgid "Permission denied" +#: ../../Zotlabs/Storage/Browser.php:329 +msgid "Drop files here to immediately upload" msgstr "" -#: ../../Zotlabs/Web/WebServer.php:128 ../../Zotlabs/Web/Router.php:65 +#: ../../Zotlabs/Web/Router.php:65 ../../Zotlabs/Web/WebServer.php:128 #: ../../Zotlabs/Module/Achievements.php:34 -#: ../../Zotlabs/Module/Connedit.php:390 ../../Zotlabs/Module/Id.php:76 -#: ../../Zotlabs/Module/Authtest.php:16 ../../Zotlabs/Module/Events.php:264 -#: ../../Zotlabs/Module/Bookmarks.php:61 ../../Zotlabs/Module/Editpost.php:17 -#: ../../Zotlabs/Module/Page.php:35 ../../Zotlabs/Module/Page.php:91 -#: ../../Zotlabs/Module/Connections.php:33 +#: ../../Zotlabs/Module/Network.php:15 ../../Zotlabs/Module/Photos.php:73 +#: ../../Zotlabs/Module/Authtest.php:16 ../../Zotlabs/Module/Like.php:181 +#: ../../Zotlabs/Module/Bookmarks.php:61 ../../Zotlabs/Module/Page.php:35 +#: ../../Zotlabs/Module/Page.php:91 ../../Zotlabs/Module/Connections.php:33 #: ../../Zotlabs/Module/Cover_photo.php:277 -#: ../../Zotlabs/Module/Cover_photo.php:290 ../../Zotlabs/Module/Chat.php:100 -#: ../../Zotlabs/Module/Chat.php:105 ../../Zotlabs/Module/Editlayout.php:67 +#: ../../Zotlabs/Module/Cover_photo.php:290 ../../Zotlabs/Module/Mail.php:121 +#: ../../Zotlabs/Module/Channel.php:104 ../../Zotlabs/Module/Channel.php:225 +#: ../../Zotlabs/Module/Channel.php:266 ../../Zotlabs/Module/Editblock.php:67 +#: ../../Zotlabs/Module/Editlayout.php:67 #: ../../Zotlabs/Module/Editlayout.php:90 #: ../../Zotlabs/Module/Editwebpage.php:68 #: ../../Zotlabs/Module/Editwebpage.php:89 @@ -327,45 +326,43 @@ msgstr "" #: ../../Zotlabs/Module/Filestorage.php:78 #: ../../Zotlabs/Module/Filestorage.php:93 #: ../../Zotlabs/Module/Filestorage.php:120 -#: ../../Zotlabs/Module/Layouts.php:71 ../../Zotlabs/Module/Layouts.php:78 -#: ../../Zotlabs/Module/Layouts.php:89 ../../Zotlabs/Module/Like.php:181 +#: ../../Zotlabs/Module/Events.php:264 ../../Zotlabs/Module/Manage.php:10 +#: ../../Zotlabs/Module/Connedit.php:390 ../../Zotlabs/Module/Editpost.php:17 +#: ../../Zotlabs/Module/Block.php:26 ../../Zotlabs/Module/Block.php:76 +#: ../../Zotlabs/Module/Settings.php:626 ../../Zotlabs/Module/Invite.php:17 +#: ../../Zotlabs/Module/Invite.php:91 ../../Zotlabs/Module/Locs.php:87 #: ../../Zotlabs/Module/Profiles.php:203 ../../Zotlabs/Module/Profiles.php:601 +#: ../../Zotlabs/Module/Menu.php:78 ../../Zotlabs/Module/Message.php:18 #: ../../Zotlabs/Module/Item.php:213 ../../Zotlabs/Module/Item.php:221 -#: ../../Zotlabs/Module/Item.php:1071 ../../Zotlabs/Module/Photos.php:73 -#: ../../Zotlabs/Module/Invite.php:17 ../../Zotlabs/Module/Invite.php:91 -#: ../../Zotlabs/Module/Locs.php:87 ../../Zotlabs/Module/Mail.php:121 -#: ../../Zotlabs/Module/Manage.php:10 ../../Zotlabs/Module/Menu.php:78 -#: ../../Zotlabs/Module/Message.php:18 ../../Zotlabs/Module/Mood.php:116 -#: ../../Zotlabs/Module/Network.php:15 ../../Zotlabs/Module/Channel.php:104 -#: ../../Zotlabs/Module/Channel.php:225 ../../Zotlabs/Module/Channel.php:266 +#: ../../Zotlabs/Module/Item.php:1071 ../../Zotlabs/Module/Mood.php:116 +#: ../../Zotlabs/Module/Chat.php:100 ../../Zotlabs/Module/Chat.php:105 #: ../../Zotlabs/Module/Mitem.php:115 ../../Zotlabs/Module/New_channel.php:77 #: ../../Zotlabs/Module/New_channel.php:104 #: ../../Zotlabs/Module/Notifications.php:70 ../../Zotlabs/Module/Poke.php:137 #: ../../Zotlabs/Module/Profile.php:68 ../../Zotlabs/Module/Profile.php:76 -#: ../../Zotlabs/Module/Block.php:26 ../../Zotlabs/Module/Block.php:76 +#: ../../Zotlabs/Module/Blocks.php:73 ../../Zotlabs/Module/Blocks.php:80 +#: ../../Zotlabs/Module/Layouts.php:71 ../../Zotlabs/Module/Layouts.php:78 +#: ../../Zotlabs/Module/Layouts.php:89 #: ../../Zotlabs/Module/Profile_photo.php:265 #: ../../Zotlabs/Module/Profile_photo.php:278 -#: ../../Zotlabs/Module/Blocks.php:73 ../../Zotlabs/Module/Blocks.php:80 -#: ../../Zotlabs/Module/Rate.php:113 ../../Zotlabs/Module/Editblock.php:67 -#: ../../Zotlabs/Module/Common.php:39 ../../Zotlabs/Module/Register.php:77 -#: ../../Zotlabs/Module/Regmod.php:21 +#: ../../Zotlabs/Module/Common.php:39 ../../Zotlabs/Module/Rate.php:113 +#: ../../Zotlabs/Module/Register.php:77 ../../Zotlabs/Module/Regmod.php:21 #: ../../Zotlabs/Module/Service_limits.php:11 -#: ../../Zotlabs/Module/Settings.php:626 ../../Zotlabs/Module/Setup.php:215 -#: ../../Zotlabs/Module/Sharedwithme.php:11 ../../Zotlabs/Module/Thing.php:274 -#: ../../Zotlabs/Module/Thing.php:294 ../../Zotlabs/Module/Thing.php:331 -#: ../../Zotlabs/Module/Sources.php:74 ../../Zotlabs/Module/Suggest.php:30 -#: ../../Zotlabs/Module/Webpages.php:73 +#: ../../Zotlabs/Module/Setup.php:215 ../../Zotlabs/Module/Sharedwithme.php:11 +#: ../../Zotlabs/Module/Thing.php:274 ../../Zotlabs/Module/Thing.php:294 +#: ../../Zotlabs/Module/Thing.php:331 ../../Zotlabs/Module/Sources.php:74 +#: ../../Zotlabs/Module/Suggest.php:30 ../../Zotlabs/Module/Webpages.php:73 #: ../../Zotlabs/Module/Viewconnections.php:28 #: ../../Zotlabs/Module/Viewconnections.php:33 #: ../../Zotlabs/Module/Viewsrc.php:18 ../../Zotlabs/Module/Api.php:13 #: ../../Zotlabs/Module/Api.php:18 ../../Zotlabs/Lib/Chatroom.php:137 -#: ../../include/photos.php:27 ../../include/attach.php:141 -#: ../../include/attach.php:189 ../../include/attach.php:252 -#: ../../include/attach.php:266 ../../include/attach.php:273 -#: ../../include/attach.php:338 ../../include/attach.php:352 -#: ../../include/attach.php:359 ../../include/attach.php:439 -#: ../../include/attach.php:901 ../../include/attach.php:972 -#: ../../include/attach.php:1124 ../../include/items.php:3448 +#: ../../include/attach.php:141 ../../include/attach.php:189 +#: ../../include/attach.php:252 ../../include/attach.php:266 +#: ../../include/attach.php:273 ../../include/attach.php:338 +#: ../../include/attach.php:352 ../../include/attach.php:359 +#: ../../include/attach.php:439 ../../include/attach.php:901 +#: ../../include/attach.php:972 ../../include/attach.php:1124 +#: ../../include/photos.php:27 ../../include/items.php:3448 msgid "Permission denied." msgstr "" @@ -373,31 +370,39 @@ msgstr "" msgid "Not Found" msgstr "" -#: ../../Zotlabs/Web/Router.php:149 ../../Zotlabs/Module/Display.php:118 -#: ../../Zotlabs/Module/Page.php:94 ../../Zotlabs/Module/Help.php:97 +#: ../../Zotlabs/Web/Router.php:149 ../../Zotlabs/Module/Page.php:94 +#: ../../Zotlabs/Module/Display.php:118 ../../Zotlabs/Module/Help.php:97 #: ../../Zotlabs/Module/Block.php:79 msgid "Page not found." msgstr "" +#: ../../Zotlabs/Web/WebServer.php:127 ../../Zotlabs/Module/Dreport.php:10 +#: ../../Zotlabs/Module/Dreport.php:66 ../../Zotlabs/Module/Like.php:283 +#: ../../Zotlabs/Module/Group.php:72 ../../Zotlabs/Module/Import_items.php:114 +#: ../../Zotlabs/Module/Profperm.php:28 ../../Zotlabs/Module/Subthread.php:62 +#: ../../include/items.php:384 +msgid "Permission denied" +msgstr "" + #: ../../Zotlabs/Zot/Auth.php:138 msgid "" "Remote authentication blocked. You are logged into this site locally. Please " "logout and retry." msgstr "" -#: ../../Zotlabs/Zot/Auth.php:246 ../../Zotlabs/Module/Openid.php:76 -#: ../../Zotlabs/Module/Openid.php:183 +#: ../../Zotlabs/Zot/Auth.php:246 #, php-format msgid "Welcome %s. Remote authentication successful." msgstr "" #: ../../Zotlabs/Module/Achievements.php:15 -#: ../../Zotlabs/Module/Connect.php:17 ../../Zotlabs/Module/Editlayout.php:31 -#: ../../Zotlabs/Module/Editwebpage.php:32 ../../Zotlabs/Module/Hcard.php:12 -#: ../../Zotlabs/Module/Filestorage.php:59 ../../Zotlabs/Module/Layouts.php:31 +#: ../../Zotlabs/Module/Editblock.php:31 +#: ../../Zotlabs/Module/Editlayout.php:31 +#: ../../Zotlabs/Module/Editwebpage.php:32 +#: ../../Zotlabs/Module/Filestorage.php:59 ../../Zotlabs/Module/Hcard.php:12 #: ../../Zotlabs/Module/Profile.php:20 ../../Zotlabs/Module/Blocks.php:33 -#: ../../Zotlabs/Module/Editblock.php:31 ../../Zotlabs/Module/Webpages.php:33 -#: ../../include/channel.php:876 +#: ../../Zotlabs/Module/Layouts.php:31 ../../Zotlabs/Module/Connect.php:17 +#: ../../Zotlabs/Module/Webpages.php:33 ../../include/channel.php:876 msgid "Requested profile is not available." msgstr "" @@ -413,485 +418,486 @@ msgstr "" msgid "Online" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:80 -msgid "Could not access contact record." +#: ../../Zotlabs/Module/Network.php:94 +msgid "No such group" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:104 -msgid "Could not locate selected profile." +#: ../../Zotlabs/Module/Network.php:134 +msgid "No such channel" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:248 -msgid "Connection updated." +#: ../../Zotlabs/Module/Network.php:139 +msgid "forum" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:250 -msgid "Failed to update connection record." +#: ../../Zotlabs/Module/Network.php:151 +msgid "Search Results For:" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:300 -msgid "is now connected to" +#: ../../Zotlabs/Module/Network.php:215 +msgid "Privacy group is empty" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:403 ../../Zotlabs/Module/Connedit.php:685 -#: ../../Zotlabs/Module/Events.php:458 ../../Zotlabs/Module/Events.php:459 -#: ../../Zotlabs/Module/Events.php:468 -#: ../../Zotlabs/Module/Filestorage.php:156 -#: ../../Zotlabs/Module/Filestorage.php:164 -#: ../../Zotlabs/Module/Profiles.php:647 ../../Zotlabs/Module/Photos.php:664 -#: ../../Zotlabs/Module/Menu.php:100 ../../Zotlabs/Module/Menu.php:157 -#: ../../Zotlabs/Module/Mitem.php:158 ../../Zotlabs/Module/Mitem.php:159 -#: ../../Zotlabs/Module/Mitem.php:232 ../../Zotlabs/Module/Mitem.php:233 -#: ../../Zotlabs/Module/Admin.php:459 ../../Zotlabs/Module/Removeme.php:63 -#: ../../Zotlabs/Module/Settings.php:635 ../../Zotlabs/Module/Api.php:89 -#: ../../include/dir_fns.php:143 ../../include/dir_fns.php:144 -#: ../../include/dir_fns.php:145 ../../view/theme/redbasic/php/config.php:105 -#: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1708 -msgid "No" +#: ../../Zotlabs/Module/Network.php:224 +msgid "Privacy group: " msgstr "" -#: ../../Zotlabs/Module/Connedit.php:403 ../../Zotlabs/Module/Events.php:458 -#: ../../Zotlabs/Module/Events.php:459 ../../Zotlabs/Module/Events.php:468 -#: ../../Zotlabs/Module/Filestorage.php:156 -#: ../../Zotlabs/Module/Filestorage.php:164 -#: ../../Zotlabs/Module/Profiles.php:647 ../../Zotlabs/Module/Photos.php:664 -#: ../../Zotlabs/Module/Menu.php:100 ../../Zotlabs/Module/Menu.php:157 -#: ../../Zotlabs/Module/Mitem.php:158 ../../Zotlabs/Module/Mitem.php:159 -#: ../../Zotlabs/Module/Mitem.php:232 ../../Zotlabs/Module/Mitem.php:233 -#: ../../Zotlabs/Module/Admin.php:461 ../../Zotlabs/Module/Removeme.php:63 -#: ../../Zotlabs/Module/Settings.php:635 ../../Zotlabs/Module/Api.php:88 -#: ../../include/dir_fns.php:143 ../../include/dir_fns.php:144 -#: ../../include/dir_fns.php:145 ../../view/theme/redbasic/php/config.php:105 -#: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1708 -msgid "Yes" +#: ../../Zotlabs/Module/Network.php:250 +msgid "Invalid connection." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:435 -msgid "Could not access address book record." +#: ../../Zotlabs/Module/Dreport.php:44 +msgid "Invalid message" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:455 -msgid "Refresh failed - channel is currently unavailable." +#: ../../Zotlabs/Module/Dreport.php:76 +msgid "no results" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:470 ../../Zotlabs/Module/Connedit.php:479 -#: ../../Zotlabs/Module/Connedit.php:488 ../../Zotlabs/Module/Connedit.php:497 -#: ../../Zotlabs/Module/Connedit.php:510 -msgid "Unable to set address book parameters." +#: ../../Zotlabs/Module/Dreport.php:91 +msgid "channel sync processed" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:533 -msgid "Connection has been removed." +#: ../../Zotlabs/Module/Dreport.php:95 +msgid "queued" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:549 ../../Zotlabs/Lib/Apps.php:221 -#: ../../include/nav.php:86 ../../include/conversation.php:957 -msgid "View Profile" +#: ../../Zotlabs/Module/Dreport.php:99 +msgid "posted" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:552 -#, php-format -msgid "View %s's profile" +#: ../../Zotlabs/Module/Dreport.php:103 +msgid "accepted for delivery" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:556 -msgid "Refresh Permissions" +#: ../../Zotlabs/Module/Dreport.php:107 +msgid "updated" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:559 -msgid "Fetch updated permissions" +#: ../../Zotlabs/Module/Dreport.php:110 +msgid "update ignored" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:563 -msgid "Recent Activity" +#: ../../Zotlabs/Module/Dreport.php:113 +msgid "permission denied" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:566 -msgid "View recent posts and comments" +#: ../../Zotlabs/Module/Dreport.php:117 +msgid "recipient not found" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:570 ../../Zotlabs/Module/Admin.php:1041 -msgid "Unblock" +#: ../../Zotlabs/Module/Dreport.php:120 +msgid "mail recalled" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:570 ../../Zotlabs/Module/Admin.php:1040 -msgid "Block" +#: ../../Zotlabs/Module/Dreport.php:123 +msgid "duplicate mail received" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:573 -msgid "Block (or Unblock) all communications with this connection" +#: ../../Zotlabs/Module/Dreport.php:126 +msgid "mail delivered" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:574 -msgid "This connection is blocked!" +#: ../../Zotlabs/Module/Dreport.php:146 +#, php-format +msgid "Delivery report for %1$s" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:578 -msgid "Unignore" +#: ../../Zotlabs/Module/Dreport.php:149 +msgid "Options" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:578 -#: ../../Zotlabs/Module/Connections.php:277 -#: ../../Zotlabs/Module/Notifications.php:55 -msgid "Ignore" +#: ../../Zotlabs/Module/Dreport.php:150 +msgid "Redeliver" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:581 -msgid "Ignore (or Unignore) all inbound communications from this connection" +#: ../../Zotlabs/Module/Photos.php:82 +msgid "Page owner information could not be retrieved." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:582 -msgid "This connection is ignored!" +#: ../../Zotlabs/Module/Photos.php:97 ../../Zotlabs/Module/Photos.php:741 +#: ../../Zotlabs/Module/Profile_photo.php:115 +#: ../../Zotlabs/Module/Profile_photo.php:212 +#: ../../Zotlabs/Module/Profile_photo.php:311 +#: ../../include/photo/photo_driver.php:718 +msgid "Profile Photos" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:586 -msgid "Unarchive" +#: ../../Zotlabs/Module/Photos.php:103 ../../Zotlabs/Module/Photos.php:147 +msgid "Album not found." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:586 -msgid "Archive" +#: ../../Zotlabs/Module/Photos.php:130 +msgid "Delete Album" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:589 +#: ../../Zotlabs/Module/Photos.php:151 msgid "" -"Archive (or Unarchive) this connection - mark channel dead but keep content" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:590 -msgid "This connection is archived!" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:594 -msgid "Unhide" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:594 -msgid "Hide" +"Multiple storage folders exist with this album name, but within different " +"directories. Please remove the desired folder or folders using the Files " +"manager" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:597 -msgid "Hide or Unhide this connection from your other connections" +#: ../../Zotlabs/Module/Photos.php:208 ../../Zotlabs/Module/Photos.php:1051 +msgid "Delete Photo" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:598 -msgid "This connection is hidden!" +#: ../../Zotlabs/Module/Photos.php:520 ../../Zotlabs/Module/Directory.php:63 +#: ../../Zotlabs/Module/Display.php:17 ../../Zotlabs/Module/Ratings.php:86 +#: ../../Zotlabs/Module/Search.php:17 +#: ../../Zotlabs/Module/Viewconnections.php:23 +msgid "Public access denied." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:605 -msgid "Delete this connection" +#: ../../Zotlabs/Module/Photos.php:531 +msgid "No photos selected" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:620 ../../include/widgets.php:493 -msgid "Me" +#: ../../Zotlabs/Module/Photos.php:580 +msgid "Access to this item is restricted." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:621 ../../include/widgets.php:494 -msgid "Family" +#: ../../Zotlabs/Module/Photos.php:619 +#, php-format +msgid "%1$.2f MB of %2$.2f MB photo storage used." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:622 ../../Zotlabs/Module/Settings.php:391 -#: ../../Zotlabs/Module/Settings.php:395 ../../Zotlabs/Module/Settings.php:396 -#: ../../Zotlabs/Module/Settings.php:399 ../../Zotlabs/Module/Settings.php:410 -#: ../../include/channel.php:402 ../../include/channel.php:403 -#: ../../include/channel.php:410 ../../include/selectors.php:123 -#: ../../include/widgets.php:495 -msgid "Friends" +#: ../../Zotlabs/Module/Photos.php:622 +#, php-format +msgid "%1$.2f MB photo storage used." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:623 ../../include/widgets.php:496 -msgid "Acquaintances" +#: ../../Zotlabs/Module/Photos.php:658 +msgid "Upload Photos" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:624 -#: ../../Zotlabs/Module/Connections.php:92 -#: ../../Zotlabs/Module/Connections.php:107 ../../include/widgets.php:497 -msgid "All" +#: ../../Zotlabs/Module/Photos.php:662 +msgid "Enter an album name" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:685 -msgid "Approve this connection" +#: ../../Zotlabs/Module/Photos.php:663 +msgid "or select an existing album (doubleclick)" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:685 -msgid "Accept connection to allow communication" +#: ../../Zotlabs/Module/Photos.php:664 +msgid "Create a status post for this upload" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:690 -msgid "Set Affinity" +#: ../../Zotlabs/Module/Photos.php:664 +#: ../../Zotlabs/Module/Filestorage.php:156 +#: ../../Zotlabs/Module/Filestorage.php:164 +#: ../../Zotlabs/Module/Events.php:458 ../../Zotlabs/Module/Events.php:459 +#: ../../Zotlabs/Module/Events.php:468 ../../Zotlabs/Module/Connedit.php:403 +#: ../../Zotlabs/Module/Connedit.php:685 ../../Zotlabs/Module/Settings.php:635 +#: ../../Zotlabs/Module/Profiles.php:647 ../../Zotlabs/Module/Menu.php:100 +#: ../../Zotlabs/Module/Menu.php:157 ../../Zotlabs/Module/Mitem.php:158 +#: ../../Zotlabs/Module/Mitem.php:159 ../../Zotlabs/Module/Mitem.php:232 +#: ../../Zotlabs/Module/Mitem.php:233 ../../Zotlabs/Module/Admin.php:459 +#: ../../Zotlabs/Module/Removeme.php:63 ../../Zotlabs/Module/Api.php:89 +#: ../../include/dir_fns.php:143 ../../include/dir_fns.php:144 +#: ../../include/dir_fns.php:145 ../../view/theme/redbasic/php/config.php:105 +#: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1711 +msgid "No" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:693 -msgid "Set Profile" +#: ../../Zotlabs/Module/Photos.php:664 +#: ../../Zotlabs/Module/Filestorage.php:156 +#: ../../Zotlabs/Module/Filestorage.php:164 +#: ../../Zotlabs/Module/Events.php:458 ../../Zotlabs/Module/Events.php:459 +#: ../../Zotlabs/Module/Events.php:468 ../../Zotlabs/Module/Connedit.php:403 +#: ../../Zotlabs/Module/Settings.php:635 ../../Zotlabs/Module/Profiles.php:647 +#: ../../Zotlabs/Module/Menu.php:100 ../../Zotlabs/Module/Menu.php:157 +#: ../../Zotlabs/Module/Mitem.php:158 ../../Zotlabs/Module/Mitem.php:159 +#: ../../Zotlabs/Module/Mitem.php:232 ../../Zotlabs/Module/Mitem.php:233 +#: ../../Zotlabs/Module/Admin.php:461 ../../Zotlabs/Module/Removeme.php:63 +#: ../../Zotlabs/Module/Api.php:88 ../../include/dir_fns.php:143 +#: ../../include/dir_fns.php:144 ../../include/dir_fns.php:145 +#: ../../view/theme/redbasic/php/config.php:105 +#: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1711 +msgid "Yes" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:696 -msgid "Set Affinity & Profile" +#: ../../Zotlabs/Module/Photos.php:665 +msgid "Caption (optional):" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:745 -msgid "none" +#: ../../Zotlabs/Module/Photos.php:666 +msgid "Description (optional):" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:749 ../../include/widgets.php:623 -msgid "Connection Default Permissions" +#: ../../Zotlabs/Module/Photos.php:669 ../../Zotlabs/Module/Photos.php:1043 +#: ../../Zotlabs/Module/Filestorage.php:152 ../../Zotlabs/Module/Chat.php:235 +#: ../../Zotlabs/Module/Thing.php:313 ../../Zotlabs/Module/Thing.php:359 +#: ../../include/acl_selectors.php:281 +msgid "Permissions" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:749 ../../include/items.php:3935 -#, php-format -msgid "Connection: %s" +#: ../../Zotlabs/Module/Photos.php:675 ../../Zotlabs/Module/Photos.php:1050 +#: ../../Zotlabs/Module/Photos.php:1090 ../../Zotlabs/Module/Photos.php:1208 +#: ../../Zotlabs/Module/Import.php:560 ../../Zotlabs/Module/Mail.php:370 +#: ../../Zotlabs/Module/Group.php:85 ../../Zotlabs/Module/Appman.php:126 +#: ../../Zotlabs/Module/Pdledit.php:66 +#: ../../Zotlabs/Module/Filestorage.php:161 +#: ../../Zotlabs/Module/Events.php:474 ../../Zotlabs/Module/Connedit.php:778 +#: ../../Zotlabs/Module/Settings.php:644 ../../Zotlabs/Module/Settings.php:757 +#: ../../Zotlabs/Module/Settings.php:806 ../../Zotlabs/Module/Settings.php:832 +#: ../../Zotlabs/Module/Settings.php:855 ../../Zotlabs/Module/Settings.php:943 +#: ../../Zotlabs/Module/Settings.php:1129 +#: ../../Zotlabs/Module/Import_items.php:122 +#: ../../Zotlabs/Module/Invite.php:146 ../../Zotlabs/Module/Locs.php:121 +#: ../../Zotlabs/Module/Profiles.php:687 ../../Zotlabs/Module/Mood.php:139 +#: ../../Zotlabs/Module/Chat.php:196 ../../Zotlabs/Module/Chat.php:238 +#: ../../Zotlabs/Module/Mitem.php:235 ../../Zotlabs/Module/Admin.php:492 +#: ../../Zotlabs/Module/Admin.php:688 ../../Zotlabs/Module/Admin.php:771 +#: ../../Zotlabs/Module/Admin.php:1032 ../../Zotlabs/Module/Admin.php:1211 +#: ../../Zotlabs/Module/Admin.php:1421 ../../Zotlabs/Module/Admin.php:1648 +#: ../../Zotlabs/Module/Admin.php:1733 ../../Zotlabs/Module/Admin.php:2116 +#: ../../Zotlabs/Module/Poke.php:186 ../../Zotlabs/Module/Pconfig.php:107 +#: ../../Zotlabs/Module/Cal.php:338 ../../Zotlabs/Module/Rate.php:170 +#: ../../Zotlabs/Module/Connect.php:98 ../../Zotlabs/Module/Setup.php:312 +#: ../../Zotlabs/Module/Setup.php:353 ../../Zotlabs/Module/Thing.php:316 +#: ../../Zotlabs/Module/Thing.php:362 ../../Zotlabs/Module/Sources.php:114 +#: ../../Zotlabs/Module/Sources.php:149 ../../Zotlabs/Module/Xchan.php:15 +#: ../../Zotlabs/Lib/ThreadItem.php:710 ../../include/js_strings.php:22 +#: ../../include/widgets.php:763 ../../view/theme/redbasic/php/config.php:99 +msgid "Submit" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:750 -msgid "Apply these permissions automatically" +#: ../../Zotlabs/Module/Photos.php:693 +msgid "Album name could not be decoded" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:750 -msgid "Connection requests will be approved without your interaction" +#: ../../Zotlabs/Module/Photos.php:741 +msgid "Contact Photos" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:752 -msgid "This connection's primary address is" +#: ../../Zotlabs/Module/Photos.php:764 +msgid "Show Newest First" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:753 -msgid "Available locations:" +#: ../../Zotlabs/Module/Photos.php:766 +msgid "Show Oldest First" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:757 -msgid "" -"The permissions indicated on this page will be applied to all new " -"connections." +#: ../../Zotlabs/Module/Photos.php:790 ../../Zotlabs/Module/Photos.php:1329 +#: ../../Zotlabs/Module/Embedphotos.php:141 ../../include/widgets.php:1593 +msgid "View Photo" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:758 -msgid "Connection Tools" +#: ../../Zotlabs/Module/Photos.php:821 +#: ../../Zotlabs/Module/Embedphotos.php:157 ../../include/widgets.php:1610 +msgid "Edit Album" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:760 -msgid "Slide to adjust your degree of friendship" +#: ../../Zotlabs/Module/Photos.php:868 +msgid "Permission denied. Access to this item may be restricted." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:761 ../../Zotlabs/Module/Rate.php:159 -#: ../../include/js_strings.php:20 -msgid "Rating" +#: ../../Zotlabs/Module/Photos.php:870 +msgid "Photo not available" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:762 -msgid "Slide to adjust your rating" +#: ../../Zotlabs/Module/Photos.php:928 +msgid "Use as profile photo" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:763 ../../Zotlabs/Module/Connedit.php:768 -msgid "Optionally explain your rating" +#: ../../Zotlabs/Module/Photos.php:929 +msgid "Use as cover photo" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:765 -msgid "Custom Filter" +#: ../../Zotlabs/Module/Photos.php:936 +msgid "Private Photo" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:766 -msgid "Only import posts with this text" +#: ../../Zotlabs/Module/Photos.php:947 ../../Zotlabs/Module/Events.php:665 +#: ../../Zotlabs/Module/Events.php:674 ../../Zotlabs/Module/Cal.php:332 +#: ../../Zotlabs/Module/Cal.php:339 +msgid "Previous" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:766 ../../Zotlabs/Module/Connedit.php:767 -msgid "" -"words one per line or #tags or /patterns/ or lang=xx, leave blank to import " -"all posts" +#: ../../Zotlabs/Module/Photos.php:951 +msgid "View Full Size" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:767 -msgid "Do not import posts with this text" +#: ../../Zotlabs/Module/Photos.php:956 ../../Zotlabs/Module/Events.php:666 +#: ../../Zotlabs/Module/Events.php:675 ../../Zotlabs/Module/Cal.php:333 +#: ../../Zotlabs/Module/Cal.php:340 ../../Zotlabs/Module/Setup.php:267 +msgid "Next" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:769 -msgid "This information is public!" +#: ../../Zotlabs/Module/Photos.php:996 ../../Zotlabs/Module/Admin.php:1437 +#: ../../Zotlabs/Module/Tagrm.php:137 +msgid "Remove" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:774 -msgid "Connection Pending Approval" +#: ../../Zotlabs/Module/Photos.php:1030 +msgid "Edit photo" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:777 -msgid "inherited" +#: ../../Zotlabs/Module/Photos.php:1032 +msgid "Rotate CW (right)" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:778 ../../Zotlabs/Module/Connect.php:98 -#: ../../Zotlabs/Module/Events.php:474 ../../Zotlabs/Module/Cal.php:338 -#: ../../Zotlabs/Module/Chat.php:196 ../../Zotlabs/Module/Chat.php:238 -#: ../../Zotlabs/Module/Group.php:85 ../../Zotlabs/Module/Appman.php:126 -#: ../../Zotlabs/Module/Pdledit.php:66 -#: ../../Zotlabs/Module/Filestorage.php:161 -#: ../../Zotlabs/Module/Profiles.php:687 ../../Zotlabs/Module/Import.php:560 -#: ../../Zotlabs/Module/Photos.php:675 ../../Zotlabs/Module/Photos.php:1050 -#: ../../Zotlabs/Module/Photos.php:1090 ../../Zotlabs/Module/Photos.php:1208 -#: ../../Zotlabs/Module/Import_items.php:122 -#: ../../Zotlabs/Module/Invite.php:146 ../../Zotlabs/Module/Locs.php:121 -#: ../../Zotlabs/Module/Mail.php:370 ../../Zotlabs/Module/Mood.php:139 -#: ../../Zotlabs/Module/Mitem.php:235 ../../Zotlabs/Module/Admin.php:492 -#: ../../Zotlabs/Module/Admin.php:688 ../../Zotlabs/Module/Admin.php:771 -#: ../../Zotlabs/Module/Admin.php:1032 ../../Zotlabs/Module/Admin.php:1211 -#: ../../Zotlabs/Module/Admin.php:1421 ../../Zotlabs/Module/Admin.php:1648 -#: ../../Zotlabs/Module/Admin.php:1733 ../../Zotlabs/Module/Admin.php:2116 -#: ../../Zotlabs/Module/Poke.php:186 ../../Zotlabs/Module/Pconfig.php:107 -#: ../../Zotlabs/Module/Rate.php:170 ../../Zotlabs/Module/Settings.php:644 -#: ../../Zotlabs/Module/Settings.php:757 ../../Zotlabs/Module/Settings.php:806 -#: ../../Zotlabs/Module/Settings.php:832 ../../Zotlabs/Module/Settings.php:855 -#: ../../Zotlabs/Module/Settings.php:943 -#: ../../Zotlabs/Module/Settings.php:1129 ../../Zotlabs/Module/Setup.php:312 -#: ../../Zotlabs/Module/Setup.php:353 ../../Zotlabs/Module/Thing.php:316 -#: ../../Zotlabs/Module/Thing.php:362 ../../Zotlabs/Module/Sources.php:114 -#: ../../Zotlabs/Module/Sources.php:149 ../../Zotlabs/Module/Xchan.php:15 -#: ../../Zotlabs/Lib/ThreadItem.php:710 ../../include/widgets.php:763 -#: ../../include/js_strings.php:22 ../../view/theme/redbasic/php/config.php:99 -msgid "Submit" +#: ../../Zotlabs/Module/Photos.php:1033 +msgid "Rotate CCW (left)" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:779 -#, php-format -msgid "" -"Please choose the profile you would like to display to %s when viewing your " -"profile securely." +#: ../../Zotlabs/Module/Photos.php:1036 +msgid "Enter a new album name" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:781 -msgid "Their Settings" +#: ../../Zotlabs/Module/Photos.php:1037 +msgid "or select an existing one (doubleclick)" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:782 -msgid "My Settings" +#: ../../Zotlabs/Module/Photos.php:1040 +msgid "Caption" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:784 -msgid "Individual Permissions" +#: ../../Zotlabs/Module/Photos.php:1042 +msgid "Add a Tag" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:785 -msgid "" -"Some permissions may be inherited from your channel's <a href=\"settings" -"\"><strong>privacy settings</strong></a>, which have higher priority than " -"individual settings. You can <strong>not</strong> change those settings here." +#: ../../Zotlabs/Module/Photos.php:1046 +msgid "Example: @bob, @Barbara_Jensen, @jim@example.com" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:786 -msgid "" -"Some permissions may be inherited from your channel's <a href=\"settings" -"\"><strong>privacy settings</strong></a>, which have higher priority than " -"individual settings. You can change those settings here but they wont have " -"any impact unless the inherited setting changes." +#: ../../Zotlabs/Module/Photos.php:1049 +msgid "Flag as adult in album view" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:787 -msgid "Last update:" +#: ../../Zotlabs/Module/Photos.php:1068 ../../Zotlabs/Lib/ThreadItem.php:261 +msgid "I like this (toggle)" msgstr "" -#: ../../Zotlabs/Module/Display.php:17 ../../Zotlabs/Module/Directory.php:63 -#: ../../Zotlabs/Module/Photos.php:520 ../../Zotlabs/Module/Ratings.php:86 -#: ../../Zotlabs/Module/Search.php:17 -#: ../../Zotlabs/Module/Viewconnections.php:23 -msgid "Public access denied." +#: ../../Zotlabs/Module/Photos.php:1069 ../../Zotlabs/Lib/ThreadItem.php:262 +msgid "I don't like this (toggle)" msgstr "" -#: ../../Zotlabs/Module/Display.php:40 ../../Zotlabs/Module/Filestorage.php:32 -#: ../../Zotlabs/Module/Admin.php:164 ../../Zotlabs/Module/Admin.php:1255 -#: ../../Zotlabs/Module/Admin.php:1561 ../../Zotlabs/Module/Thing.php:89 -#: ../../Zotlabs/Module/Viewsrc.php:24 ../../include/items.php:3369 -msgid "Item not found." +#: ../../Zotlabs/Module/Photos.php:1070 ../../Zotlabs/Module/Blocks.php:161 +#: ../../Zotlabs/Module/Layouts.php:193 ../../Zotlabs/Module/Webpages.php:195 +#: ../../include/conversation.php:1219 +msgid "Share" msgstr "" -#: ../../Zotlabs/Module/Id.php:13 -msgid "First Name" +#: ../../Zotlabs/Module/Photos.php:1071 ../../Zotlabs/Lib/ThreadItem.php:397 +#: ../../include/conversation.php:743 +msgid "Please wait" msgstr "" -#: ../../Zotlabs/Module/Id.php:14 -msgid "Last Name" +#: ../../Zotlabs/Module/Photos.php:1087 ../../Zotlabs/Module/Photos.php:1205 +#: ../../Zotlabs/Lib/ThreadItem.php:707 +msgid "This is you" msgstr "" -#: ../../Zotlabs/Module/Id.php:15 -msgid "Nickname" +#: ../../Zotlabs/Module/Photos.php:1089 ../../Zotlabs/Module/Photos.php:1207 +#: ../../Zotlabs/Lib/ThreadItem.php:709 ../../include/js_strings.php:6 +msgid "Comment" msgstr "" -#: ../../Zotlabs/Module/Id.php:16 -msgid "Full Name" +#: ../../Zotlabs/Module/Photos.php:1091 ../../Zotlabs/Module/Events.php:469 +#: ../../Zotlabs/Module/Webpages.php:201 ../../Zotlabs/Lib/ThreadItem.php:719 +#: ../../include/conversation.php:1198 ../../include/page_widgets.php:43 +msgid "Preview" msgstr "" -#: ../../Zotlabs/Module/Id.php:17 ../../Zotlabs/Module/Id.php:18 -#: ../../Zotlabs/Module/Admin.php:1035 ../../Zotlabs/Module/Admin.php:1047 -#: ../../include/network.php:2203 -msgid "Email" +#: ../../Zotlabs/Module/Photos.php:1105 ../../include/conversation.php:577 +msgctxt "title" +msgid "Likes" msgstr "" -#: ../../Zotlabs/Module/Id.php:19 ../../Zotlabs/Module/Id.php:20 -#: ../../Zotlabs/Module/Id.php:21 ../../Zotlabs/Lib/Apps.php:238 -msgid "Profile Photo" +#: ../../Zotlabs/Module/Photos.php:1105 ../../include/conversation.php:577 +msgctxt "title" +msgid "Dislikes" msgstr "" -#: ../../Zotlabs/Module/Id.php:22 -msgid "Profile Photo 16px" +#: ../../Zotlabs/Module/Photos.php:1106 ../../include/conversation.php:578 +msgctxt "title" +msgid "Agree" msgstr "" -#: ../../Zotlabs/Module/Id.php:23 -msgid "Profile Photo 32px" +#: ../../Zotlabs/Module/Photos.php:1106 ../../include/conversation.php:578 +msgctxt "title" +msgid "Disagree" msgstr "" -#: ../../Zotlabs/Module/Id.php:24 -msgid "Profile Photo 48px" +#: ../../Zotlabs/Module/Photos.php:1106 ../../include/conversation.php:578 +msgctxt "title" +msgid "Abstain" msgstr "" -#: ../../Zotlabs/Module/Id.php:25 -msgid "Profile Photo 64px" +#: ../../Zotlabs/Module/Photos.php:1107 ../../include/conversation.php:579 +msgctxt "title" +msgid "Attending" msgstr "" -#: ../../Zotlabs/Module/Id.php:26 -msgid "Profile Photo 80px" +#: ../../Zotlabs/Module/Photos.php:1107 ../../include/conversation.php:579 +msgctxt "title" +msgid "Not attending" msgstr "" -#: ../../Zotlabs/Module/Id.php:27 -msgid "Profile Photo 128px" +#: ../../Zotlabs/Module/Photos.php:1107 ../../include/conversation.php:579 +msgctxt "title" +msgid "Might attend" msgstr "" -#: ../../Zotlabs/Module/Id.php:28 -msgid "Timezone" +#: ../../Zotlabs/Module/Photos.php:1124 ../../Zotlabs/Module/Photos.php:1136 +#: ../../Zotlabs/Lib/ThreadItem.php:181 ../../Zotlabs/Lib/ThreadItem.php:193 +#: ../../include/conversation.php:1738 +msgid "View all" msgstr "" -#: ../../Zotlabs/Module/Id.php:29 ../../Zotlabs/Module/Profiles.php:731 -msgid "Homepage URL" -msgstr "" +#: ../../Zotlabs/Module/Photos.php:1128 ../../Zotlabs/Lib/ThreadItem.php:185 +#: ../../include/channel.php:1198 ../../include/conversation.php:1762 +#: ../../include/taxonomy.php:403 +msgctxt "noun" +msgid "Like" +msgid_plural "Likes" +msgstr[0] "" +msgstr[1] "" -#: ../../Zotlabs/Module/Id.php:30 ../../Zotlabs/Lib/Apps.php:236 -msgid "Language" -msgstr "" +#: ../../Zotlabs/Module/Photos.php:1133 ../../Zotlabs/Lib/ThreadItem.php:190 +#: ../../include/conversation.php:1765 +msgctxt "noun" +msgid "Dislike" +msgid_plural "Dislikes" +msgstr[0] "" +msgstr[1] "" -#: ../../Zotlabs/Module/Id.php:31 -msgid "Birth Year" +#: ../../Zotlabs/Module/Photos.php:1233 +msgid "Photo Tools" msgstr "" -#: ../../Zotlabs/Module/Id.php:32 -msgid "Birth Month" +#: ../../Zotlabs/Module/Photos.php:1242 +msgid "In This Photo:" msgstr "" -#: ../../Zotlabs/Module/Id.php:33 -msgid "Birth Day" +#: ../../Zotlabs/Module/Photos.php:1247 +msgid "Map" msgstr "" -#: ../../Zotlabs/Module/Id.php:34 -msgid "Birthdate" +#: ../../Zotlabs/Module/Photos.php:1255 ../../Zotlabs/Lib/ThreadItem.php:386 +msgctxt "noun" +msgid "Likes" msgstr "" -#: ../../Zotlabs/Module/Id.php:35 ../../Zotlabs/Module/Profiles.php:454 -msgid "Gender" +#: ../../Zotlabs/Module/Photos.php:1256 ../../Zotlabs/Lib/ThreadItem.php:387 +msgctxt "noun" +msgid "Dislikes" msgstr "" -#: ../../Zotlabs/Module/Id.php:108 ../../include/selectors.php:49 -#: ../../include/selectors.php:66 -msgid "Male" +#: ../../Zotlabs/Module/Photos.php:1261 ../../Zotlabs/Lib/ThreadItem.php:392 +#: ../../include/acl_selectors.php:283 +msgid "Close" msgstr "" -#: ../../Zotlabs/Module/Id.php:110 ../../include/selectors.php:49 -#: ../../include/selectors.php:66 -msgid "Female" +#: ../../Zotlabs/Module/Photos.php:1335 +msgid "View Album" msgstr "" -#: ../../Zotlabs/Module/Follow.php:34 -msgid "Channel added." +#: ../../Zotlabs/Module/Photos.php:1346 ../../Zotlabs/Module/Photos.php:1359 +#: ../../Zotlabs/Module/Photos.php:1360 +msgid "Recent Photos" msgstr "" #: ../../Zotlabs/Module/Directory.php:243 @@ -937,7 +943,7 @@ msgstr "" #: ../../Zotlabs/Module/Directory.php:325 ../../Zotlabs/Module/Match.php:68 #: ../../Zotlabs/Module/Suggest.php:56 ../../include/channel.php:1051 -#: ../../include/connections.php:78 ../../include/conversation.php:959 +#: ../../include/conversation.php:959 ../../include/connections.php:78 #: ../../include/widgets.php:147 ../../include/widgets.php:184 msgid "Connect" msgstr "" @@ -1014,247 +1020,200 @@ msgstr "" msgid "No entries (some entries may be hidden)." msgstr "" -#: ../../Zotlabs/Module/Connect.php:61 ../../Zotlabs/Module/Connect.php:109 -msgid "Continue" -msgstr "" - -#: ../../Zotlabs/Module/Connect.php:90 -msgid "Premium Channel Setup" -msgstr "" - -#: ../../Zotlabs/Module/Connect.php:92 -msgid "Enable premium channel connection restrictions" -msgstr "" - -#: ../../Zotlabs/Module/Connect.php:93 -msgid "" -"Please enter your restrictions or conditions, such as paypal receipt, usage " -"guidelines, etc." -msgstr "" - -#: ../../Zotlabs/Module/Connect.php:95 ../../Zotlabs/Module/Connect.php:115 -msgid "" -"This channel may require additional steps or acknowledgement of the " -"following conditions prior to connecting:" -msgstr "" - -#: ../../Zotlabs/Module/Connect.php:96 -msgid "" -"Potential connections will then see the following text before proceeding:" -msgstr "" - -#: ../../Zotlabs/Module/Connect.php:97 ../../Zotlabs/Module/Connect.php:118 -msgid "" -"By continuing, I certify that I have complied with any instructions provided " -"on this page." -msgstr "" - -#: ../../Zotlabs/Module/Connect.php:106 -msgid "(No specific instructions have been provided by the channel owner.)" -msgstr "" - -#: ../../Zotlabs/Module/Connect.php:114 -msgid "Restricted or Premium Channel" -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:104 -msgid "Event can not end before it has started." -msgstr "" - -#: ../../Zotlabs/Module/Events.php:106 ../../Zotlabs/Module/Events.php:115 -#: ../../Zotlabs/Module/Events.php:135 -msgid "Unable to generate preview." +#: ../../Zotlabs/Module/Import.php:33 +#, php-format +msgid "Your service plan only allows %d channels." msgstr "" -#: ../../Zotlabs/Module/Events.php:113 -msgid "Event title and start time are required." +#: ../../Zotlabs/Module/Import.php:71 ../../Zotlabs/Module/Import_items.php:42 +msgid "Nothing to import." msgstr "" -#: ../../Zotlabs/Module/Events.php:133 ../../Zotlabs/Module/Events.php:258 -msgid "Event not found." +#: ../../Zotlabs/Module/Import.php:95 ../../Zotlabs/Module/Import_items.php:66 +msgid "Unable to download data from old server" msgstr "" -#: ../../Zotlabs/Module/Events.php:253 ../../Zotlabs/Module/Like.php:372 -#: ../../Zotlabs/Module/Tagger.php:51 ../../include/conversation.php:123 -#: ../../include/text.php:1924 ../../include/event.php:951 -msgid "event" +#: ../../Zotlabs/Module/Import.php:101 +#: ../../Zotlabs/Module/Import_items.php:72 +msgid "Imported file is empty." msgstr "" -#: ../../Zotlabs/Module/Events.php:448 -msgid "Edit event title" +#: ../../Zotlabs/Module/Import.php:123 +#: ../../Zotlabs/Module/Import_items.php:88 +#, php-format +msgid "Warning: Database versions differ by %1$d updates." msgstr "" -#: ../../Zotlabs/Module/Events.php:448 -msgid "Event title" +#: ../../Zotlabs/Module/Import.php:153 ../../include/import.php:107 +msgid "Cloned channel not found. Import failed." msgstr "" -#: ../../Zotlabs/Module/Events.php:448 ../../Zotlabs/Module/Events.php:453 -#: ../../Zotlabs/Module/Appman.php:115 ../../Zotlabs/Module/Appman.php:116 -#: ../../Zotlabs/Module/Profiles.php:709 ../../Zotlabs/Module/Profiles.php:713 -#: ../../include/datetime.php:245 -msgid "Required" +#: ../../Zotlabs/Module/Import.php:163 +msgid "No channel. Import failed." msgstr "" -#: ../../Zotlabs/Module/Events.php:450 -msgid "Categories (comma-separated list)" +#: ../../Zotlabs/Module/Import.php:520 +#: ../../include/Import/import_diaspora.php:142 +msgid "Import completed." msgstr "" -#: ../../Zotlabs/Module/Events.php:451 -msgid "Edit Category" +#: ../../Zotlabs/Module/Import.php:542 +msgid "You must be logged in to use this feature." msgstr "" -#: ../../Zotlabs/Module/Events.php:451 -msgid "Category" +#: ../../Zotlabs/Module/Import.php:547 +msgid "Import Channel" msgstr "" -#: ../../Zotlabs/Module/Events.php:454 -msgid "Edit start date and time" +#: ../../Zotlabs/Module/Import.php:548 +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/Events.php:454 -msgid "Start date and time" +#: ../../Zotlabs/Module/Import.php:549 +#: ../../Zotlabs/Module/Import_items.php:121 +msgid "File to Upload" msgstr "" -#: ../../Zotlabs/Module/Events.php:455 ../../Zotlabs/Module/Events.php:458 -msgid "Finish date and time are not known or not relevant" +#: ../../Zotlabs/Module/Import.php:550 +msgid "Or provide the old server/hub details" msgstr "" -#: ../../Zotlabs/Module/Events.php:457 -msgid "Edit finish date and time" +#: ../../Zotlabs/Module/Import.php:551 +msgid "Your old identity address (xyz@example.com)" msgstr "" -#: ../../Zotlabs/Module/Events.php:457 -msgid "Finish date and time" +#: ../../Zotlabs/Module/Import.php:552 +msgid "Your old login email address" msgstr "" -#: ../../Zotlabs/Module/Events.php:459 ../../Zotlabs/Module/Events.php:460 -msgid "Adjust for viewer timezone" +#: ../../Zotlabs/Module/Import.php:553 +msgid "Your old login password" msgstr "" -#: ../../Zotlabs/Module/Events.php:459 +#: ../../Zotlabs/Module/Import.php:554 msgid "" -"Important for events that happen in a particular place. Not practical for " -"global holidays." -msgstr "" - -#: ../../Zotlabs/Module/Events.php:461 -msgid "Edit Description" +"For either option, please choose whether to make this hub your new primary " +"address, or whether your old location should continue this role. You will be " +"able to post from either location, but only one can be marked as the primary " +"location for files, photos, and media." msgstr "" -#: ../../Zotlabs/Module/Events.php:461 ../../Zotlabs/Module/Appman.php:117 -#: ../../Zotlabs/Module/Rbmark.php:101 -msgid "Description" +#: ../../Zotlabs/Module/Import.php:555 +msgid "Make this hub my primary location" msgstr "" -#: ../../Zotlabs/Module/Events.php:463 -msgid "Edit Location" +#: ../../Zotlabs/Module/Import.php:556 +msgid "" +"Import existing posts if possible (experimental - limited by available memory" msgstr "" -#: ../../Zotlabs/Module/Events.php:463 ../../Zotlabs/Module/Profiles.php:477 -#: ../../Zotlabs/Module/Profiles.php:698 ../../Zotlabs/Module/Locs.php:117 -#: ../../Zotlabs/Module/Pubsites.php:41 ../../include/js_strings.php:25 -msgid "Location" +#: ../../Zotlabs/Module/Import.php:557 +msgid "" +"This process may take several minutes to complete. Please submit the form " +"only once and leave this page open until finished." msgstr "" -#: ../../Zotlabs/Module/Events.php:466 ../../Zotlabs/Module/Events.php:468 -msgid "Share this event" +#: ../../Zotlabs/Module/Like.php:19 +msgid "Like/Dislike" msgstr "" -#: ../../Zotlabs/Module/Events.php:469 ../../Zotlabs/Module/Photos.php:1091 -#: ../../Zotlabs/Module/Webpages.php:201 ../../Zotlabs/Lib/ThreadItem.php:719 -#: ../../include/page_widgets.php:43 ../../include/conversation.php:1198 -msgid "Preview" +#: ../../Zotlabs/Module/Like.php:24 +msgid "This action is restricted to members." msgstr "" -#: ../../Zotlabs/Module/Events.php:470 ../../include/conversation.php:1247 -msgid "Permission settings" +#: ../../Zotlabs/Module/Like.php:25 +msgid "" +"Please <a href=\"rmagic\">login with your $Projectname ID</a> or <a href=" +"\"register\">register as a new $Projectname member</a> to continue." msgstr "" -#: ../../Zotlabs/Module/Events.php:475 -msgid "Advanced Options" +#: ../../Zotlabs/Module/Like.php:105 ../../Zotlabs/Module/Like.php:131 +#: ../../Zotlabs/Module/Like.php:169 +msgid "Invalid request." msgstr "" -#: ../../Zotlabs/Module/Events.php:587 ../../Zotlabs/Module/Cal.php:259 -msgid "l, F j" +#: ../../Zotlabs/Module/Like.php:117 ../../include/conversation.php:126 +msgid "channel" msgstr "" -#: ../../Zotlabs/Module/Events.php:609 -msgid "Edit event" +#: ../../Zotlabs/Module/Like.php:146 +msgid "thing" msgstr "" -#: ../../Zotlabs/Module/Events.php:611 -msgid "Delete event" +#: ../../Zotlabs/Module/Like.php:192 +msgid "Channel unavailable." msgstr "" -#: ../../Zotlabs/Module/Events.php:636 ../../Zotlabs/Module/Cal.php:308 -#: ../../include/text.php:1712 -msgid "Link to Source" +#: ../../Zotlabs/Module/Like.php:240 +msgid "Previous action reversed." msgstr "" -#: ../../Zotlabs/Module/Events.php:645 -msgid "calendar" +#: ../../Zotlabs/Module/Like.php:370 ../../Zotlabs/Module/Subthread.php:87 +#: ../../Zotlabs/Module/Tagger.php:47 ../../include/conversation.php:120 +#: ../../include/text.php:1921 +msgid "photo" msgstr "" -#: ../../Zotlabs/Module/Events.php:664 ../../Zotlabs/Module/Cal.php:331 -msgid "Edit Event" +#: ../../Zotlabs/Module/Like.php:370 ../../Zotlabs/Module/Subthread.php:87 +#: ../../include/conversation.php:148 ../../include/text.php:1927 +msgid "status" msgstr "" -#: ../../Zotlabs/Module/Events.php:664 ../../Zotlabs/Module/Cal.php:331 -msgid "Create Event" +#: ../../Zotlabs/Module/Like.php:372 ../../Zotlabs/Module/Events.php:253 +#: ../../Zotlabs/Module/Tagger.php:51 ../../include/conversation.php:123 +#: ../../include/event.php:951 ../../include/text.php:1924 +msgid "event" msgstr "" -#: ../../Zotlabs/Module/Events.php:665 ../../Zotlabs/Module/Events.php:674 -#: ../../Zotlabs/Module/Cal.php:332 ../../Zotlabs/Module/Cal.php:339 -#: ../../Zotlabs/Module/Photos.php:947 -msgid "Previous" +#: ../../Zotlabs/Module/Like.php:419 ../../include/conversation.php:164 +#, php-format +msgid "%1$s likes %2$s's %3$s" msgstr "" -#: ../../Zotlabs/Module/Events.php:666 ../../Zotlabs/Module/Events.php:675 -#: ../../Zotlabs/Module/Cal.php:333 ../../Zotlabs/Module/Cal.php:340 -#: ../../Zotlabs/Module/Photos.php:956 ../../Zotlabs/Module/Setup.php:267 -msgid "Next" +#: ../../Zotlabs/Module/Like.php:421 ../../include/conversation.php:167 +#, php-format +msgid "%1$s doesn't like %2$s's %3$s" msgstr "" -#: ../../Zotlabs/Module/Events.php:667 ../../Zotlabs/Module/Cal.php:334 -msgid "Export" +#: ../../Zotlabs/Module/Like.php:423 +#, php-format +msgid "%1$s agrees with %2$s's %3$s" msgstr "" -#: ../../Zotlabs/Module/Events.php:670 ../../Zotlabs/Module/Layouts.php:197 -#: ../../Zotlabs/Module/Pubsites.php:47 ../../Zotlabs/Module/Blocks.php:166 -#: ../../Zotlabs/Module/Webpages.php:200 ../../include/page_widgets.php:42 -msgid "View" +#: ../../Zotlabs/Module/Like.php:425 +#, php-format +msgid "%1$s doesn't agree with %2$s's %3$s" msgstr "" -#: ../../Zotlabs/Module/Events.php:671 -msgid "Month" +#: ../../Zotlabs/Module/Like.php:427 +#, php-format +msgid "%1$s abstains from a decision on %2$s's %3$s" msgstr "" -#: ../../Zotlabs/Module/Events.php:672 -msgid "Week" +#: ../../Zotlabs/Module/Like.php:429 +#, php-format +msgid "%1$s is attending %2$s's %3$s" msgstr "" -#: ../../Zotlabs/Module/Events.php:673 -msgid "Day" +#: ../../Zotlabs/Module/Like.php:431 +#, php-format +msgid "%1$s is not attending %2$s's %3$s" msgstr "" -#: ../../Zotlabs/Module/Events.php:676 ../../Zotlabs/Module/Cal.php:341 -msgid "Today" +#: ../../Zotlabs/Module/Like.php:433 +#, php-format +msgid "%1$s may attend %2$s's %3$s" msgstr "" -#: ../../Zotlabs/Module/Events.php:707 -msgid "Event removed" +#: ../../Zotlabs/Module/Like.php:536 +msgid "Action completed." msgstr "" -#: ../../Zotlabs/Module/Events.php:710 -msgid "Failed to remove event" +#: ../../Zotlabs/Module/Like.php:537 +msgid "Thank you." msgstr "" #: ../../Zotlabs/Module/Bookmarks.php:53 @@ -1269,28 +1228,14 @@ msgstr "" msgid "My Connections Bookmarks" msgstr "" -#: ../../Zotlabs/Module/Editpost.php:24 ../../Zotlabs/Module/Editlayout.php:79 -#: ../../Zotlabs/Module/Editwebpage.php:80 -#: ../../Zotlabs/Module/Editblock.php:79 ../../Zotlabs/Module/Editblock.php:95 -msgid "Item not found" -msgstr "" - -#: ../../Zotlabs/Module/Editpost.php:35 -msgid "Item is not editable" -msgstr "" - -#: ../../Zotlabs/Module/Editpost.php:106 ../../Zotlabs/Module/Rpost.php:134 -msgid "Edit post" -msgstr "" - #: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:222 -#: ../../include/nav.php:92 ../../include/conversation.php:1647 +#: ../../include/conversation.php:1647 ../../include/nav.php:92 msgid "Photos" msgstr "" #: ../../Zotlabs/Module/Fbrowser.php:66 ../../Zotlabs/Module/Fbrowser.php:88 -#: ../../Zotlabs/Module/Admin.php:1406 ../../Zotlabs/Module/Settings.php:645 -#: ../../Zotlabs/Module/Settings.php:671 ../../Zotlabs/Module/Tagrm.php:15 +#: ../../Zotlabs/Module/Settings.php:645 ../../Zotlabs/Module/Settings.php:671 +#: ../../Zotlabs/Module/Admin.php:1406 ../../Zotlabs/Module/Tagrm.php:15 #: ../../Zotlabs/Module/Tagrm.php:138 ../../Zotlabs/Module/Wiki.php:166 #: ../../Zotlabs/Module/Wiki.php:202 ../../include/conversation.php:1235 #: ../../include/conversation.php:1274 @@ -1301,8 +1246,8 @@ msgstr "" msgid "Invalid item." msgstr "" -#: ../../Zotlabs/Module/Page.php:56 ../../Zotlabs/Module/Cal.php:62 -#: ../../Zotlabs/Module/Block.php:43 ../../Zotlabs/Module/Wall_upload.php:33 +#: ../../Zotlabs/Module/Page.php:56 ../../Zotlabs/Module/Block.php:43 +#: ../../Zotlabs/Module/Cal.php:62 ../../Zotlabs/Module/Wall_upload.php:33 msgid "Channel not found." msgstr "" @@ -1331,6 +1276,13 @@ msgstr "" msgid "Save" msgstr "" +#: ../../Zotlabs/Module/Display.php:40 ../../Zotlabs/Module/Filestorage.php:32 +#: ../../Zotlabs/Module/Admin.php:164 ../../Zotlabs/Module/Admin.php:1255 +#: ../../Zotlabs/Module/Admin.php:1561 ../../Zotlabs/Module/Thing.php:89 +#: ../../Zotlabs/Module/Viewsrc.php:24 ../../include/items.php:3369 +msgid "Item not found." +msgstr "" + #: ../../Zotlabs/Module/Connections.php:56 #: ../../Zotlabs/Module/Connections.php:161 #: ../../Zotlabs/Module/Connections.php:242 @@ -1361,6 +1313,12 @@ msgstr "" msgid "New" msgstr "" +#: ../../Zotlabs/Module/Connections.php:92 +#: ../../Zotlabs/Module/Connections.php:107 +#: ../../Zotlabs/Module/Connedit.php:624 ../../include/widgets.php:497 +msgid "All" +msgstr "" + #: ../../Zotlabs/Module/Connections.php:138 msgid "New Connections" msgstr "" @@ -1440,6 +1398,12 @@ msgstr "" msgid "Ignore connection" msgstr "" +#: ../../Zotlabs/Module/Connections.php:277 +#: ../../Zotlabs/Module/Connedit.php:578 +#: ../../Zotlabs/Module/Notifications.php:55 +msgid "Ignore" +msgstr "" + #: ../../Zotlabs/Module/Connections.php:278 msgid "Recent activity" msgstr "" @@ -1450,9 +1414,9 @@ msgid "Connections" msgstr "" #: ../../Zotlabs/Module/Connections.php:306 ../../Zotlabs/Module/Search.php:44 -#: ../../Zotlabs/Lib/Apps.php:230 ../../include/nav.php:167 -#: ../../include/text.php:925 ../../include/text.php:937 -#: ../../include/acl_selectors.php:274 +#: ../../Zotlabs/Lib/Apps.php:230 ../../include/acl_selectors.php:274 +#: ../../include/nav.php:167 ../../include/text.php:925 +#: ../../include/text.php:937 msgid "Search" msgstr "" @@ -1543,8 +1507,8 @@ msgid "Upload Cover Photo" msgstr "" #: ../../Zotlabs/Module/Cover_photo.php:361 -#: ../../Zotlabs/Module/Profile_photo.php:396 #: ../../Zotlabs/Module/Settings.php:1080 +#: ../../Zotlabs/Module/Profile_photo.php:396 msgid "or" msgstr "" @@ -1573,202 +1537,168 @@ msgstr "" msgid "Done Editing" msgstr "" -#: ../../Zotlabs/Module/Impel.php:41 ../../include/bbcode.php:192 -msgid "webpage" -msgstr "" - -#: ../../Zotlabs/Module/Impel.php:46 ../../include/bbcode.php:198 -msgid "block" -msgstr "" - -#: ../../Zotlabs/Module/Impel.php:51 ../../include/bbcode.php:195 -msgid "layout" -msgstr "" - -#: ../../Zotlabs/Module/Impel.php:58 ../../include/bbcode.php:201 -msgid "menu" -msgstr "" - -#: ../../Zotlabs/Module/Impel.php:187 -#, php-format -msgid "%s element installed" +#: ../../Zotlabs/Module/Mail.php:38 +msgid "Unable to lookup recipient." msgstr "" -#: ../../Zotlabs/Module/Impel.php:190 -#, php-format -msgid "%s element installation failed" +#: ../../Zotlabs/Module/Mail.php:45 +msgid "Unable to communicate with requested channel." msgstr "" -#: ../../Zotlabs/Module/Cal.php:69 -msgid "Permissions denied." +#: ../../Zotlabs/Module/Mail.php:52 +msgid "Cannot verify requested channel." msgstr "" -#: ../../Zotlabs/Module/Cal.php:337 -msgid "Import" +#: ../../Zotlabs/Module/Mail.php:70 +msgid "Selected channel has private message restrictions. Send failed." msgstr "" -#: ../../Zotlabs/Module/Dirsearch.php:25 ../../Zotlabs/Module/Regdir.php:49 -msgid "This site is not a directory server" +#: ../../Zotlabs/Module/Mail.php:135 +msgid "Messages" msgstr "" -#: ../../Zotlabs/Module/Dirsearch.php:33 -msgid "This directory server requires an access token" +#: ../../Zotlabs/Module/Mail.php:170 +msgid "Message recalled." msgstr "" -#: ../../Zotlabs/Module/Chat.php:25 ../../Zotlabs/Module/Channel.php:28 -#: ../../Zotlabs/Module/Wiki.php:20 -msgid "You must be logged in to see this page." +#: ../../Zotlabs/Module/Mail.php:183 +msgid "Conversation removed." msgstr "" -#: ../../Zotlabs/Module/Chat.php:181 -msgid "Room not found" +#: ../../Zotlabs/Module/Mail.php:197 ../../Zotlabs/Module/Mail.php:306 +#: ../../Zotlabs/Module/Chat.php:205 ../../include/conversation.php:1181 +msgid "Please enter a link URL:" msgstr "" -#: ../../Zotlabs/Module/Chat.php:197 -msgid "Leave Room" +#: ../../Zotlabs/Module/Mail.php:198 ../../Zotlabs/Module/Mail.php:307 +msgid "Expires YYYY-MM-DD HH:MM" msgstr "" -#: ../../Zotlabs/Module/Chat.php:198 -msgid "Delete Room" +#: ../../Zotlabs/Module/Mail.php:226 +msgid "Requested channel is not in this network" msgstr "" -#: ../../Zotlabs/Module/Chat.php:199 -msgid "I am away right now" +#: ../../Zotlabs/Module/Mail.php:234 +msgid "Send Private Message" msgstr "" -#: ../../Zotlabs/Module/Chat.php:200 -msgid "I am online" +#: ../../Zotlabs/Module/Mail.php:235 ../../Zotlabs/Module/Mail.php:360 +msgid "To:" msgstr "" -#: ../../Zotlabs/Module/Chat.php:202 -msgid "Bookmark this room" +#: ../../Zotlabs/Module/Mail.php:238 ../../Zotlabs/Module/Mail.php:362 +msgid "Subject:" msgstr "" -#: ../../Zotlabs/Module/Chat.php:205 ../../Zotlabs/Module/Mail.php:197 -#: ../../Zotlabs/Module/Mail.php:306 ../../include/conversation.php:1181 -msgid "Please enter a link URL:" +#: ../../Zotlabs/Module/Mail.php:241 ../../Zotlabs/Module/Invite.php:135 +msgid "Your message:" msgstr "" -#: ../../Zotlabs/Module/Chat.php:206 ../../Zotlabs/Module/Mail.php:250 -#: ../../Zotlabs/Module/Mail.php:375 ../../Zotlabs/Lib/ThreadItem.php:722 -#: ../../include/conversation.php:1271 -msgid "Encrypt text" +#: ../../Zotlabs/Module/Mail.php:243 ../../Zotlabs/Module/Mail.php:368 +#: ../../include/conversation.php:1231 +msgid "Attach file" msgstr "" -#: ../../Zotlabs/Module/Chat.php:207 ../../Zotlabs/Module/Editwebpage.php:146 #: ../../Zotlabs/Module/Mail.php:244 ../../Zotlabs/Module/Mail.php:369 -#: ../../Zotlabs/Module/Editblock.php:111 ../../include/conversation.php:1146 +#: ../../Zotlabs/Module/Editblock.php:111 +#: ../../Zotlabs/Module/Editwebpage.php:146 ../../Zotlabs/Module/Chat.php:207 +#: ../../include/conversation.php:1146 msgid "Insert web link" msgstr "" -#: ../../Zotlabs/Module/Chat.php:218 -msgid "Feature disabled." -msgstr "" - -#: ../../Zotlabs/Module/Chat.php:232 -msgid "New Chatroom" -msgstr "" - -#: ../../Zotlabs/Module/Chat.php:233 -msgid "Chatroom name" -msgstr "" - -#: ../../Zotlabs/Module/Chat.php:234 -msgid "Expiration of chats (minutes)" -msgstr "" - -#: ../../Zotlabs/Module/Chat.php:235 ../../Zotlabs/Module/Filestorage.php:152 -#: ../../Zotlabs/Module/Photos.php:669 ../../Zotlabs/Module/Photos.php:1043 -#: ../../Zotlabs/Module/Thing.php:313 ../../Zotlabs/Module/Thing.php:359 -#: ../../include/acl_selectors.php:281 -msgid "Permissions" -msgstr "" - -#: ../../Zotlabs/Module/Chat.php:246 -#, php-format -msgid "%1$s's Chatrooms" +#: ../../Zotlabs/Module/Mail.php:245 +msgid "Send" msgstr "" -#: ../../Zotlabs/Module/Chat.php:251 -msgid "No chatrooms available" +#: ../../Zotlabs/Module/Mail.php:248 ../../Zotlabs/Module/Mail.php:373 +#: ../../include/conversation.php:1266 +msgid "Set expiration date" msgstr "" -#: ../../Zotlabs/Module/Chat.php:252 ../../Zotlabs/Module/Profiles.php:778 -#: ../../Zotlabs/Module/Manage.php:143 -msgid "Create New" +#: ../../Zotlabs/Module/Mail.php:250 ../../Zotlabs/Module/Mail.php:375 +#: ../../Zotlabs/Module/Chat.php:206 ../../Zotlabs/Lib/ThreadItem.php:722 +#: ../../include/conversation.php:1271 +msgid "Encrypt text" msgstr "" -#: ../../Zotlabs/Module/Chat.php:255 -msgid "Expiration" +#: ../../Zotlabs/Module/Mail.php:332 +msgid "Delete message" msgstr "" -#: ../../Zotlabs/Module/Chat.php:256 -msgid "min" +#: ../../Zotlabs/Module/Mail.php:333 +msgid "Delivery report" msgstr "" -#: ../../Zotlabs/Module/Dreport.php:44 -msgid "Invalid message" +#: ../../Zotlabs/Module/Mail.php:334 +msgid "Recall message" msgstr "" -#: ../../Zotlabs/Module/Dreport.php:76 -msgid "no results" +#: ../../Zotlabs/Module/Mail.php:336 +msgid "Message has been recalled." msgstr "" -#: ../../Zotlabs/Module/Dreport.php:91 -msgid "channel sync processed" +#: ../../Zotlabs/Module/Mail.php:353 +msgid "Delete Conversation" msgstr "" -#: ../../Zotlabs/Module/Dreport.php:95 -msgid "queued" +#: ../../Zotlabs/Module/Mail.php:355 +msgid "" +"No secure communications available. You <strong>may</strong> be able to " +"respond from the sender's profile page." msgstr "" -#: ../../Zotlabs/Module/Dreport.php:99 -msgid "posted" +#: ../../Zotlabs/Module/Mail.php:359 +msgid "Send Reply" msgstr "" -#: ../../Zotlabs/Module/Dreport.php:103 -msgid "accepted for delivery" +#: ../../Zotlabs/Module/Mail.php:364 +#, php-format +msgid "Your message for %s (%s):" msgstr "" -#: ../../Zotlabs/Module/Dreport.php:107 -msgid "updated" +#: ../../Zotlabs/Module/Channel.php:28 ../../Zotlabs/Module/Chat.php:25 +#: ../../Zotlabs/Module/Wiki.php:20 +msgid "You must be logged in to see this page." msgstr "" -#: ../../Zotlabs/Module/Dreport.php:110 -msgid "update ignored" +#: ../../Zotlabs/Module/Channel.php:40 +msgid "Posts and comments" msgstr "" -#: ../../Zotlabs/Module/Dreport.php:113 -msgid "permission denied" +#: ../../Zotlabs/Module/Channel.php:41 +msgid "Only posts" msgstr "" -#: ../../Zotlabs/Module/Dreport.php:117 -msgid "recipient not found" +#: ../../Zotlabs/Module/Channel.php:101 +msgid "Insufficient permissions. Request redirected to profile page." msgstr "" -#: ../../Zotlabs/Module/Dreport.php:120 -msgid "mail recalled" +#: ../../Zotlabs/Module/Dirsearch.php:25 ../../Zotlabs/Module/Regdir.php:49 +msgid "This site is not a directory server" msgstr "" -#: ../../Zotlabs/Module/Dreport.php:123 -msgid "duplicate mail received" +#: ../../Zotlabs/Module/Dirsearch.php:33 +msgid "This directory server requires an access token" msgstr "" -#: ../../Zotlabs/Module/Dreport.php:126 -msgid "mail delivered" +#: ../../Zotlabs/Module/Editblock.php:79 ../../Zotlabs/Module/Editblock.php:95 +#: ../../Zotlabs/Module/Editlayout.php:79 +#: ../../Zotlabs/Module/Editwebpage.php:80 +#: ../../Zotlabs/Module/Editpost.php:24 +msgid "Item not found" msgstr "" -#: ../../Zotlabs/Module/Dreport.php:146 -#, php-format -msgid "Delivery report for %1$s" +#: ../../Zotlabs/Module/Editblock.php:108 ../../Zotlabs/Module/Blocks.php:97 +#: ../../Zotlabs/Module/Blocks.php:155 +msgid "Block Name" msgstr "" -#: ../../Zotlabs/Module/Dreport.php:149 -msgid "Options" +#: ../../Zotlabs/Module/Editblock.php:124 ../../include/conversation.php:1243 +msgid "Title (optional)" msgstr "" -#: ../../Zotlabs/Module/Dreport.php:150 -msgid "Redeliver" +#: ../../Zotlabs/Module/Editblock.php:133 +msgid "Edit Block" msgstr "" #: ../../Zotlabs/Module/Editlayout.php:127 @@ -1870,10 +1800,22 @@ msgstr "" msgid "Name of app" msgstr "" +#: ../../Zotlabs/Module/Appman.php:115 ../../Zotlabs/Module/Appman.php:116 +#: ../../Zotlabs/Module/Events.php:448 ../../Zotlabs/Module/Events.php:453 +#: ../../Zotlabs/Module/Profiles.php:709 ../../Zotlabs/Module/Profiles.php:713 +#: ../../include/datetime.php:245 +msgid "Required" +msgstr "" + #: ../../Zotlabs/Module/Appman.php:116 msgid "Location (URL) of app" msgstr "" +#: ../../Zotlabs/Module/Appman.php:117 ../../Zotlabs/Module/Events.php:461 +#: ../../Zotlabs/Module/Rbmark.php:101 +msgid "Description" +msgstr "" + #: ../../Zotlabs/Module/Appman.php:118 msgid "Photo icon URL" msgstr "" @@ -1949,12 +1891,22 @@ msgstr "" msgid "Activate the Firefox $Projectname provider" msgstr "" -#: ../../Zotlabs/Module/Acl.php:312 -msgid "network" +#: ../../Zotlabs/Module/Home.php:74 ../../Zotlabs/Module/Home.php:82 +#: ../../Zotlabs/Module/Siteinfo.php:48 +msgid "$Projectname" msgstr "" -#: ../../Zotlabs/Module/Acl.php:322 -msgid "RSS" +#: ../../Zotlabs/Module/Home.php:92 +#, php-format +msgid "Welcome to %s" +msgstr "" + +#: ../../Zotlabs/Module/Lockview.php:75 +msgid "Remote privacy information not available." +msgstr "" + +#: ../../Zotlabs/Module/Lockview.php:96 +msgid "Visible to:" msgstr "" #: ../../Zotlabs/Module/Filestorage.php:87 @@ -2001,839 +1953,1206 @@ msgstr "" msgid "Notify your contacts about this file" msgstr "" -#: ../../Zotlabs/Module/Layouts.php:183 ../../include/text.php:2240 -msgid "Layouts" +#: ../../Zotlabs/Module/Probe.php:28 ../../Zotlabs/Module/Probe.php:32 +#, php-format +msgid "Fetching URL returns error: %1$s" msgstr "" -#: ../../Zotlabs/Module/Layouts.php:185 -msgid "Comanche page description language help" +#: ../../Zotlabs/Module/Events.php:25 +msgid "Calendar entries imported." msgstr "" -#: ../../Zotlabs/Module/Layouts.php:189 -msgid "Layout Description" +#: ../../Zotlabs/Module/Events.php:27 +msgid "No calendar entries found." msgstr "" -#: ../../Zotlabs/Module/Layouts.php:190 ../../Zotlabs/Module/Menu.php:114 -#: ../../Zotlabs/Module/Blocks.php:157 ../../Zotlabs/Module/Webpages.php:205 -#: ../../include/page_widgets.php:47 -msgid "Created" +#: ../../Zotlabs/Module/Events.php:104 +msgid "Event can not end before it has started." msgstr "" -#: ../../Zotlabs/Module/Layouts.php:191 ../../Zotlabs/Module/Menu.php:115 -#: ../../Zotlabs/Module/Blocks.php:158 ../../Zotlabs/Module/Webpages.php:206 -#: ../../include/page_widgets.php:48 -msgid "Edited" +#: ../../Zotlabs/Module/Events.php:106 ../../Zotlabs/Module/Events.php:115 +#: ../../Zotlabs/Module/Events.php:135 +msgid "Unable to generate preview." msgstr "" -#: ../../Zotlabs/Module/Layouts.php:193 ../../Zotlabs/Module/Photos.php:1070 -#: ../../Zotlabs/Module/Blocks.php:161 ../../Zotlabs/Module/Webpages.php:195 -#: ../../include/conversation.php:1219 -msgid "Share" +#: ../../Zotlabs/Module/Events.php:113 +msgid "Event title and start time are required." msgstr "" -#: ../../Zotlabs/Module/Layouts.php:194 -msgid "Download PDL file" +#: ../../Zotlabs/Module/Events.php:133 ../../Zotlabs/Module/Events.php:258 +msgid "Event not found." msgstr "" -#: ../../Zotlabs/Module/Like.php:19 -msgid "Like/Dislike" +#: ../../Zotlabs/Module/Events.php:448 +msgid "Edit event title" msgstr "" -#: ../../Zotlabs/Module/Like.php:24 -msgid "This action is restricted to members." +#: ../../Zotlabs/Module/Events.php:448 +msgid "Event title" msgstr "" -#: ../../Zotlabs/Module/Like.php:25 +#: ../../Zotlabs/Module/Events.php:450 +msgid "Categories (comma-separated list)" +msgstr "" + +#: ../../Zotlabs/Module/Events.php:451 +msgid "Edit Category" +msgstr "" + +#: ../../Zotlabs/Module/Events.php:451 +msgid "Category" +msgstr "" + +#: ../../Zotlabs/Module/Events.php:454 +msgid "Edit start date and time" +msgstr "" + +#: ../../Zotlabs/Module/Events.php:454 +msgid "Start date and time" +msgstr "" + +#: ../../Zotlabs/Module/Events.php:455 ../../Zotlabs/Module/Events.php:458 +msgid "Finish date and time are not known or not relevant" +msgstr "" + +#: ../../Zotlabs/Module/Events.php:457 +msgid "Edit finish date and time" +msgstr "" + +#: ../../Zotlabs/Module/Events.php:457 +msgid "Finish date and time" +msgstr "" + +#: ../../Zotlabs/Module/Events.php:459 ../../Zotlabs/Module/Events.php:460 +msgid "Adjust for viewer timezone" +msgstr "" + +#: ../../Zotlabs/Module/Events.php:459 msgid "" -"Please <a href=\"rmagic\">login with your $Projectname ID</a> or <a href=" -"\"register\">register as a new $Projectname member</a> to continue." +"Important for events that happen in a particular place. Not practical for " +"global holidays." msgstr "" -#: ../../Zotlabs/Module/Like.php:105 ../../Zotlabs/Module/Like.php:131 -#: ../../Zotlabs/Module/Like.php:169 -msgid "Invalid request." +#: ../../Zotlabs/Module/Events.php:461 +msgid "Edit Description" msgstr "" -#: ../../Zotlabs/Module/Like.php:117 ../../include/conversation.php:126 -msgid "channel" +#: ../../Zotlabs/Module/Events.php:463 +msgid "Edit Location" msgstr "" -#: ../../Zotlabs/Module/Like.php:146 -msgid "thing" +#: ../../Zotlabs/Module/Events.php:463 ../../Zotlabs/Module/Locs.php:117 +#: ../../Zotlabs/Module/Profiles.php:477 ../../Zotlabs/Module/Profiles.php:698 +#: ../../Zotlabs/Module/Pubsites.php:41 ../../include/js_strings.php:25 +msgid "Location" msgstr "" -#: ../../Zotlabs/Module/Like.php:192 -msgid "Channel unavailable." +#: ../../Zotlabs/Module/Events.php:466 ../../Zotlabs/Module/Events.php:468 +msgid "Share this event" msgstr "" -#: ../../Zotlabs/Module/Like.php:240 -msgid "Previous action reversed." +#: ../../Zotlabs/Module/Events.php:470 ../../include/conversation.php:1247 +msgid "Permission settings" msgstr "" -#: ../../Zotlabs/Module/Like.php:370 ../../Zotlabs/Module/Subthread.php:87 -#: ../../Zotlabs/Module/Tagger.php:47 ../../include/conversation.php:120 -#: ../../include/text.php:1921 -msgid "photo" +#: ../../Zotlabs/Module/Events.php:475 +msgid "Advanced Options" msgstr "" -#: ../../Zotlabs/Module/Like.php:370 ../../Zotlabs/Module/Subthread.php:87 -#: ../../include/conversation.php:148 ../../include/text.php:1927 -msgid "status" +#: ../../Zotlabs/Module/Events.php:587 ../../Zotlabs/Module/Cal.php:259 +msgid "l, F j" msgstr "" -#: ../../Zotlabs/Module/Like.php:419 ../../include/conversation.php:164 -#, php-format -msgid "%1$s likes %2$s's %3$s" +#: ../../Zotlabs/Module/Events.php:609 +msgid "Edit event" msgstr "" -#: ../../Zotlabs/Module/Like.php:421 ../../include/conversation.php:167 -#, php-format -msgid "%1$s doesn't like %2$s's %3$s" +#: ../../Zotlabs/Module/Events.php:611 +msgid "Delete event" msgstr "" -#: ../../Zotlabs/Module/Like.php:423 -#, php-format -msgid "%1$s agrees with %2$s's %3$s" +#: ../../Zotlabs/Module/Events.php:636 ../../Zotlabs/Module/Cal.php:308 +#: ../../include/text.php:1712 +msgid "Link to Source" msgstr "" -#: ../../Zotlabs/Module/Like.php:425 -#, php-format -msgid "%1$s doesn't agree with %2$s's %3$s" +#: ../../Zotlabs/Module/Events.php:645 +msgid "calendar" msgstr "" -#: ../../Zotlabs/Module/Like.php:427 -#, php-format -msgid "%1$s abstains from a decision on %2$s's %3$s" +#: ../../Zotlabs/Module/Events.php:664 ../../Zotlabs/Module/Cal.php:331 +msgid "Edit Event" msgstr "" -#: ../../Zotlabs/Module/Like.php:429 +#: ../../Zotlabs/Module/Events.php:664 ../../Zotlabs/Module/Cal.php:331 +msgid "Create Event" +msgstr "" + +#: ../../Zotlabs/Module/Events.php:667 ../../Zotlabs/Module/Cal.php:334 +msgid "Export" +msgstr "" + +#: ../../Zotlabs/Module/Events.php:670 ../../Zotlabs/Module/Blocks.php:166 +#: ../../Zotlabs/Module/Layouts.php:197 ../../Zotlabs/Module/Pubsites.php:47 +#: ../../Zotlabs/Module/Webpages.php:200 ../../include/page_widgets.php:42 +msgid "View" +msgstr "" + +#: ../../Zotlabs/Module/Events.php:671 +msgid "Month" +msgstr "" + +#: ../../Zotlabs/Module/Events.php:672 +msgid "Week" +msgstr "" + +#: ../../Zotlabs/Module/Events.php:673 +msgid "Day" +msgstr "" + +#: ../../Zotlabs/Module/Events.php:676 ../../Zotlabs/Module/Cal.php:341 +msgid "Today" +msgstr "" + +#: ../../Zotlabs/Module/Events.php:707 +msgid "Event removed" +msgstr "" + +#: ../../Zotlabs/Module/Events.php:710 +msgid "Failed to remove event" +msgstr "" + +#: ../../Zotlabs/Module/Manage.php:136 +#: ../../Zotlabs/Module/New_channel.php:121 #, php-format -msgid "%1$s is attending %2$s's %3$s" +msgid "You have created %1$.0f of %2$.0f allowed channels." msgstr "" -#: ../../Zotlabs/Module/Like.php:431 +#: ../../Zotlabs/Module/Manage.php:143 +msgid "Create a new channel" +msgstr "" + +#: ../../Zotlabs/Module/Manage.php:143 ../../Zotlabs/Module/Profiles.php:778 +#: ../../Zotlabs/Module/Chat.php:252 +msgid "Create New" +msgstr "" + +#: ../../Zotlabs/Module/Manage.php:164 ../../Zotlabs/Lib/Apps.php:214 +#: ../../include/nav.php:208 +msgid "Channel Manager" +msgstr "" + +#: ../../Zotlabs/Module/Manage.php:165 +msgid "Current Channel" +msgstr "" + +#: ../../Zotlabs/Module/Manage.php:167 +msgid "Switch to one of your channels by selecting it." +msgstr "" + +#: ../../Zotlabs/Module/Manage.php:168 +msgid "Default Channel" +msgstr "" + +#: ../../Zotlabs/Module/Manage.php:169 +msgid "Make Default" +msgstr "" + +#: ../../Zotlabs/Module/Manage.php:172 #, php-format -msgid "%1$s is not attending %2$s's %3$s" +msgid "%d new messages" msgstr "" -#: ../../Zotlabs/Module/Like.php:433 +#: ../../Zotlabs/Module/Manage.php:173 #, php-format -msgid "%1$s may attend %2$s's %3$s" +msgid "%d new introductions" msgstr "" -#: ../../Zotlabs/Module/Like.php:536 -msgid "Action completed." +#: ../../Zotlabs/Module/Manage.php:175 +msgid "Delegated Channel" msgstr "" -#: ../../Zotlabs/Module/Like.php:537 -msgid "Thank you." +#: ../../Zotlabs/Module/Connedit.php:80 +msgid "Could not access contact record." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:24 ../../Zotlabs/Module/Profiles.php:189 -#: ../../Zotlabs/Module/Profiles.php:246 ../../Zotlabs/Module/Profiles.php:625 -msgid "Profile not found." +#: ../../Zotlabs/Module/Connedit.php:104 +msgid "Could not locate selected profile." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:44 -msgid "Profile deleted." +#: ../../Zotlabs/Module/Connedit.php:248 +msgid "Connection updated." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:68 ../../Zotlabs/Module/Profiles.php:104 -msgid "Profile-" +#: ../../Zotlabs/Module/Connedit.php:250 +msgid "Failed to update connection record." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:89 ../../Zotlabs/Module/Profiles.php:132 -msgid "New profile created." +#: ../../Zotlabs/Module/Connedit.php:300 +msgid "is now connected to" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:110 -msgid "Profile unavailable to clone." +#: ../../Zotlabs/Module/Connedit.php:435 +msgid "Could not access address book record." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:151 -msgid "Profile unavailable to export." +#: ../../Zotlabs/Module/Connedit.php:455 +msgid "Refresh failed - channel is currently unavailable." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:256 -msgid "Profile Name is required." +#: ../../Zotlabs/Module/Connedit.php:470 ../../Zotlabs/Module/Connedit.php:479 +#: ../../Zotlabs/Module/Connedit.php:488 ../../Zotlabs/Module/Connedit.php:497 +#: ../../Zotlabs/Module/Connedit.php:510 +msgid "Unable to set address book parameters." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:427 -msgid "Marital Status" +#: ../../Zotlabs/Module/Connedit.php:533 +msgid "Connection has been removed." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:431 -msgid "Romantic Partner" +#: ../../Zotlabs/Module/Connedit.php:549 ../../Zotlabs/Lib/Apps.php:221 +#: ../../include/conversation.php:957 ../../include/nav.php:86 +msgid "View Profile" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:435 ../../Zotlabs/Module/Profiles.php:736 -msgid "Likes" +#: ../../Zotlabs/Module/Connedit.php:552 +#, php-format +msgid "View %s's profile" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:439 ../../Zotlabs/Module/Profiles.php:737 -msgid "Dislikes" +#: ../../Zotlabs/Module/Connedit.php:556 +msgid "Refresh Permissions" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:443 ../../Zotlabs/Module/Profiles.php:744 -msgid "Work/Employment" +#: ../../Zotlabs/Module/Connedit.php:559 +msgid "Fetch updated permissions" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:446 -msgid "Religion" +#: ../../Zotlabs/Module/Connedit.php:563 +msgid "Recent Activity" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:450 -msgid "Political Views" +#: ../../Zotlabs/Module/Connedit.php:566 +msgid "View recent posts and comments" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:458 -msgid "Sexual Preference" +#: ../../Zotlabs/Module/Connedit.php:570 ../../Zotlabs/Module/Admin.php:1041 +msgid "Unblock" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:462 -msgid "Homepage" +#: ../../Zotlabs/Module/Connedit.php:570 ../../Zotlabs/Module/Admin.php:1040 +msgid "Block" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:466 -msgid "Interests" +#: ../../Zotlabs/Module/Connedit.php:573 +msgid "Block (or Unblock) all communications with this connection" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:470 ../../Zotlabs/Module/Locs.php:118 -#: ../../Zotlabs/Module/Admin.php:1224 -msgid "Address" +#: ../../Zotlabs/Module/Connedit.php:574 +msgid "This connection is blocked!" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:560 -msgid "Profile updated." +#: ../../Zotlabs/Module/Connedit.php:578 +msgid "Unignore" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:644 -msgid "Hide your connections list from viewers of this profile" +#: ../../Zotlabs/Module/Connedit.php:581 +msgid "Ignore (or Unignore) all inbound communications from this connection" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:686 -msgid "Edit Profile Details" +#: ../../Zotlabs/Module/Connedit.php:582 +msgid "This connection is ignored!" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:688 -msgid "View this profile" +#: ../../Zotlabs/Module/Connedit.php:586 +msgid "Unarchive" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:689 ../../Zotlabs/Module/Profiles.php:771 -#: ../../include/channel.php:998 -msgid "Edit visibility" +#: ../../Zotlabs/Module/Connedit.php:586 +msgid "Archive" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:690 -msgid "Profile Tools" +#: ../../Zotlabs/Module/Connedit.php:589 +msgid "" +"Archive (or Unarchive) this connection - mark channel dead but keep content" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:691 -msgid "Change cover photo" +#: ../../Zotlabs/Module/Connedit.php:590 +msgid "This connection is archived!" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:692 ../../include/channel.php:969 -msgid "Change profile photo" +#: ../../Zotlabs/Module/Connedit.php:594 +msgid "Unhide" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:693 -msgid "Create a new profile using these settings" +#: ../../Zotlabs/Module/Connedit.php:594 +msgid "Hide" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:694 -msgid "Clone this profile" +#: ../../Zotlabs/Module/Connedit.php:597 +msgid "Hide or Unhide this connection from your other connections" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:695 -msgid "Delete this profile" +#: ../../Zotlabs/Module/Connedit.php:598 +msgid "This connection is hidden!" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:696 -msgid "Add profile things" +#: ../../Zotlabs/Module/Connedit.php:605 +msgid "Delete this connection" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:697 ../../include/conversation.php:1541 -#: ../../include/widgets.php:105 -msgid "Personal" +#: ../../Zotlabs/Module/Connedit.php:620 ../../include/widgets.php:493 +msgid "Me" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:699 -msgid "Relation" +#: ../../Zotlabs/Module/Connedit.php:621 ../../include/widgets.php:494 +msgid "Family" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:700 ../../include/datetime.php:48 -msgid "Miscellaneous" +#: ../../Zotlabs/Module/Connedit.php:622 ../../Zotlabs/Module/Settings.php:391 +#: ../../Zotlabs/Module/Settings.php:395 ../../Zotlabs/Module/Settings.php:396 +#: ../../Zotlabs/Module/Settings.php:399 ../../Zotlabs/Module/Settings.php:410 +#: ../../include/channel.php:402 ../../include/channel.php:403 +#: ../../include/channel.php:410 ../../include/selectors.php:123 +#: ../../include/widgets.php:495 +msgid "Friends" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:702 -msgid "Import profile from file" +#: ../../Zotlabs/Module/Connedit.php:623 ../../include/widgets.php:496 +msgid "Acquaintances" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:703 -msgid "Export profile to file" +#: ../../Zotlabs/Module/Connedit.php:685 +msgid "Approve this connection" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:704 -msgid "Your gender" +#: ../../Zotlabs/Module/Connedit.php:685 +msgid "Accept connection to allow communication" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:705 -msgid "Marital status" +#: ../../Zotlabs/Module/Connedit.php:690 +msgid "Set Affinity" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:706 -msgid "Sexual preference" +#: ../../Zotlabs/Module/Connedit.php:693 +msgid "Set Profile" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:709 -msgid "Profile name" +#: ../../Zotlabs/Module/Connedit.php:696 +msgid "Set Affinity & Profile" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:711 -msgid "This is your default profile." +#: ../../Zotlabs/Module/Connedit.php:745 +msgid "none" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:713 -msgid "Your full name" +#: ../../Zotlabs/Module/Connedit.php:749 ../../include/widgets.php:623 +msgid "Connection Default Permissions" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:714 -msgid "Title/Description" +#: ../../Zotlabs/Module/Connedit.php:749 ../../include/items.php:3935 +#, php-format +msgid "Connection: %s" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:717 -msgid "Street address" +#: ../../Zotlabs/Module/Connedit.php:750 +msgid "Apply these permissions automatically" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:718 -msgid "Locality/City" +#: ../../Zotlabs/Module/Connedit.php:750 +msgid "Connection requests will be approved without your interaction" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:719 -msgid "Region/State" +#: ../../Zotlabs/Module/Connedit.php:752 +msgid "This connection's primary address is" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:720 -msgid "Postal/Zip code" +#: ../../Zotlabs/Module/Connedit.php:753 +msgid "Available locations:" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:721 -msgid "Country" +#: ../../Zotlabs/Module/Connedit.php:757 +msgid "" +"The permissions indicated on this page will be applied to all new " +"connections." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:726 -msgid "Who (if applicable)" +#: ../../Zotlabs/Module/Connedit.php:758 +msgid "Connection Tools" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:726 -msgid "Examples: cathy123, Cathy Williams, cathy@example.com" +#: ../../Zotlabs/Module/Connedit.php:760 +msgid "Slide to adjust your degree of friendship" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:727 -msgid "Since (date)" +#: ../../Zotlabs/Module/Connedit.php:761 ../../Zotlabs/Module/Rate.php:159 +#: ../../include/js_strings.php:20 +msgid "Rating" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:730 -msgid "Tell us about yourself" +#: ../../Zotlabs/Module/Connedit.php:762 +msgid "Slide to adjust your rating" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:732 -msgid "Hometown" +#: ../../Zotlabs/Module/Connedit.php:763 ../../Zotlabs/Module/Connedit.php:768 +msgid "Optionally explain your rating" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:733 -msgid "Political views" +#: ../../Zotlabs/Module/Connedit.php:765 +msgid "Custom Filter" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:734 -msgid "Religious views" +#: ../../Zotlabs/Module/Connedit.php:766 +msgid "Only import posts with this text" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:735 -msgid "Keywords used in directory listings" +#: ../../Zotlabs/Module/Connedit.php:766 ../../Zotlabs/Module/Connedit.php:767 +msgid "" +"words one per line or #tags or /patterns/ or lang=xx, leave blank to import " +"all posts" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:735 -msgid "Example: fishing photography software" +#: ../../Zotlabs/Module/Connedit.php:767 +msgid "Do not import posts with this text" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:738 -msgid "Musical interests" +#: ../../Zotlabs/Module/Connedit.php:769 +msgid "This information is public!" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:739 -msgid "Books, literature" +#: ../../Zotlabs/Module/Connedit.php:774 +msgid "Connection Pending Approval" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:740 -msgid "Television" +#: ../../Zotlabs/Module/Connedit.php:777 +msgid "inherited" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:741 -msgid "Film/Dance/Culture/Entertainment" +#: ../../Zotlabs/Module/Connedit.php:779 +#, php-format +msgid "" +"Please choose the profile you would like to display to %s when viewing your " +"profile securely." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:742 -msgid "Hobbies/Interests" +#: ../../Zotlabs/Module/Connedit.php:781 +msgid "Their Settings" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:743 -msgid "Love/Romance" +#: ../../Zotlabs/Module/Connedit.php:782 +msgid "My Settings" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:745 -msgid "School/Education" +#: ../../Zotlabs/Module/Connedit.php:784 +msgid "Individual Permissions" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:746 -msgid "Contact information and social networks" +#: ../../Zotlabs/Module/Connedit.php:785 +msgid "" +"Some permissions may be inherited from your channel's <a href=\"settings" +"\"><strong>privacy settings</strong></a>, which have higher priority than " +"individual settings. You can <strong>not</strong> change those settings here." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:747 -msgid "My other channels" +#: ../../Zotlabs/Module/Connedit.php:786 +msgid "" +"Some permissions may be inherited from your channel's <a href=\"settings" +"\"><strong>privacy settings</strong></a>, which have higher priority than " +"individual settings. You can change those settings here but they wont have " +"any impact unless the inherited setting changes." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:767 ../../include/channel.php:994 -msgid "Profile Image" +#: ../../Zotlabs/Module/Connedit.php:787 +msgid "Last update:" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:777 ../../include/nav.php:88 -#: ../../include/channel.php:976 -msgid "Edit Profiles" +#: ../../Zotlabs/Module/Editpost.php:35 +msgid "Item is not editable" msgstr "" -#: ../../Zotlabs/Module/Import.php:33 -#, php-format -msgid "Your service plan only allows %d channels." +#: ../../Zotlabs/Module/Editpost.php:106 ../../Zotlabs/Module/Rpost.php:134 +msgid "Edit post" msgstr "" -#: ../../Zotlabs/Module/Import.php:71 ../../Zotlabs/Module/Import_items.php:42 -msgid "Nothing to import." +#: ../../Zotlabs/Module/Settings.php:64 +msgid "Name is required" msgstr "" -#: ../../Zotlabs/Module/Import.php:95 ../../Zotlabs/Module/Import_items.php:66 -msgid "Unable to download data from old server" +#: ../../Zotlabs/Module/Settings.php:68 +msgid "Key and Secret are required" msgstr "" -#: ../../Zotlabs/Module/Import.php:101 -#: ../../Zotlabs/Module/Import_items.php:72 -msgid "Imported file is empty." +#: ../../Zotlabs/Module/Settings.php:72 ../../Zotlabs/Module/Settings.php:670 +#: ../../Zotlabs/Module/Admin.php:1435 ../../Zotlabs/Lib/Apps.php:334 +msgid "Update" msgstr "" -#: ../../Zotlabs/Module/Import.php:123 -#: ../../Zotlabs/Module/Import_items.php:88 +#: ../../Zotlabs/Module/Settings.php:138 #, php-format -msgid "Warning: Database versions differ by %1$d updates." +msgid "This channel is limited to %d tokens" msgstr "" -#: ../../Zotlabs/Module/Import.php:153 ../../include/import.php:107 -msgid "Cloned channel not found. Import failed." +#: ../../Zotlabs/Module/Settings.php:144 +msgid "Name and Password are required." msgstr "" -#: ../../Zotlabs/Module/Import.php:163 -msgid "No channel. Import failed." +#: ../../Zotlabs/Module/Settings.php:168 +msgid "Token saved." msgstr "" -#: ../../Zotlabs/Module/Import.php:520 -#: ../../include/Import/import_diaspora.php:142 -msgid "Import completed." +#: ../../Zotlabs/Module/Settings.php:274 +msgid "Not valid email." msgstr "" -#: ../../Zotlabs/Module/Import.php:542 -msgid "You must be logged in to use this feature." +#: ../../Zotlabs/Module/Settings.php:277 +msgid "Protected email address. Cannot change to that email." msgstr "" -#: ../../Zotlabs/Module/Import.php:547 -msgid "Import Channel" +#: ../../Zotlabs/Module/Settings.php:286 +msgid "System failure storing new email. Please try again." msgstr "" -#: ../../Zotlabs/Module/Import.php:548 -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." +#: ../../Zotlabs/Module/Settings.php:303 +msgid "Password verification failed." msgstr "" -#: ../../Zotlabs/Module/Import.php:549 -#: ../../Zotlabs/Module/Import_items.php:121 -msgid "File to Upload" +#: ../../Zotlabs/Module/Settings.php:310 +msgid "Passwords do not match. Password unchanged." msgstr "" -#: ../../Zotlabs/Module/Import.php:550 -msgid "Or provide the old server/hub details" +#: ../../Zotlabs/Module/Settings.php:314 +msgid "Empty passwords are not allowed. Password unchanged." msgstr "" -#: ../../Zotlabs/Module/Import.php:551 -msgid "Your old identity address (xyz@example.com)" +#: ../../Zotlabs/Module/Settings.php:328 +msgid "Password changed." msgstr "" -#: ../../Zotlabs/Module/Import.php:552 -msgid "Your old login email address" +#: ../../Zotlabs/Module/Settings.php:330 +msgid "Password update failed. Please try again." msgstr "" -#: ../../Zotlabs/Module/Import.php:553 -msgid "Your old login password" +#: ../../Zotlabs/Module/Settings.php:579 +msgid "Settings updated." msgstr "" -#: ../../Zotlabs/Module/Import.php:554 +#: ../../Zotlabs/Module/Settings.php:643 ../../Zotlabs/Module/Settings.php:669 +#: ../../Zotlabs/Module/Settings.php:705 +msgid "Add application" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:646 +msgid "Name of application" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:647 ../../Zotlabs/Module/Settings.php:673 +msgid "Consumer Key" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:647 ../../Zotlabs/Module/Settings.php:648 +msgid "Automatically generated - change if desired. Max length 20" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:648 ../../Zotlabs/Module/Settings.php:674 +msgid "Consumer Secret" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:649 ../../Zotlabs/Module/Settings.php:675 +msgid "Redirect" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:649 msgid "" -"For either option, please choose whether to make this hub your new primary " -"address, or whether your old location should continue this role. You will be " -"able to post from either location, but only one can be marked as the primary " -"location for files, photos, and media." +"Redirect URI - leave blank unless your application specifically requires this" msgstr "" -#: ../../Zotlabs/Module/Import.php:555 -msgid "Make this hub my primary location" +#: ../../Zotlabs/Module/Settings.php:650 ../../Zotlabs/Module/Settings.php:676 +msgid "Icon url" msgstr "" -#: ../../Zotlabs/Module/Import.php:556 +#: ../../Zotlabs/Module/Settings.php:650 ../../Zotlabs/Module/Sources.php:112 +#: ../../Zotlabs/Module/Sources.php:147 +msgid "Optional" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:661 +msgid "Application not found." +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:704 +msgid "Connected Apps" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:708 +msgid "Client key starts with" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:709 +msgid "No name" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:710 +msgid "Remove authorization" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:723 +msgid "No feature settings configured" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:730 +msgid "Feature/Addon Settings" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:753 +msgid "Account Settings" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:754 +msgid "Current Password" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:755 +msgid "Enter New Password" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:756 +msgid "Confirm New Password" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:756 +msgid "Leave password fields blank unless changing" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:758 +#: ../../Zotlabs/Module/Settings.php:1136 +msgid "Email Address:" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:759 +#: ../../Zotlabs/Module/Removeaccount.php:61 +msgid "Remove Account" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:760 +msgid "Remove this account including all its channels" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:789 msgid "" -"Import existing posts if possible (experimental - limited by available memory" +"Use this form to create temporary access identifiers to share things with " +"non-members. These identities may be used in Access Control Lists and " +"visitors may login using these credentials to access the private content." msgstr "" -#: ../../Zotlabs/Module/Import.php:557 +#: ../../Zotlabs/Module/Settings.php:791 msgid "" -"This process may take several minutes to complete. Please submit the form " -"only once and leave this page open until finished." +"You may also provide <em>dropbox</em> style access links to friends and " +"associates by adding the Login Password to any specific site URL as shown. " +"Examples:" msgstr "" -#: ../../Zotlabs/Module/Home.php:74 ../../Zotlabs/Module/Home.php:82 -#: ../../Zotlabs/Module/Siteinfo.php:48 -msgid "$Projectname" +#: ../../Zotlabs/Module/Settings.php:796 ../../include/widgets.php:614 +msgid "Guest Access Tokens" msgstr "" -#: ../../Zotlabs/Module/Home.php:92 -#, php-format -msgid "Welcome to %s" +#: ../../Zotlabs/Module/Settings.php:803 +msgid "Login Name" msgstr "" -#: ../../Zotlabs/Module/Item.php:179 -msgid "Unable to locate original post." +#: ../../Zotlabs/Module/Settings.php:804 +msgid "Login Password" msgstr "" -#: ../../Zotlabs/Module/Item.php:432 -msgid "Empty post discarded." +#: ../../Zotlabs/Module/Settings.php:805 +msgid "Expires (yyyy-mm-dd)" msgstr "" -#: ../../Zotlabs/Module/Item.php:472 -msgid "Executable content type not permitted to this channel." +#: ../../Zotlabs/Module/Settings.php:823 ../../Zotlabs/Module/Admin.php:677 +#: ../../Zotlabs/Module/Admin.php:678 +msgid "Off" msgstr "" -#: ../../Zotlabs/Module/Item.php:856 -msgid "Duplicate post suppressed." +#: ../../Zotlabs/Module/Settings.php:823 ../../Zotlabs/Module/Admin.php:677 +#: ../../Zotlabs/Module/Admin.php:678 +msgid "On" msgstr "" -#: ../../Zotlabs/Module/Item.php:989 -msgid "System error. Post not saved." +#: ../../Zotlabs/Module/Settings.php:830 +msgid "Additional Features" msgstr "" -#: ../../Zotlabs/Module/Item.php:1242 -msgid "Unable to obtain post information from database." +#: ../../Zotlabs/Module/Settings.php:854 +msgid "Connector Settings" msgstr "" -#: ../../Zotlabs/Module/Item.php:1249 -#, php-format -msgid "You have reached your limit of %1$.0f top level posts." +#: ../../Zotlabs/Module/Settings.php:893 +msgid "No special theme for mobile devices" msgstr "" -#: ../../Zotlabs/Module/Item.php:1256 +#: ../../Zotlabs/Module/Settings.php:896 #, php-format -msgid "You have reached your limit of %1$.0f webpages." +msgid "%s - (Experimental)" msgstr "" -#: ../../Zotlabs/Module/Photos.php:82 -msgid "Page owner information could not be retrieved." +#: ../../Zotlabs/Module/Settings.php:899 ../../Zotlabs/Module/Admin.php:410 +msgid "mobile" msgstr "" -#: ../../Zotlabs/Module/Photos.php:97 ../../Zotlabs/Module/Photos.php:741 -#: ../../Zotlabs/Module/Profile_photo.php:115 -#: ../../Zotlabs/Module/Profile_photo.php:212 -#: ../../Zotlabs/Module/Profile_photo.php:311 -#: ../../include/photo/photo_driver.php:718 -msgid "Profile Photos" +#: ../../Zotlabs/Module/Settings.php:938 +msgid "Display Settings" msgstr "" -#: ../../Zotlabs/Module/Photos.php:103 ../../Zotlabs/Module/Photos.php:147 -msgid "Album not found." +#: ../../Zotlabs/Module/Settings.php:939 +msgid "Theme Settings" msgstr "" -#: ../../Zotlabs/Module/Photos.php:130 -msgid "Delete Album" +#: ../../Zotlabs/Module/Settings.php:940 +msgid "Custom Theme Settings" msgstr "" -#: ../../Zotlabs/Module/Photos.php:151 +#: ../../Zotlabs/Module/Settings.php:941 +msgid "Content Settings" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:947 +msgid "Display Theme:" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:948 +msgid "Mobile Theme:" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:949 +msgid "Preload images before rendering the page" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:949 msgid "" -"Multiple storage folders exist with this album name, but within different " -"directories. Please remove the desired folder or folders using the Files " -"manager" +"The subjective page load time will be longer but the page will be ready when " +"displayed" msgstr "" -#: ../../Zotlabs/Module/Photos.php:208 ../../Zotlabs/Module/Photos.php:1051 -msgid "Delete Photo" +#: ../../Zotlabs/Module/Settings.php:950 +msgid "Enable user zoom on mobile devices" msgstr "" -#: ../../Zotlabs/Module/Photos.php:531 -msgid "No photos selected" +#: ../../Zotlabs/Module/Settings.php:951 +msgid "Update browser every xx seconds" msgstr "" -#: ../../Zotlabs/Module/Photos.php:580 -msgid "Access to this item is restricted." +#: ../../Zotlabs/Module/Settings.php:951 +msgid "Minimum of 10 seconds, no maximum" msgstr "" -#: ../../Zotlabs/Module/Photos.php:619 -#, php-format -msgid "%1$.2f MB of %2$.2f MB photo storage used." +#: ../../Zotlabs/Module/Settings.php:952 +msgid "Maximum number of conversations to load at any time:" msgstr "" -#: ../../Zotlabs/Module/Photos.php:622 -#, php-format -msgid "%1$.2f MB photo storage used." +#: ../../Zotlabs/Module/Settings.php:952 +msgid "Maximum of 100 items" msgstr "" -#: ../../Zotlabs/Module/Photos.php:658 -msgid "Upload Photos" +#: ../../Zotlabs/Module/Settings.php:953 +msgid "Show emoticons (smilies) as images" msgstr "" -#: ../../Zotlabs/Module/Photos.php:662 -msgid "Enter an album name" +#: ../../Zotlabs/Module/Settings.php:954 +msgid "Link post titles to source" msgstr "" -#: ../../Zotlabs/Module/Photos.php:663 -msgid "or select an existing album (doubleclick)" +#: ../../Zotlabs/Module/Settings.php:955 +msgid "System Page Layout Editor - (advanced)" msgstr "" -#: ../../Zotlabs/Module/Photos.php:664 -msgid "Create a status post for this upload" +#: ../../Zotlabs/Module/Settings.php:958 +msgid "Use blog/list mode on channel page" msgstr "" -#: ../../Zotlabs/Module/Photos.php:665 -msgid "Caption (optional):" +#: ../../Zotlabs/Module/Settings.php:958 ../../Zotlabs/Module/Settings.php:959 +msgid "(comments displayed separately)" msgstr "" -#: ../../Zotlabs/Module/Photos.php:666 -msgid "Description (optional):" +#: ../../Zotlabs/Module/Settings.php:959 +msgid "Use blog/list mode on grid page" msgstr "" -#: ../../Zotlabs/Module/Photos.php:693 -msgid "Album name could not be decoded" +#: ../../Zotlabs/Module/Settings.php:960 +msgid "Channel page max height of content (in pixels)" msgstr "" -#: ../../Zotlabs/Module/Photos.php:741 -msgid "Contact Photos" +#: ../../Zotlabs/Module/Settings.php:960 ../../Zotlabs/Module/Settings.php:961 +msgid "click to expand content exceeding this height" msgstr "" -#: ../../Zotlabs/Module/Photos.php:764 -msgid "Show Newest First" +#: ../../Zotlabs/Module/Settings.php:961 +msgid "Grid page max height of content (in pixels)" msgstr "" -#: ../../Zotlabs/Module/Photos.php:766 -msgid "Show Oldest First" +#: ../../Zotlabs/Module/Settings.php:990 +msgid "Nobody except yourself" msgstr "" -#: ../../Zotlabs/Module/Photos.php:790 ../../Zotlabs/Module/Photos.php:1329 -#: ../../Zotlabs/Module/Embedphotos.php:141 ../../include/widgets.php:1593 -msgid "View Photo" +#: ../../Zotlabs/Module/Settings.php:991 +msgid "Only those you specifically allow" msgstr "" -#: ../../Zotlabs/Module/Photos.php:821 -#: ../../Zotlabs/Module/Embedphotos.php:157 ../../include/widgets.php:1610 -msgid "Edit Album" +#: ../../Zotlabs/Module/Settings.php:992 +msgid "Approved connections" msgstr "" -#: ../../Zotlabs/Module/Photos.php:868 -msgid "Permission denied. Access to this item may be restricted." +#: ../../Zotlabs/Module/Settings.php:993 +msgid "Any connections" msgstr "" -#: ../../Zotlabs/Module/Photos.php:870 -msgid "Photo not available" +#: ../../Zotlabs/Module/Settings.php:994 +msgid "Anybody on this website" msgstr "" -#: ../../Zotlabs/Module/Photos.php:928 -msgid "Use as profile photo" +#: ../../Zotlabs/Module/Settings.php:995 +msgid "Anybody in this network" msgstr "" -#: ../../Zotlabs/Module/Photos.php:929 -msgid "Use as cover photo" +#: ../../Zotlabs/Module/Settings.php:996 +msgid "Anybody authenticated" msgstr "" -#: ../../Zotlabs/Module/Photos.php:936 -msgid "Private Photo" +#: ../../Zotlabs/Module/Settings.php:997 +msgid "Anybody on the internet" msgstr "" -#: ../../Zotlabs/Module/Photos.php:951 -msgid "View Full Size" +#: ../../Zotlabs/Module/Settings.php:1071 +msgid "Publish your default profile in the network directory" msgstr "" -#: ../../Zotlabs/Module/Photos.php:996 ../../Zotlabs/Module/Admin.php:1437 -#: ../../Zotlabs/Module/Tagrm.php:137 -msgid "Remove" +#: ../../Zotlabs/Module/Settings.php:1076 +msgid "Allow us to suggest you as a potential friend to new members?" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1030 -msgid "Edit photo" +#: ../../Zotlabs/Module/Settings.php:1085 +msgid "Your channel address is" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1032 -msgid "Rotate CW (right)" +#: ../../Zotlabs/Module/Settings.php:1127 +msgid "Channel Settings" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1033 -msgid "Rotate CCW (left)" +#: ../../Zotlabs/Module/Settings.php:1134 +msgid "Basic Settings" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1036 -msgid "Enter a new album name" +#: ../../Zotlabs/Module/Settings.php:1135 ../../include/channel.php:1180 +msgid "Full Name:" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1037 -msgid "or select an existing one (doubleclick)" +#: ../../Zotlabs/Module/Settings.php:1137 +msgid "Your Timezone:" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1040 -msgid "Caption" +#: ../../Zotlabs/Module/Settings.php:1138 +msgid "Default Post Location:" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1042 -msgid "Add a Tag" +#: ../../Zotlabs/Module/Settings.php:1138 +msgid "Geographical location to display on your posts" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1046 -msgid "Example: @bob, @Barbara_Jensen, @jim@example.com" +#: ../../Zotlabs/Module/Settings.php:1139 +msgid "Use Browser Location:" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1049 -msgid "Flag as adult in album view" +#: ../../Zotlabs/Module/Settings.php:1141 +msgid "Adult Content" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1068 ../../Zotlabs/Lib/ThreadItem.php:261 -msgid "I like this (toggle)" +#: ../../Zotlabs/Module/Settings.php:1141 +msgid "" +"This channel frequently or regularly publishes adult content. (Please tag " +"any adult material and/or nudity with #NSFW)" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1069 ../../Zotlabs/Lib/ThreadItem.php:262 -msgid "I don't like this (toggle)" +#: ../../Zotlabs/Module/Settings.php:1143 +msgid "Security and Privacy Settings" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1071 ../../Zotlabs/Lib/ThreadItem.php:397 -#: ../../include/conversation.php:743 -msgid "Please wait" +#: ../../Zotlabs/Module/Settings.php:1146 +msgid "Your permissions are already configured. Click to view/adjust" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1087 ../../Zotlabs/Module/Photos.php:1205 -#: ../../Zotlabs/Lib/ThreadItem.php:707 -msgid "This is you" +#: ../../Zotlabs/Module/Settings.php:1148 +msgid "Hide my online presence" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1089 ../../Zotlabs/Module/Photos.php:1207 -#: ../../Zotlabs/Lib/ThreadItem.php:709 ../../include/js_strings.php:6 -msgid "Comment" +#: ../../Zotlabs/Module/Settings.php:1148 +msgid "Prevents displaying in your profile that you are online" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1105 ../../include/conversation.php:577 -msgctxt "title" -msgid "Likes" +#: ../../Zotlabs/Module/Settings.php:1150 +msgid "Simple Privacy Settings:" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1105 ../../include/conversation.php:577 -msgctxt "title" -msgid "Dislikes" +#: ../../Zotlabs/Module/Settings.php:1151 +msgid "" +"Very Public - <em>extremely permissive (should be used with caution)</em>" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1106 ../../include/conversation.php:578 -msgctxt "title" -msgid "Agree" +#: ../../Zotlabs/Module/Settings.php:1152 +msgid "" +"Typical - <em>default public, privacy when desired (similar to social " +"network permissions but with improved privacy)</em>" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1106 ../../include/conversation.php:578 -msgctxt "title" -msgid "Disagree" +#: ../../Zotlabs/Module/Settings.php:1153 +msgid "Private - <em>default private, never open or public</em>" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1106 ../../include/conversation.php:578 -msgctxt "title" -msgid "Abstain" +#: ../../Zotlabs/Module/Settings.php:1154 +msgid "Blocked - <em>default blocked to/from everybody</em>" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1107 ../../include/conversation.php:579 -msgctxt "title" -msgid "Attending" +#: ../../Zotlabs/Module/Settings.php:1156 +msgid "Allow others to tag your posts" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1107 ../../include/conversation.php:579 -msgctxt "title" -msgid "Not attending" +#: ../../Zotlabs/Module/Settings.php:1156 +msgid "" +"Often used by the community to retro-actively flag inappropriate content" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1107 ../../include/conversation.php:579 -msgctxt "title" -msgid "Might attend" +#: ../../Zotlabs/Module/Settings.php:1158 +msgid "Advanced Privacy Settings" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1124 ../../Zotlabs/Module/Photos.php:1136 -#: ../../Zotlabs/Lib/ThreadItem.php:181 ../../Zotlabs/Lib/ThreadItem.php:193 -#: ../../include/conversation.php:1738 -msgid "View all" +#: ../../Zotlabs/Module/Settings.php:1160 +msgid "Expire other channel content after this many days" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1128 ../../Zotlabs/Lib/ThreadItem.php:185 -#: ../../include/taxonomy.php:403 ../../include/channel.php:1198 -#: ../../include/conversation.php:1762 -msgctxt "noun" -msgid "Like" -msgid_plural "Likes" -msgstr[0] "" -msgstr[1] "" +#: ../../Zotlabs/Module/Settings.php:1160 +msgid "0 or blank to use the website limit." +msgstr "" -#: ../../Zotlabs/Module/Photos.php:1133 ../../Zotlabs/Lib/ThreadItem.php:190 -#: ../../include/conversation.php:1765 -msgctxt "noun" -msgid "Dislike" -msgid_plural "Dislikes" -msgstr[0] "" -msgstr[1] "" +#: ../../Zotlabs/Module/Settings.php:1160 +#, php-format +msgid "This website expires after %d days." +msgstr "" -#: ../../Zotlabs/Module/Photos.php:1233 -msgid "Photo Tools" +#: ../../Zotlabs/Module/Settings.php:1160 +msgid "This website does not expire imported content." msgstr "" -#: ../../Zotlabs/Module/Photos.php:1242 -msgid "In This Photo:" +#: ../../Zotlabs/Module/Settings.php:1160 +msgid "The website limit takes precedence if lower than your limit." msgstr "" -#: ../../Zotlabs/Module/Photos.php:1247 -msgid "Map" +#: ../../Zotlabs/Module/Settings.php:1161 +msgid "Maximum Friend Requests/Day:" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1255 ../../Zotlabs/Lib/ThreadItem.php:386 -msgctxt "noun" -msgid "Likes" +#: ../../Zotlabs/Module/Settings.php:1161 +msgid "May reduce spam activity" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1256 ../../Zotlabs/Lib/ThreadItem.php:387 -msgctxt "noun" -msgid "Dislikes" +#: ../../Zotlabs/Module/Settings.php:1162 +msgid "Default Post and Publish Permissions" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1261 ../../Zotlabs/Lib/ThreadItem.php:392 -#: ../../include/acl_selectors.php:283 -msgid "Close" +#: ../../Zotlabs/Module/Settings.php:1163 ../../Zotlabs/Module/Mitem.php:154 +#: ../../Zotlabs/Module/Mitem.php:227 +msgid "(click to open/close)" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1335 -msgid "View Album" +#: ../../Zotlabs/Module/Settings.php:1164 +msgid "Use my default audience setting for the type of object published" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1346 ../../Zotlabs/Module/Photos.php:1359 -#: ../../Zotlabs/Module/Photos.php:1360 -msgid "Recent Photos" +#: ../../Zotlabs/Module/Settings.php:1167 +msgid "Channel permissions category:" msgstr "" -#: ../../Zotlabs/Module/Lockview.php:75 -msgid "Remote privacy information not available." +#: ../../Zotlabs/Module/Settings.php:1173 +msgid "Maximum private messages per day from unknown people:" msgstr "" -#: ../../Zotlabs/Module/Lockview.php:96 -msgid "Visible to:" +#: ../../Zotlabs/Module/Settings.php:1173 +msgid "Useful to reduce spamming" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1176 +msgid "Notification Settings" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1177 +msgid "By default post a status message when:" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1178 +msgid "accepting a friend request" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1179 +msgid "joining a forum/community" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1180 +msgid "making an <em>interesting</em> profile change" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1181 +msgid "Send a notification email when:" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1182 +msgid "You receive a connection request" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1183 +msgid "Your connections are confirmed" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1184 +msgid "Someone writes on your profile wall" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1185 +msgid "Someone writes a followup comment" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1186 +msgid "You receive a private message" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1187 +msgid "You receive a friend suggestion" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1188 +msgid "You are tagged in a post" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1189 +msgid "You are poked/prodded/etc. in a post" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1192 +msgid "Show visual notifications including:" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1194 +msgid "Unseen grid activity" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1195 +msgid "Unseen channel activity" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1196 +msgid "Unseen private messages" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1196 +#: ../../Zotlabs/Module/Settings.php:1201 +#: ../../Zotlabs/Module/Settings.php:1202 +#: ../../Zotlabs/Module/Settings.php:1203 +msgid "Recommended" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1197 +msgid "Upcoming events" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1198 +msgid "Events today" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1199 +msgid "Upcoming birthdays" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1199 +msgid "Not available in all themes" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1200 +msgid "System (personal) notifications" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1201 +msgid "System info messages" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1202 +msgid "System critical alerts" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1203 +msgid "New connections" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1204 +msgid "System Registrations" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1205 +msgid "" +"Also show new wall posts, private messages and connections under Notices" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1207 +msgid "Notify me of events this many days in advance" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1207 +msgid "Must be greater than 0" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1209 +msgid "Advanced Account/Page Type Settings" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1210 +msgid "Change the behaviour of this account for special situations" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1213 +msgid "" +"Please enable expert mode (in <a href=\"settings/features\">Settings > " +"Additional features</a>) to adjust!" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1214 +msgid "Miscellaneous Settings" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1215 +msgid "Default photo upload folder" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1215 +#: ../../Zotlabs/Module/Settings.php:1216 +msgid "%Y - current year, %m - current month" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1216 +msgid "Default file upload folder" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1218 +msgid "Personal menu to display in your channel pages" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1219 ../../Zotlabs/Module/Removeme.php:64 +msgid "Remove Channel" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1220 +msgid "Remove this channel." +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1221 +msgid "Firefox Share $Projectname provider" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1222 +msgid "Start calendar week on monday" msgstr "" #: ../../Zotlabs/Module/Import_items.php:104 @@ -2889,10 +3208,6 @@ msgstr "" msgid "Enter email addresses, one per line:" msgstr "" -#: ../../Zotlabs/Module/Invite.php:135 ../../Zotlabs/Module/Mail.php:241 -msgid "Your message:" -msgstr "" - #: ../../Zotlabs/Module/Invite.php:136 msgid "Please join my community on $Projectname." msgstr "" @@ -2943,6 +3258,11 @@ msgstr "" msgid "Manage Channel Locations" msgstr "" +#: ../../Zotlabs/Module/Locs.php:118 ../../Zotlabs/Module/Profiles.php:470 +#: ../../Zotlabs/Module/Admin.php:1224 +msgid "Address" +msgstr "" + #: ../../Zotlabs/Module/Locs.php:119 msgid "Primary" msgstr "" @@ -2973,146 +3293,284 @@ msgstr "" msgid "Hub not found." msgstr "" -#: ../../Zotlabs/Module/Mail.php:38 -msgid "Unable to lookup recipient." +#: ../../Zotlabs/Module/Follow.php:34 +msgid "Channel added." msgstr "" -#: ../../Zotlabs/Module/Mail.php:45 -msgid "Unable to communicate with requested channel." +#: ../../Zotlabs/Module/Profiles.php:24 ../../Zotlabs/Module/Profiles.php:189 +#: ../../Zotlabs/Module/Profiles.php:246 ../../Zotlabs/Module/Profiles.php:625 +msgid "Profile not found." msgstr "" -#: ../../Zotlabs/Module/Mail.php:52 -msgid "Cannot verify requested channel." +#: ../../Zotlabs/Module/Profiles.php:44 +msgid "Profile deleted." msgstr "" -#: ../../Zotlabs/Module/Mail.php:70 -msgid "Selected channel has private message restrictions. Send failed." +#: ../../Zotlabs/Module/Profiles.php:68 ../../Zotlabs/Module/Profiles.php:104 +msgid "Profile-" msgstr "" -#: ../../Zotlabs/Module/Mail.php:135 -msgid "Messages" +#: ../../Zotlabs/Module/Profiles.php:89 ../../Zotlabs/Module/Profiles.php:132 +msgid "New profile created." msgstr "" -#: ../../Zotlabs/Module/Mail.php:170 -msgid "Message recalled." +#: ../../Zotlabs/Module/Profiles.php:110 +msgid "Profile unavailable to clone." msgstr "" -#: ../../Zotlabs/Module/Mail.php:183 -msgid "Conversation removed." +#: ../../Zotlabs/Module/Profiles.php:151 +msgid "Profile unavailable to export." msgstr "" -#: ../../Zotlabs/Module/Mail.php:198 ../../Zotlabs/Module/Mail.php:307 -msgid "Expires YYYY-MM-DD HH:MM" +#: ../../Zotlabs/Module/Profiles.php:256 +msgid "Profile Name is required." msgstr "" -#: ../../Zotlabs/Module/Mail.php:226 -msgid "Requested channel is not in this network" +#: ../../Zotlabs/Module/Profiles.php:427 +msgid "Marital Status" msgstr "" -#: ../../Zotlabs/Module/Mail.php:234 -msgid "Send Private Message" +#: ../../Zotlabs/Module/Profiles.php:431 +msgid "Romantic Partner" msgstr "" -#: ../../Zotlabs/Module/Mail.php:235 ../../Zotlabs/Module/Mail.php:360 -msgid "To:" +#: ../../Zotlabs/Module/Profiles.php:435 ../../Zotlabs/Module/Profiles.php:736 +msgid "Likes" msgstr "" -#: ../../Zotlabs/Module/Mail.php:238 ../../Zotlabs/Module/Mail.php:362 -msgid "Subject:" +#: ../../Zotlabs/Module/Profiles.php:439 ../../Zotlabs/Module/Profiles.php:737 +msgid "Dislikes" msgstr "" -#: ../../Zotlabs/Module/Mail.php:243 ../../Zotlabs/Module/Mail.php:368 -#: ../../include/conversation.php:1231 -msgid "Attach file" +#: ../../Zotlabs/Module/Profiles.php:443 ../../Zotlabs/Module/Profiles.php:744 +msgid "Work/Employment" msgstr "" -#: ../../Zotlabs/Module/Mail.php:245 -msgid "Send" +#: ../../Zotlabs/Module/Profiles.php:446 +msgid "Religion" msgstr "" -#: ../../Zotlabs/Module/Mail.php:248 ../../Zotlabs/Module/Mail.php:373 -#: ../../include/conversation.php:1266 -msgid "Set expiration date" +#: ../../Zotlabs/Module/Profiles.php:450 +msgid "Political Views" msgstr "" -#: ../../Zotlabs/Module/Mail.php:332 -msgid "Delete message" +#: ../../Zotlabs/Module/Profiles.php:454 +msgid "Gender" msgstr "" -#: ../../Zotlabs/Module/Mail.php:333 -msgid "Delivery report" +#: ../../Zotlabs/Module/Profiles.php:458 +msgid "Sexual Preference" msgstr "" -#: ../../Zotlabs/Module/Mail.php:334 -msgid "Recall message" +#: ../../Zotlabs/Module/Profiles.php:462 +msgid "Homepage" msgstr "" -#: ../../Zotlabs/Module/Mail.php:336 -msgid "Message has been recalled." +#: ../../Zotlabs/Module/Profiles.php:466 +msgid "Interests" msgstr "" -#: ../../Zotlabs/Module/Mail.php:353 -msgid "Delete Conversation" +#: ../../Zotlabs/Module/Profiles.php:560 +msgid "Profile updated." msgstr "" -#: ../../Zotlabs/Module/Mail.php:355 -msgid "" -"No secure communications available. You <strong>may</strong> be able to " -"respond from the sender's profile page." +#: ../../Zotlabs/Module/Profiles.php:644 +msgid "Hide your connections list from viewers of this profile" msgstr "" -#: ../../Zotlabs/Module/Mail.php:359 -msgid "Send Reply" +#: ../../Zotlabs/Module/Profiles.php:686 +msgid "Edit Profile Details" msgstr "" -#: ../../Zotlabs/Module/Mail.php:364 -#, php-format -msgid "Your message for %s (%s):" +#: ../../Zotlabs/Module/Profiles.php:688 +msgid "View this profile" msgstr "" -#: ../../Zotlabs/Module/Manage.php:136 -#: ../../Zotlabs/Module/New_channel.php:121 -#, php-format -msgid "You have created %1$.0f of %2$.0f allowed channels." +#: ../../Zotlabs/Module/Profiles.php:689 ../../Zotlabs/Module/Profiles.php:771 +#: ../../include/channel.php:998 +msgid "Edit visibility" msgstr "" -#: ../../Zotlabs/Module/Manage.php:143 -msgid "Create a new channel" +#: ../../Zotlabs/Module/Profiles.php:690 +msgid "Profile Tools" msgstr "" -#: ../../Zotlabs/Module/Manage.php:164 ../../Zotlabs/Lib/Apps.php:214 -#: ../../include/nav.php:208 -msgid "Channel Manager" +#: ../../Zotlabs/Module/Profiles.php:691 +msgid "Change cover photo" msgstr "" -#: ../../Zotlabs/Module/Manage.php:165 -msgid "Current Channel" +#: ../../Zotlabs/Module/Profiles.php:692 ../../include/channel.php:969 +msgid "Change profile photo" msgstr "" -#: ../../Zotlabs/Module/Manage.php:167 -msgid "Switch to one of your channels by selecting it." +#: ../../Zotlabs/Module/Profiles.php:693 +msgid "Create a new profile using these settings" msgstr "" -#: ../../Zotlabs/Module/Manage.php:168 -msgid "Default Channel" +#: ../../Zotlabs/Module/Profiles.php:694 +msgid "Clone this profile" msgstr "" -#: ../../Zotlabs/Module/Manage.php:169 -msgid "Make Default" +#: ../../Zotlabs/Module/Profiles.php:695 +msgid "Delete this profile" msgstr "" -#: ../../Zotlabs/Module/Manage.php:172 -#, php-format -msgid "%d new messages" +#: ../../Zotlabs/Module/Profiles.php:696 +msgid "Add profile things" msgstr "" -#: ../../Zotlabs/Module/Manage.php:173 -#, php-format -msgid "%d new introductions" +#: ../../Zotlabs/Module/Profiles.php:697 ../../include/conversation.php:1541 +#: ../../include/widgets.php:105 +msgid "Personal" msgstr "" -#: ../../Zotlabs/Module/Manage.php:175 -msgid "Delegated Channel" +#: ../../Zotlabs/Module/Profiles.php:699 +msgid "Relation" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:700 ../../include/datetime.php:48 +msgid "Miscellaneous" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:702 +msgid "Import profile from file" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:703 +msgid "Export profile to file" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:704 +msgid "Your gender" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:705 +msgid "Marital status" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:706 +msgid "Sexual preference" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:709 +msgid "Profile name" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:711 +msgid "This is your default profile." +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:713 +msgid "Your full name" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:714 +msgid "Title/Description" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:717 +msgid "Street address" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:718 +msgid "Locality/City" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:719 +msgid "Region/State" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:720 +msgid "Postal/Zip code" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:721 +msgid "Country" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:726 +msgid "Who (if applicable)" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:726 +msgid "Examples: cathy123, Cathy Williams, cathy@example.com" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:727 +msgid "Since (date)" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:730 +msgid "Tell us about yourself" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:731 +msgid "Homepage URL" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:732 +msgid "Hometown" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:733 +msgid "Political views" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:734 +msgid "Religious views" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:735 +msgid "Keywords used in directory listings" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:735 +msgid "Example: fishing photography software" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:738 +msgid "Musical interests" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:739 +msgid "Books, literature" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:740 +msgid "Television" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:741 +msgid "Film/Dance/Culture/Entertainment" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:742 +msgid "Hobbies/Interests" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:743 +msgid "Love/Romance" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:745 +msgid "School/Education" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:746 +msgid "Contact information and social networks" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:747 +msgid "My other channels" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:767 ../../include/channel.php:994 +msgid "Profile Image" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:777 ../../include/channel.php:976 +#: ../../include/nav.php:88 +msgid "Edit Profiles" msgstr "" #: ../../Zotlabs/Module/Menu.php:49 @@ -3155,6 +3613,18 @@ msgstr "" msgid "Menus" msgstr "" +#: ../../Zotlabs/Module/Menu.php:114 ../../Zotlabs/Module/Blocks.php:157 +#: ../../Zotlabs/Module/Layouts.php:190 ../../Zotlabs/Module/Webpages.php:205 +#: ../../include/page_widgets.php:47 +msgid "Created" +msgstr "" + +#: ../../Zotlabs/Module/Menu.php:115 ../../Zotlabs/Module/Blocks.php:158 +#: ../../Zotlabs/Module/Layouts.php:191 ../../Zotlabs/Module/Webpages.php:206 +#: ../../include/page_widgets.php:48 +msgid "Edited" +msgstr "" + #: ../../Zotlabs/Module/Menu.php:117 msgid "Bookmarks allowed" msgstr "" @@ -3212,6 +3682,40 @@ msgstr "" msgid "Not found." msgstr "" +#: ../../Zotlabs/Module/Item.php:179 +msgid "Unable to locate original post." +msgstr "" + +#: ../../Zotlabs/Module/Item.php:432 +msgid "Empty post discarded." +msgstr "" + +#: ../../Zotlabs/Module/Item.php:472 +msgid "Executable content type not permitted to this channel." +msgstr "" + +#: ../../Zotlabs/Module/Item.php:856 +msgid "Duplicate post suppressed." +msgstr "" + +#: ../../Zotlabs/Module/Item.php:989 +msgid "System error. Post not saved." +msgstr "" + +#: ../../Zotlabs/Module/Item.php:1242 +msgid "Unable to obtain post information from database." +msgstr "" + +#: ../../Zotlabs/Module/Item.php:1249 +#, php-format +msgid "You have reached your limit of %1$.0f top level posts." +msgstr "" + +#: ../../Zotlabs/Module/Item.php:1256 +#, php-format +msgid "You have reached your limit of %1$.0f webpages." +msgstr "" + #: ../../Zotlabs/Module/Lostpass.php:19 msgid "No valid account found." msgstr "" @@ -3236,7 +3740,7 @@ msgid "" "Password reset failed." msgstr "" -#: ../../Zotlabs/Module/Lostpass.php:90 ../../boot.php:1712 +#: ../../Zotlabs/Module/Lostpass.php:90 ../../boot.php:1715 msgid "Password Reset" msgstr "" @@ -3299,32 +3803,12 @@ msgstr "" msgid "Set your current mood and tell your friends" msgstr "" -#: ../../Zotlabs/Module/Network.php:94 -msgid "No such group" -msgstr "" - -#: ../../Zotlabs/Module/Network.php:134 -msgid "No such channel" -msgstr "" - -#: ../../Zotlabs/Module/Network.php:139 -msgid "forum" -msgstr "" - -#: ../../Zotlabs/Module/Network.php:151 -msgid "Search Results For:" -msgstr "" - -#: ../../Zotlabs/Module/Network.php:215 -msgid "Privacy group is empty" -msgstr "" - -#: ../../Zotlabs/Module/Network.php:224 -msgid "Privacy group: " +#: ../../Zotlabs/Module/Acl.php:312 +msgid "network" msgstr "" -#: ../../Zotlabs/Module/Network.php:250 -msgid "Invalid connection." +#: ../../Zotlabs/Module/Acl.php:322 +msgid "RSS" msgstr "" #: ../../Zotlabs/Module/Notify.php:57 @@ -3353,16 +3837,61 @@ msgstr "" msgid "No matches" msgstr "" -#: ../../Zotlabs/Module/Channel.php:40 -msgid "Posts and comments" +#: ../../Zotlabs/Module/Chat.php:181 +msgid "Room not found" msgstr "" -#: ../../Zotlabs/Module/Channel.php:41 -msgid "Only posts" +#: ../../Zotlabs/Module/Chat.php:197 +msgid "Leave Room" msgstr "" -#: ../../Zotlabs/Module/Channel.php:101 -msgid "Insufficient permissions. Request redirected to profile page." +#: ../../Zotlabs/Module/Chat.php:198 +msgid "Delete Room" +msgstr "" + +#: ../../Zotlabs/Module/Chat.php:199 +msgid "I am away right now" +msgstr "" + +#: ../../Zotlabs/Module/Chat.php:200 +msgid "I am online" +msgstr "" + +#: ../../Zotlabs/Module/Chat.php:202 +msgid "Bookmark this room" +msgstr "" + +#: ../../Zotlabs/Module/Chat.php:218 +msgid "Feature disabled." +msgstr "" + +#: ../../Zotlabs/Module/Chat.php:232 +msgid "New Chatroom" +msgstr "" + +#: ../../Zotlabs/Module/Chat.php:233 +msgid "Chatroom name" +msgstr "" + +#: ../../Zotlabs/Module/Chat.php:234 +msgid "Expiration of chats (minutes)" +msgstr "" + +#: ../../Zotlabs/Module/Chat.php:246 +#, php-format +msgid "%1$s's Chatrooms" +msgstr "" + +#: ../../Zotlabs/Module/Chat.php:251 +msgid "No chatrooms available" +msgstr "" + +#: ../../Zotlabs/Module/Chat.php:255 +msgid "Expiration" +msgstr "" + +#: ../../Zotlabs/Module/Chat.php:256 +msgid "min" msgstr "" #: ../../Zotlabs/Module/Mitem.php:52 @@ -3381,11 +3910,6 @@ msgstr "" msgid "Menu Item Permissions" msgstr "" -#: ../../Zotlabs/Module/Mitem.php:154 ../../Zotlabs/Module/Mitem.php:227 -#: ../../Zotlabs/Module/Settings.php:1163 -msgid "(click to open/close)" -msgstr "" - #: ../../Zotlabs/Module/Mitem.php:156 ../../Zotlabs/Module/Mitem.php:172 msgid "Link Name" msgstr "" @@ -3571,10 +4095,6 @@ msgstr "" msgid "Default" msgstr "" -#: ../../Zotlabs/Module/Admin.php:410 ../../Zotlabs/Module/Settings.php:899 -msgid "mobile" -msgstr "" - #: ../../Zotlabs/Module/Admin.php:412 msgid "experimental" msgstr "" @@ -3889,16 +4409,6 @@ msgstr "" msgid "0 for no expiration of imported content" msgstr "" -#: ../../Zotlabs/Module/Admin.php:677 ../../Zotlabs/Module/Admin.php:678 -#: ../../Zotlabs/Module/Settings.php:823 -msgid "Off" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:677 ../../Zotlabs/Module/Admin.php:678 -#: ../../Zotlabs/Module/Settings.php:823 -msgid "On" -msgstr "" - #: ../../Zotlabs/Module/Admin.php:678 #, php-format msgid "Lock feature %s" @@ -4135,6 +4645,11 @@ msgstr "" msgid "Request date" msgstr "" +#: ../../Zotlabs/Module/Admin.php:1035 ../../Zotlabs/Module/Admin.php:1047 +#: ../../include/network.php:2203 +msgid "Email" +msgstr "" + #: ../../Zotlabs/Module/Admin.php:1036 msgid "No registrations." msgstr "" @@ -4366,11 +4881,6 @@ msgstr "" msgid "Install a New Plugin Repository" msgstr "" -#: ../../Zotlabs/Module/Admin.php:1435 ../../Zotlabs/Module/Settings.php:72 -#: ../../Zotlabs/Module/Settings.php:670 ../../Zotlabs/Lib/Apps.php:334 -msgid "Update" -msgstr "" - #: ../../Zotlabs/Module/Admin.php:1436 msgid "Switch branch" msgstr "" @@ -4620,14 +5130,6 @@ msgstr "" msgid "Post successful." msgstr "" -#: ../../Zotlabs/Module/Openid.php:30 -msgid "OpenID protocol error. No ID returned." -msgstr "" - -#: ../../Zotlabs/Module/Openid.php:193 ../../include/auth.php:285 -msgid "Login failed." -msgstr "" - #: ../../Zotlabs/Module/Profperm.php:34 ../../Zotlabs/Module/Profperm.php:63 msgid "Invalid profile identifier." msgstr "" @@ -4663,9 +5165,20 @@ msgid "" "to correctly use this feature." msgstr "" -#: ../../Zotlabs/Module/Probe.php:28 ../../Zotlabs/Module/Probe.php:32 -#, php-format -msgid "Fetching URL returns error: %1$s" +#: ../../Zotlabs/Module/Rmagic.php:35 +msgid "Authentication failed." +msgstr "" + +#: ../../Zotlabs/Module/Rmagic.php:75 +msgid "Remote Authentication" +msgstr "" + +#: ../../Zotlabs/Module/Rmagic.php:76 +msgid "Enter your channel address (e.g. channel@example.com)" +msgstr "" + +#: ../../Zotlabs/Module/Rmagic.php:77 +msgid "Authenticate" msgstr "" #: ../../Zotlabs/Module/Siteinfo.php:19 @@ -4726,30 +5239,28 @@ msgstr "" msgid "Site Administrators" msgstr "" -#: ../../Zotlabs/Module/Rmagic.php:44 -msgid "" -"We encountered a problem while logging in with the OpenID you provided. " -"Please check the correct spelling of the ID." +#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2238 +msgid "Blocks" msgstr "" -#: ../../Zotlabs/Module/Rmagic.php:44 -msgid "The error message was:" +#: ../../Zotlabs/Module/Blocks.php:156 +msgid "Block Title" msgstr "" -#: ../../Zotlabs/Module/Rmagic.php:48 -msgid "Authentication failed." +#: ../../Zotlabs/Module/Layouts.php:183 ../../include/text.php:2240 +msgid "Layouts" msgstr "" -#: ../../Zotlabs/Module/Rmagic.php:88 -msgid "Remote Authentication" +#: ../../Zotlabs/Module/Layouts.php:185 +msgid "Comanche page description language help" msgstr "" -#: ../../Zotlabs/Module/Rmagic.php:89 -msgid "Enter your channel address (e.g. channel@example.com)" +#: ../../Zotlabs/Module/Layouts.php:189 +msgid "Layout Description" msgstr "" -#: ../../Zotlabs/Module/Rmagic.php:90 -msgid "Authenticate" +#: ../../Zotlabs/Module/Layouts.php:194 +msgid "Download PDL file" msgstr "" #: ../../Zotlabs/Module/Pubsites.php:22 ../../include/widgets.php:1337 @@ -4804,17 +5315,24 @@ msgstr "" msgid "Upload Profile Photo" msgstr "" -#: ../../Zotlabs/Module/Blocks.php:97 ../../Zotlabs/Module/Blocks.php:155 -#: ../../Zotlabs/Module/Editblock.php:108 -msgid "Block Name" +#: ../../Zotlabs/Module/Cal.php:69 +msgid "Permissions denied." msgstr "" -#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2238 -msgid "Blocks" +#: ../../Zotlabs/Module/Cal.php:337 +msgid "Import" msgstr "" -#: ../../Zotlabs/Module/Blocks.php:156 -msgid "Block Title" +#: ../../Zotlabs/Module/Common.php:14 +msgid "No channel." +msgstr "" + +#: ../../Zotlabs/Module/Common.php:43 +msgid "Common connections" +msgstr "" + +#: ../../Zotlabs/Module/Common.php:48 +msgid "No connections in common." msgstr "" #: ../../Zotlabs/Module/Rate.php:160 @@ -4855,24 +5373,47 @@ msgstr "" msgid "Apps" msgstr "" -#: ../../Zotlabs/Module/Editblock.php:124 ../../include/conversation.php:1243 -msgid "Title (optional)" +#: ../../Zotlabs/Module/Connect.php:61 ../../Zotlabs/Module/Connect.php:109 +msgid "Continue" msgstr "" -#: ../../Zotlabs/Module/Editblock.php:133 -msgid "Edit Block" +#: ../../Zotlabs/Module/Connect.php:90 +msgid "Premium Channel Setup" msgstr "" -#: ../../Zotlabs/Module/Common.php:14 -msgid "No channel." +#: ../../Zotlabs/Module/Connect.php:92 +msgid "Enable premium channel connection restrictions" msgstr "" -#: ../../Zotlabs/Module/Common.php:43 -msgid "Common connections" +#: ../../Zotlabs/Module/Connect.php:93 +msgid "" +"Please enter your restrictions or conditions, such as paypal receipt, usage " +"guidelines, etc." msgstr "" -#: ../../Zotlabs/Module/Common.php:48 -msgid "No connections in common." +#: ../../Zotlabs/Module/Connect.php:95 ../../Zotlabs/Module/Connect.php:115 +msgid "" +"This channel may require additional steps or acknowledgement of the " +"following conditions prior to connecting:" +msgstr "" + +#: ../../Zotlabs/Module/Connect.php:96 +msgid "" +"Potential connections will then see the following text before proceeding:" +msgstr "" + +#: ../../Zotlabs/Module/Connect.php:97 ../../Zotlabs/Module/Connect.php:118 +msgid "" +"By continuing, I certify that I have complied with any instructions provided " +"on this page." +msgstr "" + +#: ../../Zotlabs/Module/Connect.php:106 +msgid "(No specific instructions have been provided by the channel owner.)" +msgstr "" + +#: ../../Zotlabs/Module/Connect.php:114 +msgid "Restricted or Premium Channel" msgstr "" #: ../../Zotlabs/Module/Rbmark.php:94 @@ -4978,7 +5519,7 @@ msgid "Membership on this site is by invitation only." msgstr "" #: ../../Zotlabs/Module/Register.php:262 ../../include/nav.php:149 -#: ../../boot.php:1686 +#: ../../boot.php:1689 msgid "Register" msgstr "" @@ -5035,11 +5576,6 @@ msgid "" "removed from the network" msgstr "" -#: ../../Zotlabs/Module/Removeaccount.php:61 -#: ../../Zotlabs/Module/Settings.php:759 -msgid "Remove Account" -msgstr "" - #: ../../Zotlabs/Module/Removeme.php:35 msgid "" "Channel removals are not allowed within 48 hours of changing the account " @@ -5064,10 +5600,6 @@ msgid "" "removed from the network" msgstr "" -#: ../../Zotlabs/Module/Removeme.php:64 ../../Zotlabs/Module/Settings.php:1219 -msgid "Remove Channel" -msgstr "" - #: ../../Zotlabs/Module/Uexport.php:55 ../../Zotlabs/Module/Uexport.php:56 msgid "Export Channel" msgstr "" @@ -5140,652 +5672,30 @@ msgstr "" msgid "No service class restrictions found." msgstr "" -#: ../../Zotlabs/Module/Settings.php:64 -msgid "Name is required" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:68 -msgid "Key and Secret are required" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:138 -#, php-format -msgid "This channel is limited to %d tokens" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:144 -msgid "Name and Password are required." -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:168 -msgid "Token saved." -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:274 -msgid "Not valid email." -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:277 -msgid "Protected email address. Cannot change to that email." -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:286 -msgid "System failure storing new email. Please try again." -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:303 -msgid "Password verification failed." -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:310 -msgid "Passwords do not match. Password unchanged." -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:314 -msgid "Empty passwords are not allowed. Password unchanged." -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:328 -msgid "Password changed." -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:330 -msgid "Password update failed. Please try again." -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:579 -msgid "Settings updated." -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:643 ../../Zotlabs/Module/Settings.php:669 -#: ../../Zotlabs/Module/Settings.php:705 -msgid "Add application" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:646 -msgid "Name of application" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:647 ../../Zotlabs/Module/Settings.php:673 -msgid "Consumer Key" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:647 ../../Zotlabs/Module/Settings.php:648 -msgid "Automatically generated - change if desired. Max length 20" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:648 ../../Zotlabs/Module/Settings.php:674 -msgid "Consumer Secret" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:649 ../../Zotlabs/Module/Settings.php:675 -msgid "Redirect" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:649 -msgid "" -"Redirect URI - leave blank unless your application specifically requires this" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:650 ../../Zotlabs/Module/Settings.php:676 -msgid "Icon url" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:650 ../../Zotlabs/Module/Sources.php:112 -#: ../../Zotlabs/Module/Sources.php:147 -msgid "Optional" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:661 -msgid "Application not found." -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:704 -msgid "Connected Apps" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:708 -msgid "Client key starts with" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:709 -msgid "No name" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:710 -msgid "Remove authorization" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:723 -msgid "No feature settings configured" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:730 -msgid "Feature/Addon Settings" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:753 -msgid "Account Settings" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:754 -msgid "Current Password" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:755 -msgid "Enter New Password" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:756 -msgid "Confirm New Password" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:756 -msgid "Leave password fields blank unless changing" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:758 -#: ../../Zotlabs/Module/Settings.php:1136 -msgid "Email Address:" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:760 -msgid "Remove this account including all its channels" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:789 -msgid "" -"Use this form to create temporary access identifiers to share things with " -"non-members. These identities may be used in Access Control Lists and " -"visitors may login using these credentials to access the private content." -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:791 -msgid "" -"You may also provide <em>dropbox</em> style access links to friends and " -"associates by adding the Login Password to any specific site URL as shown. " -"Examples:" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:796 ../../include/widgets.php:614 -msgid "Guest Access Tokens" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:803 -msgid "Login Name" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:804 -msgid "Login Password" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:805 -msgid "Expires (yyyy-mm-dd)" +#: ../../Zotlabs/Module/Impel.php:41 ../../include/bbcode.php:192 +msgid "webpage" msgstr "" -#: ../../Zotlabs/Module/Settings.php:830 -msgid "Additional Features" +#: ../../Zotlabs/Module/Impel.php:46 ../../include/bbcode.php:198 +msgid "block" msgstr "" -#: ../../Zotlabs/Module/Settings.php:854 -msgid "Connector Settings" +#: ../../Zotlabs/Module/Impel.php:51 ../../include/bbcode.php:195 +msgid "layout" msgstr "" -#: ../../Zotlabs/Module/Settings.php:893 -msgid "No special theme for mobile devices" +#: ../../Zotlabs/Module/Impel.php:58 ../../include/bbcode.php:201 +msgid "menu" msgstr "" -#: ../../Zotlabs/Module/Settings.php:896 +#: ../../Zotlabs/Module/Impel.php:187 #, php-format -msgid "%s - (Experimental)" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:938 -msgid "Display Settings" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:939 -msgid "Theme Settings" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:940 -msgid "Custom Theme Settings" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:941 -msgid "Content Settings" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:947 -msgid "Display Theme:" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:948 -msgid "Mobile Theme:" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:949 -msgid "Preload images before rendering the page" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:949 -msgid "" -"The subjective page load time will be longer but the page will be ready when " -"displayed" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:950 -msgid "Enable user zoom on mobile devices" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:951 -msgid "Update browser every xx seconds" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:951 -msgid "Minimum of 10 seconds, no maximum" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:952 -msgid "Maximum number of conversations to load at any time:" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:952 -msgid "Maximum of 100 items" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:953 -msgid "Show emoticons (smilies) as images" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:954 -msgid "Link post titles to source" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:955 -msgid "System Page Layout Editor - (advanced)" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:958 -msgid "Use blog/list mode on channel page" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:958 ../../Zotlabs/Module/Settings.php:959 -msgid "(comments displayed separately)" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:959 -msgid "Use blog/list mode on grid page" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:960 -msgid "Channel page max height of content (in pixels)" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:960 ../../Zotlabs/Module/Settings.php:961 -msgid "click to expand content exceeding this height" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:961 -msgid "Grid page max height of content (in pixels)" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:990 -msgid "Nobody except yourself" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:991 -msgid "Only those you specifically allow" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:992 -msgid "Approved connections" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:993 -msgid "Any connections" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:994 -msgid "Anybody on this website" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:995 -msgid "Anybody in this network" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:996 -msgid "Anybody authenticated" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:997 -msgid "Anybody on the internet" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1071 -msgid "Publish your default profile in the network directory" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1076 -msgid "Allow us to suggest you as a potential friend to new members?" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1085 -msgid "Your channel address is" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1127 -msgid "Channel Settings" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1134 -msgid "Basic Settings" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1135 ../../include/channel.php:1180 -msgid "Full Name:" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1137 -msgid "Your Timezone:" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1138 -msgid "Default Post Location:" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1138 -msgid "Geographical location to display on your posts" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1139 -msgid "Use Browser Location:" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1141 -msgid "Adult Content" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1141 -msgid "" -"This channel frequently or regularly publishes adult content. (Please tag " -"any adult material and/or nudity with #NSFW)" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1143 -msgid "Security and Privacy Settings" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1146 -msgid "Your permissions are already configured. Click to view/adjust" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1148 -msgid "Hide my online presence" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1148 -msgid "Prevents displaying in your profile that you are online" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1150 -msgid "Simple Privacy Settings:" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1151 -msgid "" -"Very Public - <em>extremely permissive (should be used with caution)</em>" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1152 -msgid "" -"Typical - <em>default public, privacy when desired (similar to social " -"network permissions but with improved privacy)</em>" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1153 -msgid "Private - <em>default private, never open or public</em>" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1154 -msgid "Blocked - <em>default blocked to/from everybody</em>" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1156 -msgid "Allow others to tag your posts" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1156 -msgid "" -"Often used by the community to retro-actively flag inappropriate content" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1158 -msgid "Advanced Privacy Settings" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1160 -msgid "Expire other channel content after this many days" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1160 -msgid "0 or blank to use the website limit." +msgid "%s element installed" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1160 +#: ../../Zotlabs/Module/Impel.php:190 #, php-format -msgid "This website expires after %d days." -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1160 -msgid "This website does not expire imported content." -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1160 -msgid "The website limit takes precedence if lower than your limit." -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1161 -msgid "Maximum Friend Requests/Day:" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1161 -msgid "May reduce spam activity" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1162 -msgid "Default Post and Publish Permissions" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1164 -msgid "Use my default audience setting for the type of object published" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1167 -msgid "Channel permissions category:" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1173 -msgid "Maximum private messages per day from unknown people:" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1173 -msgid "Useful to reduce spamming" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1176 -msgid "Notification Settings" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1177 -msgid "By default post a status message when:" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1178 -msgid "accepting a friend request" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1179 -msgid "joining a forum/community" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1180 -msgid "making an <em>interesting</em> profile change" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1181 -msgid "Send a notification email when:" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1182 -msgid "You receive a connection request" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1183 -msgid "Your connections are confirmed" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1184 -msgid "Someone writes on your profile wall" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1185 -msgid "Someone writes a followup comment" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1186 -msgid "You receive a private message" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1187 -msgid "You receive a friend suggestion" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1188 -msgid "You are tagged in a post" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1189 -msgid "You are poked/prodded/etc. in a post" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1192 -msgid "Show visual notifications including:" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1194 -msgid "Unseen grid activity" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1195 -msgid "Unseen channel activity" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1196 -msgid "Unseen private messages" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1196 -#: ../../Zotlabs/Module/Settings.php:1201 -#: ../../Zotlabs/Module/Settings.php:1202 -#: ../../Zotlabs/Module/Settings.php:1203 -msgid "Recommended" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1197 -msgid "Upcoming events" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1198 -msgid "Events today" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1199 -msgid "Upcoming birthdays" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1199 -msgid "Not available in all themes" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1200 -msgid "System (personal) notifications" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1201 -msgid "System info messages" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1202 -msgid "System critical alerts" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1203 -msgid "New connections" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1204 -msgid "System Registrations" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1205 -msgid "" -"Also show new wall posts, private messages and connections under Notices" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1207 -msgid "Notify me of events this many days in advance" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1207 -msgid "Must be greater than 0" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1209 -msgid "Advanced Account/Page Type Settings" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1210 -msgid "Change the behaviour of this account for special situations" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1213 -msgid "" -"Please enable expert mode (in <a href=\"settings/features\">Settings > " -"Additional features</a>) to adjust!" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1214 -msgid "Miscellaneous Settings" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1215 -msgid "Default photo upload folder" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1215 -#: ../../Zotlabs/Module/Settings.php:1216 -msgid "%Y - current year, %m - current month" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1216 -msgid "Default file upload folder" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1218 -msgid "Personal menu to display in your channel pages" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1220 -msgid "Remove this channel." -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1221 -msgid "Firefox Share $Projectname provider" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1222 -msgid "Start calendar week on monday" +msgid "%s element installation failed" msgstr "" #: ../../Zotlabs/Module/Setup.php:179 @@ -6407,7 +6317,7 @@ msgid "Select a tag to remove: " msgstr "" #: ../../Zotlabs/Module/Webpages.php:191 ../../Zotlabs/Lib/Apps.php:218 -#: ../../include/nav.php:106 ../../include/conversation.php:1700 +#: ../../include/conversation.php:1700 ../../include/nav.php:106 msgid "Webpages" msgstr "" @@ -6428,8 +6338,8 @@ msgid "Not found" msgstr "" #: ../../Zotlabs/Module/Wiki.php:92 ../../Zotlabs/Lib/Apps.php:219 -#: ../../include/nav.php:108 ../../include/conversation.php:1710 -#: ../../include/conversation.php:1713 ../../include/features.php:55 +#: ../../include/conversation.php:1710 ../../include/conversation.php:1713 +#: ../../include/features.php:55 ../../include/nav.php:108 msgid "Wiki" msgstr "" @@ -6796,7 +6706,7 @@ msgid "Suggest Channels" msgstr "" #: ../../Zotlabs/Lib/Apps.php:213 ../../include/nav.php:112 -#: ../../boot.php:1704 +#: ../../boot.php:1707 msgid "Login" msgstr "" @@ -6808,8 +6718,8 @@ msgstr "" msgid "Channel Home" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:223 ../../include/nav.php:203 -#: ../../include/conversation.php:1664 ../../include/conversation.php:1667 +#: ../../Zotlabs/Lib/Apps.php:223 ../../include/conversation.php:1664 +#: ../../include/conversation.php:1667 ../../include/nav.php:203 msgid "Events" msgstr "" @@ -6845,10 +6755,18 @@ msgstr "" msgid "Features" msgstr "" +#: ../../Zotlabs/Lib/Apps.php:236 +msgid "Language" +msgstr "" + #: ../../Zotlabs/Lib/Apps.php:237 msgid "Post" msgstr "" +#: ../../Zotlabs/Lib/Apps.php:238 +msgid "Profile Photo" +msgstr "" + #: ../../Zotlabs/Lib/Apps.php:339 msgid "Purchase" msgstr "" @@ -7105,327 +7023,199 @@ msgstr "" msgid "Cannot locate DNS info for database server '%s'" msgstr "" -#: ../../include/photos.php:114 -#, php-format -msgid "Image exceeds website size limit of %lu bytes" -msgstr "" - -#: ../../include/photos.php:121 -msgid "Image file is empty." -msgstr "" - -#: ../../include/photos.php:259 -msgid "Photo storage failed." -msgstr "" - -#: ../../include/photos.php:299 -msgid "a new photo" -msgstr "" - -#: ../../include/photos.php:303 -#, php-format -msgctxt "photo_upload" -msgid "%1$s posted %2$s to %3$s" -msgstr "" - -#: ../../include/photos.php:506 ../../include/conversation.php:1650 -msgid "Photo Albums" -msgstr "" - -#: ../../include/photos.php:510 -msgid "Upload New Photos" -msgstr "" - -#: ../../include/nav.php:82 ../../include/nav.php:115 ../../boot.php:1703 -msgid "Logout" -msgstr "" - -#: ../../include/nav.php:82 ../../include/nav.php:115 -msgid "End this session" -msgstr "" - -#: ../../include/nav.php:85 ../../include/nav.php:146 -msgid "Home" -msgstr "" - -#: ../../include/nav.php:85 -msgid "Your posts and conversations" -msgstr "" - -#: ../../include/nav.php:86 -msgid "Your profile page" -msgstr "" - -#: ../../include/nav.php:88 -msgid "Manage/Edit profiles" -msgstr "" - -#: ../../include/nav.php:90 ../../include/channel.php:980 -msgid "Edit Profile" -msgstr "" - -#: ../../include/nav.php:90 -msgid "Edit your profile" -msgstr "" - -#: ../../include/nav.php:92 -msgid "Your photos" +#: ../../include/api.php:1327 +msgid "Public Timeline" msgstr "" -#: ../../include/nav.php:93 -msgid "Your files" +#: ../../include/account.php:28 +msgid "Not a valid email address" msgstr "" -#: ../../include/nav.php:96 -msgid "Your chatrooms" +#: ../../include/account.php:30 +msgid "Your email domain is not among those allowed on this site" msgstr "" -#: ../../include/nav.php:102 ../../include/conversation.php:1690 -msgid "Bookmarks" +#: ../../include/account.php:36 +msgid "Your email address is already registered at this site." msgstr "" -#: ../../include/nav.php:102 -msgid "Your bookmarks" +#: ../../include/account.php:68 +msgid "An invitation is required." msgstr "" -#: ../../include/nav.php:106 -msgid "Your webpages" +#: ../../include/account.php:72 +msgid "Invitation could not be verified." msgstr "" -#: ../../include/nav.php:108 -msgid "Your wiki" +#: ../../include/account.php:122 +msgid "Please enter the required information." msgstr "" -#: ../../include/nav.php:112 -msgid "Sign in" +#: ../../include/account.php:189 +msgid "Failed to store account information." msgstr "" -#: ../../include/nav.php:129 +#: ../../include/account.php:249 #, php-format -msgid "%s - click to logout" -msgstr "" - -#: ../../include/nav.php:132 -msgid "Remote authentication" -msgstr "" - -#: ../../include/nav.php:132 -msgid "Click to authenticate to your home hub" -msgstr "" - -#: ../../include/nav.php:146 -msgid "Home Page" -msgstr "" - -#: ../../include/nav.php:149 -msgid "Create an account" -msgstr "" - -#: ../../include/nav.php:161 -msgid "Help and documentation" -msgstr "" - -#: ../../include/nav.php:165 -msgid "Applications, utilities, links, games" -msgstr "" - -#: ../../include/nav.php:167 -msgid "Search site @name, #tag, ?docs, content" -msgstr "" - -#: ../../include/nav.php:169 -msgid "Channel Directory" -msgstr "" - -#: ../../include/nav.php:181 -msgid "Your grid" -msgstr "" - -#: ../../include/nav.php:182 -msgid "Mark all grid notifications seen" -msgstr "" - -#: ../../include/nav.php:184 -msgid "Channel home" -msgstr "" - -#: ../../include/nav.php:185 -msgid "Mark all channel notifications seen" -msgstr "" - -#: ../../include/nav.php:191 -msgid "Notices" -msgstr "" - -#: ../../include/nav.php:191 -msgid "Notifications" -msgstr "" - -#: ../../include/nav.php:192 -msgid "See all notifications" -msgstr "" - -#: ../../include/nav.php:195 -msgid "Private mail" -msgstr "" - -#: ../../include/nav.php:196 -msgid "See all private messages" -msgstr "" - -#: ../../include/nav.php:197 -msgid "Mark all private messages seen" -msgstr "" - -#: ../../include/nav.php:198 ../../include/widgets.php:667 -msgid "Inbox" -msgstr "" - -#: ../../include/nav.php:199 ../../include/widgets.php:672 -msgid "Outbox" -msgstr "" - -#: ../../include/nav.php:200 ../../include/widgets.php:677 -msgid "New Message" -msgstr "" - -#: ../../include/nav.php:203 -msgid "Event Calendar" -msgstr "" - -#: ../../include/nav.php:204 -msgid "See all events" -msgstr "" - -#: ../../include/nav.php:205 -msgid "Mark all events seen" +msgid "Registration confirmation for %s" msgstr "" -#: ../../include/nav.php:208 -msgid "Manage Your Channels" +#: ../../include/account.php:315 +#, php-format +msgid "Registration request at %s" msgstr "" -#: ../../include/nav.php:210 -msgid "Account/Channel Settings" +#: ../../include/account.php:317 ../../include/account.php:344 +#: ../../include/account.php:404 ../../include/network.php:1930 +msgid "Administrator" msgstr "" -#: ../../include/nav.php:218 ../../include/widgets.php:1510 -msgid "Admin" +#: ../../include/account.php:339 +msgid "your registration password" msgstr "" -#: ../../include/nav.php:218 -msgid "Site Setup and Configuration" +#: ../../include/account.php:342 ../../include/account.php:402 +#, php-format +msgid "Registration details for %s" msgstr "" -#: ../../include/nav.php:249 ../../include/conversation.php:854 -msgid "Loading..." +#: ../../include/account.php:414 +msgid "Account approved." msgstr "" -#: ../../include/nav.php:254 -msgid "@name, #tag, ?doc, content" +#: ../../include/account.php:454 +#, php-format +msgid "Registration revoked for %s" msgstr "" -#: ../../include/nav.php:255 -msgid "Please wait..." +#: ../../include/account.php:739 ../../include/account.php:741 +msgid "Click here to upgrade." msgstr "" -#: ../../include/network.php:704 -msgid "view full size" +#: ../../include/account.php:747 +msgid "This action exceeds the limits set by your subscription plan." msgstr "" -#: ../../include/network.php:1930 ../../include/account.php:317 -#: ../../include/account.php:344 ../../include/account.php:404 -msgid "Administrator" +#: ../../include/account.php:752 +msgid "This action is not available under your subscription plan." msgstr "" -#: ../../include/network.php:1944 -msgid "No Subject" +#: ../../include/acl_selectors.php:269 +msgid "Who can see this?" msgstr "" -#: ../../include/network.php:2198 ../../include/network.php:2199 -msgid "Friendica" +#: ../../include/acl_selectors.php:270 +msgid "Custom selection" msgstr "" -#: ../../include/network.php:2200 -msgid "OStatus" +#: ../../include/acl_selectors.php:271 +msgid "" +"Select \"Show\" to allow viewing. \"Don't show\" lets you override and limit " +"the scope of \"Show\"." msgstr "" -#: ../../include/network.php:2201 -msgid "GNU-Social" +#: ../../include/acl_selectors.php:272 +msgid "Show" msgstr "" -#: ../../include/network.php:2202 -msgid "RSS/Atom" +#: ../../include/acl_selectors.php:273 +msgid "Don't show" msgstr "" -#: ../../include/network.php:2204 -msgid "Diaspora" +#: ../../include/acl_selectors.php:279 +msgid "Other networks and post services" msgstr "" -#: ../../include/network.php:2205 -msgid "Facebook" +#: ../../include/acl_selectors.php:309 +#, php-format +msgid "" +"Post permissions %s cannot be changed %s after a post is shared.</br />These " +"permissions set who is allowed to view the post." msgstr "" -#: ../../include/network.php:2206 -msgid "Zot" +#: ../../include/datetime.php:135 +msgid "Birthday" msgstr "" -#: ../../include/network.php:2207 -msgid "LinkedIn" +#: ../../include/datetime.php:137 +msgid "Age: " msgstr "" -#: ../../include/network.php:2208 -msgid "XMPP/IM" +#: ../../include/datetime.php:139 +msgid "YYYY-MM-DD or MM-DD" msgstr "" -#: ../../include/network.php:2209 -msgid "MySpace" +#: ../../include/datetime.php:272 ../../boot.php:2543 +msgid "never" msgstr "" -#: ../../include/page_widgets.php:7 -msgid "New Page" +#: ../../include/datetime.php:278 +msgid "less than a second ago" msgstr "" -#: ../../include/page_widgets.php:46 -msgid "Title" +#: ../../include/datetime.php:296 +#, php-format +msgctxt "e.g. 22 hours ago, 1 minute ago" +msgid "%1$d %2$s ago" msgstr "" -#: ../../include/taxonomy.php:188 ../../include/taxonomy.php:270 -#: ../../include/widgets.php:46 ../../include/widgets.php:429 -#: ../../include/contact_widgets.php:91 -msgid "Categories" -msgstr "" +#: ../../include/datetime.php:307 +msgctxt "relative_date" +msgid "year" +msgid_plural "years" +msgstr[0] "" +msgstr[1] "" -#: ../../include/taxonomy.php:228 ../../include/taxonomy.php:249 -msgid "Tags" -msgstr "" +#: ../../include/datetime.php:310 +msgctxt "relative_date" +msgid "month" +msgid_plural "months" +msgstr[0] "" +msgstr[1] "" -#: ../../include/taxonomy.php:293 -msgid "Keywords" -msgstr "" +#: ../../include/datetime.php:313 +msgctxt "relative_date" +msgid "week" +msgid_plural "weeks" +msgstr[0] "" +msgstr[1] "" -#: ../../include/taxonomy.php:314 -msgid "have" -msgstr "" +#: ../../include/datetime.php:316 +msgctxt "relative_date" +msgid "day" +msgid_plural "days" +msgstr[0] "" +msgstr[1] "" -#: ../../include/taxonomy.php:314 -msgid "has" -msgstr "" +#: ../../include/datetime.php:319 +msgctxt "relative_date" +msgid "hour" +msgid_plural "hours" +msgstr[0] "" +msgstr[1] "" -#: ../../include/taxonomy.php:315 -msgid "want" -msgstr "" +#: ../../include/datetime.php:322 +msgctxt "relative_date" +msgid "minute" +msgid_plural "minutes" +msgstr[0] "" +msgstr[1] "" -#: ../../include/taxonomy.php:315 -msgid "wants" -msgstr "" +#: ../../include/datetime.php:325 +msgctxt "relative_date" +msgid "second" +msgid_plural "seconds" +msgstr[0] "" +msgstr[1] "" -#: ../../include/taxonomy.php:316 -msgid "likes" +#: ../../include/datetime.php:562 +#, php-format +msgid "%1$s's birthday" msgstr "" -#: ../../include/taxonomy.php:317 -msgid "dislikes" +#: ../../include/datetime.php:563 +#, php-format +msgid "Happy Birthday %1$s" msgstr "" #: ../../include/channel.php:33 @@ -7473,6 +7263,10 @@ msgstr "" msgid "Create New Profile" msgstr "" +#: ../../include/channel.php:980 ../../include/nav.php:90 +msgid "Edit Profile" +msgstr "" + #: ../../include/channel.php:997 msgid "Visible to everybody" msgstr "" @@ -7582,292 +7376,6 @@ msgstr "" msgid "Like this thing" msgstr "" -#: ../../include/connections.php:95 -msgid "New window" -msgstr "" - -#: ../../include/connections.php:96 -msgid "Open the selected location in a different window or browser tab" -msgstr "" - -#: ../../include/connections.php:214 -#, php-format -msgid "User '%s' deleted" -msgstr "" - -#: ../../include/conversation.php:204 -#, php-format -msgid "%1$s is now connected with %2$s" -msgstr "" - -#: ../../include/conversation.php:239 -#, php-format -msgid "%1$s poked %2$s" -msgstr "" - -#: ../../include/conversation.php:243 ../../include/text.php:1013 -#: ../../include/text.php:1018 -msgid "poked" -msgstr "" - -#: ../../include/conversation.php:694 -#, php-format -msgid "View %s's profile @ %s" -msgstr "" - -#: ../../include/conversation.php:713 -msgid "Categories:" -msgstr "" - -#: ../../include/conversation.php:714 -msgid "Filed under:" -msgstr "" - -#: ../../include/conversation.php:741 -msgid "View in context" -msgstr "" - -#: ../../include/conversation.php:850 -msgid "remove" -msgstr "" - -#: ../../include/conversation.php:855 -msgid "Delete Selected Items" -msgstr "" - -#: ../../include/conversation.php:951 -msgid "View Source" -msgstr "" - -#: ../../include/conversation.php:952 -msgid "Follow Thread" -msgstr "" - -#: ../../include/conversation.php:953 -msgid "Unfollow Thread" -msgstr "" - -#: ../../include/conversation.php:958 -msgid "Activity/Posts" -msgstr "" - -#: ../../include/conversation.php:960 -msgid "Edit Connection" -msgstr "" - -#: ../../include/conversation.php:961 -msgid "Message" -msgstr "" - -#: ../../include/conversation.php:1078 -#, php-format -msgid "%s likes this." -msgstr "" - -#: ../../include/conversation.php:1078 -#, php-format -msgid "%s doesn't like this." -msgstr "" - -#: ../../include/conversation.php:1082 -#, php-format -msgid "<span %1$s>%2$d people</span> like this." -msgid_plural "<span %1$s>%2$d people</span> like this." -msgstr[0] "" -msgstr[1] "" - -#: ../../include/conversation.php:1084 -#, php-format -msgid "<span %1$s>%2$d people</span> don't like this." -msgid_plural "<span %1$s>%2$d people</span> don't like this." -msgstr[0] "" -msgstr[1] "" - -#: ../../include/conversation.php:1090 -msgid "and" -msgstr "" - -#: ../../include/conversation.php:1093 -#, php-format -msgid ", and %d other people" -msgid_plural ", and %d other people" -msgstr[0] "" -msgstr[1] "" - -#: ../../include/conversation.php:1094 -#, php-format -msgid "%s like this." -msgstr "" - -#: ../../include/conversation.php:1094 -#, php-format -msgid "%s don't like this." -msgstr "" - -#: ../../include/conversation.php:1133 -msgid "Set your location" -msgstr "" - -#: ../../include/conversation.php:1134 -msgid "Clear browser location" -msgstr "" - -#: ../../include/conversation.php:1182 -msgid "Tag term:" -msgstr "" - -#: ../../include/conversation.php:1183 -msgid "Where are you right now?" -msgstr "" - -#: ../../include/conversation.php:1221 -msgid "Page link name" -msgstr "" - -#: ../../include/conversation.php:1224 -msgid "Post as" -msgstr "" - -#: ../../include/conversation.php:1238 -msgid "Toggle voting" -msgstr "" - -#: ../../include/conversation.php:1246 -msgid "Categories (optional, comma-separated list)" -msgstr "" - -#: ../../include/conversation.php:1269 -msgid "Set publish date" -msgstr "" - -#: ../../include/conversation.php:1518 -msgid "Discover" -msgstr "" - -#: ../../include/conversation.php:1521 -msgid "Imported public streams" -msgstr "" - -#: ../../include/conversation.php:1526 -msgid "Commented Order" -msgstr "" - -#: ../../include/conversation.php:1529 -msgid "Sort by Comment Date" -msgstr "" - -#: ../../include/conversation.php:1533 -msgid "Posted Order" -msgstr "" - -#: ../../include/conversation.php:1536 -msgid "Sort by Post Date" -msgstr "" - -#: ../../include/conversation.php:1544 -msgid "Posts that mention or involve you" -msgstr "" - -#: ../../include/conversation.php:1553 -msgid "Activity Stream - by date" -msgstr "" - -#: ../../include/conversation.php:1559 -msgid "Starred" -msgstr "" - -#: ../../include/conversation.php:1562 -msgid "Favourite Posts" -msgstr "" - -#: ../../include/conversation.php:1569 -msgid "Spam" -msgstr "" - -#: ../../include/conversation.php:1572 -msgid "Posts flagged as SPAM" -msgstr "" - -#: ../../include/conversation.php:1629 -msgid "Status Messages and Posts" -msgstr "" - -#: ../../include/conversation.php:1638 -msgid "About" -msgstr "" - -#: ../../include/conversation.php:1641 -msgid "Profile Details" -msgstr "" - -#: ../../include/conversation.php:1657 -msgid "Files and Storage" -msgstr "" - -#: ../../include/conversation.php:1677 ../../include/conversation.php:1680 -#: ../../include/widgets.php:836 -msgid "Chatrooms" -msgstr "" - -#: ../../include/conversation.php:1693 -msgid "Saved Bookmarks" -msgstr "" - -#: ../../include/conversation.php:1703 -msgid "Manage Webpages" -msgstr "" - -#: ../../include/conversation.php:1768 -msgctxt "noun" -msgid "Attending" -msgid_plural "Attending" -msgstr[0] "" -msgstr[1] "" - -#: ../../include/conversation.php:1771 -msgctxt "noun" -msgid "Not Attending" -msgid_plural "Not Attending" -msgstr[0] "" -msgstr[1] "" - -#: ../../include/conversation.php:1774 -msgctxt "noun" -msgid "Undecided" -msgid_plural "Undecided" -msgstr[0] "" -msgstr[1] "" - -#: ../../include/conversation.php:1777 -msgctxt "noun" -msgid "Agree" -msgid_plural "Agrees" -msgstr[0] "" -msgstr[1] "" - -#: ../../include/conversation.php:1780 -msgctxt "noun" -msgid "Disagree" -msgid_plural "Disagrees" -msgstr[0] "" -msgstr[1] "" - -#: ../../include/conversation.php:1783 -msgctxt "noun" -msgid "Abstain" -msgid_plural "Abstains" -msgstr[0] "" -msgstr[1] "" - -#: ../../include/import.php:30 -msgid "" -"Cannot create a duplicate channel identifier on this system. Import failed." -msgstr "" - -#: ../../include/import.php:97 -msgid "Channel clone failed. Import failed." -msgstr "" - #: ../../include/selectors.php:30 msgid "Frequently" msgstr "" @@ -7892,6 +7400,14 @@ msgstr "" msgid "Monthly" msgstr "" +#: ../../include/selectors.php:49 ../../include/selectors.php:66 +msgid "Male" +msgstr "" + +#: ../../include/selectors.php:49 ../../include/selectors.php:66 +msgid "Female" +msgstr "" + #: ../../include/selectors.php:49 msgid "Currently Male" msgstr "" @@ -8108,364 +7624,324 @@ msgstr "" msgid "Ask me" msgstr "" -#: ../../include/bookmarks.php:35 +#: ../../include/conversation.php:204 #, php-format -msgid "%1$s's bookmarks" -msgstr "" - -#: ../../include/security.php:109 -msgid "guest:" -msgstr "" - -#: ../../include/security.php:427 -msgid "" -"The form security token was not correct. This probably happened because the " -"form has been opened for too long (>3 hours) before submitting it." -msgstr "" - -#: ../../include/text.php:404 -msgid "prev" -msgstr "" - -#: ../../include/text.php:406 -msgid "first" -msgstr "" - -#: ../../include/text.php:435 -msgid "last" -msgstr "" - -#: ../../include/text.php:438 -msgid "next" -msgstr "" - -#: ../../include/text.php:448 -msgid "older" -msgstr "" - -#: ../../include/text.php:450 -msgid "newer" -msgstr "" - -#: ../../include/text.php:843 -msgid "No connections" +msgid "%1$s is now connected with %2$s" msgstr "" -#: ../../include/text.php:868 +#: ../../include/conversation.php:239 #, php-format -msgid "View all %s connections" -msgstr "" - -#: ../../include/text.php:1013 ../../include/text.php:1018 -msgid "poke" -msgstr "" - -#: ../../include/text.php:1019 -msgid "ping" -msgstr "" - -#: ../../include/text.php:1019 -msgid "pinged" -msgstr "" - -#: ../../include/text.php:1020 -msgid "prod" -msgstr "" - -#: ../../include/text.php:1020 -msgid "prodded" -msgstr "" - -#: ../../include/text.php:1021 -msgid "slap" -msgstr "" - -#: ../../include/text.php:1021 -msgid "slapped" -msgstr "" - -#: ../../include/text.php:1022 -msgid "finger" -msgstr "" - -#: ../../include/text.php:1022 -msgid "fingered" -msgstr "" - -#: ../../include/text.php:1023 -msgid "rebuff" +msgid "%1$s poked %2$s" msgstr "" -#: ../../include/text.php:1023 -msgid "rebuffed" +#: ../../include/conversation.php:243 ../../include/text.php:1013 +#: ../../include/text.php:1018 +msgid "poked" msgstr "" -#: ../../include/text.php:1035 -msgid "happy" +#: ../../include/conversation.php:694 +#, php-format +msgid "View %s's profile @ %s" msgstr "" -#: ../../include/text.php:1036 -msgid "sad" +#: ../../include/conversation.php:713 +msgid "Categories:" msgstr "" -#: ../../include/text.php:1037 -msgid "mellow" +#: ../../include/conversation.php:714 +msgid "Filed under:" msgstr "" -#: ../../include/text.php:1038 -msgid "tired" +#: ../../include/conversation.php:741 +msgid "View in context" msgstr "" -#: ../../include/text.php:1039 -msgid "perky" +#: ../../include/conversation.php:850 +msgid "remove" msgstr "" -#: ../../include/text.php:1040 -msgid "angry" +#: ../../include/conversation.php:854 ../../include/nav.php:249 +msgid "Loading..." msgstr "" -#: ../../include/text.php:1041 -msgid "stupefied" +#: ../../include/conversation.php:855 +msgid "Delete Selected Items" msgstr "" -#: ../../include/text.php:1042 -msgid "puzzled" +#: ../../include/conversation.php:951 +msgid "View Source" msgstr "" -#: ../../include/text.php:1043 -msgid "interested" +#: ../../include/conversation.php:952 +msgid "Follow Thread" msgstr "" -#: ../../include/text.php:1044 -msgid "bitter" +#: ../../include/conversation.php:953 +msgid "Unfollow Thread" msgstr "" -#: ../../include/text.php:1045 -msgid "cheerful" +#: ../../include/conversation.php:958 +msgid "Activity/Posts" msgstr "" -#: ../../include/text.php:1046 -msgid "alive" +#: ../../include/conversation.php:960 +msgid "Edit Connection" msgstr "" -#: ../../include/text.php:1047 -msgid "annoyed" +#: ../../include/conversation.php:961 +msgid "Message" msgstr "" -#: ../../include/text.php:1048 -msgid "anxious" +#: ../../include/conversation.php:1078 +#, php-format +msgid "%s likes this." msgstr "" -#: ../../include/text.php:1049 -msgid "cranky" +#: ../../include/conversation.php:1078 +#, php-format +msgid "%s doesn't like this." msgstr "" -#: ../../include/text.php:1050 -msgid "disturbed" -msgstr "" +#: ../../include/conversation.php:1082 +#, php-format +msgid "<span %1$s>%2$d people</span> like this." +msgid_plural "<span %1$s>%2$d people</span> like this." +msgstr[0] "" +msgstr[1] "" -#: ../../include/text.php:1051 -msgid "frustrated" -msgstr "" +#: ../../include/conversation.php:1084 +#, php-format +msgid "<span %1$s>%2$d people</span> don't like this." +msgid_plural "<span %1$s>%2$d people</span> don't like this." +msgstr[0] "" +msgstr[1] "" -#: ../../include/text.php:1052 -msgid "depressed" +#: ../../include/conversation.php:1090 +msgid "and" msgstr "" -#: ../../include/text.php:1053 -msgid "motivated" -msgstr "" +#: ../../include/conversation.php:1093 +#, php-format +msgid ", and %d other people" +msgid_plural ", and %d other people" +msgstr[0] "" +msgstr[1] "" -#: ../../include/text.php:1054 -msgid "relaxed" +#: ../../include/conversation.php:1094 +#, php-format +msgid "%s like this." msgstr "" -#: ../../include/text.php:1055 -msgid "surprised" +#: ../../include/conversation.php:1094 +#, php-format +msgid "%s don't like this." msgstr "" -#: ../../include/text.php:1237 ../../include/js_strings.php:70 -msgid "Monday" +#: ../../include/conversation.php:1133 +msgid "Set your location" msgstr "" -#: ../../include/text.php:1237 ../../include/js_strings.php:71 -msgid "Tuesday" +#: ../../include/conversation.php:1134 +msgid "Clear browser location" msgstr "" -#: ../../include/text.php:1237 ../../include/js_strings.php:72 -msgid "Wednesday" +#: ../../include/conversation.php:1182 +msgid "Tag term:" msgstr "" -#: ../../include/text.php:1237 ../../include/js_strings.php:73 -msgid "Thursday" +#: ../../include/conversation.php:1183 +msgid "Where are you right now?" msgstr "" -#: ../../include/text.php:1237 ../../include/js_strings.php:74 -msgid "Friday" +#: ../../include/conversation.php:1221 +msgid "Page link name" msgstr "" -#: ../../include/text.php:1237 ../../include/js_strings.php:75 -msgid "Saturday" +#: ../../include/conversation.php:1224 +msgid "Post as" msgstr "" -#: ../../include/text.php:1237 ../../include/js_strings.php:69 -msgid "Sunday" +#: ../../include/conversation.php:1238 +msgid "Toggle voting" msgstr "" -#: ../../include/text.php:1241 ../../include/js_strings.php:45 -msgid "January" +#: ../../include/conversation.php:1246 +msgid "Categories (optional, comma-separated list)" msgstr "" -#: ../../include/text.php:1241 ../../include/js_strings.php:46 -msgid "February" +#: ../../include/conversation.php:1269 +msgid "Set publish date" msgstr "" -#: ../../include/text.php:1241 ../../include/js_strings.php:47 -msgid "March" +#: ../../include/conversation.php:1518 +msgid "Discover" msgstr "" -#: ../../include/text.php:1241 ../../include/js_strings.php:48 -msgid "April" +#: ../../include/conversation.php:1521 +msgid "Imported public streams" msgstr "" -#: ../../include/text.php:1241 -msgid "May" +#: ../../include/conversation.php:1526 +msgid "Commented Order" msgstr "" -#: ../../include/text.php:1241 ../../include/js_strings.php:50 -msgid "June" +#: ../../include/conversation.php:1529 +msgid "Sort by Comment Date" msgstr "" -#: ../../include/text.php:1241 ../../include/js_strings.php:51 -msgid "July" +#: ../../include/conversation.php:1533 +msgid "Posted Order" msgstr "" -#: ../../include/text.php:1241 ../../include/js_strings.php:52 -msgid "August" +#: ../../include/conversation.php:1536 +msgid "Sort by Post Date" msgstr "" -#: ../../include/text.php:1241 ../../include/js_strings.php:53 -msgid "September" +#: ../../include/conversation.php:1544 +msgid "Posts that mention or involve you" msgstr "" -#: ../../include/text.php:1241 ../../include/js_strings.php:54 -msgid "October" +#: ../../include/conversation.php:1553 +msgid "Activity Stream - by date" msgstr "" -#: ../../include/text.php:1241 ../../include/js_strings.php:55 -msgid "November" +#: ../../include/conversation.php:1559 +msgid "Starred" msgstr "" -#: ../../include/text.php:1241 ../../include/js_strings.php:56 -msgid "December" +#: ../../include/conversation.php:1562 +msgid "Favourite Posts" msgstr "" -#: ../../include/text.php:1318 ../../include/text.php:1322 -msgid "Unknown Attachment" +#: ../../include/conversation.php:1569 +msgid "Spam" msgstr "" -#: ../../include/text.php:1324 -msgid "unknown" +#: ../../include/conversation.php:1572 +msgid "Posts flagged as SPAM" msgstr "" -#: ../../include/text.php:1360 -msgid "remove category" +#: ../../include/conversation.php:1629 +msgid "Status Messages and Posts" msgstr "" -#: ../../include/text.php:1437 -msgid "remove from file" +#: ../../include/conversation.php:1638 +msgid "About" msgstr "" -#: ../../include/text.php:1734 ../../include/text.php:1805 -msgid "default" +#: ../../include/conversation.php:1641 +msgid "Profile Details" msgstr "" -#: ../../include/text.php:1742 -msgid "Page layout" +#: ../../include/conversation.php:1650 ../../include/photos.php:506 +msgid "Photo Albums" msgstr "" -#: ../../include/text.php:1742 -msgid "You can create your own with the layouts tool" +#: ../../include/conversation.php:1657 +msgid "Files and Storage" msgstr "" -#: ../../include/text.php:1784 -msgid "Page content type" +#: ../../include/conversation.php:1677 ../../include/conversation.php:1680 +#: ../../include/widgets.php:836 +msgid "Chatrooms" msgstr "" -#: ../../include/text.php:1817 -msgid "Select an alternate language" +#: ../../include/conversation.php:1690 ../../include/nav.php:102 +msgid "Bookmarks" msgstr "" -#: ../../include/text.php:1934 -msgid "activity" +#: ../../include/conversation.php:1693 +msgid "Saved Bookmarks" msgstr "" -#: ../../include/text.php:2235 -msgid "Design Tools" +#: ../../include/conversation.php:1703 +msgid "Manage Webpages" msgstr "" -#: ../../include/text.php:2241 -msgid "Pages" -msgstr "" +#: ../../include/conversation.php:1768 +msgctxt "noun" +msgid "Attending" +msgid_plural "Attending" +msgstr[0] "" +msgstr[1] "" -#: ../../include/auth.php:147 -msgid "Logged out." -msgstr "" +#: ../../include/conversation.php:1771 +msgctxt "noun" +msgid "Not Attending" +msgid_plural "Not Attending" +msgstr[0] "" +msgstr[1] "" -#: ../../include/auth.php:274 -msgid "Failed authentication" -msgstr "" +#: ../../include/conversation.php:1774 +msgctxt "noun" +msgid "Undecided" +msgid_plural "Undecided" +msgstr[0] "" +msgstr[1] "" -#: ../../include/permissions.php:26 -msgid "Can view my normal stream and posts" -msgstr "" +#: ../../include/conversation.php:1777 +msgctxt "noun" +msgid "Agree" +msgid_plural "Agrees" +msgstr[0] "" +msgstr[1] "" -#: ../../include/permissions.php:30 -msgid "Can view my webpages" -msgstr "" +#: ../../include/conversation.php:1780 +msgctxt "noun" +msgid "Disagree" +msgid_plural "Disagrees" +msgstr[0] "" +msgstr[1] "" -#: ../../include/permissions.php:34 -msgid "Can post on my channel page (\"wall\")" -msgstr "" +#: ../../include/conversation.php:1783 +msgctxt "noun" +msgid "Abstain" +msgid_plural "Abstains" +msgstr[0] "" +msgstr[1] "" -#: ../../include/permissions.php:37 -msgid "Can like/dislike stuff" +#: ../../include/bookmarks.php:35 +#, php-format +msgid "%1$s's bookmarks" msgstr "" -#: ../../include/permissions.php:37 -msgid "Profiles and things other than posts/comments" +#: ../../include/event.php:22 ../../include/event.php:69 +#: ../../include/bb2diaspora.php:485 +msgid "l F d, Y \\@ g:i A" msgstr "" -#: ../../include/permissions.php:39 -msgid "Can forward to all my channel contacts via post @mentions" +#: ../../include/event.php:30 ../../include/event.php:73 +#: ../../include/bb2diaspora.php:491 +msgid "Starts:" msgstr "" -#: ../../include/permissions.php:39 -msgid "Advanced - useful for creating group forum channels" +#: ../../include/event.php:40 ../../include/event.php:77 +#: ../../include/bb2diaspora.php:499 +msgid "Finishes:" msgstr "" -#: ../../include/permissions.php:40 -msgid "Can chat with me (when available)" +#: ../../include/event.php:814 +msgid "This event has been added to your calendar." msgstr "" -#: ../../include/permissions.php:41 -msgid "Can write to my file storage and photos" +#: ../../include/event.php:1014 +msgid "Not specified" msgstr "" -#: ../../include/permissions.php:42 -msgid "Can edit my webpages" +#: ../../include/event.php:1015 +msgid "Needs Action" msgstr "" -#: ../../include/permissions.php:44 -msgid "Somewhat advanced - very useful in open communities" +#: ../../include/event.php:1016 +msgid "Completed" msgstr "" -#: ../../include/permissions.php:46 -msgid "Can administer my channel resources" +#: ../../include/event.php:1017 +msgid "In Process" msgstr "" -#: ../../include/permissions.php:46 -msgid "Extremely advanced. Leave this alone unless you know what you are doing" +#: ../../include/event.php:1018 +msgid "Cancelled" msgstr "" #: ../../include/features.php:48 @@ -8731,8 +8207,8 @@ msgstr "" msgid "Add emoji reaction ability to posts" msgstr "" -#: ../../include/features.php:99 ../../include/widgets.php:310 -#: ../../include/contact_widgets.php:53 +#: ../../include/features.php:99 ../../include/contact_widgets.php:53 +#: ../../include/widgets.php:310 msgid "Saved Folders" msgstr "" @@ -8795,139 +8271,254 @@ msgstr "" msgid "add" msgstr "" -#: ../../include/event.php:22 ../../include/event.php:69 -#: ../../include/bb2diaspora.php:485 -msgid "l F d, Y \\@ g:i A" +#: ../../include/nav.php:82 ../../include/nav.php:115 ../../boot.php:1706 +msgid "Logout" msgstr "" -#: ../../include/event.php:30 ../../include/event.php:73 -#: ../../include/bb2diaspora.php:491 -msgid "Starts:" +#: ../../include/nav.php:82 ../../include/nav.php:115 +msgid "End this session" msgstr "" -#: ../../include/event.php:40 ../../include/event.php:77 -#: ../../include/bb2diaspora.php:499 -msgid "Finishes:" +#: ../../include/nav.php:85 ../../include/nav.php:146 +msgid "Home" msgstr "" -#: ../../include/event.php:814 -msgid "This event has been added to your calendar." +#: ../../include/nav.php:85 +msgid "Your posts and conversations" msgstr "" -#: ../../include/event.php:1014 -msgid "Not specified" +#: ../../include/nav.php:86 +msgid "Your profile page" msgstr "" -#: ../../include/event.php:1015 -msgid "Needs Action" +#: ../../include/nav.php:88 +msgid "Manage/Edit profiles" msgstr "" -#: ../../include/event.php:1016 -msgid "Completed" +#: ../../include/nav.php:90 +msgid "Edit your profile" msgstr "" -#: ../../include/event.php:1017 -msgid "In Process" +#: ../../include/nav.php:92 +msgid "Your photos" msgstr "" -#: ../../include/event.php:1018 -msgid "Cancelled" +#: ../../include/nav.php:93 +msgid "Your files" msgstr "" -#: ../../include/account.php:28 -msgid "Not a valid email address" +#: ../../include/nav.php:96 +msgid "Your chatrooms" msgstr "" -#: ../../include/account.php:30 -msgid "Your email domain is not among those allowed on this site" +#: ../../include/nav.php:102 +msgid "Your bookmarks" msgstr "" -#: ../../include/account.php:36 -msgid "Your email address is already registered at this site." +#: ../../include/nav.php:106 +msgid "Your webpages" msgstr "" -#: ../../include/account.php:68 -msgid "An invitation is required." +#: ../../include/nav.php:108 +msgid "Your wiki" msgstr "" -#: ../../include/account.php:72 -msgid "Invitation could not be verified." +#: ../../include/nav.php:112 +msgid "Sign in" msgstr "" -#: ../../include/account.php:122 -msgid "Please enter the required information." +#: ../../include/nav.php:129 +#, php-format +msgid "%s - click to logout" msgstr "" -#: ../../include/account.php:189 -msgid "Failed to store account information." +#: ../../include/nav.php:132 +msgid "Remote authentication" msgstr "" -#: ../../include/account.php:249 -#, php-format -msgid "Registration confirmation for %s" +#: ../../include/nav.php:132 +msgid "Click to authenticate to your home hub" msgstr "" -#: ../../include/account.php:315 -#, php-format -msgid "Registration request at %s" +#: ../../include/nav.php:146 +msgid "Home Page" msgstr "" -#: ../../include/account.php:339 -msgid "your registration password" +#: ../../include/nav.php:149 +msgid "Create an account" msgstr "" -#: ../../include/account.php:342 ../../include/account.php:402 -#, php-format -msgid "Registration details for %s" +#: ../../include/nav.php:161 +msgid "Help and documentation" msgstr "" -#: ../../include/account.php:414 -msgid "Account approved." +#: ../../include/nav.php:165 +msgid "Applications, utilities, links, games" msgstr "" -#: ../../include/account.php:454 -#, php-format -msgid "Registration revoked for %s" +#: ../../include/nav.php:167 +msgid "Search site @name, #tag, ?docs, content" msgstr "" -#: ../../include/account.php:739 ../../include/account.php:741 -msgid "Click here to upgrade." +#: ../../include/nav.php:169 +msgid "Channel Directory" msgstr "" -#: ../../include/account.php:747 -msgid "This action exceeds the limits set by your subscription plan." +#: ../../include/nav.php:181 +msgid "Your grid" msgstr "" -#: ../../include/account.php:752 -msgid "This action is not available under your subscription plan." +#: ../../include/nav.php:182 +msgid "Mark all grid notifications seen" msgstr "" -#: ../../include/follow.php:27 -msgid "Channel is blocked on this site." +#: ../../include/nav.php:184 +msgid "Channel home" msgstr "" -#: ../../include/follow.php:32 -msgid "Channel location missing." +#: ../../include/nav.php:185 +msgid "Mark all channel notifications seen" msgstr "" -#: ../../include/follow.php:80 -msgid "Response from remote channel was incomplete." +#: ../../include/nav.php:191 +msgid "Notices" msgstr "" -#: ../../include/follow.php:97 -msgid "Channel was deleted and no longer exists." +#: ../../include/nav.php:191 +msgid "Notifications" msgstr "" -#: ../../include/follow.php:147 ../../include/follow.php:183 -msgid "Protocol disabled." +#: ../../include/nav.php:192 +msgid "See all notifications" msgstr "" -#: ../../include/follow.php:171 -msgid "Channel discovery failed." +#: ../../include/nav.php:195 +msgid "Private mail" msgstr "" -#: ../../include/follow.php:210 -msgid "Cannot connect to yourself." +#: ../../include/nav.php:196 +msgid "See all private messages" +msgstr "" + +#: ../../include/nav.php:197 +msgid "Mark all private messages seen" +msgstr "" + +#: ../../include/nav.php:198 ../../include/widgets.php:667 +msgid "Inbox" +msgstr "" + +#: ../../include/nav.php:199 ../../include/widgets.php:672 +msgid "Outbox" +msgstr "" + +#: ../../include/nav.php:200 ../../include/widgets.php:677 +msgid "New Message" +msgstr "" + +#: ../../include/nav.php:203 +msgid "Event Calendar" +msgstr "" + +#: ../../include/nav.php:204 +msgid "See all events" +msgstr "" + +#: ../../include/nav.php:205 +msgid "Mark all events seen" +msgstr "" + +#: ../../include/nav.php:208 +msgid "Manage Your Channels" +msgstr "" + +#: ../../include/nav.php:210 +msgid "Account/Channel Settings" +msgstr "" + +#: ../../include/nav.php:218 ../../include/widgets.php:1510 +msgid "Admin" +msgstr "" + +#: ../../include/nav.php:218 +msgid "Site Setup and Configuration" +msgstr "" + +#: ../../include/nav.php:254 +msgid "@name, #tag, ?doc, content" +msgstr "" + +#: ../../include/nav.php:255 +msgid "Please wait..." +msgstr "" + +#: ../../include/network.php:704 +msgid "view full size" +msgstr "" + +#: ../../include/network.php:1944 +msgid "No Subject" +msgstr "" + +#: ../../include/network.php:2198 ../../include/network.php:2199 +msgid "Friendica" +msgstr "" + +#: ../../include/network.php:2200 +msgid "OStatus" +msgstr "" + +#: ../../include/network.php:2201 +msgid "GNU-Social" +msgstr "" + +#: ../../include/network.php:2202 +msgid "RSS/Atom" +msgstr "" + +#: ../../include/network.php:2204 +msgid "Diaspora" +msgstr "" + +#: ../../include/network.php:2205 +msgid "Facebook" +msgstr "" + +#: ../../include/network.php:2206 +msgid "Zot" +msgstr "" + +#: ../../include/network.php:2207 +msgid "LinkedIn" +msgstr "" + +#: ../../include/network.php:2208 +msgid "XMPP/IM" +msgstr "" + +#: ../../include/network.php:2209 +msgid "MySpace" +msgstr "" + +#: ../../include/page_widgets.php:7 +msgid "New Page" +msgstr "" + +#: ../../include/page_widgets.php:46 +msgid "Title" +msgstr "" + +#: ../../include/connections.php:95 +msgid "New window" +msgstr "" + +#: ../../include/connections.php:96 +msgid "Open the selected location in a different window or browser tab" +msgstr "" + +#: ../../include/connections.php:214 +#, php-format +msgid "User '%s' deleted" msgstr "" #: ../../include/attach.php:247 ../../include/attach.php:333 @@ -8992,6 +8583,26 @@ msgstr "" msgid "Empty path" msgstr "" +#: ../../include/auth.php:147 +msgid "Logged out." +msgstr "" + +#: ../../include/auth.php:274 +msgid "Failed authentication" +msgstr "" + +#: ../../include/auth.php:285 +msgid "Login failed." +msgstr "" + +#: ../../include/bb2diaspora.php:398 +msgid "Attachments:" +msgstr "" + +#: ../../include/bb2diaspora.php:487 +msgid "$Projectname event notification:" +msgstr "" + #: ../../include/bbcode.php:123 ../../include/bbcode.php:878 #: ../../include/bbcode.php:881 ../../include/bbcode.php:886 #: ../../include/bbcode.php:889 ../../include/bbcode.php:892 @@ -9039,562 +8650,678 @@ msgstr "" msgid "$1 wrote:" msgstr "" -#: ../../include/items.php:897 ../../include/items.php:942 -msgid "(Unknown)" +#: ../../include/js_strings.php:5 +msgid "Delete this item?" msgstr "" -#: ../../include/items.php:1141 -msgid "Visible to anybody on the internet." +#: ../../include/js_strings.php:8 +#, php-format +msgid "%s show less" msgstr "" -#: ../../include/items.php:1143 -msgid "Visible to you only." +#: ../../include/js_strings.php:9 +#, php-format +msgid "%s expand" msgstr "" -#: ../../include/items.php:1145 -msgid "Visible to anybody in this network." +#: ../../include/js_strings.php:10 +#, php-format +msgid "%s collapse" msgstr "" -#: ../../include/items.php:1147 -msgid "Visible to anybody authenticated." +#: ../../include/js_strings.php:11 +msgid "Password too short" msgstr "" -#: ../../include/items.php:1149 -#, php-format -msgid "Visible to anybody on %s." +#: ../../include/js_strings.php:12 +msgid "Passwords do not match" msgstr "" -#: ../../include/items.php:1151 -msgid "Visible to all connections." +#: ../../include/js_strings.php:13 +msgid "everybody" msgstr "" -#: ../../include/items.php:1153 -msgid "Visible to approved connections." +#: ../../include/js_strings.php:14 +msgid "Secret Passphrase" msgstr "" -#: ../../include/items.php:1155 -msgid "Visible to specific connections." +#: ../../include/js_strings.php:15 +msgid "Passphrase hint" msgstr "" -#: ../../include/items.php:3918 -msgid "Privacy group is empty." +#: ../../include/js_strings.php:16 +msgid "Notice: Permissions have changed but have not yet been submitted." msgstr "" -#: ../../include/items.php:3925 -#, php-format -msgid "Privacy group: %s" +#: ../../include/js_strings.php:17 +msgid "close all" msgstr "" -#: ../../include/items.php:3937 -msgid "Connection not found." +#: ../../include/js_strings.php:18 +msgid "Nothing new here" msgstr "" -#: ../../include/items.php:4290 -msgid "profile photo" +#: ../../include/js_strings.php:19 +msgid "Rate This Channel (this is public)" msgstr "" -#: ../../include/oembed.php:336 -msgid "Embedded content" +#: ../../include/js_strings.php:21 +msgid "Describe (optional)" msgstr "" -#: ../../include/oembed.php:345 -msgid "Embedding disabled" +#: ../../include/js_strings.php:23 +msgid "Please enter a link URL" msgstr "" -#: ../../include/widgets.php:103 -msgid "System" +#: ../../include/js_strings.php:24 +msgid "Unsaved changes. Are you sure you wish to leave this page?" msgstr "" -#: ../../include/widgets.php:106 -msgid "New App" +#: ../../include/js_strings.php:27 +msgid "timeago.prefixAgo" msgstr "" -#: ../../include/widgets.php:154 -msgid "Suggestions" +#: ../../include/js_strings.php:28 +msgid "timeago.prefixFromNow" msgstr "" -#: ../../include/widgets.php:155 -msgid "See more..." +#: ../../include/js_strings.php:29 +msgid "ago" msgstr "" -#: ../../include/widgets.php:175 +#: ../../include/js_strings.php:30 +msgid "from now" +msgstr "" + +#: ../../include/js_strings.php:31 +msgid "less than a minute" +msgstr "" + +#: ../../include/js_strings.php:32 +msgid "about a minute" +msgstr "" + +#: ../../include/js_strings.php:33 #, php-format -msgid "You have %1$.0f of %2$.0f allowed connections." +msgid "%d minutes" msgstr "" -#: ../../include/widgets.php:181 -msgid "Add New Connection" +#: ../../include/js_strings.php:34 +msgid "about an hour" msgstr "" -#: ../../include/widgets.php:182 -msgid "Enter channel address" +#: ../../include/js_strings.php:35 +#, php-format +msgid "about %d hours" msgstr "" -#: ../../include/widgets.php:183 -msgid "Examples: bob@example.com, https://example.com/barbara" +#: ../../include/js_strings.php:36 +msgid "a day" msgstr "" -#: ../../include/widgets.php:199 -msgid "Notes" +#: ../../include/js_strings.php:37 +#, php-format +msgid "%d days" msgstr "" -#: ../../include/widgets.php:273 -msgid "Remove term" +#: ../../include/js_strings.php:38 +msgid "about a month" msgstr "" -#: ../../include/widgets.php:313 ../../include/widgets.php:432 -#: ../../include/contact_widgets.php:56 ../../include/contact_widgets.php:94 -msgid "Everything" +#: ../../include/js_strings.php:39 +#, php-format +msgid "%d months" msgstr "" -#: ../../include/widgets.php:354 -msgid "Archives" +#: ../../include/js_strings.php:40 +msgid "about a year" msgstr "" -#: ../../include/widgets.php:516 -msgid "Refresh" +#: ../../include/js_strings.php:41 +#, php-format +msgid "%d years" msgstr "" -#: ../../include/widgets.php:556 -msgid "Account settings" +#: ../../include/js_strings.php:42 +msgid " " msgstr "" -#: ../../include/widgets.php:562 -msgid "Channel settings" +#: ../../include/js_strings.php:43 +msgid "timeago.numbers" msgstr "" -#: ../../include/widgets.php:571 -msgid "Additional features" +#: ../../include/js_strings.php:45 ../../include/text.php:1241 +msgid "January" msgstr "" -#: ../../include/widgets.php:578 -msgid "Feature/Addon settings" +#: ../../include/js_strings.php:46 ../../include/text.php:1241 +msgid "February" msgstr "" -#: ../../include/widgets.php:584 -msgid "Display settings" +#: ../../include/js_strings.php:47 ../../include/text.php:1241 +msgid "March" msgstr "" -#: ../../include/widgets.php:591 -msgid "Manage locations" +#: ../../include/js_strings.php:48 ../../include/text.php:1241 +msgid "April" msgstr "" -#: ../../include/widgets.php:600 -msgid "Export channel" +#: ../../include/js_strings.php:49 +msgctxt "long" +msgid "May" msgstr "" -#: ../../include/widgets.php:607 -msgid "Connected apps" +#: ../../include/js_strings.php:50 ../../include/text.php:1241 +msgid "June" msgstr "" -#: ../../include/widgets.php:631 -msgid "Premium Channel Settings" +#: ../../include/js_strings.php:51 ../../include/text.php:1241 +msgid "July" msgstr "" -#: ../../include/widgets.php:660 -msgid "Private Mail Menu" +#: ../../include/js_strings.php:52 ../../include/text.php:1241 +msgid "August" msgstr "" -#: ../../include/widgets.php:662 -msgid "Combined View" +#: ../../include/js_strings.php:53 ../../include/text.php:1241 +msgid "September" msgstr "" -#: ../../include/widgets.php:694 ../../include/widgets.php:706 -msgid "Conversations" +#: ../../include/js_strings.php:54 ../../include/text.php:1241 +msgid "October" msgstr "" -#: ../../include/widgets.php:698 -msgid "Received Messages" +#: ../../include/js_strings.php:55 ../../include/text.php:1241 +msgid "November" msgstr "" -#: ../../include/widgets.php:702 -msgid "Sent Messages" +#: ../../include/js_strings.php:56 ../../include/text.php:1241 +msgid "December" msgstr "" -#: ../../include/widgets.php:716 -msgid "No messages." +#: ../../include/js_strings.php:57 +msgid "Jan" msgstr "" -#: ../../include/widgets.php:734 -msgid "Delete conversation" +#: ../../include/js_strings.php:58 +msgid "Feb" msgstr "" -#: ../../include/widgets.php:760 -msgid "Events Tools" +#: ../../include/js_strings.php:59 +msgid "Mar" msgstr "" -#: ../../include/widgets.php:761 -msgid "Export Calendar" +#: ../../include/js_strings.php:60 +msgid "Apr" msgstr "" -#: ../../include/widgets.php:762 -msgid "Import Calendar" +#: ../../include/js_strings.php:61 +msgctxt "short" +msgid "May" msgstr "" -#: ../../include/widgets.php:840 -msgid "Overview" +#: ../../include/js_strings.php:62 +msgid "Jun" msgstr "" -#: ../../include/widgets.php:847 -msgid "Chat Members" +#: ../../include/js_strings.php:63 +msgid "Jul" msgstr "" -#: ../../include/widgets.php:869 -msgid "Wiki List" +#: ../../include/js_strings.php:64 +msgid "Aug" msgstr "" -#: ../../include/widgets.php:907 -msgid "Wiki Pages" +#: ../../include/js_strings.php:65 +msgid "Sep" msgstr "" -#: ../../include/widgets.php:942 -msgid "Bookmarked Chatrooms" +#: ../../include/js_strings.php:66 +msgid "Oct" msgstr "" -#: ../../include/widgets.php:965 -msgid "Suggested Chatrooms" +#: ../../include/js_strings.php:67 +msgid "Nov" msgstr "" -#: ../../include/widgets.php:1111 ../../include/widgets.php:1223 -msgid "photo/image" +#: ../../include/js_strings.php:68 +msgid "Dec" msgstr "" -#: ../../include/widgets.php:1166 -msgid "Click to show more" +#: ../../include/js_strings.php:69 ../../include/text.php:1237 +msgid "Sunday" msgstr "" -#: ../../include/widgets.php:1317 -msgid "Rating Tools" +#: ../../include/js_strings.php:70 ../../include/text.php:1237 +msgid "Monday" msgstr "" -#: ../../include/widgets.php:1321 ../../include/widgets.php:1323 -msgid "Rate Me" +#: ../../include/js_strings.php:71 ../../include/text.php:1237 +msgid "Tuesday" msgstr "" -#: ../../include/widgets.php:1326 -msgid "View Ratings" +#: ../../include/js_strings.php:72 ../../include/text.php:1237 +msgid "Wednesday" msgstr "" -#: ../../include/widgets.php:1410 -msgid "Forums" +#: ../../include/js_strings.php:73 ../../include/text.php:1237 +msgid "Thursday" msgstr "" -#: ../../include/widgets.php:1439 -msgid "Tasks" +#: ../../include/js_strings.php:74 ../../include/text.php:1237 +msgid "Friday" msgstr "" -#: ../../include/widgets.php:1448 -msgid "Documentation" +#: ../../include/js_strings.php:75 ../../include/text.php:1237 +msgid "Saturday" msgstr "" -#: ../../include/widgets.php:1450 -msgid "Project/Site Information" +#: ../../include/js_strings.php:76 +msgid "Sun" msgstr "" -#: ../../include/widgets.php:1451 -msgid "For Members" +#: ../../include/js_strings.php:77 +msgid "Mon" msgstr "" -#: ../../include/widgets.php:1452 -msgid "For Administrators" +#: ../../include/js_strings.php:78 +msgid "Tue" msgstr "" -#: ../../include/widgets.php:1453 -msgid "For Developers" +#: ../../include/js_strings.php:79 +msgid "Wed" msgstr "" -#: ../../include/widgets.php:1477 ../../include/widgets.php:1515 -msgid "Member registrations waiting for confirmation" +#: ../../include/js_strings.php:80 +msgid "Thu" msgstr "" -#: ../../include/widgets.php:1483 -msgid "Inspect queue" +#: ../../include/js_strings.php:81 +msgid "Fri" msgstr "" -#: ../../include/widgets.php:1485 -msgid "DB updates" +#: ../../include/js_strings.php:82 +msgid "Sat" msgstr "" -#: ../../include/widgets.php:1511 -msgid "Plugin Features" +#: ../../include/js_strings.php:83 +msgctxt "calendar" +msgid "today" msgstr "" -#: ../../include/activities.php:41 -msgid " and " +#: ../../include/js_strings.php:84 +msgctxt "calendar" +msgid "month" msgstr "" -#: ../../include/activities.php:49 -msgid "public profile" +#: ../../include/js_strings.php:85 +msgctxt "calendar" +msgid "week" msgstr "" -#: ../../include/activities.php:58 -#, php-format -msgid "%1$s changed %2$s to “%3$s”" +#: ../../include/js_strings.php:86 +msgctxt "calendar" +msgid "day" msgstr "" -#: ../../include/activities.php:59 -#, php-format -msgid "Visit %1$s's %2$s" +#: ../../include/js_strings.php:87 +msgctxt "calendar" +msgid "All day" msgstr "" -#: ../../include/activities.php:62 -#, php-format -msgid "%1$s has an updated %2$s, changing %3$s." +#: ../../include/follow.php:27 +msgid "Channel is blocked on this site." msgstr "" -#: ../../include/bb2diaspora.php:398 -msgid "Attachments:" +#: ../../include/follow.php:32 +msgid "Channel location missing." msgstr "" -#: ../../include/bb2diaspora.php:487 -msgid "$Projectname event notification:" +#: ../../include/follow.php:80 +msgid "Response from remote channel was incomplete." msgstr "" -#: ../../include/js_strings.php:5 -msgid "Delete this item?" +#: ../../include/follow.php:97 +msgid "Channel was deleted and no longer exists." msgstr "" -#: ../../include/js_strings.php:8 +#: ../../include/follow.php:147 ../../include/follow.php:183 +msgid "Protocol disabled." +msgstr "" + +#: ../../include/follow.php:171 +msgid "Channel discovery failed." +msgstr "" + +#: ../../include/follow.php:210 +msgid "Cannot connect to yourself." +msgstr "" + +#: ../../include/import.php:30 +msgid "" +"Cannot create a duplicate channel identifier on this system. Import failed." +msgstr "" + +#: ../../include/import.php:97 +msgid "Channel clone failed. Import failed." +msgstr "" + +#: ../../include/photos.php:114 #, php-format -msgid "%s show less" +msgid "Image exceeds website size limit of %lu bytes" msgstr "" -#: ../../include/js_strings.php:9 +#: ../../include/photos.php:121 +msgid "Image file is empty." +msgstr "" + +#: ../../include/photos.php:259 +msgid "Photo storage failed." +msgstr "" + +#: ../../include/photos.php:299 +msgid "a new photo" +msgstr "" + +#: ../../include/photos.php:303 #, php-format -msgid "%s expand" +msgctxt "photo_upload" +msgid "%1$s posted %2$s to %3$s" msgstr "" -#: ../../include/js_strings.php:10 +#: ../../include/photos.php:510 +msgid "Upload New Photos" +msgstr "" + +#: ../../include/text.php:404 +msgid "prev" +msgstr "" + +#: ../../include/text.php:406 +msgid "first" +msgstr "" + +#: ../../include/text.php:435 +msgid "last" +msgstr "" + +#: ../../include/text.php:438 +msgid "next" +msgstr "" + +#: ../../include/text.php:448 +msgid "older" +msgstr "" + +#: ../../include/text.php:450 +msgid "newer" +msgstr "" + +#: ../../include/text.php:843 +msgid "No connections" +msgstr "" + +#: ../../include/text.php:868 #, php-format -msgid "%s collapse" +msgid "View all %s connections" msgstr "" -#: ../../include/js_strings.php:11 -msgid "Password too short" +#: ../../include/text.php:1013 ../../include/text.php:1018 +msgid "poke" msgstr "" -#: ../../include/js_strings.php:12 -msgid "Passwords do not match" +#: ../../include/text.php:1019 +msgid "ping" msgstr "" -#: ../../include/js_strings.php:13 -msgid "everybody" +#: ../../include/text.php:1019 +msgid "pinged" msgstr "" -#: ../../include/js_strings.php:14 -msgid "Secret Passphrase" +#: ../../include/text.php:1020 +msgid "prod" msgstr "" -#: ../../include/js_strings.php:15 -msgid "Passphrase hint" +#: ../../include/text.php:1020 +msgid "prodded" msgstr "" -#: ../../include/js_strings.php:16 -msgid "Notice: Permissions have changed but have not yet been submitted." +#: ../../include/text.php:1021 +msgid "slap" msgstr "" -#: ../../include/js_strings.php:17 -msgid "close all" +#: ../../include/text.php:1021 +msgid "slapped" msgstr "" -#: ../../include/js_strings.php:18 -msgid "Nothing new here" +#: ../../include/text.php:1022 +msgid "finger" msgstr "" -#: ../../include/js_strings.php:19 -msgid "Rate This Channel (this is public)" +#: ../../include/text.php:1022 +msgid "fingered" msgstr "" -#: ../../include/js_strings.php:21 -msgid "Describe (optional)" +#: ../../include/text.php:1023 +msgid "rebuff" msgstr "" -#: ../../include/js_strings.php:23 -msgid "Please enter a link URL" +#: ../../include/text.php:1023 +msgid "rebuffed" msgstr "" -#: ../../include/js_strings.php:24 -msgid "Unsaved changes. Are you sure you wish to leave this page?" +#: ../../include/text.php:1035 +msgid "happy" msgstr "" -#: ../../include/js_strings.php:27 -msgid "timeago.prefixAgo" +#: ../../include/text.php:1036 +msgid "sad" msgstr "" -#: ../../include/js_strings.php:28 -msgid "timeago.prefixFromNow" +#: ../../include/text.php:1037 +msgid "mellow" msgstr "" -#: ../../include/js_strings.php:29 -msgid "ago" +#: ../../include/text.php:1038 +msgid "tired" msgstr "" -#: ../../include/js_strings.php:30 -msgid "from now" +#: ../../include/text.php:1039 +msgid "perky" msgstr "" -#: ../../include/js_strings.php:31 -msgid "less than a minute" +#: ../../include/text.php:1040 +msgid "angry" msgstr "" -#: ../../include/js_strings.php:32 -msgid "about a minute" +#: ../../include/text.php:1041 +msgid "stupefied" msgstr "" -#: ../../include/js_strings.php:33 -#, php-format -msgid "%d minutes" +#: ../../include/text.php:1042 +msgid "puzzled" msgstr "" -#: ../../include/js_strings.php:34 -msgid "about an hour" +#: ../../include/text.php:1043 +msgid "interested" msgstr "" -#: ../../include/js_strings.php:35 -#, php-format -msgid "about %d hours" +#: ../../include/text.php:1044 +msgid "bitter" msgstr "" -#: ../../include/js_strings.php:36 -msgid "a day" +#: ../../include/text.php:1045 +msgid "cheerful" msgstr "" -#: ../../include/js_strings.php:37 -#, php-format -msgid "%d days" +#: ../../include/text.php:1046 +msgid "alive" msgstr "" -#: ../../include/js_strings.php:38 -msgid "about a month" +#: ../../include/text.php:1047 +msgid "annoyed" msgstr "" -#: ../../include/js_strings.php:39 -#, php-format -msgid "%d months" +#: ../../include/text.php:1048 +msgid "anxious" msgstr "" -#: ../../include/js_strings.php:40 -msgid "about a year" +#: ../../include/text.php:1049 +msgid "cranky" msgstr "" -#: ../../include/js_strings.php:41 -#, php-format -msgid "%d years" +#: ../../include/text.php:1050 +msgid "disturbed" msgstr "" -#: ../../include/js_strings.php:42 -msgid " " +#: ../../include/text.php:1051 +msgid "frustrated" msgstr "" -#: ../../include/js_strings.php:43 -msgid "timeago.numbers" +#: ../../include/text.php:1052 +msgid "depressed" msgstr "" -#: ../../include/js_strings.php:49 -msgctxt "long" +#: ../../include/text.php:1053 +msgid "motivated" +msgstr "" + +#: ../../include/text.php:1054 +msgid "relaxed" +msgstr "" + +#: ../../include/text.php:1055 +msgid "surprised" +msgstr "" + +#: ../../include/text.php:1241 msgid "May" msgstr "" -#: ../../include/js_strings.php:57 -msgid "Jan" +#: ../../include/text.php:1318 ../../include/text.php:1322 +msgid "Unknown Attachment" msgstr "" -#: ../../include/js_strings.php:58 -msgid "Feb" +#: ../../include/text.php:1324 +msgid "unknown" msgstr "" -#: ../../include/js_strings.php:59 -msgid "Mar" +#: ../../include/text.php:1360 +msgid "remove category" msgstr "" -#: ../../include/js_strings.php:60 -msgid "Apr" +#: ../../include/text.php:1437 +msgid "remove from file" msgstr "" -#: ../../include/js_strings.php:61 -msgctxt "short" -msgid "May" +#: ../../include/text.php:1734 ../../include/text.php:1805 +msgid "default" msgstr "" -#: ../../include/js_strings.php:62 -msgid "Jun" +#: ../../include/text.php:1742 +msgid "Page layout" msgstr "" -#: ../../include/js_strings.php:63 -msgid "Jul" +#: ../../include/text.php:1742 +msgid "You can create your own with the layouts tool" msgstr "" -#: ../../include/js_strings.php:64 -msgid "Aug" +#: ../../include/text.php:1784 +msgid "Page content type" msgstr "" -#: ../../include/js_strings.php:65 -msgid "Sep" +#: ../../include/text.php:1817 +msgid "Select an alternate language" msgstr "" -#: ../../include/js_strings.php:66 -msgid "Oct" +#: ../../include/text.php:1934 +msgid "activity" msgstr "" -#: ../../include/js_strings.php:67 -msgid "Nov" +#: ../../include/text.php:2235 +msgid "Design Tools" msgstr "" -#: ../../include/js_strings.php:68 -msgid "Dec" +#: ../../include/text.php:2241 +msgid "Pages" msgstr "" -#: ../../include/js_strings.php:76 -msgid "Sun" +#: ../../include/zot.php:697 +msgid "Invalid data packet" msgstr "" -#: ../../include/js_strings.php:77 -msgid "Mon" +#: ../../include/zot.php:713 +msgid "Unable to verify channel signature" msgstr "" -#: ../../include/js_strings.php:78 -msgid "Tue" +#: ../../include/zot.php:2326 +#, php-format +msgid "Unable to verify site signature for %s" msgstr "" -#: ../../include/js_strings.php:79 -msgid "Wed" +#: ../../include/zot.php:3703 +msgid "invalid target signature" msgstr "" -#: ../../include/js_strings.php:80 -msgid "Thu" +#: ../../include/activities.php:41 +msgid " and " msgstr "" -#: ../../include/js_strings.php:81 -msgid "Fri" +#: ../../include/activities.php:49 +msgid "public profile" msgstr "" -#: ../../include/js_strings.php:82 -msgid "Sat" +#: ../../include/activities.php:58 +#, php-format +msgid "%1$s changed %2$s to “%3$s”" msgstr "" -#: ../../include/js_strings.php:83 -msgctxt "calendar" -msgid "today" +#: ../../include/activities.php:59 +#, php-format +msgid "Visit %1$s's %2$s" msgstr "" -#: ../../include/js_strings.php:84 -msgctxt "calendar" -msgid "month" +#: ../../include/activities.php:62 +#, php-format +msgid "%1$s has an updated %2$s, changing %3$s." msgstr "" -#: ../../include/js_strings.php:85 -msgctxt "calendar" -msgid "week" +#: ../../include/taxonomy.php:188 ../../include/taxonomy.php:270 +#: ../../include/contact_widgets.php:91 ../../include/widgets.php:46 +#: ../../include/widgets.php:429 +msgid "Categories" msgstr "" -#: ../../include/js_strings.php:86 -msgctxt "calendar" -msgid "day" +#: ../../include/taxonomy.php:228 ../../include/taxonomy.php:249 +msgid "Tags" msgstr "" -#: ../../include/js_strings.php:87 -msgctxt "calendar" -msgid "All day" +#: ../../include/taxonomy.php:293 +msgid "Keywords" +msgstr "" + +#: ../../include/taxonomy.php:314 +msgid "have" +msgstr "" + +#: ../../include/taxonomy.php:314 +msgid "has" +msgstr "" + +#: ../../include/taxonomy.php:315 +msgid "want" +msgstr "" + +#: ../../include/taxonomy.php:315 +msgid "wants" +msgstr "" + +#: ../../include/taxonomy.php:316 +msgid "likes" +msgstr "" + +#: ../../include/taxonomy.php:317 +msgid "dislikes" msgstr "" #: ../../include/contact_widgets.php:11 @@ -9632,6 +9359,11 @@ msgstr "" msgid "Advanced example: name=fred and country=iceland" msgstr "" +#: ../../include/contact_widgets.php:56 ../../include/contact_widgets.php:94 +#: ../../include/widgets.php:313 ../../include/widgets.php:432 +msgid "Everything" +msgstr "" + #: ../../include/contact_widgets.php:122 #, php-format msgid "%d connection in common" @@ -9675,143 +9407,341 @@ msgstr "" msgid "Stored post could not be verified." msgstr "" -#: ../../include/acl_selectors.php:269 -msgid "Who can see this?" +#: ../../include/items.php:897 ../../include/items.php:942 +msgid "(Unknown)" msgstr "" -#: ../../include/acl_selectors.php:270 -msgid "Custom selection" +#: ../../include/items.php:1141 +msgid "Visible to anybody on the internet." msgstr "" -#: ../../include/acl_selectors.php:271 -msgid "" -"Select \"Show\" to allow viewing. \"Don't show\" lets you override and limit " -"the scope of \"Show\"." +#: ../../include/items.php:1143 +msgid "Visible to you only." msgstr "" -#: ../../include/acl_selectors.php:272 -msgid "Show" +#: ../../include/items.php:1145 +msgid "Visible to anybody in this network." msgstr "" -#: ../../include/acl_selectors.php:273 -msgid "Don't show" +#: ../../include/items.php:1147 +msgid "Visible to anybody authenticated." msgstr "" -#: ../../include/acl_selectors.php:279 -msgid "Other networks and post services" +#: ../../include/items.php:1149 +#, php-format +msgid "Visible to anybody on %s." msgstr "" -#: ../../include/acl_selectors.php:309 +#: ../../include/items.php:1151 +msgid "Visible to all connections." +msgstr "" + +#: ../../include/items.php:1153 +msgid "Visible to approved connections." +msgstr "" + +#: ../../include/items.php:1155 +msgid "Visible to specific connections." +msgstr "" + +#: ../../include/items.php:3918 +msgid "Privacy group is empty." +msgstr "" + +#: ../../include/items.php:3925 #, php-format -msgid "" -"Post permissions %s cannot be changed %s after a post is shared.</br />These " -"permissions set who is allowed to view the post." +msgid "Privacy group: %s" msgstr "" -#: ../../include/datetime.php:135 -msgid "Birthday" +#: ../../include/items.php:3937 +msgid "Connection not found." msgstr "" -#: ../../include/datetime.php:137 -msgid "Age: " +#: ../../include/items.php:4290 +msgid "profile photo" msgstr "" -#: ../../include/datetime.php:139 -msgid "YYYY-MM-DD or MM-DD" +#: ../../include/oembed.php:336 +msgid "Embedded content" msgstr "" -#: ../../include/datetime.php:272 ../../boot.php:2479 -msgid "never" +#: ../../include/oembed.php:345 +msgid "Embedding disabled" msgstr "" -#: ../../include/datetime.php:278 -msgid "less than a second ago" +#: ../../include/permissions.php:26 +msgid "Can view my normal stream and posts" msgstr "" -#: ../../include/datetime.php:296 -#, php-format -msgctxt "e.g. 22 hours ago, 1 minute ago" -msgid "%1$d %2$s ago" +#: ../../include/permissions.php:30 +msgid "Can view my webpages" msgstr "" -#: ../../include/datetime.php:307 -msgctxt "relative_date" -msgid "year" -msgid_plural "years" -msgstr[0] "" -msgstr[1] "" +#: ../../include/permissions.php:34 +msgid "Can post on my channel page (\"wall\")" +msgstr "" -#: ../../include/datetime.php:310 -msgctxt "relative_date" -msgid "month" -msgid_plural "months" -msgstr[0] "" -msgstr[1] "" +#: ../../include/permissions.php:37 +msgid "Can like/dislike stuff" +msgstr "" -#: ../../include/datetime.php:313 -msgctxt "relative_date" -msgid "week" -msgid_plural "weeks" -msgstr[0] "" -msgstr[1] "" +#: ../../include/permissions.php:37 +msgid "Profiles and things other than posts/comments" +msgstr "" -#: ../../include/datetime.php:316 -msgctxt "relative_date" -msgid "day" -msgid_plural "days" -msgstr[0] "" -msgstr[1] "" +#: ../../include/permissions.php:39 +msgid "Can forward to all my channel contacts via post @mentions" +msgstr "" -#: ../../include/datetime.php:319 -msgctxt "relative_date" -msgid "hour" -msgid_plural "hours" -msgstr[0] "" -msgstr[1] "" +#: ../../include/permissions.php:39 +msgid "Advanced - useful for creating group forum channels" +msgstr "" -#: ../../include/datetime.php:322 -msgctxt "relative_date" -msgid "minute" -msgid_plural "minutes" -msgstr[0] "" -msgstr[1] "" +#: ../../include/permissions.php:40 +msgid "Can chat with me (when available)" +msgstr "" -#: ../../include/datetime.php:325 -msgctxt "relative_date" -msgid "second" -msgid_plural "seconds" -msgstr[0] "" -msgstr[1] "" +#: ../../include/permissions.php:41 +msgid "Can write to my file storage and photos" +msgstr "" -#: ../../include/datetime.php:562 -#, php-format -msgid "%1$s's birthday" +#: ../../include/permissions.php:42 +msgid "Can edit my webpages" msgstr "" -#: ../../include/datetime.php:563 -#, php-format -msgid "Happy Birthday %1$s" +#: ../../include/permissions.php:44 +msgid "Somewhat advanced - very useful in open communities" msgstr "" -#: ../../include/api.php:1327 -msgid "Public Timeline" +#: ../../include/permissions.php:46 +msgid "Can administer my channel resources" msgstr "" -#: ../../include/zot.php:697 -msgid "Invalid data packet" +#: ../../include/permissions.php:46 +msgid "Extremely advanced. Leave this alone unless you know what you are doing" msgstr "" -#: ../../include/zot.php:713 -msgid "Unable to verify channel signature" +#: ../../include/security.php:109 +msgid "guest:" msgstr "" -#: ../../include/zot.php:2326 +#: ../../include/security.php:427 +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/widgets.php:103 +msgid "System" +msgstr "" + +#: ../../include/widgets.php:106 +msgid "New App" +msgstr "" + +#: ../../include/widgets.php:154 +msgid "Suggestions" +msgstr "" + +#: ../../include/widgets.php:155 +msgid "See more..." +msgstr "" + +#: ../../include/widgets.php:175 #, php-format -msgid "Unable to verify site signature for %s" +msgid "You have %1$.0f of %2$.0f allowed connections." msgstr "" -#: ../../include/zot.php:3703 -msgid "invalid target signature" +#: ../../include/widgets.php:181 +msgid "Add New Connection" +msgstr "" + +#: ../../include/widgets.php:182 +msgid "Enter channel address" +msgstr "" + +#: ../../include/widgets.php:183 +msgid "Examples: bob@example.com, https://example.com/barbara" +msgstr "" + +#: ../../include/widgets.php:199 +msgid "Notes" +msgstr "" + +#: ../../include/widgets.php:273 +msgid "Remove term" +msgstr "" + +#: ../../include/widgets.php:354 +msgid "Archives" +msgstr "" + +#: ../../include/widgets.php:516 +msgid "Refresh" +msgstr "" + +#: ../../include/widgets.php:556 +msgid "Account settings" +msgstr "" + +#: ../../include/widgets.php:562 +msgid "Channel settings" +msgstr "" + +#: ../../include/widgets.php:571 +msgid "Additional features" +msgstr "" + +#: ../../include/widgets.php:578 +msgid "Feature/Addon settings" +msgstr "" + +#: ../../include/widgets.php:584 +msgid "Display settings" +msgstr "" + +#: ../../include/widgets.php:591 +msgid "Manage locations" +msgstr "" + +#: ../../include/widgets.php:600 +msgid "Export channel" +msgstr "" + +#: ../../include/widgets.php:607 +msgid "Connected apps" +msgstr "" + +#: ../../include/widgets.php:631 +msgid "Premium Channel Settings" +msgstr "" + +#: ../../include/widgets.php:660 +msgid "Private Mail Menu" +msgstr "" + +#: ../../include/widgets.php:662 +msgid "Combined View" +msgstr "" + +#: ../../include/widgets.php:694 ../../include/widgets.php:706 +msgid "Conversations" +msgstr "" + +#: ../../include/widgets.php:698 +msgid "Received Messages" +msgstr "" + +#: ../../include/widgets.php:702 +msgid "Sent Messages" +msgstr "" + +#: ../../include/widgets.php:716 +msgid "No messages." +msgstr "" + +#: ../../include/widgets.php:734 +msgid "Delete conversation" +msgstr "" + +#: ../../include/widgets.php:760 +msgid "Events Tools" +msgstr "" + +#: ../../include/widgets.php:761 +msgid "Export Calendar" +msgstr "" + +#: ../../include/widgets.php:762 +msgid "Import Calendar" +msgstr "" + +#: ../../include/widgets.php:840 +msgid "Overview" +msgstr "" + +#: ../../include/widgets.php:847 +msgid "Chat Members" +msgstr "" + +#: ../../include/widgets.php:869 +msgid "Wiki List" +msgstr "" + +#: ../../include/widgets.php:907 +msgid "Wiki Pages" +msgstr "" + +#: ../../include/widgets.php:942 +msgid "Bookmarked Chatrooms" +msgstr "" + +#: ../../include/widgets.php:965 +msgid "Suggested Chatrooms" +msgstr "" + +#: ../../include/widgets.php:1111 ../../include/widgets.php:1223 +msgid "photo/image" +msgstr "" + +#: ../../include/widgets.php:1166 +msgid "Click to show more" +msgstr "" + +#: ../../include/widgets.php:1317 +msgid "Rating Tools" +msgstr "" + +#: ../../include/widgets.php:1321 ../../include/widgets.php:1323 +msgid "Rate Me" +msgstr "" + +#: ../../include/widgets.php:1326 +msgid "View Ratings" +msgstr "" + +#: ../../include/widgets.php:1410 +msgid "Forums" +msgstr "" + +#: ../../include/widgets.php:1439 +msgid "Tasks" +msgstr "" + +#: ../../include/widgets.php:1448 +msgid "Documentation" +msgstr "" + +#: ../../include/widgets.php:1450 +msgid "Project/Site Information" +msgstr "" + +#: ../../include/widgets.php:1451 +msgid "For Members" +msgstr "" + +#: ../../include/widgets.php:1452 +msgid "For Administrators" +msgstr "" + +#: ../../include/widgets.php:1453 +msgid "For Developers" +msgstr "" + +#: ../../include/widgets.php:1477 ../../include/widgets.php:1515 +msgid "Member registrations waiting for confirmation" +msgstr "" + +#: ../../include/widgets.php:1483 +msgid "Inspect queue" +msgstr "" + +#: ../../include/widgets.php:1485 +msgid "DB updates" +msgstr "" + +#: ../../include/widgets.php:1511 +msgid "Plugin Features" msgstr "" #: ../../view/theme/redbasic/php/config.php:82 @@ -9971,45 +9901,45 @@ msgstr "" msgid "Update Error at %s" msgstr "" -#: ../../boot.php:1685 +#: ../../boot.php:1688 msgid "" "Create an account to access services and applications within the Hubzilla" msgstr "" -#: ../../boot.php:1706 +#: ../../boot.php:1709 msgid "Login/Email" msgstr "" -#: ../../boot.php:1707 +#: ../../boot.php:1710 msgid "Password" msgstr "" -#: ../../boot.php:1708 +#: ../../boot.php:1711 msgid "Remember me" msgstr "" -#: ../../boot.php:1711 +#: ../../boot.php:1714 msgid "Forgot your password?" msgstr "" -#: ../../boot.php:2277 +#: ../../boot.php:2280 msgid "toggle mobile" msgstr "" -#: ../../boot.php:2432 +#: ../../boot.php:2435 msgid "Website SSL certificate is not valid. Please correct." msgstr "" -#: ../../boot.php:2435 +#: ../../boot.php:2438 #, php-format msgid "[hubzilla] Website SSL error for %s" msgstr "" -#: ../../boot.php:2478 +#: ../../boot.php:2542 msgid "Cron/Scheduled tasks not running." msgstr "" -#: ../../boot.php:2482 +#: ../../boot.php:2546 #, php-format msgid "[hubzilla] Cron tasks not running on %s" msgstr "" diff --git a/view/css/mod_webpages.css b/view/css/mod_webpages.css index 1c6ec4aea..f72f632dd 100644 --- a/view/css/mod_webpages.css +++ b/view/css/mod_webpages.css @@ -34,3 +34,88 @@ .webpage-list-tool { padding: 7px 10px; } + +.webpage-import-button { + background-color: green; + color: white; +} + +.webpage-import-button:hover { + background-color: darkgreen; +} + + +/* SQUARED TWO */ +.squaredTwo { + width: 28px; + height: 28px; + background: #fcfff4; + + background: -webkit-linear-gradient(top, #fcfff4 0%, #dfe5d7 40%, #b3bead 100%); + background: -moz-linear-gradient(top, #fcfff4 0%, #dfe5d7 40%, #b3bead 100%); + background: -o-linear-gradient(top, #fcfff4 0%, #dfe5d7 40%, #b3bead 100%); + background: -ms-linear-gradient(top, #fcfff4 0%, #dfe5d7 40%, #b3bead 100%); + background: linear-gradient(top, #fcfff4 0%, #dfe5d7 40%, #b3bead 100%); + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#fcfff4', endColorstr='#b3bead',GradientType=0 ); + margin: 20px auto; + + -webkit-box-shadow: inset 0px 1px 1px white, 0px 1px 3px rgba(0,0,0,0.5); + -moz-box-shadow: inset 0px 1px 1px white, 0px 1px 3px rgba(0,0,0,0.5); + box-shadow: inset 0px 1px 1px white, 0px 1px 3px rgba(0,0,0,0.5); + position: relative; +} + +.squaredTwo label { + cursor: pointer; + position: absolute; + width: 20px; + height: 20px; + left: 4px; + top: 4px; + + -webkit-box-shadow: inset 0px 1px 1px rgba(0,0,0,0.5), 0px 1px 0px rgba(255,255,255,1); + -moz-box-shadow: inset 0px 1px 1px rgba(0,0,0,0.5), 0px 1px 0px rgba(255,255,255,1); + box-shadow: inset 0px 1px 1px rgba(0,0,0,0.5), 0px 1px 0px rgba(255,255,255,1); + + background: -webkit-linear-gradient(top, #222 0%, #45484d 100%); + background: -moz-linear-gradient(top, #222 0%, #45484d 100%); + background: -o-linear-gradient(top, #222 0%, #45484d 100%); + background: -ms-linear-gradient(top, #222 0%, #45484d 100%); + background: linear-gradient(top, #222 0%, #45484d 100%); + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#222', endColorstr='#45484d',GradientType=0 ); +} + +.squaredTwo label:after { + -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; + filter: alpha(opacity=0); + opacity: 0; + content: ''; + position: absolute; + width: 9px; + height: 5px; + background: transparent; + top: 4px; + left: 4px; + border: 3px solid #fcfff4; + border-top: none; + border-right: none; + + -webkit-transform: rotate(-45deg); + -moz-transform: rotate(-45deg); + -o-transform: rotate(-45deg); + -ms-transform: rotate(-45deg); + transform: rotate(-45deg); +} + +.squaredTwo label:hover::after { + -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=30)"; + filter: alpha(opacity=30); + opacity: 0.3; +} + +.squaredTwo input[type=checkbox]:checked + label:after { + -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; + filter: alpha(opacity=100); + opacity: 1; +} + diff --git a/view/js/mod_webpages.js b/view/js/mod_webpages.js new file mode 100644 index 000000000..7cfe297e1 --- /dev/null +++ b/view/js/mod_webpages.js @@ -0,0 +1,15 @@ +$(document).ready(function() { + $("input[type=\"checkbox\"]").hide(); +}); + +window.isChecked = true; + +function checkedAll(isChecked) { + window.isChecked = !window.isChecked ; + var c = document.getElementsByTagName('input'); + for (var i = 0; i < c.length; i++){ + if (c[i].type == 'checkbox'){ + c[i].checked = isChecked; + } + } +}
\ No newline at end of file diff --git a/view/pdl/mod_webpages.pdl b/view/pdl/mod_webpages.pdl index cef69f194..b62ec6e7c 100644 --- a/view/pdl/mod_webpages.pdl +++ b/view/pdl/mod_webpages.pdl @@ -1,3 +1,4 @@ [region=aside] [widget=design_tools][/widget] +[widget=website_import_tools][/widget] [/region]
\ No newline at end of file diff --git a/view/theme/redbasic/schema/dark.css b/view/theme/redbasic/schema/dark.css index ea50f50ec..ed2714dfc 100644 --- a/view/theme/redbasic/schema/dark.css +++ b/view/theme/redbasic/schema/dark.css @@ -3,6 +3,31 @@ background-color: transparent; } +textarea, input, select +{ + color: #BBB !important; + background: #333 !important; + border-color: #2B2B2B !important; + } + +#profile-jot-submit-wrapper { + border-top: none; + padding: 10px 0; +} + +#jot-title-wrap { + border-bottom: none; + margin-bottom: 5px; +} + +optgroup { + color: #CCC !important; +} + +option { + color: $link_colour !important; +} + .vcard, #contact-block, .widget { background-color: transparent; border: none; @@ -390,3 +415,21 @@ pre { box-shadow: 0px 3px 3px #222; } +.contextual-help-content-open { + background: $nav_bg; + top: 50px; + border-bottom: #555 1px solid; + box-shadow: 0px 3px 3px rgba(85,85,85,0.2); +} + +.contextual-help-tool { + opacity: 0.5; +} + +.contextual-help-tool:hover { + opacity: 1; +} + +.contextual-help-tool i { + color: $link_colour; +} diff --git a/view/theme/redbasic/schema/simple_black_on_white.css b/view/theme/redbasic/schema/simple_black_on_white.css index b7cca0930..7dd8125a4 100644 --- a/view/theme/redbasic/schema/simple_black_on_white.css +++ b/view/theme/redbasic/schema/simple_black_on_white.css @@ -290,3 +290,10 @@ pre { -webkit-box-shadow: none; box-shadow: none; } + + +.contextual-help-content-open { + background: #FFF; + top: 50px; + +} diff --git a/view/theme/redbasic/schema/simple_green_on_black.css b/view/theme/redbasic/schema/simple_green_on_black.css index 990980e8f..ca2e5b15a 100644 --- a/view/theme/redbasic/schema/simple_green_on_black.css +++ b/view/theme/redbasic/schema/simple_green_on_black.css @@ -3,6 +3,31 @@ background-color: transparent; } +textarea, input, select +{ + color: $font_colour !important; + background: $bgcolour !important; + border: 1px solid #143D12 !important; + } + +#profile-jot-submit-wrapper { + border-top: none; + padding: 10px 0; +} + +#jot-title-wrap { + border-bottom: none; + margin-bottom: 5px; +} + +optgroup { + color: #32962D !important; +} + +option { + color: $link_colour !important; +} + .vcard, #contact-block, .widget { background-color: transparent; border: none; @@ -153,22 +178,22 @@ input[type="submit"] { color: #50f148 !important; } -nav .dropdown-menu>li>a{ +nav .dropdown-menu>li>a { color: #50f148; } -nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus{ +nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus { color: #50f148; background-color: #143D12; background-image: none; } -nav .dropdown-menu .divider{ +nav .dropdown-menu .divider { background-color: #143D12; } -nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus{ +nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus { color: #50f148; background-color: #143D12; background-image: none; @@ -339,3 +364,22 @@ pre { -webkit-box-shadow: none; box-shadow: none; } + +.contextual-help-content-open { + background: $nav_bg; + top: 50px; + border-bottom: #1C5419 1px solid; + box-shadow: 0px 3px 3px rgba(28,84,25,0.2); +} + +.contextual-help-tool { + opacity: 0.5; +} + +.contextual-help-tool:hover { + opacity: 1; +} + +.contextual-help-tool i { + color: $link_colour; +} diff --git a/view/theme/redbasic/schema/simple_white_on_black.css b/view/theme/redbasic/schema/simple_white_on_black.css index c23dbaf68..a462c4d29 100644 --- a/view/theme/redbasic/schema/simple_white_on_black.css +++ b/view/theme/redbasic/schema/simple_white_on_black.css @@ -3,6 +3,31 @@ background-color: transparent; } +textarea, input, select +{ + color: $font_colour !important; + background: $bgcolour !important; + border: 1px solid #FFF !important; + } + +#profile-jot-submit-wrapper { + border-top: none; + padding: 10px 0; +} + +#jot-title-wrap { + border-bottom: none; + margin-bottom: 5px; +} + +optgroup { + color: #FFF !important; +} + +option { + color: $link_colour !important; +} + .vcard, #contact-block, .widget { background-color: transparent; border: none; @@ -312,3 +337,22 @@ pre { -webkit-box-shadow: none; box-shadow: none; } + +.contextual-help-content-open { + background: $nav_bg; + top: 50px; + border-bottom: #FFF 1px solid; + box-shadow: 0px 3px 3px rgba(255,255,255,0.2); +} + +.contextual-help-tool { + opacity: 0.5; +} + +.contextual-help-tool:hover { + opacity: 1; +} + +.contextual-help-tool i { + color: $link_colour; +} diff --git a/view/tpl/field_acheckbox.tpl b/view/tpl/field_acheckbox.tpl index b54a4f3c3..c87b9ac79 100755 --- a/view/tpl/field_acheckbox.tpl +++ b/view/tpl/field_acheckbox.tpl @@ -9,7 +9,7 @@ </td> {{/if}} <td class="abook-me"> - {{if $self || !$field.5}} + {{if $self || !$field.5 || $twocol }} <input type="checkbox" name='{{$field.0}}' class='abook-edit-me' id='me_id_{{$field.0}}' value="{{$field.4}}" {{if $field.3}}checked="checked"{{/if}} /> {{/if}} {{if $notself && $field.5}} diff --git a/view/tpl/settings_tokens.tpl b/view/tpl/settings_tokens.tpl index 22af381e9..6f08ce971 100644 --- a/view/tpl/settings_tokens.tpl +++ b/view/tpl/settings_tokens.tpl @@ -17,13 +17,45 @@ <div class="settings-submit-wrapper form-group"> <button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button> </div> - </form> - <div class="descriptive-text">{{$desc2}}</div> - <ul> - <li>{{$url1}}<span class="zat-example">?f=&zat=<span class="token-mirror"></span></span></li> - <li>{{$url2}}<span class="zat-example">?f=&zat=<span class="token-mirror"></span></span></li> - </ul> </div> + + <div class="panel"> + <div class="section-subtitle-wrapper" role="tab" id="perms-tool"> + <h3> + <a data-toggle="collapse" data-parent="#contact-edit-tools" href="#perms-tool-collapse" aria-expanded="true" aria-controls="perms-tool-collapse"> + {{$permlbl}} + </a> + </h3> + </div> + <div id="perms-tool-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="perms-tool"> + <div class="section-content-tools-wrapper"> + <div class="section-content-warning-wrapper"> + {{$permnote}} + </div> + + <table id="perms-tool-table" class=form-group> + <tr> + <td></td><td class="abook-them">{{$them}}</td><td colspan="2" class="abook-me">{{$me}}</td> + </tr> + {{foreach $perms as $prm}} + {{include file="field_acheckbox.tpl" field=$prm}} + {{/foreach}} + </table> + + <div class="settings-submit-wrapper" > + <button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button> + </div> + </div> + </div> + </div> + </form> + + <div class="descriptive-text">{{$desc2}}</div> + <ul> + <li>{{$url1}}<span class="zat-example">?f=&zat=<span class="token-mirror"></span></span></li> + <li>{{$url2}}<span class="zat-example">?f=&zat=<span class="token-mirror"></span></span></li> + </ul> + {{if $tokens}} <div class="section-content-wrapper-np"> <table id="atoken-index"> diff --git a/view/tpl/webpage_import.tpl b/view/tpl/webpage_import.tpl new file mode 100644 index 000000000..fdc983932 --- /dev/null +++ b/view/tpl/webpage_import.tpl @@ -0,0 +1,126 @@ +<div class="generic-content-wrapper"> + <form action="" method="post" autocomplete="on" > + <input type="hidden" name="action" value="importselected"> + <div class="section-title-wrapper"> + <div class="pull-right"> + <button class="btn btn-md btn-success" type="submit" name="submit" value="{{$importbtn}}">{{$importbtn}}</button> + </div> + <h2>{{$title}}</h2> + <div class="clear"></div> + </div> + <div id="import-website-content-wrapper" class="section-content-wrapper"> + <div class="pull-left"> + <button id="toggle-select-all" class="btn btn-xs btn-primary" onclick="checkedAll(window.isChecked); return false;"><i class="fa fa-check"></i> Toggle Select All</button> + </div> + <div class="clear"></div> + <h4>Scanned Pages</h4> + <div> + <table class="table-striped table-responsive table-hover" style="width: 100%;"> + <tr><td>Import?</td><td>Page</td><!--<td>Existing Page</td>--></tr> + {{foreach $pages as $page}} + <tr> + <td> + <div class='squaredTwo'> + <input type="checkbox" id="page_{{$page.pagelink}}" name="page[]" value="{{$page.pagelink}}"> + <label for="page_{{$page.pagelink}}"></label> + </div> + </td> + <td> + <div class='desc'> + Page Link: {{$page.pagelink}}<br> + Layout: {{$page.layout}}<br> + Title: {{$page.title}}<br> + Content File: {{$page.contentfile}}<br> + Type: {{$page.type}}<br> + </div> + </td> + <!-- TODO: Retrieve existing element information to avoid accidental overwriting + <td> + <div class='desc'> + Name: {{$page.curpage.pagelink}}<br> + Layout: {{$page.curpage.layout}}<br> + Title: {{$page.curpage.title}}<br> + Last edit: {{$page.curpage.edited}}<br> + Type: {{$page.curpage.type}}<br> + </div> + </td> + --> + </tr> + {{/foreach}} + </table> + </div> + + + <h4>Scanned Layouts</h4> + <div> + <table class="table-striped table-responsive table-hover" style="width: 100%;"> + <tr><td>Import?</td><td>Layout</td><!--<td>Existing Layout</td>--></tr> + {{foreach $layouts as $layout}} + <tr> + <td> + <div class='squaredTwo'> + <input type="checkbox" id="layout_{{$layout.name}}" name="layout[]" value="{{$layout.name}}"> + <label for="layout_{{$layout.name}}"></label> + </div> + </td> + <td> + <div class='desc'> + Name: {{$layout.name}}<br> + Description: {{$layout.description}}<br> + Content File: {{$layout.contentfile}}<br> + </div> + </td> + <!-- TODO: Retrieve existing element information to avoid accidental overwriting + <td> + <div class='desc'> + Name: {{$layout.curblock.name}}<br> + Title: {{$layout.curblock.description}}<br> + Last edit: {{$layout.curblock.edited}}<br> + </div> + </td> + --> + </tr> + {{/foreach}} + </table> + </div> + + <h4>Scanned Blocks</h4> + <div> + <table class="table-striped table-responsive table-hover" style="width: 100%;"> + <tr><td>Import?</td><td>Block</td><!--<td>Existing Block</td>--></tr> + {{foreach $blocks as $block}} + <tr> + <td> + <div class='squaredTwo'> + <input type="checkbox" id="block_{{$block.name}}" name="block[]" value="{{$block.name}}"> + <label for="block_{{$block.name}}"></label> + </div> + </td> + <td> + <div class='desc'> + Name: {{$block.name}}<br> + Title: {{$block.title}}<br> + Content File: {{$block.contentfile}}<br> + Type: {{$block.type}}<br> + </div> + </td> + <!-- TODO: Retrieve existing element information to avoid accidental overwriting + <td> + <div class='desc'> + Name: {{$block.curblock.name}}<br> + Title: {{$block.curblock.title}}<br> + Last edit: {{$block.curblock.edited}}<br> + Type: {{$block.curblock.type}}<br> + </div> + </td> + --> + </tr> + {{/foreach}} + </table> + </div> + + </div> + <div class="clear"></div> + </form> +</div> + diff --git a/view/tpl/website_import_tools.tpl b/view/tpl/website_import_tools.tpl new file mode 100644 index 000000000..cb3e6b524 --- /dev/null +++ b/view/tpl/website_import_tools.tpl @@ -0,0 +1,37 @@ +<div id="website-import-tools" class="widget"> + <h3>{{$title}}</h3> + <ul class="nav nav-pills nav-stacked"> + <li> + <a href="#" onclick="openClose('import-form'); + return false;"><i class="fa fa-cloud-upload generic-icons"></i> {{$import_label}}</a> + </li> + <li> + <form id="import-form" enctype="multipart/form-data" method="post" action="" style="display: none;" class="sub-menu"> + + <input type="hidden" name="action" value="scan"> + + <p style="margin-top: 20px;" class="descriptive-text">{{$file_import_text}}</p> + <div class="form-group"> + <div class="input-group"> + <input class="widget-input" type="text" name="path" title="{{$hint}}" placeholder="{{$desc}}" /> + <div class="input-group-btn"> + <button class="btn btn-default btn-sm" type="submit" name="cloudsubmit" value="{{$select}}"><i class="fa fa-folder-open generic-icons"></i></button> + </div> + </div> + </div> + + <!-- Or upload a zipped file containing the website --> + <p class="descriptive-text">{{$file_upload_text}}</p> + <div class="form-group"> + + <div class="input-group"> + <input class="widget-input" type="file" name="zip_file" /> + <div class="input-group-btn"> + <button class="btn btn-default btn-sm" type="submit" name="w_upload" value="w_upload"><i class="fa fa-file-archive-o generic-icons"></i></button> + </div> + </div> + </div> + </form> + </li> + </ul> +</div> |