diff options
| -rw-r--r-- | Zotlabs/Lib/System.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Module/Acl.php | 3 | ||||
| -rw-r--r-- | Zotlabs/Module/Admin.php | 1 | ||||
| -rw-r--r-- | Zotlabs/Module/Channel.php | 3 | ||||
| -rw-r--r-- | Zotlabs/Module/Display.php | 3 | ||||
| -rw-r--r-- | Zotlabs/Module/Network.php | 5 | ||||
| -rw-r--r-- | Zotlabs/Module/Rpost.php | 5 | ||||
| -rw-r--r-- | Zotlabs/Module/Setup.php | 2 | ||||
| -rwxr-xr-x | boot.php | 49 | ||||
| -rw-r--r-- | doc/contributor/covenant.html | 106 | ||||
| -rw-r--r-- | doc/develop.bb | 2 | ||||
| -rw-r--r-- | doc/developers.bb | 2 | ||||
| -rw-r--r-- | doc/feature/access_tokens.bb | 47 | ||||
| -rw-r--r-- | include/acl_selectors.php | 7 | ||||
| -rw-r--r-- | include/channel.php | 10 | ||||
| -rw-r--r-- | include/conversation.php | 10 | ||||
| -rwxr-xr-x | include/items.php | 35 | ||||
| -rwxr-xr-x | include/plugin.php | 12 | ||||
| -rw-r--r-- | include/zot.php | 9 | ||||
| -rwxr-xr-x | install/htconfig.sample.php | 4 | ||||
| -rw-r--r-- | util/hmessages.po | 7421 | ||||
| -rw-r--r-- | view/css/conversation.css | 14 | ||||
| -rw-r--r-- | view/js/acl.js | 12 | ||||
| -rwxr-xr-x | view/tpl/acl_selector.tpl | 13 | ||||
| -rwxr-xr-x | view/tpl/admin_plugins_details.tpl | 3 | ||||
| -rwxr-xr-x | view/tpl/jot.tpl | 157 | ||||
| -rwxr-xr-x | view/tpl/msg-header.tpl | 53 | ||||
| -rwxr-xr-x | view/tpl/profed_head.tpl | 36 |
28 files changed, 4113 insertions, 3913 deletions
diff --git a/Zotlabs/Lib/System.php b/Zotlabs/Lib/System.php index 4479bf597..6ccfd664c 100644 --- a/Zotlabs/Lib/System.php +++ b/Zotlabs/Lib/System.php @@ -45,7 +45,7 @@ class System { static public function get_server_role() { if(is_array(\App::$config) && is_array(\App::$config['system']) && \App::$config['system']['server_role']) return \App::$config['system']['server_role']; - return 'pro'; + return 'standard'; } static public function get_std_version() { diff --git a/Zotlabs/Module/Acl.php b/Zotlabs/Module/Acl.php index 03dc6c5d3..8c62f4de9 100644 --- a/Zotlabs/Module/Acl.php +++ b/Zotlabs/Module/Acl.php @@ -72,6 +72,7 @@ class Acl extends \Zotlabs\Web\Controller { ); $permitted = ids_to_array($x,'xchan'); + } @@ -249,7 +250,7 @@ class Acl extends \Zotlabs\Web\Controller { ); if($z) { foreach($z as $zz) { - if(in_array($zz['id'],$permitted)) { + if(in_array($zz['hash'],$permitted)) { $r[] = $zz; } } diff --git a/Zotlabs/Module/Admin.php b/Zotlabs/Module/Admin.php index 085d13fd7..eede5a045 100644 --- a/Zotlabs/Module/Admin.php +++ b/Zotlabs/Module/Admin.php @@ -1341,6 +1341,7 @@ class Admin extends \Zotlabs\Web\Controller { '$str_minversion' => t('Minimum project version: '), '$str_maxversion' => t('Maximum project version: '), '$str_minphpversion' => t('Minimum PHP version: '), + '$str_serverroles' => t('Compatible Server Roles: '), '$str_requires' => t('Requires: '), '$disabled' => t('Disabled - version incompatibility'), diff --git a/Zotlabs/Module/Channel.php b/Zotlabs/Module/Channel.php index 59cb9f06c..be65354a9 100644 --- a/Zotlabs/Module/Channel.php +++ b/Zotlabs/Module/Channel.php @@ -140,7 +140,8 @@ class Channel extends \Zotlabs\Web\Controller { 'profile_uid' => \App::$profile['profile_uid'], 'editor_autocomplete' => true, 'bbco_autocomplete' => 'bbcode', - 'bbcode' => true + 'bbcode' => true, + 'jotnets' => true ); $o .= status_editor($a,$x); diff --git a/Zotlabs/Module/Display.php b/Zotlabs/Module/Display.php index 35ed0c894..e9441bbdf 100644 --- a/Zotlabs/Module/Display.php +++ b/Zotlabs/Module/Display.php @@ -73,7 +73,8 @@ class Display extends \Zotlabs\Web\Controller { 'expanded' => true, 'editor_autocomplete' => true, 'bbco_autocomplete' => 'bbcode', - 'bbcode' => true + 'bbcode' => true, + 'jotnets' => true ); $o = '<div id="jot-popup">'; diff --git a/Zotlabs/Module/Network.php b/Zotlabs/Module/Network.php index 0128adc2c..50bb05075 100644 --- a/Zotlabs/Module/Network.php +++ b/Zotlabs/Module/Network.php @@ -159,7 +159,7 @@ class Network extends \Zotlabs\Web\Controller { 'allow_gid' => $channel['channel_allow_gid'], 'deny_cid' => $channel['channel_deny_cid'], 'deny_gid' => $channel['channel_deny_gid'] - ); + ); $private_editing = ((($group || $cid) && (! intval($_GET['pf']))) ? true : false); @@ -176,7 +176,8 @@ class Network extends \Zotlabs\Web\Controller { 'profile_uid' => local_channel(), 'editor_autocomplete' => true, 'bbco_autocomplete' => 'bbcode', - 'bbcode' => true + 'bbcode' => true, + 'jotnets' => true ); if($deftag) $x['pretext'] = $deftag; diff --git a/Zotlabs/Module/Rpost.php b/Zotlabs/Module/Rpost.php index 525f053de..1349cd1c5 100644 --- a/Zotlabs/Module/Rpost.php +++ b/Zotlabs/Module/Rpost.php @@ -126,7 +126,10 @@ class Rpost extends \Zotlabs\Web\Controller { 'source' => ((x($_REQUEST,'source')) ? strip_tags($_REQUEST['source']) : ''), 'return_path' => 'rpost/return', 'bbco_autocomplete' => 'bbcode', - 'bbcode' => true + 'editor_autocomplete'=> true, + 'bbcode' => true, + 'jotnets' => true + ); $editor = status_editor($a,$x); diff --git a/Zotlabs/Module/Setup.php b/Zotlabs/Module/Setup.php index 4553b6866..cb43b5c20 100644 --- a/Zotlabs/Module/Setup.php +++ b/Zotlabs/Module/Setup.php @@ -101,7 +101,7 @@ class Setup extends \Zotlabs\Web\Controller { $timezone = notags(trim($_POST['timezone'])); $adminmail = notags(trim($_POST['adminmail'])); $siteurl = notags(trim($_POST['siteurl'])); - $advanced = ((intval($_POST['advanced'])) ? 'pro' : 'basic'); + $advanced = ((intval($_POST['advanced'])) ? 'standard' : 'basic'); if($siteurl != z_root()) { $test = z_fetch_url($siteurl."/setup/testrewrite"); @@ -150,15 +150,6 @@ define ( 'MAX_IMAGE_LENGTH', -1 ); define ( 'DEFAULT_DB_ENGINE', 'MyISAM' ); /** - * SSL redirection policies - */ - -define ( 'SSL_POLICY_NONE', 0 ); -define ( 'SSL_POLICY_FULL', 1 ); -define ( 'SSL_POLICY_SELFSIGN', 2 ); // NOT supported in Red - - -/** * log levels */ @@ -168,6 +159,15 @@ define ( 'LOGGER_DEBUG', 2 ); define ( 'LOGGER_DATA', 3 ); define ( 'LOGGER_ALL', 4 ); + +/** + * Server roles + */ + +define ( 'SERVER_ROLE_BASIC', 0x0001 ); +define ( 'SERVER_ROLE_STANDARD', 0x0002 ); +define ( 'SERVER_ROLE_PRO', 0x0004 ); + /** * registration policies */ @@ -612,11 +612,11 @@ function sys_boot() { if(UNO) App::$config['system']['server_role'] = 'basic'; else - App::$config['system']['server_role'] = 'pro'; + App::$config['system']['server_role'] = 'standard'; } if(! (array_key_exists('server_role',App::$config['system']) && App::$config['system']['server_role'])) - App::$config['system']['server_role'] = 'pro'; + App::$config['system']['server_role'] = 'standard'; App::$timezone = ((App::$config['system']['timezone']) ? App::$config['system']['timezone'] : 'UTC'); date_default_timezone_set(App::$timezone); @@ -760,7 +760,7 @@ class miniApp { class App { public static $install = false; // true if we are installing the software - + public static $role = 0; // server role (constant, not the string) public static $account = null; // account record of the logged-in account public static $channel = null; // channel record of the current channel of the logged-in account public static $observer = null; // xchan record of the page observer @@ -1044,6 +1044,31 @@ class App { } } + public static function get_role() { + if(! self::$role) + return self::set_role(); + return self::$role; + } + + public static function set_role() { + $role_str = \Zotlabs\Lib\System::get_server_role(); + switch($role_str) { + case 'basic': + $role = SERVER_ROLE_BASIC; + break; + case 'pro': + $role = SERVER_ROLE_PRO; + break; + case 'standard': + default: + $role = SERVER_ROLE_STANDARD; + break; + } + self::$role = $role; + return $role; + } + + public static function get_scheme() { return self::$scheme; } diff --git a/doc/contributor/covenant.html b/doc/contributor/covenant.html new file mode 100644 index 000000000..4facac24e --- /dev/null +++ b/doc/contributor/covenant.html @@ -0,0 +1,106 @@ +<!DOCTYPE html> + +<html lang="en"> +<head> + <meta charset="utf-8"/> + <title>Contributor Covenant 1.4.0</title> + <style> + body { + font-family: monospace; + padding: 4em; + } + a { + color: #990000; + } + </style> + <link rel="alternate" hreflang="de" href="version/1/3/0/de/" /> + <link rel="alternate" hreflang="es" href="version/1/4/es/" /> + <link rel="alternate" hreflang="fr" href="version/1/3/0/fr/" /> + <link rel="alternate" hreflang="hu" href="version/1/3/0/hu/" /> + <link rel="alternate" hreflang="it" href="version/1/3/0/it/" /> + <link rel="alternate" hreflang="ja" href="version/1/3/0/ja/" /> + <link rel="alternate" hreflang="pl" href="version/1/4/pl/" /> + <link rel="alternate" hreflang="pt" href="version/1/3/0/pt/" /> + <link rel="alternate" hreflang="pt" href="version/1/3/0/pt_br/" /> + <link rel="alternate" hreflang="ru" href="version/1/3/0/ru/" /> + <link rel="alternate" hreflang="sl" href="version/1/4/sl/" /> + <link rel="alternate" hreflang="uk" href="version/1/4/uk/" /> +</head> + +<body> + +<h1>Contributor Covenant Code of Conduct</h1> + +<h2>Our Pledge</h2> + +<p>In the interest of fostering an open and welcoming environment, we as +contributors and maintainers pledge to making participation in our project and +our community a harassment-free experience for everyone, regardless of age, body +size, disability, ethnicity, gender identity and expression, level of experience, +nationality, personal appearance, race, religion, or sexual identity and +orientation.</p> + +<h2>Our Standards</h2> + +<p>Examples of behavior that contributes to creating a positive environment +include:</p> + +<ul> + <li>Using welcoming and inclusive language</li> + <li>Being respectful of differing viewpoints and experiences</li> + <li>Gracefully accepting constructive criticism</li> + <li>Focusing on what is best for the community</li> + <li>Showing empathy towards other community members</li> +</ul> + +<p>Examples of unacceptable behavior by participants include:</p> + +<ul> + <li>The use of sexualized language or imagery and unwelcome sexual attention or advances</li> + <li>Trolling, insulting/derogatory comments, and personal or political attacks</li> + <li>Public or private harassment</li> + <li>Publishing others' private information, such as a physical or electronic address, without explicit permission</li> + <li>Other conduct which could reasonably be considered inappropriate in a professional setting</li> +</ul> + +<h2>Our Responsibilities</h2> + +<p>Project maintainers are responsible for clarifying the standards of acceptable +behavior and are expected to take appropriate and fair corrective action in +response to any instances of unacceptable behavior.</p> + +<p>Project maintainers have the right and responsibility to remove, edit, or +reject comments, commits, code, wiki edits, issues, and other contributions +that are not aligned to this Code of Conduct, or to ban temporarily or +permanently any contributor for other behaviors that they deem inappropriate, +threatening, offensive, or harmful.</p> + +<h2>Scope</h2> + +<p>This Code of Conduct applies both within project spaces and in public spaces +when an individual is representing the project or its community. Examples of +representing a project or community include using an official project e-mail +address, posting via an official social media account, or acting as an appointed +representative at an online or offline event. Representation of a project may be +further defined and clarified by project maintainers.</p> + +<h2>Enforcement</h2> + +<p>Instances of abusive, harassing, or otherwise unacceptable behavior may be +reported by contacting the project team at project@hubzilla.org. All +complaints will be reviewed and investigated and will result in a response that +is deemed necessary and appropriate to the circumstances. The project team is +obligated to maintain confidentiality with regard to the reporter of an incident. +Further details of specific enforcement policies may be posted separately.</p> + +<p>Project maintainers who do not follow or enforce the Code of Conduct in good +faith may face temporary or permanent repercussions as determined by other +members of the project's leadership.</p> + +<h2>Attribution</h2> + +<p>This Code of Conduct is adapted from the <a href="http://contributor-covenant.org">Contributor Covenant</a>, version 1.4, +available at <a href="http://contributor-covenant.org/version/1/4/">http://contributor-covenant.org/version/1/4</a>.</p> + +</body> +</html> diff --git a/doc/develop.bb b/doc/develop.bb index ef3ea5bd0..7a7350049 100644 --- a/doc/develop.bb +++ b/doc/develop.bb @@ -27,5 +27,5 @@ [zrl=[baseurl]/help/dev_beginner]Step-for-step manual for beginning developers[/zrl] [h3]External Resources[/h3] -[url=https://zothub.com/channel/one]Development Channel[/url] +[url=https://grid.reticu.li/channel/hubzilla]Development Channel[/url] [url=https://federated.social/channel/postgres]Postgres-specific $Projectname Admin Support Channel[/url] diff --git a/doc/developers.bb b/doc/developers.bb index 6f7752577..c7cf66093 100644 --- a/doc/developers.bb +++ b/doc/developers.bb @@ -1,6 +1,6 @@ [b]$Projectname Developer Guide[/b]
-We're pretty relaxed when it comes to developers. We don't have a lot of rules. Some of us are over-worked and if you want to help we're happy to let you help. That said, attention to a few guidelines will make the process smoother and make it easier to work together. We have developers from across the globe with different abilities and different cultural backgrounds and different levels of patience. Our primary rule is to respect others. Sometimes this is hard and sometimes we have very different opinions of how things should work, but if everybody makes an effort, we'll get along just fine.
+We're pretty relaxed when it comes to developers. We don't have a lot of rules. Some of us are over-worked and if you want to help we're happy to let you help. That said, attention to a few guidelines will make the process smoother and make it easier to work together. All developers are expected to abide by our [zrl=[baseurl]/help/contributor/covenant]code of conduct[/zrl]. We have developers from across the globe with different abilities and different cultural backgrounds and different levels of patience. Our primary rule is to respect others. Sometimes this is hard and sometimes we have very different opinions of how things should work, but if everybody makes an effort, we'll get along just fine.
[b]Here is how you can join us.[/b]
diff --git a/doc/feature/access_tokens.bb b/doc/feature/access_tokens.bb new file mode 100644 index 000000000..eb5c03717 --- /dev/null +++ b/doc/feature/access_tokens.bb @@ -0,0 +1,47 @@ +Feature: Zot Access Tokens +Status: Draft +Date: 15 July 2016 + + +Purpose: + +In order to facilitate sharing of private resources with non-members or members of federation nodes with limited identification discovery, Hubzilla should provide members with a mechanism to create and manage temporary ("throwaway") logins, aka "Zot Access Tokens". These tokens/credentials may be used to authenticate to a hubzilla site for the sole purpose of accessing privileged or access controlled resources (files, photos, posts, webpages, chatrooms, etc.). + + +Scope: + +Zot Access Tokens do not convey membership in the site or network. In particular, they do not provide an account or channel; which may be necessary to interact with the hub owner or with others in the network or federation of networks. In most cases they can only be used to consume restricted resources and do not have an ability to create those resources, however this ability may be provided by custom configurations or in future releases or addons. + +For instance the ability for a temporary login to access a chatroom may provide suitable permission to create chat messages inside that chatroom. + + +Implementation: + +Zot Access Tokens are managed through a "tab" of the settings page. Access to this tab may be controlled by site configuration. On this page, channels may create, edit, list, and remove any access tokens under their control. + +The form to create/edit accepts three parameters, a human readable name, a password or access token, and an optional expiration. Once expired, the access token is no longer valid, may no longer be used, and will be automatically purged from the list of temporary accounts. The password field in the create/edit forms displays the text of the access token and not an obscured password. By default we will create a token using the autoname() function, which generally produces a random character sequence which is "pronounceable", hence easy to convey or remember. This can be changed to any other character sequence which is acceptable to the site password complexity policy. (In most Hubzilla installations this imposes a minimum of three characters, but may be extended by plugin or site policy). + + +Usage: + +We do not specify mechanisms for sharing these tokens with others. Any communication method may be used. Any tokens you have created are added to the Access Control List selector and may be used anywhere that Access Control Lists are provided. + + Example: A visitor arrives at your site. She has an access token you have provided, and attempts to visit one of your photo albums (which is restricted to be viewed only by yourself and one temporary identity). Permission is denied. + +The visitor now selects "Login" from the menu navigation bar. This presents a login page. She enters the name and password you have provided her, and she can now view the restricted photo album. + + +Alternatively, you may share a link to a protected file by adding a parameter "&zat=abc123" to the URL, where the string "abc123" is the access token or password for the temporary login. No further negotiation is required, and the file is presented. + +Zot Acess Tokens are represented internally as an authenticated "observer". Querying the observer in code should return a pseudo or system generated xchan with an unknown protocol and a default profile photo. It will match (successfully) any access control rule which allows authenticated observers. + +Security Considerations: + +The URL form of authentication is inherently less secure than using a login, but may be preferable for some uses of this feature. It probably should not be transmitted over non-SSL links. + + +Future development: + +It might be desirable for future implementations to provide an options for single-use, where the access token is removed promptly following first use. + +
\ No newline at end of file diff --git a/include/acl_selectors.php b/include/acl_selectors.php index 9bee942e2..362776b44 100644 --- a/include/acl_selectors.php +++ b/include/acl_selectors.php @@ -148,11 +148,6 @@ function populate_acl($defaults = null,$show_jotnets = true, $emptyACL_descripti array_walk($deny_cid,'fixacl'); array_walk($deny_gid,'fixacl'); } - - $jotnets = ''; - if($show_jotnets) { - call_hooks('jot_networks', $jotnets); - } $r = q("SELECT id, hash, gname FROM groups WHERE deleted = 0 AND uid = %d ORDER BY gname ASC", intval(local_channel()) @@ -181,8 +176,6 @@ function populate_acl($defaults = null,$show_jotnets = true, $emptyACL_descripti '$allowgid' => json_encode($allow_gid), '$denycid' => json_encode($deny_cid), '$denygid' => json_encode($deny_gid), - '$jnetModalTitle' => t('Other networks and post services'), - '$jotnets' => $jotnets, '$aclModalTitle' => t('Permissions'), '$aclModalDesc' => $dialog_description, '$aclModalDismiss' => t('Close'), diff --git a/include/channel.php b/include/channel.php index 1179697a4..47db7e806 100644 --- a/include/channel.php +++ b/include/channel.php @@ -1381,6 +1381,11 @@ function zid($s,$address = '') { if (! strlen($s) || strpos($s,'zid=')) return $s; + $m = parse_url($s); + $fragment = ((array_key_exists('fragment',$m) && $m['fragment']) ? $m['fragment'] : false); + if($fragment !== false) + $s = str_replace('#' . $fragment,'',$s); + $has_params = ((strpos($s,'?')) ? true : false); $num_slashes = substr_count($s, '/'); if (! $has_params) @@ -1401,6 +1406,11 @@ function zid($s,$address = '') { else $zurl = $s; + // put fragment at the end + + if($fragment) + $zurl .= '#' . $fragment; + $arr = array('url' => $s, 'zid' => urlencode($myaddr), 'result' => $zurl); call_hooks('zid', $arr); diff --git a/include/conversation.php b/include/conversation.php index 7d1473fe2..637234bff 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1200,8 +1200,6 @@ function status_editor($a, $x, $popup = false) { $tpl = get_markup_template('jot.tpl'); - $jotplugins = ''; - $preview = t('Preview'); if(x($x, 'hide_preview')) $preview = ''; @@ -1218,8 +1216,14 @@ function status_editor($a, $x, $popup = false) { if(! $cipher) $cipher = 'aes256'; + $jotplugins = ''; call_hooks('jot_tool', $jotplugins); + $jotnets = ''; + if(x($x,'jotnets')) { + call_hooks('jot_networks', $jotnets); + } + $o .= replace_macros($tpl, array( '$return_path' => ((x($x, 'return_path')) ? $x['return_path'] : App::$query_string), '$action' => z_root() . '/item', @@ -1276,6 +1280,8 @@ function status_editor($a, $x, $popup = false) { '$preview' => $preview, '$source' => ((x($x, 'source')) ? $x['source'] : ''), '$jotplugins' => $jotplugins, + '$jotnets' => $jotnets, + '$jotnets_label' => t('Other networks and post services'), '$defexpire' => $defexpire, '$feature_expire' => $feature_expire, '$expires' => t('Set expiration date'), diff --git a/include/items.php b/include/items.php index 91110eb07..ac746c189 100755 --- a/include/items.php +++ b/include/items.php @@ -1627,8 +1627,21 @@ function item_store($arr, $allow_exec = false, $deliver = true) { $arr['commented'] = ((x($arr,'commented') !== false) ? datetime_convert('UTC','UTC',$arr['commented']) : datetime_convert()); $arr['comments_closed'] = ((x($arr,'comments_closed') !== false) ? datetime_convert('UTC','UTC',$arr['comments_closed']) : NULL_DATE); - $arr['received'] = datetime_convert(); - $arr['changed'] = datetime_convert(); + if($deliver) { + $arr['received'] = datetime_convert(); + $arr['changed'] = datetime_convert(); + } + else { + + // When deliver flag is false, we are *probably* performing an import or bulk migration. + // If one updates the changed timestamp it will be made available to zotfeed and delivery + // will still take place through backdoor methods. Since these fields are rarely used + // otherwise, just preserve the original timestamp. + + $arr['received'] = ((x($arr,'received') !== false) ? datetime_convert('UTC','UTC',$arr['received']) : datetime_convert()); + $arr['changed'] = ((x($arr,'changed') !== false) ? datetime_convert('UTC','UTC',$arr['changed']) : datetime_convert()); + } + $arr['location'] = ((x($arr,'location')) ? notags(trim($arr['location'])) : ''); $arr['coord'] = ((x($arr,'coord')) ? notags(trim($arr['coord'])) : ''); $arr['parent_mid'] = ((x($arr,'parent_mid')) ? notags(trim($arr['parent_mid'])) : ''); @@ -2035,8 +2048,22 @@ function item_store_update($arr,$allow_exec = false, $deliver = true) { $arr['comments_closed'] = $orig[0]['comments_closed']; $arr['commented'] = $orig[0]['commented']; - $arr['received'] = datetime_convert(); - $arr['changed'] = datetime_convert(); + + if($deliver) { + $arr['received'] = datetime_convert(); + $arr['changed'] = datetime_convert(); + } + else { + + // When deliver flag is false, we are *probably* performing an import or bulk migration. + // If one updates the changed timestamp it will be made available to zotfeed and delivery + // will still take place through backdoor methods. Since these fields are rarely used + // otherwise, just preserve the original timestamp. + + $arr['received'] = $orig[0]['received']; + $arr['changed'] = $orig[0]['changed']; + } + $arr['route'] = ((array_key_exists('route',$arr)) ? trim($arr['route']) : $orig[0]['route']); $arr['diaspora_meta'] = ((x($arr,'diaspora_meta')) ? $arr['diaspora_meta'] : $orig[0]['diaspora_meta']); $arr['location'] = ((x($arr,'location')) ? notags(trim($arr['location'])) : $orig[0]['location']); diff --git a/include/plugin.php b/include/plugin.php index cb206d944..663d17959 100755 --- a/include/plugin.php +++ b/include/plugin.php @@ -404,6 +404,18 @@ function check_plugin_versions($info) { return false; } } + if(array_key_exists('serverroles',$info)) { + $role = \Zotlabs\Lib\System::get_server_role(); + if(! ( + stristr($info['serverroles'],'*') + || stristr($info['serverroles'],'any') + || stristr($info['serverroles'],$role))) { + logger('serverrole limit: ' . $info['name'],LOGGER_NORMAL,LOG_WARNING); + return false; + + } + } + if(array_key_exists('requires',$info)) { $arr = explode(',',$info['requires']); diff --git a/include/zot.php b/include/zot.php index 01b29f74b..c3c924113 100644 --- a/include/zot.php +++ b/include/zot.php @@ -3708,6 +3708,8 @@ function zotinfo($arr) { } } + $ztarget_hash = (($ztarget && $zsig) ? make_xchan_hash($ztarget,$zsig) : '' ); + $r = null; if(strlen($zhash)) { @@ -3783,11 +3785,11 @@ function zotinfo($arr) { if($role === 'forum' || $role === 'repository') { $public_forum = true; } - else { + elseif($ztarget_hash) { // check if it has characteristics of a public forum based on custom permissions. $t = q("select * from abconfig where abconfig.cat = 'my_perms' and abconfig.chan = %d and abconfig.xchan = '%s' and abconfig.k in ('tag_deliver', 'send_stream') ", intval($e['channel_id']), - dbesc($e['channel_hash']) + dbesc($ztarget_hash) ); $ch = 0; @@ -3889,9 +3891,6 @@ function zotinfo($arr) { $ret['follow_url'] = z_root() . '/follow?f=&url=%s'; - $ztarget_hash = (($ztarget && $zsig) - ? make_xchan_hash($ztarget,$zsig) - : '' ); $permissions = get_all_perms($e['channel_id'],$ztarget_hash,false); diff --git a/install/htconfig.sample.php b/install/htconfig.sample.php index e5c743ac1..f37b3dc79 100755 --- a/install/htconfig.sample.php +++ b/install/htconfig.sample.php @@ -47,9 +47,9 @@ App::$config['system']['location_hash'] = 'if the auto install failed, put a uni // Choices are 'basic', 'standard', and 'pro'. // basic sets up the sevrer for basic social networking and removes "complicated" features // standard provides most desired features except e-commerce -// pro gives you access to everything +// pro gives you access to everything, but removes cross-platform federation/emulation -App::$config['system']['server_role'] = 'pro'; +App::$config['system']['server_role'] = 'standard'; // These lines set additional security headers to be sent with all responses diff --git a/util/hmessages.po b/util/hmessages.po index 99a478c2e..ada834815 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-08-12 00:02-0700\n" +"POT-Creation-Date: 2016-08-19 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:95 -#: ../../include/conversation.php:1659 +#: ../../Zotlabs/Lib/Apps.php:217 ../../include/conversation.php:1669 +#: ../../include/nav.php:95 msgid "Files" msgstr "" @@ -213,24 +213,24 @@ msgid "Shared" msgstr "" #: ../../Zotlabs/Storage/Browser.php:230 ../../Zotlabs/Storage/Browser.php:323 -#: ../../Zotlabs/Module/Webpages.php:216 ../../Zotlabs/Module/Menu.php:118 -#: ../../Zotlabs/Module/New_channel.php:142 +#: ../../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:216 msgid "Create" msgstr "" #: ../../Zotlabs/Storage/Browser.php:231 ../../Zotlabs/Storage/Browser.php:325 #: ../../Zotlabs/Module/Cover_photo.php:357 -#: ../../Zotlabs/Module/Photos.php:827 ../../Zotlabs/Module/Photos.php:1370 #: ../../Zotlabs/Module/Profile_photo.php:390 +#: ../../Zotlabs/Module/Photos.php:827 ../../Zotlabs/Module/Photos.php:1370 #: ../../Zotlabs/Module/Embedphotos.php:159 ../../include/widgets.php:1626 msgid "Upload" msgstr "" #: ../../Zotlabs/Storage/Browser.php:235 ../../Zotlabs/Module/Chat.php:250 -#: ../../Zotlabs/Module/Settings.php:662 ../../Zotlabs/Module/Settings.php:688 #: ../../Zotlabs/Module/Admin.php:1223 #: ../../Zotlabs/Module/Sharedwithme.php:99 +#: ../../Zotlabs/Module/Settings.php:684 ../../Zotlabs/Module/Settings.php:710 msgid "Name" msgstr "" @@ -248,32 +248,32 @@ msgstr "" msgid "Last Modified" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:240 ../../Zotlabs/Module/Webpages.php:217 +#: ../../Zotlabs/Storage/Browser.php:240 ../../Zotlabs/Module/Thing.php:260 #: ../../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/Menu.php:112 -#: ../../Zotlabs/Module/Editpost.php:84 ../../Zotlabs/Module/Settings.php:722 #: ../../Zotlabs/Module/Admin.php:2113 ../../Zotlabs/Module/Blocks.php:160 -#: ../../Zotlabs/Module/Layouts.php:192 ../../Zotlabs/Module/Thing.php:260 +#: ../../Zotlabs/Module/Layouts.php:192 ../../Zotlabs/Module/Webpages.php:217 +#: ../../Zotlabs/Module/Settings.php:744 ../../Zotlabs/Module/Editpost.php:84 #: ../../Zotlabs/Lib/Apps.php:341 ../../Zotlabs/Lib/ThreadItem.php:106 -#: ../../include/menu.php:113 ../../include/page_widgets.php:9 -#: ../../include/page_widgets.php:39 ../../include/channel.php:959 +#: ../../include/page_widgets.php:9 ../../include/page_widgets.php:39 +#: ../../include/menu.php:113 ../../include/channel.php:959 #: ../../include/channel.php:963 msgid "Edit" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:241 ../../Zotlabs/Module/Webpages.php:219 +#: ../../Zotlabs/Storage/Browser.php:241 ../../Zotlabs/Module/Thing.php:261 +#: ../../Zotlabs/Module/Connedit.php:607 #: ../../Zotlabs/Module/Connections.php:263 #: ../../Zotlabs/Module/Editblock.php:134 #: ../../Zotlabs/Module/Editlayout.php:137 -#: ../../Zotlabs/Module/Editwebpage.php:170 -#: ../../Zotlabs/Module/Connedit.php:610 ../../Zotlabs/Module/Group.php:177 -#: ../../Zotlabs/Module/Photos.php:1179 ../../Zotlabs/Module/Settings.php:723 +#: ../../Zotlabs/Module/Editwebpage.php:170 ../../Zotlabs/Module/Group.php:177 #: ../../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/Lib/Apps.php:342 +#: ../../Zotlabs/Module/Photos.php:1179 ../../Zotlabs/Module/Webpages.php:219 +#: ../../Zotlabs/Module/Settings.php:745 ../../Zotlabs/Lib/Apps.php:342 #: ../../Zotlabs/Lib/ThreadItem.php:126 ../../include/conversation.php:660 msgid "Delete" msgstr "" @@ -304,64 +304,74 @@ msgstr "" msgid "Drop files here to immediately upload" msgstr "" -#: ../../Zotlabs/Web/Router.php:65 ../../Zotlabs/Web/WebServer.php:128 -#: ../../Zotlabs/Module/Achievements.php:34 ../../Zotlabs/Module/Setup.php:215 -#: ../../Zotlabs/Module/Webpages.php:95 ../../Zotlabs/Module/Authtest.php:16 -#: ../../Zotlabs/Module/Profiles.php:203 ../../Zotlabs/Module/Profiles.php:601 -#: ../../Zotlabs/Module/Bookmarks.php:61 ../../Zotlabs/Module/Item.php:213 -#: ../../Zotlabs/Module/Item.php:221 ../../Zotlabs/Module/Item.php:1071 -#: ../../Zotlabs/Module/Page.php:35 ../../Zotlabs/Module/Page.php:91 -#: ../../Zotlabs/Module/Channel.php:104 ../../Zotlabs/Module/Channel.php:226 -#: ../../Zotlabs/Module/Channel.php:267 +#: ../../Zotlabs/Web/WebServer.php:127 ../../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 +#: ../../Zotlabs/Module/Dreport.php:10 ../../Zotlabs/Module/Dreport.php:66 +#: ../../include/items.php:384 +msgid "Permission denied" +msgstr "" + +#: ../../Zotlabs/Web/WebServer.php:128 ../../Zotlabs/Web/Router.php:65 +#: ../../Zotlabs/Module/Achievements.php:34 ../../Zotlabs/Module/Thing.php:274 +#: ../../Zotlabs/Module/Thing.php:294 ../../Zotlabs/Module/Thing.php:335 +#: ../../Zotlabs/Module/Like.php:181 ../../Zotlabs/Module/Authtest.php:16 +#: ../../Zotlabs/Module/Rate.php:113 ../../Zotlabs/Module/Bookmarks.php:61 +#: ../../Zotlabs/Module/Item.php:214 ../../Zotlabs/Module/Item.php:222 +#: ../../Zotlabs/Module/Item.php:1073 ../../Zotlabs/Module/Page.php:35 +#: ../../Zotlabs/Module/Page.php:91 ../../Zotlabs/Module/Connedit.php:395 #: ../../Zotlabs/Module/Connections.php:33 #: ../../Zotlabs/Module/Cover_photo.php:277 -#: ../../Zotlabs/Module/Cover_photo.php:290 ../../Zotlabs/Module/Like.php:181 +#: ../../Zotlabs/Module/Cover_photo.php:290 ../../Zotlabs/Module/Mail.php:121 #: ../../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 #: ../../Zotlabs/Module/Editwebpage.php:104 -#: ../../Zotlabs/Module/Editwebpage.php:126 ../../Zotlabs/Module/Appman.php:75 +#: ../../Zotlabs/Module/Editwebpage.php:126 ../../Zotlabs/Module/Chat.php:100 +#: ../../Zotlabs/Module/Chat.php:105 ../../Zotlabs/Module/Appman.php:75 #: ../../Zotlabs/Module/Pdledit.php:26 ../../Zotlabs/Module/Filestorage.php:23 #: ../../Zotlabs/Module/Filestorage.php:78 #: ../../Zotlabs/Module/Filestorage.php:93 #: ../../Zotlabs/Module/Filestorage.php:120 -#: ../../Zotlabs/Module/Connedit.php:398 ../../Zotlabs/Module/Group.php:13 -#: ../../Zotlabs/Module/Menu.php:78 ../../Zotlabs/Module/Block.php:26 -#: ../../Zotlabs/Module/Block.php:76 ../../Zotlabs/Module/Editpost.php:17 -#: ../../Zotlabs/Module/Invite.php:17 ../../Zotlabs/Module/Invite.php:91 -#: ../../Zotlabs/Module/Locs.php:87 ../../Zotlabs/Module/Chat.php:100 -#: ../../Zotlabs/Module/Chat.php:105 ../../Zotlabs/Module/Events.php:264 -#: ../../Zotlabs/Module/Message.php:18 ../../Zotlabs/Module/Mail.php:121 -#: ../../Zotlabs/Module/Mood.php:116 ../../Zotlabs/Module/Manage.php:10 -#: ../../Zotlabs/Module/Photos.php:73 ../../Zotlabs/Module/Settings.php:642 +#: ../../Zotlabs/Module/Profiles.php:203 ../../Zotlabs/Module/Profiles.php:601 +#: ../../Zotlabs/Module/Channel.php:104 ../../Zotlabs/Module/Channel.php:226 +#: ../../Zotlabs/Module/Channel.php:267 ../../Zotlabs/Module/Group.php:13 +#: ../../Zotlabs/Module/Mitem.php:115 ../../Zotlabs/Module/Block.php:26 +#: ../../Zotlabs/Module/Block.php:76 ../../Zotlabs/Module/Invite.php:17 +#: ../../Zotlabs/Module/Invite.php:91 ../../Zotlabs/Module/Locs.php:87 +#: ../../Zotlabs/Module/Events.php:264 ../../Zotlabs/Module/Message.php:18 +#: ../../Zotlabs/Module/Manage.php:10 ../../Zotlabs/Module/Mood.php:116 +#: ../../Zotlabs/Module/Menu.php:78 ../../Zotlabs/Module/Setup.php:215 #: ../../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/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/Api.php:12 ../../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/Common.php:39 ../../Zotlabs/Module/Register.php:77 -#: ../../Zotlabs/Module/Mitem.php:115 ../../Zotlabs/Module/Network.php:15 -#: ../../Zotlabs/Module/Regmod.php:21 ../../Zotlabs/Module/Thing.php:274 -#: ../../Zotlabs/Module/Thing.php:294 ../../Zotlabs/Module/Thing.php:335 +#: ../../Zotlabs/Module/Common.php:39 ../../Zotlabs/Module/Network.php:15 +#: ../../Zotlabs/Module/Photos.php:73 ../../Zotlabs/Module/Regmod.php:21 +#: ../../Zotlabs/Module/Webpages.php:95 #: ../../Zotlabs/Module/Service_limits.php:11 -#: ../../Zotlabs/Module/Rate.php:113 ../../Zotlabs/Module/Sharedwithme.php:11 +#: ../../Zotlabs/Module/Register.php:77 +#: ../../Zotlabs/Module/Sharedwithme.php:11 #: ../../Zotlabs/Module/Sources.php:74 ../../Zotlabs/Module/Suggest.php:30 -#: ../../Zotlabs/Module/Api.php:12 ../../Zotlabs/Module/Viewconnections.php:28 +#: ../../Zotlabs/Module/Settings.php:664 +#: ../../Zotlabs/Module/Viewconnections.php:28 #: ../../Zotlabs/Module/Viewconnections.php:33 -#: ../../Zotlabs/Module/Viewsrc.php:18 ../../Zotlabs/Lib/Chatroom.php:137 -#: ../../include/items.php:3448 ../../include/photos.php:27 -#: ../../include/attach.php:142 ../../include/attach.php:190 -#: ../../include/attach.php:253 ../../include/attach.php:267 -#: ../../include/attach.php:274 ../../include/attach.php:339 -#: ../../include/attach.php:353 ../../include/attach.php:360 -#: ../../include/attach.php:440 ../../include/attach.php:902 -#: ../../include/attach.php:973 ../../include/attach.php:1125 +#: ../../Zotlabs/Module/Viewsrc.php:18 ../../Zotlabs/Module/Editpost.php:17 +#: ../../Zotlabs/Lib/Chatroom.php:137 ../../include/photos.php:27 +#: ../../include/items.php:3450 ../../include/attach.php:142 +#: ../../include/attach.php:190 ../../include/attach.php:253 +#: ../../include/attach.php:267 ../../include/attach.php:274 +#: ../../include/attach.php:339 ../../include/attach.php:353 +#: ../../include/attach.php:360 ../../include/attach.php:440 +#: ../../include/attach.php:902 ../../include/attach.php:973 +#: ../../include/attach.php:1125 msgid "Permission denied." msgstr "" @@ -375,14 +385,6 @@ msgstr "" 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 " @@ -395,13 +397,13 @@ msgid "Welcome %s. Remote authentication successful." msgstr "" #: ../../Zotlabs/Module/Achievements.php:15 -#: ../../Zotlabs/Module/Webpages.php:33 ../../Zotlabs/Module/Editblock.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/Layouts.php:31 ../../Zotlabs/Module/Connect.php:17 -#: ../../include/channel.php:859 +#: ../../Zotlabs/Module/Webpages.php:33 ../../include/channel.php:859 msgid "Requested profile is not available." msgstr "" @@ -417,611 +419,302 @@ msgstr "" msgid "Online" msgstr "" -#: ../../Zotlabs/Module/Setup.php:179 -msgid "$Projectname Server - Setup" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:183 -msgid "Could not connect to database." -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:187 -msgid "" -"Could not connect to specified site URL. Possible SSL certificate or DNS " -"issue." -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:194 -msgid "Could not create table." -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:199 -msgid "Your site database has been installed." -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:203 -msgid "" -"You may need to import the file \"install/schema_xxx.sql\" manually using a " -"database client." -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:204 ../../Zotlabs/Module/Setup.php:266 -#: ../../Zotlabs/Module/Setup.php:722 -msgid "Please see the file \"install/INSTALL.txt\"." -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:263 -msgid "System check" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:267 ../../Zotlabs/Module/Events.php:676 -#: ../../Zotlabs/Module/Events.php:685 ../../Zotlabs/Module/Photos.php:960 -#: ../../Zotlabs/Module/Cal.php:333 ../../Zotlabs/Module/Cal.php:340 -msgid "Next" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:268 -msgid "Check again" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:290 -msgid "Database connection" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:291 -msgid "" -"In order to install $Projectname we need to know how to connect to your " -"database." -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:292 -msgid "" -"Please contact your hosting provider or site administrator if you have " -"questions about these settings." +#: ../../Zotlabs/Module/Thing.php:89 ../../Zotlabs/Module/Filestorage.php:32 +#: ../../Zotlabs/Module/Display.php:40 ../../Zotlabs/Module/Admin.php:164 +#: ../../Zotlabs/Module/Admin.php:1255 ../../Zotlabs/Module/Admin.php:1561 +#: ../../Zotlabs/Module/Viewsrc.php:24 ../../include/items.php:3371 +msgid "Item not found." msgstr "" -#: ../../Zotlabs/Module/Setup.php:293 -msgid "" -"The database you specify below should already exist. If it does not, please " -"create it before continuing." +#: ../../Zotlabs/Module/Thing.php:114 +msgid "Thing updated" msgstr "" -#: ../../Zotlabs/Module/Setup.php:297 -msgid "Database Server Name" +#: ../../Zotlabs/Module/Thing.php:166 +msgid "Object store: failed" msgstr "" -#: ../../Zotlabs/Module/Setup.php:297 -msgid "Default is 127.0.0.1" +#: ../../Zotlabs/Module/Thing.php:170 +msgid "Thing added" msgstr "" -#: ../../Zotlabs/Module/Setup.php:298 -msgid "Database Port" +#: ../../Zotlabs/Module/Thing.php:196 +#, php-format +msgid "OBJ: %1$s %2$s %3$s" msgstr "" -#: ../../Zotlabs/Module/Setup.php:298 -msgid "Communication port number - use 0 for default" +#: ../../Zotlabs/Module/Thing.php:259 +msgid "Show Thing" msgstr "" -#: ../../Zotlabs/Module/Setup.php:299 -msgid "Database Login Name" +#: ../../Zotlabs/Module/Thing.php:266 +msgid "item not found." msgstr "" -#: ../../Zotlabs/Module/Setup.php:300 -msgid "Database Login Password" +#: ../../Zotlabs/Module/Thing.php:299 +msgid "Edit Thing" msgstr "" -#: ../../Zotlabs/Module/Setup.php:301 -msgid "Database Name" +#: ../../Zotlabs/Module/Thing.php:301 ../../Zotlabs/Module/Thing.php:355 +msgid "Select a profile" msgstr "" -#: ../../Zotlabs/Module/Setup.php:302 -msgid "Database Type" +#: ../../Zotlabs/Module/Thing.php:305 ../../Zotlabs/Module/Thing.php:358 +msgid "Post an activity" msgstr "" -#: ../../Zotlabs/Module/Setup.php:304 ../../Zotlabs/Module/Setup.php:344 -msgid "Site administrator email address" +#: ../../Zotlabs/Module/Thing.php:305 ../../Zotlabs/Module/Thing.php:358 +msgid "Only sends to viewers of the applicable profile" msgstr "" -#: ../../Zotlabs/Module/Setup.php:304 ../../Zotlabs/Module/Setup.php:344 -msgid "" -"Your account email address must match this in order to use the web admin " -"panel." +#: ../../Zotlabs/Module/Thing.php:307 ../../Zotlabs/Module/Thing.php:360 +msgid "Name of thing e.g. something" msgstr "" -#: ../../Zotlabs/Module/Setup.php:305 ../../Zotlabs/Module/Setup.php:346 -msgid "Website URL" +#: ../../Zotlabs/Module/Thing.php:309 ../../Zotlabs/Module/Thing.php:361 +msgid "URL of thing (optional)" msgstr "" -#: ../../Zotlabs/Module/Setup.php:305 ../../Zotlabs/Module/Setup.php:346 -msgid "Please use SSL (https) URL if available." +#: ../../Zotlabs/Module/Thing.php:311 ../../Zotlabs/Module/Thing.php:362 +msgid "URL for photo of thing (optional)" msgstr "" -#: ../../Zotlabs/Module/Setup.php:306 ../../Zotlabs/Module/Setup.php:349 -msgid "Please select a default timezone for your website" +#: ../../Zotlabs/Module/Thing.php:313 ../../Zotlabs/Module/Thing.php:363 +#: ../../Zotlabs/Module/Chat.php:234 ../../Zotlabs/Module/Filestorage.php:152 +#: ../../Zotlabs/Module/Photos.php:669 ../../Zotlabs/Module/Photos.php:1047 +#: ../../include/acl_selectors.php:186 +msgid "Permissions" msgstr "" -#: ../../Zotlabs/Module/Setup.php:312 ../../Zotlabs/Module/Setup.php:353 -#: ../../Zotlabs/Module/Profiles.php:687 ../../Zotlabs/Module/Appman.php:126 -#: ../../Zotlabs/Module/Pdledit.php:66 +#: ../../Zotlabs/Module/Thing.php:320 ../../Zotlabs/Module/Thing.php:370 +#: ../../Zotlabs/Module/Rate.php:170 ../../Zotlabs/Module/Connedit.php:783 +#: ../../Zotlabs/Module/Import.php:560 ../../Zotlabs/Module/Mail.php:370 +#: ../../Zotlabs/Module/Chat.php:196 ../../Zotlabs/Module/Chat.php:241 +#: ../../Zotlabs/Module/Appman.php:126 ../../Zotlabs/Module/Pdledit.php:66 #: ../../Zotlabs/Module/Filestorage.php:165 -#: ../../Zotlabs/Module/Connedit.php:786 ../../Zotlabs/Module/Group.php:85 +#: ../../Zotlabs/Module/Profiles.php:687 ../../Zotlabs/Module/Group.php:85 +#: ../../Zotlabs/Module/Mitem.php:243 #: ../../Zotlabs/Module/Import_items.php:122 #: ../../Zotlabs/Module/Invite.php:146 ../../Zotlabs/Module/Locs.php:121 -#: ../../Zotlabs/Module/Chat.php:196 ../../Zotlabs/Module/Chat.php:241 -#: ../../Zotlabs/Module/Events.php:484 ../../Zotlabs/Module/Mail.php:370 -#: ../../Zotlabs/Module/Mood.php:139 ../../Zotlabs/Module/Photos.php:679 +#: ../../Zotlabs/Module/Events.php:484 ../../Zotlabs/Module/Mood.php:139 +#: ../../Zotlabs/Module/Setup.php:312 ../../Zotlabs/Module/Setup.php:353 +#: ../../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/Connect.php:98 ../../Zotlabs/Module/Photos.php:679 #: ../../Zotlabs/Module/Photos.php:1058 ../../Zotlabs/Module/Photos.php:1098 -#: ../../Zotlabs/Module/Photos.php:1216 ../../Zotlabs/Module/Settings.php:660 -#: ../../Zotlabs/Module/Settings.php:773 ../../Zotlabs/Module/Settings.php:864 -#: ../../Zotlabs/Module/Settings.php:890 ../../Zotlabs/Module/Settings.php:913 -#: ../../Zotlabs/Module/Settings.php:1001 -#: ../../Zotlabs/Module/Settings.php:1187 ../../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/Mitem.php:243 -#: ../../Zotlabs/Module/Connect.php:98 ../../Zotlabs/Module/Thing.php:320 -#: ../../Zotlabs/Module/Thing.php:370 ../../Zotlabs/Module/Rate.php:170 -#: ../../Zotlabs/Module/Sources.php:114 ../../Zotlabs/Module/Sources.php:149 -#: ../../Zotlabs/Module/Import.php:560 ../../Zotlabs/Module/Xchan.php:15 -#: ../../Zotlabs/Lib/ThreadItem.php:711 ../../include/js_strings.php:22 -#: ../../include/widgets.php:763 ../../view/theme/redbasic/php/config.php:99 +#: ../../Zotlabs/Module/Photos.php:1216 ../../Zotlabs/Module/Sources.php:114 +#: ../../Zotlabs/Module/Sources.php:149 ../../Zotlabs/Module/Settings.php:682 +#: ../../Zotlabs/Module/Settings.php:795 ../../Zotlabs/Module/Settings.php:886 +#: ../../Zotlabs/Module/Settings.php:912 ../../Zotlabs/Module/Settings.php:935 +#: ../../Zotlabs/Module/Settings.php:1040 +#: ../../Zotlabs/Module/Settings.php:1229 ../../Zotlabs/Module/Xchan.php:15 +#: ../../Zotlabs/Lib/ThreadItem.php:711 ../../include/widgets.php:763 +#: ../../include/js_strings.php:22 +#: ../../view/theme/redbasic/php/config.php:106 msgid "Submit" msgstr "" -#: ../../Zotlabs/Module/Setup.php:333 -msgid "Site settings" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:347 -msgid "Enable $Projectname <strong>advanced</strong> features?" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:347 -msgid "" -"Some advanced features, while useful - may be best suited for technically " -"proficient audiences" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:388 -msgid "PHP version 5.5 or greater is required." -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:389 -msgid "PHP version" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:404 -msgid "Could not find a command line version of PHP in the web server PATH." -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:405 -msgid "" -"If you don't have a command line version of PHP installed on server, you " -"will not be able to run background polling via cron." -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:409 -msgid "PHP executable path" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:409 -msgid "" -"Enter full path to php executable. You can leave this blank to continue the " -"installation." -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:414 -msgid "Command line PHP" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:423 -msgid "" -"The command line version of PHP on your system does not have " -"\"register_argc_argv\" enabled." -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:424 -msgid "This is required for message delivery to work." -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:427 -msgid "PHP register_argc_argv" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:445 -#, php-format -msgid "" -"Your max allowed total upload size is set to %s. Maximum size of one file to " -"upload is set to %s. You are allowed to upload up to %d files at once." -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:450 -msgid "You can adjust these settings in the servers php.ini." -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:452 -msgid "PHP upload limits" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:475 -msgid "" -"Error: the \"openssl_pkey_new\" function on this system is not able to " -"generate encryption keys" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:476 -msgid "" -"If running under Windows, please see \"http://www.php.net/manual/en/openssl." -"installation.php\"." -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:479 -msgid "Generate encryption keys" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:491 -msgid "libCurl PHP module" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:492 -msgid "GD graphics PHP module" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:493 -msgid "OpenSSL PHP module" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:494 -msgid "mysqli or postgres PHP module" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:495 -msgid "mb_string PHP module" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:496 -msgid "xml PHP module" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:500 ../../Zotlabs/Module/Setup.php:502 -msgid "Apache mod_rewrite module" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:500 -msgid "" -"Error: Apache webserver mod-rewrite module is required but not installed." -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:506 ../../Zotlabs/Module/Setup.php:509 -msgid "proc_open" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:506 -msgid "" -"Error: proc_open is required but is either not installed or has been " -"disabled in php.ini" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:514 -msgid "Error: libCURL PHP module required but not installed." +#: ../../Zotlabs/Module/Thing.php:353 +msgid "Add Thing to your Profile" msgstr "" -#: ../../Zotlabs/Module/Setup.php:518 -msgid "" -"Error: GD graphics PHP module with JPEG support required but not installed." +#: ../../Zotlabs/Module/Like.php:19 +msgid "Like/Dislike" msgstr "" -#: ../../Zotlabs/Module/Setup.php:522 -msgid "Error: openssl PHP module required but not installed." +#: ../../Zotlabs/Module/Like.php:24 +msgid "This action is restricted to members." msgstr "" -#: ../../Zotlabs/Module/Setup.php:526 +#: ../../Zotlabs/Module/Like.php:25 msgid "" -"Error: mysqli or postgres PHP module required but neither are installed." +"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/Setup.php:530 -msgid "Error: mb_string PHP module required but not installed." +#: ../../Zotlabs/Module/Like.php:105 ../../Zotlabs/Module/Like.php:131 +#: ../../Zotlabs/Module/Like.php:169 +msgid "Invalid request." msgstr "" -#: ../../Zotlabs/Module/Setup.php:534 -msgid "Error: xml PHP module required for DAV but not installed." +#: ../../Zotlabs/Module/Like.php:117 ../../include/conversation.php:126 +msgid "channel" msgstr "" -#: ../../Zotlabs/Module/Setup.php:552 -msgid "" -"The web installer needs to be able to create a file called \".htconfig.php\" " -"in the top folder of your web server and it is unable to do so." +#: ../../Zotlabs/Module/Like.php:146 +msgid "thing" msgstr "" -#: ../../Zotlabs/Module/Setup.php:553 -msgid "" -"This is most often a permission setting, as the web server may not be able " -"to write files in your folder - even if you can." +#: ../../Zotlabs/Module/Like.php:192 +msgid "Channel unavailable." msgstr "" -#: ../../Zotlabs/Module/Setup.php:554 -msgid "" -"At the end of this procedure, we will give you a text to save in a file " -"named .htconfig.php in your Red top folder." +#: ../../Zotlabs/Module/Like.php:240 +msgid "Previous action reversed." msgstr "" -#: ../../Zotlabs/Module/Setup.php:555 -msgid "" -"You can alternatively skip this procedure and perform a manual installation. " -"Please see the file \"install/INSTALL.txt\" for instructions." +#: ../../Zotlabs/Module/Like.php:370 ../../Zotlabs/Module/Subthread.php:87 +#: ../../Zotlabs/Module/Tagger.php:47 ../../include/conversation.php:120 +#: ../../include/text.php:1945 +msgid "photo" msgstr "" -#: ../../Zotlabs/Module/Setup.php:558 -msgid ".htconfig.php is writable" +#: ../../Zotlabs/Module/Like.php:370 ../../Zotlabs/Module/Subthread.php:87 +#: ../../include/conversation.php:148 ../../include/text.php:1951 +msgid "status" msgstr "" -#: ../../Zotlabs/Module/Setup.php:572 -msgid "" -"Red uses the Smarty3 template engine to render its web views. Smarty3 " -"compiles templates to PHP to speed up rendering." +#: ../../Zotlabs/Module/Like.php:372 ../../Zotlabs/Module/Events.php:253 +#: ../../Zotlabs/Module/Tagger.php:51 ../../include/conversation.php:123 +#: ../../include/text.php:1948 ../../include/event.php:958 +msgid "event" msgstr "" -#: ../../Zotlabs/Module/Setup.php:573 +#: ../../Zotlabs/Module/Like.php:419 ../../include/conversation.php:164 #, php-format -msgid "" -"In order to store these compiled templates, the web server needs to have " -"write access to the directory %s under the top level web folder." -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:574 ../../Zotlabs/Module/Setup.php:595 -msgid "" -"Please ensure that the user that your web server runs as (e.g. www-data) has " -"write access to this folder." +msgid "%1$s likes %2$s's %3$s" msgstr "" -#: ../../Zotlabs/Module/Setup.php:575 +#: ../../Zotlabs/Module/Like.php:421 ../../include/conversation.php:167 #, php-format -msgid "" -"Note: as a security measure, you should give the web server write access to " -"%s only--not the template files (.tpl) that it contains." +msgid "%1$s doesn't like %2$s's %3$s" msgstr "" -#: ../../Zotlabs/Module/Setup.php:578 +#: ../../Zotlabs/Module/Like.php:423 #, php-format -msgid "%s is writable" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:594 -msgid "" -"This software uses the store directory to save uploaded files. The web " -"server needs to have write access to the store directory under the Red top " -"level folder" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:598 -msgid "store is writable" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:631 -msgid "" -"SSL certificate cannot be validated. Fix certificate or disable https access " -"to this site." -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:632 -msgid "" -"If you have https access to your website or allow connections to TCP port " -"443 (the https: port), you MUST use a browser-valid certificate. You MUST " -"NOT use self-signed certificates!" +msgid "%1$s agrees with %2$s's %3$s" msgstr "" -#: ../../Zotlabs/Module/Setup.php:633 -msgid "" -"This restriction is incorporated because public posts from you may for " -"example contain references to images on your own hub." +#: ../../Zotlabs/Module/Like.php:425 +#, php-format +msgid "%1$s doesn't agree with %2$s's %3$s" msgstr "" -#: ../../Zotlabs/Module/Setup.php:634 -msgid "" -"If your certificate is not recognized, members of other sites (who may " -"themselves have valid certificates) will get a warning message on their own " -"site complaining about security issues." +#: ../../Zotlabs/Module/Like.php:427 +#, php-format +msgid "%1$s abstains from a decision on %2$s's %3$s" msgstr "" -#: ../../Zotlabs/Module/Setup.php:635 -msgid "" -"This can cause usability issues elsewhere (not just on your own site) so we " -"must insist on this requirement." +#: ../../Zotlabs/Module/Like.php:429 +#, php-format +msgid "%1$s is attending %2$s's %3$s" msgstr "" -#: ../../Zotlabs/Module/Setup.php:636 -msgid "" -"Providers are available that issue free certificates which are browser-valid." +#: ../../Zotlabs/Module/Like.php:431 +#, php-format +msgid "%1$s is not attending %2$s's %3$s" msgstr "" -#: ../../Zotlabs/Module/Setup.php:638 -msgid "" -"If you are confident that the certificate is valid and signed by a trusted " -"authority, check to see if you have failed to install an intermediate cert. " -"These are not normally required by browsers, but are required for server-to-" -"server communications." +#: ../../Zotlabs/Module/Like.php:433 +#, php-format +msgid "%1$s may attend %2$s's %3$s" msgstr "" -#: ../../Zotlabs/Module/Setup.php:641 -msgid "SSL certificate validation" +#: ../../Zotlabs/Module/Like.php:538 +msgid "Action completed." msgstr "" -#: ../../Zotlabs/Module/Setup.php:647 -msgid "" -"Url rewrite in .htaccess is not working. Check your server configuration." -"Test: " +#: ../../Zotlabs/Module/Like.php:539 +msgid "Thank you." msgstr "" -#: ../../Zotlabs/Module/Setup.php:650 -msgid "Url rewrite is working" +#: ../../Zotlabs/Module/Wiki.php:20 ../../Zotlabs/Module/Chat.php:25 +#: ../../Zotlabs/Module/Channel.php:28 +msgid "You must be logged in to see this page." msgstr "" -#: ../../Zotlabs/Module/Setup.php:659 -msgid "" -"The database configuration file \".htconfig.php\" could not be written. " -"Please use the enclosed text to create a configuration file in your web " -"server root." +#: ../../Zotlabs/Module/Wiki.php:34 +msgid "Not found" msgstr "" -#: ../../Zotlabs/Module/Setup.php:683 -msgid "Errors encountered creating database tables." +#: ../../Zotlabs/Module/Wiki.php:97 ../../Zotlabs/Lib/Apps.php:219 +#: ../../include/conversation.php:1725 ../../include/conversation.php:1728 +#: ../../include/features.php:57 ../../include/nav.php:110 +msgid "Wiki" msgstr "" -#: ../../Zotlabs/Module/Setup.php:720 -msgid "<h1>What next</h1>" +#: ../../Zotlabs/Module/Wiki.php:98 +msgid "Sandbox" msgstr "" -#: ../../Zotlabs/Module/Setup.php:721 +#: ../../Zotlabs/Module/Wiki.php:100 msgid "" -"IMPORTANT: You will need to [manually] setup a scheduled task for the poller." -msgstr "" - -#: ../../Zotlabs/Module/Dreport.php:44 -msgid "Invalid message" -msgstr "" - -#: ../../Zotlabs/Module/Dreport.php:76 -msgid "no results" -msgstr "" - -#: ../../Zotlabs/Module/Dreport.php:91 -msgid "channel sync processed" -msgstr "" - -#: ../../Zotlabs/Module/Dreport.php:95 -msgid "queued" -msgstr "" - -#: ../../Zotlabs/Module/Dreport.php:99 -msgid "posted" -msgstr "" - -#: ../../Zotlabs/Module/Dreport.php:103 -msgid "accepted for delivery" -msgstr "" - -#: ../../Zotlabs/Module/Dreport.php:107 -msgid "updated" -msgstr "" - -#: ../../Zotlabs/Module/Dreport.php:110 -msgid "update ignored" -msgstr "" - -#: ../../Zotlabs/Module/Dreport.php:113 -msgid "permission denied" -msgstr "" - -#: ../../Zotlabs/Module/Dreport.php:117 -msgid "recipient not found" -msgstr "" - -#: ../../Zotlabs/Module/Dreport.php:120 -msgid "mail recalled" -msgstr "" - -#: ../../Zotlabs/Module/Dreport.php:123 -msgid "duplicate mail received" -msgstr "" - -#: ../../Zotlabs/Module/Dreport.php:126 -msgid "mail delivered" -msgstr "" - -#: ../../Zotlabs/Module/Dreport.php:146 -#, php-format -msgid "Delivery report for %1$s" -msgstr "" - -#: ../../Zotlabs/Module/Dreport.php:149 -msgid "Options" -msgstr "" - -#: ../../Zotlabs/Module/Dreport.php:150 -msgid "Redeliver" -msgstr "" - -#: ../../Zotlabs/Module/Webpages.php:53 -msgid "Import Webpage Elements" +"\"# Wiki Sandbox\\n\\nContent you **edit** and **preview** here *will not be " +"saved*.\"" msgstr "" -#: ../../Zotlabs/Module/Webpages.php:54 -msgid "Import selected" +#: ../../Zotlabs/Module/Wiki.php:169 +msgid "Revision Comparison" msgstr "" -#: ../../Zotlabs/Module/Webpages.php:214 ../../Zotlabs/Lib/Apps.php:218 -#: ../../include/nav.php:108 ../../include/conversation.php:1705 -msgid "Webpages" +#: ../../Zotlabs/Module/Wiki.php:170 +msgid "Revert" msgstr "" -#: ../../Zotlabs/Module/Webpages.php:218 ../../Zotlabs/Module/Photos.php:1078 -#: ../../Zotlabs/Module/Blocks.php:161 ../../Zotlabs/Module/Layouts.php:193 -#: ../../include/conversation.php:1220 -msgid "Share" +#: ../../Zotlabs/Module/Wiki.php:171 ../../Zotlabs/Module/Wiki.php:211 +#: ../../Zotlabs/Module/Fbrowser.php:66 ../../Zotlabs/Module/Fbrowser.php:88 +#: ../../Zotlabs/Module/Admin.php:1406 ../../Zotlabs/Module/Tagrm.php:15 +#: ../../Zotlabs/Module/Tagrm.php:138 ../../Zotlabs/Module/Settings.php:683 +#: ../../Zotlabs/Module/Settings.php:709 ../../include/conversation.php:1242 +#: ../../include/conversation.php:1289 +msgid "Cancel" msgstr "" -#: ../../Zotlabs/Module/Webpages.php:223 ../../Zotlabs/Module/Events.php:680 -#: ../../Zotlabs/Module/Blocks.php:166 ../../Zotlabs/Module/Layouts.php:197 -#: ../../Zotlabs/Module/Pubsites.php:47 ../../include/page_widgets.php:42 -msgid "View" +#: ../../Zotlabs/Module/Wiki.php:201 +msgid "Enter the name of your new wiki:" msgstr "" -#: ../../Zotlabs/Module/Webpages.php:224 ../../Zotlabs/Module/Events.php:473 -#: ../../Zotlabs/Module/Photos.php:1099 ../../Zotlabs/Lib/ThreadItem.php:720 -#: ../../include/page_widgets.php:43 ../../include/conversation.php:1199 -msgid "Preview" +#: ../../Zotlabs/Module/Wiki.php:202 +msgid "Enter the name of the new page:" msgstr "" -#: ../../Zotlabs/Module/Webpages.php:225 ../../include/page_widgets.php:44 -msgid "Actions" +#: ../../Zotlabs/Module/Wiki.php:203 +msgid "Enter the new name:" msgstr "" -#: ../../Zotlabs/Module/Webpages.php:226 ../../include/page_widgets.php:45 -msgid "Page Link" +#: ../../Zotlabs/Module/Wiki.php:209 ../../include/conversation.php:1155 +msgid "Embed image from photo albums" msgstr "" -#: ../../Zotlabs/Module/Webpages.php:227 -msgid "Page Title" +#: ../../Zotlabs/Module/Wiki.php:210 ../../include/conversation.php:1241 +msgid "Embed an image from your albums" msgstr "" -#: ../../Zotlabs/Module/Webpages.php:228 ../../Zotlabs/Module/Menu.php:114 -#: ../../Zotlabs/Module/Blocks.php:157 ../../Zotlabs/Module/Layouts.php:190 -#: ../../include/page_widgets.php:47 -msgid "Created" +#: ../../Zotlabs/Module/Wiki.php:212 ../../include/conversation.php:1243 +#: ../../include/conversation.php:1288 +msgid "OK" msgstr "" -#: ../../Zotlabs/Module/Webpages.php:229 ../../Zotlabs/Module/Menu.php:115 -#: ../../Zotlabs/Module/Blocks.php:158 ../../Zotlabs/Module/Layouts.php:191 -#: ../../include/page_widgets.php:48 -msgid "Edited" +#: ../../Zotlabs/Module/Wiki.php:213 ../../include/conversation.php:1191 +msgid "Choose images to embed" msgstr "" -#: ../../Zotlabs/Module/Webpages.php:258 -msgid "Invalid file type." +#: ../../Zotlabs/Module/Wiki.php:214 ../../include/conversation.php:1192 +msgid "Choose an album" msgstr "" -#: ../../Zotlabs/Module/Webpages.php:270 -msgid "Error opening zip file" +#: ../../Zotlabs/Module/Wiki.php:215 ../../include/conversation.php:1193 +msgid "Choose a different album..." msgstr "" -#: ../../Zotlabs/Module/Webpages.php:281 -msgid "Invalid folder path." +#: ../../Zotlabs/Module/Wiki.php:216 ../../include/conversation.php:1194 +msgid "Error getting album list" msgstr "" -#: ../../Zotlabs/Module/Webpages.php:308 -msgid "No webpage elements detected." +#: ../../Zotlabs/Module/Wiki.php:217 ../../include/conversation.php:1195 +msgid "Error getting photo link" msgstr "" -#: ../../Zotlabs/Module/Webpages.php:382 -msgid "Import complete." +#: ../../Zotlabs/Module/Wiki.php:218 ../../include/conversation.php:1196 +msgid "Error getting album" msgstr "" #: ../../Zotlabs/Module/Directory.php:63 ../../Zotlabs/Module/Display.php:17 -#: ../../Zotlabs/Module/Photos.php:520 ../../Zotlabs/Module/Ratings.php:86 +#: ../../Zotlabs/Module/Ratings.php:86 ../../Zotlabs/Module/Photos.php:520 #: ../../Zotlabs/Module/Search.php:17 #: ../../Zotlabs/Module/Viewconnections.php:23 msgid "Public access denied." @@ -1050,9 +743,9 @@ msgstr "" msgid "Age:" msgstr "" -#: ../../Zotlabs/Module/Directory.php:311 ../../include/event.php:52 -#: ../../include/event.php:84 ../../include/channel.php:1049 -#: ../../include/bb2diaspora.php:507 +#: ../../Zotlabs/Module/Directory.php:311 ../../include/bb2diaspora.php:507 +#: ../../include/channel.php:1049 ../../include/event.php:52 +#: ../../include/event.php:84 msgid "Location:" msgstr "" @@ -1069,9 +762,9 @@ msgid "About:" msgstr "" #: ../../Zotlabs/Module/Directory.php:325 ../../Zotlabs/Module/Match.php:68 -#: ../../Zotlabs/Module/Suggest.php:56 ../../include/channel.php:1034 -#: ../../include/conversation.php:960 ../../include/widgets.php:147 -#: ../../include/widgets.php:184 ../../include/connections.php:78 +#: ../../Zotlabs/Module/Suggest.php:56 ../../include/conversation.php:960 +#: ../../include/widgets.php:147 ../../include/widgets.php:184 +#: ../../include/channel.php:1034 ../../include/connections.php:78 msgid "Connect" msgstr "" @@ -1147,452 +840,446 @@ msgstr "" msgid "No entries (some entries may be hidden)." 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." -msgstr "" - -#: ../../Zotlabs/Module/Profiles.php:44 -msgid "Profile deleted." -msgstr "" - -#: ../../Zotlabs/Module/Profiles.php:68 ../../Zotlabs/Module/Profiles.php:104 -msgid "Profile-" -msgstr "" - -#: ../../Zotlabs/Module/Profiles.php:89 ../../Zotlabs/Module/Profiles.php:132 -msgid "New profile created." -msgstr "" - -#: ../../Zotlabs/Module/Profiles.php:110 -msgid "Profile unavailable to clone." +#: ../../Zotlabs/Module/Rate.php:159 ../../Zotlabs/Module/Connedit.php:766 +#: ../../include/js_strings.php:20 +msgid "Rating" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:151 -msgid "Profile unavailable to export." +#: ../../Zotlabs/Module/Rate.php:160 +msgid "Website:" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:256 -msgid "Profile Name is required." +#: ../../Zotlabs/Module/Rate.php:163 +#, php-format +msgid "Remote Channel [%s] (not yet known on this site)" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:427 -msgid "Marital Status" +#: ../../Zotlabs/Module/Rate.php:164 +msgid "Rating (this information is public)" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:431 -msgid "Romantic Partner" +#: ../../Zotlabs/Module/Rate.php:165 +msgid "Optionally explain your rating (this information is public)" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:435 ../../Zotlabs/Module/Profiles.php:736 -msgid "Likes" +#: ../../Zotlabs/Module/Bookmarks.php:53 +msgid "Bookmark added" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:439 ../../Zotlabs/Module/Profiles.php:737 -msgid "Dislikes" +#: ../../Zotlabs/Module/Bookmarks.php:75 +msgid "My Bookmarks" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:443 ../../Zotlabs/Module/Profiles.php:744 -msgid "Work/Employment" +#: ../../Zotlabs/Module/Bookmarks.php:86 +msgid "My Connections Bookmarks" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:446 -msgid "Religion" +#: ../../Zotlabs/Module/Item.php:180 +msgid "Unable to locate original post." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:450 -msgid "Political Views" +#: ../../Zotlabs/Module/Item.php:433 +msgid "Empty post discarded." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:454 -msgid "Gender" +#: ../../Zotlabs/Module/Item.php:473 +msgid "Executable content type not permitted to this channel." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:458 -msgid "Sexual Preference" +#: ../../Zotlabs/Module/Item.php:858 +msgid "Duplicate post suppressed." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:462 -msgid "Homepage" +#: ../../Zotlabs/Module/Item.php:991 +msgid "System error. Post not saved." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:466 -msgid "Interests" +#: ../../Zotlabs/Module/Item.php:1112 +msgid "Unable to obtain post information from database." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:470 ../../Zotlabs/Module/Locs.php:118 -#: ../../Zotlabs/Module/Admin.php:1224 -msgid "Address" +#: ../../Zotlabs/Module/Item.php:1119 +#, php-format +msgid "You have reached your limit of %1$.0f top level posts." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:477 ../../Zotlabs/Module/Profiles.php:698 -#: ../../Zotlabs/Module/Locs.php:117 ../../Zotlabs/Module/Events.php:467 -#: ../../Zotlabs/Module/Pubsites.php:41 ../../include/js_strings.php:25 -msgid "Location" +#: ../../Zotlabs/Module/Item.php:1126 +#, php-format +msgid "You have reached your limit of %1$.0f webpages." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:560 -msgid "Profile updated." +#: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:222 +#: ../../include/conversation.php:1662 ../../include/nav.php:94 +msgid "Photos" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:644 -msgid "Hide your connections list from viewers of this profile" +#: ../../Zotlabs/Module/Page.php:40 ../../Zotlabs/Module/Block.php:31 +msgid "Invalid item." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:647 -#: ../../Zotlabs/Module/Filestorage.php:160 -#: ../../Zotlabs/Module/Filestorage.php:168 -#: ../../Zotlabs/Module/Connedit.php:411 ../../Zotlabs/Module/Connedit.php:693 -#: ../../Zotlabs/Module/Menu.php:100 ../../Zotlabs/Module/Menu.php:157 -#: ../../Zotlabs/Module/Events.php:462 ../../Zotlabs/Module/Events.php:463 -#: ../../Zotlabs/Module/Events.php:472 ../../Zotlabs/Module/Photos.php:664 -#: ../../Zotlabs/Module/Settings.php:651 ../../Zotlabs/Module/Admin.php:459 -#: ../../Zotlabs/Module/Mitem.php:162 ../../Zotlabs/Module/Mitem.php:163 -#: ../../Zotlabs/Module/Mitem.php:240 ../../Zotlabs/Module/Mitem.php:241 -#: ../../Zotlabs/Module/Removeme.php:63 ../../Zotlabs/Module/Api.php:85 -#: ../../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:1717 -msgid "No" +#: ../../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 "" -#: ../../Zotlabs/Module/Profiles.php:647 -#: ../../Zotlabs/Module/Filestorage.php:160 -#: ../../Zotlabs/Module/Filestorage.php:168 -#: ../../Zotlabs/Module/Connedit.php:411 ../../Zotlabs/Module/Menu.php:100 -#: ../../Zotlabs/Module/Menu.php:157 ../../Zotlabs/Module/Events.php:462 -#: ../../Zotlabs/Module/Events.php:463 ../../Zotlabs/Module/Events.php:472 -#: ../../Zotlabs/Module/Photos.php:664 ../../Zotlabs/Module/Settings.php:651 -#: ../../Zotlabs/Module/Admin.php:461 ../../Zotlabs/Module/Mitem.php:162 -#: ../../Zotlabs/Module/Mitem.php:163 ../../Zotlabs/Module/Mitem.php:240 -#: ../../Zotlabs/Module/Mitem.php:241 ../../Zotlabs/Module/Removeme.php:63 -#: ../../Zotlabs/Module/Api.php:84 ../../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:1717 -msgid "Yes" +#: ../../Zotlabs/Module/Page.php:131 +msgid "" +"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod " +"tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, " +"quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo " +"consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse " +"cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat " +"non proident, sunt in culpa qui officia deserunt mollit anim id est laborum." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:686 -msgid "Edit Profile Details" +#: ../../Zotlabs/Module/Filer.php:52 +msgid "Save to Folder:" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:688 -msgid "View this profile" +#: ../../Zotlabs/Module/Filer.php:52 +msgid "- select -" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:689 ../../Zotlabs/Module/Profiles.php:771 -#: ../../include/channel.php:981 -msgid "Edit visibility" +#: ../../Zotlabs/Module/Filer.php:53 ../../Zotlabs/Module/Admin.php:2033 +#: ../../Zotlabs/Module/Admin.php:2053 ../../Zotlabs/Module/Rbmark.php:32 +#: ../../Zotlabs/Module/Rbmark.php:104 ../../include/widgets.php:201 +#: ../../include/text.php:926 ../../include/text.php:938 +msgid "Save" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:690 -msgid "Profile Tools" +#: ../../Zotlabs/Module/Connedit.php:80 +msgid "Could not access contact record." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:691 -msgid "Change cover photo" +#: ../../Zotlabs/Module/Connedit.php:104 +msgid "Could not locate selected profile." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:692 ../../include/channel.php:952 -msgid "Change profile photo" +#: ../../Zotlabs/Module/Connedit.php:256 +msgid "Connection updated." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:693 -msgid "Create a new profile using these settings" +#: ../../Zotlabs/Module/Connedit.php:258 +msgid "Failed to update connection record." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:694 -msgid "Clone this profile" +#: ../../Zotlabs/Module/Connedit.php:308 +msgid "is now connected to" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:695 -msgid "Delete this profile" +#: ../../Zotlabs/Module/Connedit.php:408 ../../Zotlabs/Module/Connedit.php:690 +#: ../../Zotlabs/Module/Filestorage.php:160 +#: ../../Zotlabs/Module/Filestorage.php:168 +#: ../../Zotlabs/Module/Profiles.php:647 ../../Zotlabs/Module/Mitem.php:162 +#: ../../Zotlabs/Module/Mitem.php:163 ../../Zotlabs/Module/Mitem.php:240 +#: ../../Zotlabs/Module/Mitem.php:241 ../../Zotlabs/Module/Events.php:462 +#: ../../Zotlabs/Module/Events.php:463 ../../Zotlabs/Module/Events.php:472 +#: ../../Zotlabs/Module/Menu.php:100 ../../Zotlabs/Module/Menu.php:157 +#: ../../Zotlabs/Module/Admin.php:459 ../../Zotlabs/Module/Api.php:85 +#: ../../Zotlabs/Module/Photos.php:664 ../../Zotlabs/Module/Removeme.php:63 +#: ../../Zotlabs/Module/Settings.php:673 ../../include/dir_fns.php:143 +#: ../../include/dir_fns.php:144 ../../include/dir_fns.php:145 +#: ../../view/theme/redbasic/php/config.php:111 +#: ../../view/theme/redbasic/php/config.php:136 ../../boot.php:1717 +msgid "No" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:696 -msgid "Add profile things" +#: ../../Zotlabs/Module/Connedit.php:408 +#: ../../Zotlabs/Module/Filestorage.php:160 +#: ../../Zotlabs/Module/Filestorage.php:168 +#: ../../Zotlabs/Module/Profiles.php:647 ../../Zotlabs/Module/Mitem.php:162 +#: ../../Zotlabs/Module/Mitem.php:163 ../../Zotlabs/Module/Mitem.php:240 +#: ../../Zotlabs/Module/Mitem.php:241 ../../Zotlabs/Module/Events.php:462 +#: ../../Zotlabs/Module/Events.php:463 ../../Zotlabs/Module/Events.php:472 +#: ../../Zotlabs/Module/Menu.php:100 ../../Zotlabs/Module/Menu.php:157 +#: ../../Zotlabs/Module/Admin.php:461 ../../Zotlabs/Module/Api.php:84 +#: ../../Zotlabs/Module/Photos.php:664 ../../Zotlabs/Module/Removeme.php:63 +#: ../../Zotlabs/Module/Settings.php:673 ../../include/dir_fns.php:143 +#: ../../include/dir_fns.php:144 ../../include/dir_fns.php:145 +#: ../../view/theme/redbasic/php/config.php:111 +#: ../../view/theme/redbasic/php/config.php:136 ../../boot.php:1717 +msgid "Yes" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:697 ../../include/conversation.php:1546 -#: ../../include/widgets.php:105 -msgid "Personal" +#: ../../Zotlabs/Module/Connedit.php:440 +msgid "Could not access address book record." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:699 -msgid "Relation" +#: ../../Zotlabs/Module/Connedit.php:460 +msgid "Refresh failed - channel is currently unavailable." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:700 ../../include/datetime.php:48 -msgid "Miscellaneous" +#: ../../Zotlabs/Module/Connedit.php:475 ../../Zotlabs/Module/Connedit.php:484 +#: ../../Zotlabs/Module/Connedit.php:493 ../../Zotlabs/Module/Connedit.php:502 +#: ../../Zotlabs/Module/Connedit.php:515 +msgid "Unable to set address book parameters." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:702 -msgid "Import profile from file" +#: ../../Zotlabs/Module/Connedit.php:538 +msgid "Connection has been removed." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:703 -msgid "Export profile to file" +#: ../../Zotlabs/Module/Connedit.php:554 ../../Zotlabs/Lib/Apps.php:221 +#: ../../include/conversation.php:958 ../../include/nav.php:88 +msgid "View Profile" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:704 -msgid "Your gender" +#: ../../Zotlabs/Module/Connedit.php:557 +#, php-format +msgid "View %s's profile" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:705 -msgid "Marital status" +#: ../../Zotlabs/Module/Connedit.php:561 +msgid "Refresh Permissions" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:706 -msgid "Sexual preference" +#: ../../Zotlabs/Module/Connedit.php:564 +msgid "Fetch updated permissions" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:709 -msgid "Profile name" +#: ../../Zotlabs/Module/Connedit.php:568 +msgid "Recent Activity" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:709 ../../Zotlabs/Module/Profiles.php:713 -#: ../../Zotlabs/Module/Appman.php:115 ../../Zotlabs/Module/Appman.php:116 -#: ../../Zotlabs/Module/Events.php:452 ../../Zotlabs/Module/Events.php:457 -#: ../../include/datetime.php:245 -msgid "Required" +#: ../../Zotlabs/Module/Connedit.php:571 +msgid "View recent posts and comments" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:711 -msgid "This is your default profile." +#: ../../Zotlabs/Module/Connedit.php:575 ../../Zotlabs/Module/Admin.php:1041 +msgid "Unblock" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:713 -msgid "Your full name" +#: ../../Zotlabs/Module/Connedit.php:575 ../../Zotlabs/Module/Admin.php:1040 +msgid "Block" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:714 -msgid "Title/Description" +#: ../../Zotlabs/Module/Connedit.php:578 +msgid "Block (or Unblock) all communications with this connection" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:717 -msgid "Street address" +#: ../../Zotlabs/Module/Connedit.php:579 +msgid "This connection is blocked!" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:718 -msgid "Locality/City" +#: ../../Zotlabs/Module/Connedit.php:583 +msgid "Unignore" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:719 -msgid "Region/State" +#: ../../Zotlabs/Module/Connedit.php:583 +#: ../../Zotlabs/Module/Connections.php:277 +#: ../../Zotlabs/Module/Notifications.php:55 +msgid "Ignore" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:720 -msgid "Postal/Zip code" +#: ../../Zotlabs/Module/Connedit.php:586 +msgid "Ignore (or Unignore) all inbound communications from this connection" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:721 -msgid "Country" +#: ../../Zotlabs/Module/Connedit.php:587 +msgid "This connection is ignored!" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:726 -msgid "Who (if applicable)" +#: ../../Zotlabs/Module/Connedit.php:591 +msgid "Unarchive" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:726 -msgid "Examples: cathy123, Cathy Williams, cathy@example.com" +#: ../../Zotlabs/Module/Connedit.php:591 +msgid "Archive" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:727 -msgid "Since (date)" +#: ../../Zotlabs/Module/Connedit.php:594 +msgid "" +"Archive (or Unarchive) this connection - mark channel dead but keep content" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:730 -msgid "Tell us about yourself" +#: ../../Zotlabs/Module/Connedit.php:595 +msgid "This connection is archived!" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:731 -msgid "Homepage URL" +#: ../../Zotlabs/Module/Connedit.php:599 +msgid "Unhide" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:732 -msgid "Hometown" +#: ../../Zotlabs/Module/Connedit.php:599 +msgid "Hide" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:733 -msgid "Political views" +#: ../../Zotlabs/Module/Connedit.php:602 +msgid "Hide or Unhide this connection from your other connections" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:734 -msgid "Religious views" +#: ../../Zotlabs/Module/Connedit.php:603 +msgid "This connection is hidden!" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:735 -msgid "Keywords used in directory listings" +#: ../../Zotlabs/Module/Connedit.php:610 +msgid "Delete this connection" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:735 -msgid "Example: fishing photography software" +#: ../../Zotlabs/Module/Connedit.php:625 ../../include/widgets.php:493 +msgid "Me" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:738 -msgid "Musical interests" +#: ../../Zotlabs/Module/Connedit.php:626 ../../include/widgets.php:494 +msgid "Family" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:739 -msgid "Books, literature" +#: ../../Zotlabs/Module/Connedit.php:627 ../../Zotlabs/Module/Settings.php:429 +#: ../../Zotlabs/Module/Settings.php:433 ../../Zotlabs/Module/Settings.php:434 +#: ../../Zotlabs/Module/Settings.php:437 ../../Zotlabs/Module/Settings.php:448 +#: ../../include/selectors.php:123 ../../include/widgets.php:495 +#: ../../include/channel.php:402 ../../include/channel.php:403 +#: ../../include/channel.php:410 +msgid "Friends" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:740 -msgid "Television" +#: ../../Zotlabs/Module/Connedit.php:628 ../../include/widgets.php:496 +msgid "Acquaintances" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:741 -msgid "Film/Dance/Culture/Entertainment" +#: ../../Zotlabs/Module/Connedit.php:629 +#: ../../Zotlabs/Module/Connections.php:92 +#: ../../Zotlabs/Module/Connections.php:107 ../../include/widgets.php:497 +msgid "All" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:742 -msgid "Hobbies/Interests" +#: ../../Zotlabs/Module/Connedit.php:690 +msgid "Approve this connection" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:743 -msgid "Love/Romance" +#: ../../Zotlabs/Module/Connedit.php:690 +msgid "Accept connection to allow communication" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:745 -msgid "School/Education" +#: ../../Zotlabs/Module/Connedit.php:695 +msgid "Set Affinity" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:746 -msgid "Contact information and social networks" +#: ../../Zotlabs/Module/Connedit.php:698 +msgid "Set Profile" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:747 -msgid "My other channels" +#: ../../Zotlabs/Module/Connedit.php:701 +msgid "Set Affinity & Profile" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:767 ../../include/channel.php:977 -msgid "Profile Image" +#: ../../Zotlabs/Module/Connedit.php:750 +msgid "none" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:777 ../../include/nav.php:90 -#: ../../include/channel.php:959 -msgid "Edit Profiles" +#: ../../Zotlabs/Module/Connedit.php:754 ../../include/widgets.php:623 +msgid "Connection Default Permissions" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:778 ../../Zotlabs/Module/Chat.php:255 -#: ../../Zotlabs/Module/Manage.php:143 -msgid "Create New" +#: ../../Zotlabs/Module/Connedit.php:754 ../../include/items.php:3937 +#, php-format +msgid "Connection: %s" msgstr "" -#: ../../Zotlabs/Module/Rpost.php:135 ../../Zotlabs/Module/Editpost.php:106 -msgid "Edit post" +#: ../../Zotlabs/Module/Connedit.php:755 +msgid "Apply these permissions automatically" msgstr "" -#: ../../Zotlabs/Module/Bookmarks.php:53 -msgid "Bookmark added" +#: ../../Zotlabs/Module/Connedit.php:755 +msgid "Connection requests will be approved without your interaction" msgstr "" -#: ../../Zotlabs/Module/Bookmarks.php:75 -msgid "My Bookmarks" +#: ../../Zotlabs/Module/Connedit.php:757 +msgid "This connection's primary address is" msgstr "" -#: ../../Zotlabs/Module/Bookmarks.php:86 -msgid "My Connections Bookmarks" +#: ../../Zotlabs/Module/Connedit.php:758 +msgid "Available locations:" msgstr "" -#: ../../Zotlabs/Module/Item.php:179 -msgid "Unable to locate original post." +#: ../../Zotlabs/Module/Connedit.php:762 +msgid "" +"The permissions indicated on this page will be applied to all new " +"connections." msgstr "" -#: ../../Zotlabs/Module/Item.php:432 -msgid "Empty post discarded." +#: ../../Zotlabs/Module/Connedit.php:763 +msgid "Connection Tools" msgstr "" -#: ../../Zotlabs/Module/Item.php:472 -msgid "Executable content type not permitted to this channel." +#: ../../Zotlabs/Module/Connedit.php:765 +msgid "Slide to adjust your degree of friendship" msgstr "" -#: ../../Zotlabs/Module/Item.php:856 -msgid "Duplicate post suppressed." +#: ../../Zotlabs/Module/Connedit.php:767 +msgid "Slide to adjust your rating" msgstr "" -#: ../../Zotlabs/Module/Item.php:989 -msgid "System error. Post not saved." +#: ../../Zotlabs/Module/Connedit.php:768 ../../Zotlabs/Module/Connedit.php:773 +msgid "Optionally explain your rating" msgstr "" -#: ../../Zotlabs/Module/Item.php:1242 -msgid "Unable to obtain post information from database." +#: ../../Zotlabs/Module/Connedit.php:770 +msgid "Custom Filter" msgstr "" -#: ../../Zotlabs/Module/Item.php:1249 -#, php-format -msgid "You have reached your limit of %1$.0f top level posts." +#: ../../Zotlabs/Module/Connedit.php:771 +msgid "Only import posts with this text" msgstr "" -#: ../../Zotlabs/Module/Item.php:1256 -#, php-format -msgid "You have reached your limit of %1$.0f webpages." +#: ../../Zotlabs/Module/Connedit.php:771 ../../Zotlabs/Module/Connedit.php:772 +msgid "" +"words one per line or #tags or /patterns/ or lang=xx, leave blank to import " +"all posts" msgstr "" -#: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:222 -#: ../../include/nav.php:94 ../../include/conversation.php:1652 -msgid "Photos" +#: ../../Zotlabs/Module/Connedit.php:772 +msgid "Do not import posts with this text" msgstr "" -#: ../../Zotlabs/Module/Fbrowser.php:66 ../../Zotlabs/Module/Fbrowser.php:88 -#: ../../Zotlabs/Module/Settings.php:661 ../../Zotlabs/Module/Settings.php:687 -#: ../../Zotlabs/Module/Admin.php:1406 ../../Zotlabs/Module/Wiki.php:171 -#: ../../Zotlabs/Module/Wiki.php:211 ../../Zotlabs/Module/Tagrm.php:15 -#: ../../Zotlabs/Module/Tagrm.php:138 ../../include/conversation.php:1236 -#: ../../include/conversation.php:1279 -msgid "Cancel" +#: ../../Zotlabs/Module/Connedit.php:774 +msgid "This information is public!" msgstr "" -#: ../../Zotlabs/Module/Page.php:40 ../../Zotlabs/Module/Block.php:31 -msgid "Invalid item." +#: ../../Zotlabs/Module/Connedit.php:779 +msgid "Connection Pending Approval" msgstr "" -#: ../../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." +#: ../../Zotlabs/Module/Connedit.php:782 ../../Zotlabs/Module/Settings.php:882 +msgid "inherited" msgstr "" -#: ../../Zotlabs/Module/Page.php:131 +#: ../../Zotlabs/Module/Connedit.php:784 +#, php-format msgid "" -"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod " -"tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, " -"quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo " -"consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse " -"cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat " -"non proident, sunt in culpa qui officia deserunt mollit anim id est laborum." -msgstr "" - -#: ../../Zotlabs/Module/Filer.php:52 -msgid "Save to Folder:" +"Please choose the profile you would like to display to %s when viewing your " +"profile securely." msgstr "" -#: ../../Zotlabs/Module/Filer.php:52 -msgid "- select -" +#: ../../Zotlabs/Module/Connedit.php:786 ../../Zotlabs/Module/Settings.php:879 +msgid "Their Settings" msgstr "" -#: ../../Zotlabs/Module/Filer.php:53 ../../Zotlabs/Module/Admin.php:2033 -#: ../../Zotlabs/Module/Admin.php:2053 ../../Zotlabs/Module/Rbmark.php:32 -#: ../../Zotlabs/Module/Rbmark.php:104 ../../include/text.php:926 -#: ../../include/text.php:938 ../../include/widgets.php:201 -msgid "Save" +#: ../../Zotlabs/Module/Connedit.php:787 ../../Zotlabs/Module/Settings.php:880 +msgid "My Settings" msgstr "" -#: ../../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." +#: ../../Zotlabs/Module/Connedit.php:789 ../../Zotlabs/Module/Settings.php:884 +msgid "Individual Permissions" msgstr "" -#: ../../Zotlabs/Module/Channel.php:40 -msgid "Posts and comments" +#: ../../Zotlabs/Module/Connedit.php:790 ../../Zotlabs/Module/Settings.php:885 +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/Channel.php:41 -msgid "Only posts" +#: ../../Zotlabs/Module/Connedit.php:791 +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/Channel.php:101 -msgid "Insufficient permissions. Request redirected to profile page." +#: ../../Zotlabs/Module/Connedit.php:792 +msgid "Last update:" msgstr "" #: ../../Zotlabs/Module/Connections.php:56 @@ -1621,16 +1308,10 @@ msgstr "" #: ../../Zotlabs/Module/Connections.php:76 #: ../../Zotlabs/Module/Connections.php:86 ../../Zotlabs/Module/Menu.php:116 -#: ../../include/conversation.php:1555 +#: ../../include/conversation.php:1565 msgid "New" msgstr "" -#: ../../Zotlabs/Module/Connections.php:92 -#: ../../Zotlabs/Module/Connections.php:107 -#: ../../Zotlabs/Module/Connedit.php:632 ../../include/widgets.php:497 -msgid "All" -msgstr "" - #: ../../Zotlabs/Module/Connections.php:138 msgid "New Connections" msgstr "" @@ -1710,25 +1391,19 @@ msgstr "" msgid "Ignore connection" msgstr "" -#: ../../Zotlabs/Module/Connections.php:277 -#: ../../Zotlabs/Module/Connedit.php:586 -#: ../../Zotlabs/Module/Notifications.php:55 -msgid "Ignore" -msgstr "" - #: ../../Zotlabs/Module/Connections.php:278 msgid "Recent activity" msgstr "" #: ../../Zotlabs/Module/Connections.php:302 ../../Zotlabs/Lib/Apps.php:209 -#: ../../include/text.php:855 ../../include/nav.php:190 +#: ../../include/nav.php:190 ../../include/text.php:855 msgid "Connections" msgstr "" #: ../../Zotlabs/Module/Connections.php:306 ../../Zotlabs/Module/Search.php:44 -#: ../../Zotlabs/Lib/Apps.php:230 ../../include/acl_selectors.php:274 +#: ../../Zotlabs/Lib/Apps.php:230 ../../include/nav.php:169 #: ../../include/text.php:925 ../../include/text.php:937 -#: ../../include/nav.php:169 +#: ../../include/acl_selectors.php:179 msgid "Search" msgstr "" @@ -1770,25 +1445,25 @@ msgstr "" msgid "Unable to process image." msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:233 ../../include/items.php:4283 +#: ../../Zotlabs/Module/Cover_photo.php:233 ../../include/items.php:4285 msgid "female" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:234 ../../include/items.php:4284 +#: ../../Zotlabs/Module/Cover_photo.php:234 ../../include/items.php:4286 #, php-format msgid "%1$s updated her %2$s" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:235 ../../include/items.php:4285 +#: ../../Zotlabs/Module/Cover_photo.php:235 ../../include/items.php:4287 msgid "male" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:236 ../../include/items.php:4286 +#: ../../Zotlabs/Module/Cover_photo.php:236 ../../include/items.php:4288 #, php-format msgid "%1$s updated his %2$s" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:238 ../../include/items.php:4288 +#: ../../Zotlabs/Module/Cover_photo.php:238 ../../include/items.php:4290 #, php-format msgid "%1$s updated their %2$s" msgstr "" @@ -1819,8 +1494,8 @@ msgid "Upload Cover Photo" msgstr "" #: ../../Zotlabs/Module/Cover_photo.php:361 -#: ../../Zotlabs/Module/Settings.php:1138 #: ../../Zotlabs/Module/Profile_photo.php:396 +#: ../../Zotlabs/Module/Settings.php:1180 msgid "or" msgstr "" @@ -1849,130 +1524,219 @@ msgstr "" msgid "Done Editing" msgstr "" -#: ../../Zotlabs/Module/Impel.php:41 ../../include/bbcode.php:192 -msgid "webpage" +#: ../../Zotlabs/Module/Import.php:33 +#, php-format +msgid "Your service plan only allows %d channels." msgstr "" -#: ../../Zotlabs/Module/Impel.php:46 ../../include/bbcode.php:198 -msgid "block" +#: ../../Zotlabs/Module/Import.php:71 ../../Zotlabs/Module/Import_items.php:42 +msgid "Nothing to import." msgstr "" -#: ../../Zotlabs/Module/Impel.php:51 ../../include/bbcode.php:195 -msgid "layout" +#: ../../Zotlabs/Module/Import.php:95 ../../Zotlabs/Module/Import_items.php:66 +msgid "Unable to download data from old server" msgstr "" -#: ../../Zotlabs/Module/Impel.php:58 ../../include/bbcode.php:201 -msgid "menu" +#: ../../Zotlabs/Module/Import.php:101 +#: ../../Zotlabs/Module/Import_items.php:72 +msgid "Imported file is empty." msgstr "" -#: ../../Zotlabs/Module/Impel.php:191 +#: ../../Zotlabs/Module/Import.php:123 +#: ../../Zotlabs/Module/Import_items.php:88 #, php-format -msgid "%s element installed" +msgid "Warning: Database versions differ by %1$d updates." msgstr "" -#: ../../Zotlabs/Module/Impel.php:194 -#, php-format -msgid "%s element installation failed" +#: ../../Zotlabs/Module/Import.php:153 ../../include/import.php:107 +msgid "Cloned channel not found. Import failed." msgstr "" -#: ../../Zotlabs/Module/Like.php:19 -msgid "Like/Dislike" +#: ../../Zotlabs/Module/Import.php:163 +msgid "No channel. Import failed." msgstr "" -#: ../../Zotlabs/Module/Like.php:24 -msgid "This action is restricted to members." +#: ../../Zotlabs/Module/Import.php:520 +#: ../../include/Import/import_diaspora.php:142 +msgid "Import completed." msgstr "" -#: ../../Zotlabs/Module/Like.php:25 +#: ../../Zotlabs/Module/Import.php:542 +msgid "You must be logged in to use this feature." +msgstr "" + +#: ../../Zotlabs/Module/Import.php:547 +msgid "Import Channel" +msgstr "" + +#: ../../Zotlabs/Module/Import.php:548 msgid "" -"Please <a href=\"rmagic\">login with your $Projectname ID</a> or <a href=" -"\"register\">register as a new $Projectname member</a> to continue." +"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/Like.php:105 ../../Zotlabs/Module/Like.php:131 -#: ../../Zotlabs/Module/Like.php:169 -msgid "Invalid request." +#: ../../Zotlabs/Module/Import.php:549 +#: ../../Zotlabs/Module/Import_items.php:121 +msgid "File to Upload" msgstr "" -#: ../../Zotlabs/Module/Like.php:117 ../../include/conversation.php:126 -msgid "channel" +#: ../../Zotlabs/Module/Import.php:550 +msgid "Or provide the old server/hub details" msgstr "" -#: ../../Zotlabs/Module/Like.php:146 -msgid "thing" +#: ../../Zotlabs/Module/Import.php:551 +msgid "Your old identity address (xyz@example.com)" msgstr "" -#: ../../Zotlabs/Module/Like.php:192 -msgid "Channel unavailable." +#: ../../Zotlabs/Module/Import.php:552 +msgid "Your old login email address" msgstr "" -#: ../../Zotlabs/Module/Like.php:240 -msgid "Previous action reversed." +#: ../../Zotlabs/Module/Import.php:553 +msgid "Your old login password" msgstr "" -#: ../../Zotlabs/Module/Like.php:370 ../../Zotlabs/Module/Subthread.php:87 -#: ../../Zotlabs/Module/Tagger.php:47 ../../include/text.php:1945 -#: ../../include/conversation.php:120 -msgid "photo" +#: ../../Zotlabs/Module/Import.php:554 +msgid "" +"For either option, please choose whether to make this hub your new primary " +"address, or whether your old location should continue this role. You will be " +"able to post from either location, but only one can be marked as the primary " +"location for files, photos, and media." msgstr "" -#: ../../Zotlabs/Module/Like.php:370 ../../Zotlabs/Module/Subthread.php:87 -#: ../../include/text.php:1951 ../../include/conversation.php:148 -msgid "status" +#: ../../Zotlabs/Module/Import.php:555 +msgid "Make this hub my primary location" msgstr "" -#: ../../Zotlabs/Module/Like.php:372 ../../Zotlabs/Module/Events.php:253 -#: ../../Zotlabs/Module/Tagger.php:51 ../../include/text.php:1948 -#: ../../include/event.php:951 ../../include/conversation.php:123 -msgid "event" +#: ../../Zotlabs/Module/Import.php:556 +msgid "" +"Import existing posts if possible (experimental - limited by available memory" msgstr "" -#: ../../Zotlabs/Module/Like.php:419 ../../include/conversation.php:164 -#, php-format -msgid "%1$s likes %2$s's %3$s" +#: ../../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/Like.php:421 ../../include/conversation.php:167 -#, php-format -msgid "%1$s doesn't like %2$s's %3$s" +#: ../../Zotlabs/Module/Mail.php:38 +msgid "Unable to lookup recipient." msgstr "" -#: ../../Zotlabs/Module/Like.php:423 -#, php-format -msgid "%1$s agrees with %2$s's %3$s" +#: ../../Zotlabs/Module/Mail.php:45 +msgid "Unable to communicate with requested channel." msgstr "" -#: ../../Zotlabs/Module/Like.php:425 -#, php-format -msgid "%1$s doesn't agree with %2$s's %3$s" +#: ../../Zotlabs/Module/Mail.php:52 +msgid "Cannot verify requested channel." msgstr "" -#: ../../Zotlabs/Module/Like.php:427 -#, php-format -msgid "%1$s abstains from a decision on %2$s's %3$s" +#: ../../Zotlabs/Module/Mail.php:70 +msgid "Selected channel has private message restrictions. Send failed." msgstr "" -#: ../../Zotlabs/Module/Like.php:429 -#, php-format -msgid "%1$s is attending %2$s's %3$s" +#: ../../Zotlabs/Module/Mail.php:135 +msgid "Messages" msgstr "" -#: ../../Zotlabs/Module/Like.php:431 -#, php-format -msgid "%1$s is not attending %2$s's %3$s" +#: ../../Zotlabs/Module/Mail.php:170 +msgid "Message recalled." msgstr "" -#: ../../Zotlabs/Module/Like.php:433 -#, php-format -msgid "%1$s may attend %2$s's %3$s" +#: ../../Zotlabs/Module/Mail.php:183 +msgid "Conversation removed." msgstr "" -#: ../../Zotlabs/Module/Like.php:538 -msgid "Action completed." +#: ../../Zotlabs/Module/Mail.php:197 ../../Zotlabs/Module/Mail.php:306 +#: ../../Zotlabs/Module/Chat.php:205 ../../include/conversation.php:1186 +msgid "Please enter a link URL:" msgstr "" -#: ../../Zotlabs/Module/Like.php:539 -msgid "Thank you." +#: ../../Zotlabs/Module/Mail.php:198 ../../Zotlabs/Module/Mail.php:307 +msgid "Expires YYYY-MM-DD HH:MM" +msgstr "" + +#: ../../Zotlabs/Module/Mail.php:226 +msgid "Requested channel is not in this network" +msgstr "" + +#: ../../Zotlabs/Module/Mail.php:234 +msgid "Send Private Message" +msgstr "" + +#: ../../Zotlabs/Module/Mail.php:235 ../../Zotlabs/Module/Mail.php:360 +msgid "To:" +msgstr "" + +#: ../../Zotlabs/Module/Mail.php:238 ../../Zotlabs/Module/Mail.php:362 +msgid "Subject:" +msgstr "" + +#: ../../Zotlabs/Module/Mail.php:241 ../../Zotlabs/Module/Invite.php:135 +msgid "Your message:" +msgstr "" + +#: ../../Zotlabs/Module/Mail.php:243 ../../Zotlabs/Module/Mail.php:368 +#: ../../include/conversation.php:1238 +msgid "Attach file" +msgstr "" + +#: ../../Zotlabs/Module/Mail.php:244 ../../Zotlabs/Module/Mail.php:369 +#: ../../Zotlabs/Module/Editblock.php:111 +#: ../../Zotlabs/Module/Editwebpage.php:146 ../../Zotlabs/Module/Chat.php:207 +#: ../../include/conversation.php:1151 +msgid "Insert web link" +msgstr "" + +#: ../../Zotlabs/Module/Mail.php:245 +msgid "Send" +msgstr "" + +#: ../../Zotlabs/Module/Mail.php:248 ../../Zotlabs/Module/Mail.php:373 +#: ../../include/conversation.php:1281 +msgid "Set expiration date" +msgstr "" + +#: ../../Zotlabs/Module/Mail.php:250 ../../Zotlabs/Module/Mail.php:375 +#: ../../Zotlabs/Module/Chat.php:206 ../../Zotlabs/Lib/ThreadItem.php:723 +#: ../../include/conversation.php:1286 +msgid "Encrypt text" +msgstr "" + +#: ../../Zotlabs/Module/Mail.php:332 +msgid "Delete message" +msgstr "" + +#: ../../Zotlabs/Module/Mail.php:333 +msgid "Delivery report" +msgstr "" + +#: ../../Zotlabs/Module/Mail.php:334 +msgid "Recall message" +msgstr "" + +#: ../../Zotlabs/Module/Mail.php:336 +msgid "Message has been recalled." +msgstr "" + +#: ../../Zotlabs/Module/Mail.php:353 +msgid "Delete Conversation" +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." +msgstr "" + +#: ../../Zotlabs/Module/Mail.php:359 +msgid "Send Reply" +msgstr "" + +#: ../../Zotlabs/Module/Mail.php:364 +#, php-format +msgid "Your message for %s (%s):" msgstr "" #: ../../Zotlabs/Module/Dirsearch.php:25 ../../Zotlabs/Module/Regdir.php:49 @@ -1995,14 +1759,7 @@ msgstr "" msgid "Block Name" msgstr "" -#: ../../Zotlabs/Module/Editblock.php:111 -#: ../../Zotlabs/Module/Editwebpage.php:146 ../../Zotlabs/Module/Chat.php:207 -#: ../../Zotlabs/Module/Mail.php:244 ../../Zotlabs/Module/Mail.php:369 -#: ../../include/conversation.php:1147 -msgid "Insert web link" -msgstr "" - -#: ../../Zotlabs/Module/Editblock.php:124 ../../include/conversation.php:1244 +#: ../../Zotlabs/Module/Editblock.php:124 ../../include/conversation.php:1254 msgid "Title (optional)" msgstr "" @@ -2032,12 +1789,66 @@ msgstr "" msgid "Edit Webpage" msgstr "" -#: ../../Zotlabs/Module/Acl.php:312 -msgid "network" +#: ../../Zotlabs/Module/Chat.php:181 +msgid "Room not found" msgstr "" -#: ../../Zotlabs/Module/Acl.php:322 -msgid "RSS" +#: ../../Zotlabs/Module/Chat.php:197 +msgid "Leave Room" +msgstr "" + +#: ../../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:231 +msgid "New Chatroom" +msgstr "" + +#: ../../Zotlabs/Module/Chat.php:232 +msgid "Chatroom name" +msgstr "" + +#: ../../Zotlabs/Module/Chat.php:233 +msgid "Expiration of chats (minutes)" +msgstr "" + +#: ../../Zotlabs/Module/Chat.php:249 +#, php-format +msgid "%1$s's Chatrooms" +msgstr "" + +#: ../../Zotlabs/Module/Chat.php:254 +msgid "No chatrooms available" +msgstr "" + +#: ../../Zotlabs/Module/Chat.php:255 ../../Zotlabs/Module/Profiles.php:778 +#: ../../Zotlabs/Module/Manage.php:143 +msgid "Create New" +msgstr "" + +#: ../../Zotlabs/Module/Chat.php:258 +msgid "Expiration" +msgstr "" + +#: ../../Zotlabs/Module/Chat.php:259 +msgid "min" msgstr "" #: ../../Zotlabs/Module/Appman.php:37 ../../Zotlabs/Module/Appman.php:53 @@ -2064,6 +1875,13 @@ msgstr "" msgid "Name of app" msgstr "" +#: ../../Zotlabs/Module/Appman.php:115 ../../Zotlabs/Module/Appman.php:116 +#: ../../Zotlabs/Module/Profiles.php:709 ../../Zotlabs/Module/Profiles.php:713 +#: ../../Zotlabs/Module/Events.php:452 ../../Zotlabs/Module/Events.php:457 +#: ../../include/datetime.php:245 +msgid "Required" +msgstr "" + #: ../../Zotlabs/Module/Appman.php:116 msgid "Location (URL) of app" msgstr "" @@ -2166,13 +1984,6 @@ msgstr "" msgid "Visible to:" msgstr "" -#: ../../Zotlabs/Module/Filestorage.php:32 ../../Zotlabs/Module/Display.php:40 -#: ../../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/Filestorage.php:87 msgid "Permission Denied." msgstr "" @@ -2185,13 +1996,6 @@ msgstr "" msgid "Edit file permissions" msgstr "" -#: ../../Zotlabs/Module/Filestorage.php:152 ../../Zotlabs/Module/Chat.php:234 -#: ../../Zotlabs/Module/Photos.php:669 ../../Zotlabs/Module/Photos.php:1047 -#: ../../Zotlabs/Module/Thing.php:313 ../../Zotlabs/Module/Thing.php:363 -#: ../../include/acl_selectors.php:281 -msgid "Permissions" -msgstr "" - #: ../../Zotlabs/Module/Filestorage.php:159 msgid "Set/edit permissions" msgstr "" @@ -2224,303 +2028,303 @@ msgstr "" msgid "Notify your contacts about this file" msgstr "" -#: ../../Zotlabs/Module/Probe.php:28 ../../Zotlabs/Module/Probe.php:32 -#, php-format -msgid "Fetching URL returns error: %1$s" +#: ../../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/Connedit.php:80 -msgid "Could not access contact record." +#: ../../Zotlabs/Module/Profiles.php:44 +msgid "Profile deleted." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:104 -msgid "Could not locate selected profile." +#: ../../Zotlabs/Module/Profiles.php:68 ../../Zotlabs/Module/Profiles.php:104 +msgid "Profile-" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:256 -msgid "Connection updated." +#: ../../Zotlabs/Module/Profiles.php:89 ../../Zotlabs/Module/Profiles.php:132 +msgid "New profile created." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:258 -msgid "Failed to update connection record." +#: ../../Zotlabs/Module/Profiles.php:110 +msgid "Profile unavailable to clone." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:308 -msgid "is now connected to" +#: ../../Zotlabs/Module/Profiles.php:151 +msgid "Profile unavailable to export." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:443 -msgid "Could not access address book record." +#: ../../Zotlabs/Module/Profiles.php:256 +msgid "Profile Name is required." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:463 -msgid "Refresh failed - channel is currently unavailable." +#: ../../Zotlabs/Module/Profiles.php:427 +msgid "Marital Status" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:478 ../../Zotlabs/Module/Connedit.php:487 -#: ../../Zotlabs/Module/Connedit.php:496 ../../Zotlabs/Module/Connedit.php:505 -#: ../../Zotlabs/Module/Connedit.php:518 -msgid "Unable to set address book parameters." +#: ../../Zotlabs/Module/Profiles.php:431 +msgid "Romantic Partner" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:541 -msgid "Connection has been removed." +#: ../../Zotlabs/Module/Profiles.php:435 ../../Zotlabs/Module/Profiles.php:736 +msgid "Likes" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:557 ../../Zotlabs/Lib/Apps.php:221 -#: ../../include/nav.php:88 ../../include/conversation.php:958 -msgid "View Profile" +#: ../../Zotlabs/Module/Profiles.php:439 ../../Zotlabs/Module/Profiles.php:737 +msgid "Dislikes" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:560 -#, php-format -msgid "View %s's profile" +#: ../../Zotlabs/Module/Profiles.php:443 ../../Zotlabs/Module/Profiles.php:744 +msgid "Work/Employment" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:564 -msgid "Refresh Permissions" +#: ../../Zotlabs/Module/Profiles.php:446 +msgid "Religion" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:567 -msgid "Fetch updated permissions" +#: ../../Zotlabs/Module/Profiles.php:450 +msgid "Political Views" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:571 -msgid "Recent Activity" +#: ../../Zotlabs/Module/Profiles.php:454 +msgid "Gender" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:574 -msgid "View recent posts and comments" +#: ../../Zotlabs/Module/Profiles.php:458 +msgid "Sexual Preference" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:578 ../../Zotlabs/Module/Admin.php:1041 -msgid "Unblock" +#: ../../Zotlabs/Module/Profiles.php:462 +msgid "Homepage" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:578 ../../Zotlabs/Module/Admin.php:1040 -msgid "Block" +#: ../../Zotlabs/Module/Profiles.php:466 +msgid "Interests" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:581 -msgid "Block (or Unblock) all communications with this connection" +#: ../../Zotlabs/Module/Profiles.php:470 ../../Zotlabs/Module/Locs.php:118 +#: ../../Zotlabs/Module/Admin.php:1224 +msgid "Address" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:582 -msgid "This connection is blocked!" +#: ../../Zotlabs/Module/Profiles.php:477 ../../Zotlabs/Module/Profiles.php:698 +#: ../../Zotlabs/Module/Locs.php:117 ../../Zotlabs/Module/Events.php:467 +#: ../../Zotlabs/Module/Pubsites.php:41 ../../include/js_strings.php:25 +msgid "Location" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:586 -msgid "Unignore" +#: ../../Zotlabs/Module/Profiles.php:560 +msgid "Profile updated." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:589 -msgid "Ignore (or Unignore) all inbound communications from this connection" +#: ../../Zotlabs/Module/Profiles.php:644 +msgid "Hide your connections list from viewers of this profile" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:590 -msgid "This connection is ignored!" +#: ../../Zotlabs/Module/Profiles.php:686 +msgid "Edit Profile Details" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:594 -msgid "Unarchive" +#: ../../Zotlabs/Module/Profiles.php:688 +msgid "View this profile" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:594 -msgid "Archive" +#: ../../Zotlabs/Module/Profiles.php:689 ../../Zotlabs/Module/Profiles.php:771 +#: ../../include/channel.php:981 +msgid "Edit visibility" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:597 -msgid "" -"Archive (or Unarchive) this connection - mark channel dead but keep content" +#: ../../Zotlabs/Module/Profiles.php:690 +msgid "Profile Tools" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:598 -msgid "This connection is archived!" +#: ../../Zotlabs/Module/Profiles.php:691 +msgid "Change cover photo" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:602 -msgid "Unhide" +#: ../../Zotlabs/Module/Profiles.php:692 ../../include/channel.php:952 +msgid "Change profile photo" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:602 -msgid "Hide" +#: ../../Zotlabs/Module/Profiles.php:693 +msgid "Create a new profile using these settings" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:605 -msgid "Hide or Unhide this connection from your other connections" +#: ../../Zotlabs/Module/Profiles.php:694 +msgid "Clone this profile" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:606 -msgid "This connection is hidden!" +#: ../../Zotlabs/Module/Profiles.php:695 +msgid "Delete this profile" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:613 -msgid "Delete this connection" +#: ../../Zotlabs/Module/Profiles.php:696 +msgid "Add profile things" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:628 ../../include/widgets.php:493 -msgid "Me" +#: ../../Zotlabs/Module/Profiles.php:697 ../../include/conversation.php:1556 +#: ../../include/widgets.php:105 +msgid "Personal" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:629 ../../include/widgets.php:494 -msgid "Family" +#: ../../Zotlabs/Module/Profiles.php:699 +msgid "Relation" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:630 ../../Zotlabs/Module/Settings.php:407 -#: ../../Zotlabs/Module/Settings.php:411 ../../Zotlabs/Module/Settings.php:412 -#: ../../Zotlabs/Module/Settings.php:415 ../../Zotlabs/Module/Settings.php:426 -#: ../../include/selectors.php:123 ../../include/channel.php:402 -#: ../../include/channel.php:403 ../../include/channel.php:410 -#: ../../include/widgets.php:495 -msgid "Friends" +#: ../../Zotlabs/Module/Profiles.php:700 ../../include/datetime.php:48 +msgid "Miscellaneous" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:631 ../../include/widgets.php:496 -msgid "Acquaintances" +#: ../../Zotlabs/Module/Profiles.php:702 +msgid "Import profile from file" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:693 -msgid "Approve this connection" +#: ../../Zotlabs/Module/Profiles.php:703 +msgid "Export profile to file" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:693 -msgid "Accept connection to allow communication" +#: ../../Zotlabs/Module/Profiles.php:704 +msgid "Your gender" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:698 -msgid "Set Affinity" +#: ../../Zotlabs/Module/Profiles.php:705 +msgid "Marital status" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:701 -msgid "Set Profile" +#: ../../Zotlabs/Module/Profiles.php:706 +msgid "Sexual preference" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:704 -msgid "Set Affinity & Profile" +#: ../../Zotlabs/Module/Profiles.php:709 +msgid "Profile name" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:753 -msgid "none" +#: ../../Zotlabs/Module/Profiles.php:711 +msgid "This is your default profile." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:757 ../../include/widgets.php:623 -msgid "Connection Default Permissions" +#: ../../Zotlabs/Module/Profiles.php:713 +msgid "Your full name" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:757 ../../include/items.php:3935 -#, php-format -msgid "Connection: %s" +#: ../../Zotlabs/Module/Profiles.php:714 +msgid "Title/Description" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:758 -msgid "Apply these permissions automatically" +#: ../../Zotlabs/Module/Profiles.php:717 +msgid "Street address" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:758 -msgid "Connection requests will be approved without your interaction" +#: ../../Zotlabs/Module/Profiles.php:718 +msgid "Locality/City" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:760 -msgid "This connection's primary address is" +#: ../../Zotlabs/Module/Profiles.php:719 +msgid "Region/State" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:761 -msgid "Available locations:" +#: ../../Zotlabs/Module/Profiles.php:720 +msgid "Postal/Zip code" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:765 -msgid "" -"The permissions indicated on this page will be applied to all new " -"connections." +#: ../../Zotlabs/Module/Profiles.php:721 +msgid "Country" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:766 -msgid "Connection Tools" +#: ../../Zotlabs/Module/Profiles.php:726 +msgid "Who (if applicable)" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:768 -msgid "Slide to adjust your degree of friendship" +#: ../../Zotlabs/Module/Profiles.php:726 +msgid "Examples: cathy123, Cathy Williams, cathy@example.com" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:769 ../../Zotlabs/Module/Rate.php:159 -#: ../../include/js_strings.php:20 -msgid "Rating" +#: ../../Zotlabs/Module/Profiles.php:727 +msgid "Since (date)" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:770 -msgid "Slide to adjust your rating" +#: ../../Zotlabs/Module/Profiles.php:730 +msgid "Tell us about yourself" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:771 ../../Zotlabs/Module/Connedit.php:776 -msgid "Optionally explain your rating" +#: ../../Zotlabs/Module/Profiles.php:731 +msgid "Homepage URL" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:773 -msgid "Custom Filter" +#: ../../Zotlabs/Module/Profiles.php:732 +msgid "Hometown" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:774 -msgid "Only import posts with this text" +#: ../../Zotlabs/Module/Profiles.php:733 +msgid "Political views" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:774 ../../Zotlabs/Module/Connedit.php:775 -msgid "" -"words one per line or #tags or /patterns/ or lang=xx, leave blank to import " -"all posts" +#: ../../Zotlabs/Module/Profiles.php:734 +msgid "Religious views" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:775 -msgid "Do not import posts with this text" +#: ../../Zotlabs/Module/Profiles.php:735 +msgid "Keywords used in directory listings" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:777 -msgid "This information is public!" +#: ../../Zotlabs/Module/Profiles.php:735 +msgid "Example: fishing photography software" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:782 -msgid "Connection Pending Approval" +#: ../../Zotlabs/Module/Profiles.php:738 +msgid "Musical interests" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:785 ../../Zotlabs/Module/Settings.php:860 -msgid "inherited" +#: ../../Zotlabs/Module/Profiles.php:739 +msgid "Books, literature" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:787 -#, php-format -msgid "" -"Please choose the profile you would like to display to %s when viewing your " -"profile securely." +#: ../../Zotlabs/Module/Profiles.php:740 +msgid "Television" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:789 ../../Zotlabs/Module/Settings.php:857 -msgid "Their Settings" +#: ../../Zotlabs/Module/Profiles.php:741 +msgid "Film/Dance/Culture/Entertainment" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:790 ../../Zotlabs/Module/Settings.php:858 -msgid "My Settings" +#: ../../Zotlabs/Module/Profiles.php:742 +msgid "Hobbies/Interests" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:792 ../../Zotlabs/Module/Settings.php:862 -msgid "Individual Permissions" +#: ../../Zotlabs/Module/Profiles.php:743 +msgid "Love/Romance" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:793 ../../Zotlabs/Module/Settings.php:863 -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/Profiles.php:745 +msgid "School/Education" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:794 -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/Profiles.php:746 +msgid "Contact information and social networks" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:795 -msgid "Last update:" +#: ../../Zotlabs/Module/Profiles.php:747 +msgid "My other channels" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:767 ../../include/channel.php:977 +msgid "Profile Image" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:777 ../../include/nav.php:90 +#: ../../include/channel.php:959 +msgid "Edit Profiles" +msgstr "" + +#: ../../Zotlabs/Module/Channel.php:40 +msgid "Posts and comments" +msgstr "" + +#: ../../Zotlabs/Module/Channel.php:41 +msgid "Only posts" +msgstr "" + +#: ../../Zotlabs/Module/Channel.php:101 +msgid "Insufficient permissions. Request redirected to profile page." msgstr "" #: ../../Zotlabs/Module/Group.php:24 @@ -2532,7 +2336,7 @@ msgid "Could not create privacy group." msgstr "" #: ../../Zotlabs/Module/Group.php:42 ../../Zotlabs/Module/Group.php:141 -#: ../../include/items.php:3902 +#: ../../include/items.php:3904 msgid "Privacy group not found." msgstr "" @@ -2576,128 +2380,134 @@ msgstr "" msgid "Click on a channel to add or remove." msgstr "" -#: ../../Zotlabs/Module/Menu.php:49 -msgid "Unable to update menu." +#: ../../Zotlabs/Module/Mitem.php:28 ../../Zotlabs/Module/Menu.php:144 +msgid "Menu not found." msgstr "" -#: ../../Zotlabs/Module/Menu.php:60 -msgid "Unable to create menu." +#: ../../Zotlabs/Module/Mitem.php:52 +msgid "Unable to create element." msgstr "" -#: ../../Zotlabs/Module/Menu.php:98 ../../Zotlabs/Module/Menu.php:110 -msgid "Menu Name" +#: ../../Zotlabs/Module/Mitem.php:76 +msgid "Unable to update menu element." msgstr "" -#: ../../Zotlabs/Module/Menu.php:98 -msgid "Unique name (not visible on webpage) - required" +#: ../../Zotlabs/Module/Mitem.php:92 +msgid "Unable to add menu element." msgstr "" -#: ../../Zotlabs/Module/Menu.php:99 ../../Zotlabs/Module/Menu.php:111 -msgid "Menu Title" +#: ../../Zotlabs/Module/Mitem.php:120 ../../Zotlabs/Module/Menu.php:166 +#: ../../Zotlabs/Module/Xchan.php:41 +msgid "Not found." msgstr "" -#: ../../Zotlabs/Module/Menu.php:99 -msgid "Visible on webpage - leave empty for no title" +#: ../../Zotlabs/Module/Mitem.php:153 ../../Zotlabs/Module/Mitem.php:230 +msgid "Menu Item Permissions" msgstr "" -#: ../../Zotlabs/Module/Menu.php:100 -msgid "Allow Bookmarks" +#: ../../Zotlabs/Module/Mitem.php:154 ../../Zotlabs/Module/Mitem.php:231 +#: ../../Zotlabs/Module/Settings.php:1263 +msgid "(click to open/close)" msgstr "" -#: ../../Zotlabs/Module/Menu.php:100 ../../Zotlabs/Module/Menu.php:157 -msgid "Menu may be used to store saved bookmarks" +#: ../../Zotlabs/Module/Mitem.php:160 ../../Zotlabs/Module/Mitem.php:176 +msgid "Link Name" msgstr "" -#: ../../Zotlabs/Module/Menu.php:101 ../../Zotlabs/Module/Menu.php:159 -msgid "Submit and proceed" +#: ../../Zotlabs/Module/Mitem.php:161 ../../Zotlabs/Module/Mitem.php:239 +msgid "Link or Submenu Target" msgstr "" -#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2263 -msgid "Menus" +#: ../../Zotlabs/Module/Mitem.php:161 +msgid "Enter URL of the link or select a menu name to create a submenu" msgstr "" -#: ../../Zotlabs/Module/Menu.php:113 ../../Zotlabs/Module/Locs.php:120 -msgid "Drop" +#: ../../Zotlabs/Module/Mitem.php:162 ../../Zotlabs/Module/Mitem.php:240 +msgid "Use magic-auth if available" msgstr "" -#: ../../Zotlabs/Module/Menu.php:117 -msgid "Bookmarks allowed" +#: ../../Zotlabs/Module/Mitem.php:163 ../../Zotlabs/Module/Mitem.php:241 +msgid "Open link in new window" msgstr "" -#: ../../Zotlabs/Module/Menu.php:119 -msgid "Delete this menu" +#: ../../Zotlabs/Module/Mitem.php:164 ../../Zotlabs/Module/Mitem.php:242 +msgid "Order in list" msgstr "" -#: ../../Zotlabs/Module/Menu.php:120 ../../Zotlabs/Module/Menu.php:154 -msgid "Edit menu contents" +#: ../../Zotlabs/Module/Mitem.php:164 ../../Zotlabs/Module/Mitem.php:242 +msgid "Higher numbers will sink to bottom of listing" msgstr "" -#: ../../Zotlabs/Module/Menu.php:121 -msgid "Edit this menu" +#: ../../Zotlabs/Module/Mitem.php:165 +msgid "Submit and finish" msgstr "" -#: ../../Zotlabs/Module/Menu.php:136 -msgid "Menu could not be deleted." +#: ../../Zotlabs/Module/Mitem.php:166 +msgid "Submit and continue" msgstr "" -#: ../../Zotlabs/Module/Menu.php:144 ../../Zotlabs/Module/Mitem.php:28 -msgid "Menu not found." +#: ../../Zotlabs/Module/Mitem.php:174 +msgid "Menu:" msgstr "" -#: ../../Zotlabs/Module/Menu.php:149 -msgid "Edit Menu" +#: ../../Zotlabs/Module/Mitem.php:177 +msgid "Link Target" msgstr "" -#: ../../Zotlabs/Module/Menu.php:153 -msgid "Add or remove entries to this menu" +#: ../../Zotlabs/Module/Mitem.php:180 +msgid "Edit menu" msgstr "" -#: ../../Zotlabs/Module/Menu.php:155 -msgid "Menu name" +#: ../../Zotlabs/Module/Mitem.php:183 +msgid "Edit element" msgstr "" -#: ../../Zotlabs/Module/Menu.php:155 -msgid "Must be unique, only seen by you" +#: ../../Zotlabs/Module/Mitem.php:184 +msgid "Drop element" msgstr "" -#: ../../Zotlabs/Module/Menu.php:156 -msgid "Menu title" +#: ../../Zotlabs/Module/Mitem.php:185 +msgid "New element" msgstr "" -#: ../../Zotlabs/Module/Menu.php:156 -msgid "Menu title as seen by others" +#: ../../Zotlabs/Module/Mitem.php:186 +msgid "Edit this menu container" msgstr "" -#: ../../Zotlabs/Module/Menu.php:157 -msgid "Allow bookmarks" +#: ../../Zotlabs/Module/Mitem.php:187 +msgid "Add menu element" msgstr "" -#: ../../Zotlabs/Module/Menu.php:166 ../../Zotlabs/Module/Mitem.php:120 -#: ../../Zotlabs/Module/Xchan.php:41 -msgid "Not found." +#: ../../Zotlabs/Module/Mitem.php:188 +msgid "Delete this menu item" msgstr "" -#: ../../Zotlabs/Module/Editpost.php:35 -msgid "Item is not editable" +#: ../../Zotlabs/Module/Mitem.php:189 +msgid "Edit this menu item" msgstr "" -#: ../../Zotlabs/Module/Import_items.php:42 ../../Zotlabs/Module/Import.php:71 -msgid "Nothing to import." +#: ../../Zotlabs/Module/Mitem.php:206 +msgid "Menu item not found." msgstr "" -#: ../../Zotlabs/Module/Import_items.php:66 ../../Zotlabs/Module/Import.php:95 -msgid "Unable to download data from old server" +#: ../../Zotlabs/Module/Mitem.php:219 +msgid "Menu item deleted." msgstr "" -#: ../../Zotlabs/Module/Import_items.php:72 -#: ../../Zotlabs/Module/Import.php:101 -msgid "Imported file is empty." +#: ../../Zotlabs/Module/Mitem.php:221 +msgid "Menu item could not be deleted." msgstr "" -#: ../../Zotlabs/Module/Import_items.php:88 -#: ../../Zotlabs/Module/Import.php:123 -#, php-format -msgid "Warning: Database versions differ by %1$d updates." +#: ../../Zotlabs/Module/Mitem.php:228 +msgid "Edit Menu Element" +msgstr "" + +#: ../../Zotlabs/Module/Mitem.php:238 +msgid "Link text" +msgstr "" + +#: ../../Zotlabs/Module/Follow.php:34 +msgid "Channel added." msgstr "" #: ../../Zotlabs/Module/Import_items.php:104 @@ -2712,11 +2522,6 @@ msgstr "" msgid "Use this form to import existing posts and content from an export file." msgstr "" -#: ../../Zotlabs/Module/Import_items.php:121 -#: ../../Zotlabs/Module/Import.php:549 -msgid "File to Upload" -msgstr "" - #: ../../Zotlabs/Module/Invite.php:29 msgid "Total invitation limit exceeded." msgstr "" @@ -2758,10 +2563,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 "" @@ -2816,6 +2617,10 @@ msgstr "" msgid "Primary" msgstr "" +#: ../../Zotlabs/Module/Locs.php:120 ../../Zotlabs/Module/Menu.php:113 +msgid "Drop" +msgstr "" + #: ../../Zotlabs/Module/Locs.php:122 msgid "Sync Now" msgstr "" @@ -2838,72 +2643,30 @@ msgstr "" msgid "Hub not found." msgstr "" -#: ../../Zotlabs/Module/Chat.php:181 -msgid "Room not found" -msgstr "" - -#: ../../Zotlabs/Module/Chat.php:197 -msgid "Leave Room" -msgstr "" - -#: ../../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:205 ../../Zotlabs/Module/Mail.php:197 -#: ../../Zotlabs/Module/Mail.php:306 ../../include/conversation.php:1182 -msgid "Please enter a link URL:" -msgstr "" - -#: ../../Zotlabs/Module/Chat.php:206 ../../Zotlabs/Module/Mail.php:250 -#: ../../Zotlabs/Module/Mail.php:375 ../../Zotlabs/Lib/ThreadItem.php:723 -#: ../../include/conversation.php:1276 -msgid "Encrypt text" -msgstr "" - -#: ../../Zotlabs/Module/Chat.php:218 -msgid "Feature disabled." +#: ../../Zotlabs/Module/Impel.php:41 ../../include/bbcode.php:192 +msgid "webpage" msgstr "" -#: ../../Zotlabs/Module/Chat.php:231 -msgid "New Chatroom" +#: ../../Zotlabs/Module/Impel.php:46 ../../include/bbcode.php:198 +msgid "block" msgstr "" -#: ../../Zotlabs/Module/Chat.php:232 -msgid "Chatroom name" +#: ../../Zotlabs/Module/Impel.php:51 ../../include/bbcode.php:195 +msgid "layout" msgstr "" -#: ../../Zotlabs/Module/Chat.php:233 -msgid "Expiration of chats (minutes)" +#: ../../Zotlabs/Module/Impel.php:58 ../../include/bbcode.php:201 +msgid "menu" msgstr "" -#: ../../Zotlabs/Module/Chat.php:249 +#: ../../Zotlabs/Module/Impel.php:191 #, php-format -msgid "%1$s's Chatrooms" -msgstr "" - -#: ../../Zotlabs/Module/Chat.php:254 -msgid "No chatrooms available" -msgstr "" - -#: ../../Zotlabs/Module/Chat.php:258 -msgid "Expiration" +msgid "%s element installed" msgstr "" -#: ../../Zotlabs/Module/Chat.php:259 -msgid "min" +#: ../../Zotlabs/Module/Impel.php:194 +#, php-format +msgid "%s element installation failed" msgstr "" #: ../../Zotlabs/Module/Events.php:25 @@ -2993,7 +2756,13 @@ msgstr "" msgid "Share this event" msgstr "" -#: ../../Zotlabs/Module/Events.php:474 ../../include/conversation.php:1248 +#: ../../Zotlabs/Module/Events.php:473 ../../Zotlabs/Module/Photos.php:1099 +#: ../../Zotlabs/Module/Webpages.php:224 ../../Zotlabs/Lib/ThreadItem.php:720 +#: ../../include/conversation.php:1205 ../../include/page_widgets.php:43 +msgid "Preview" +msgstr "" + +#: ../../Zotlabs/Module/Events.php:474 ../../include/conversation.php:1258 msgid "Permission settings" msgstr "" @@ -3031,15 +2800,27 @@ msgid "Create Event" msgstr "" #: ../../Zotlabs/Module/Events.php:675 ../../Zotlabs/Module/Events.php:684 -#: ../../Zotlabs/Module/Photos.php:951 ../../Zotlabs/Module/Cal.php:332 -#: ../../Zotlabs/Module/Cal.php:339 +#: ../../Zotlabs/Module/Cal.php:332 ../../Zotlabs/Module/Cal.php:339 +#: ../../Zotlabs/Module/Photos.php:951 msgid "Previous" msgstr "" +#: ../../Zotlabs/Module/Events.php:676 ../../Zotlabs/Module/Events.php:685 +#: ../../Zotlabs/Module/Setup.php:267 ../../Zotlabs/Module/Cal.php:333 +#: ../../Zotlabs/Module/Cal.php:340 ../../Zotlabs/Module/Photos.php:960 +msgid "Next" +msgstr "" + #: ../../Zotlabs/Module/Events.php:677 ../../Zotlabs/Module/Cal.php:334 msgid "Export" msgstr "" +#: ../../Zotlabs/Module/Events.php:680 ../../Zotlabs/Module/Blocks.php:166 +#: ../../Zotlabs/Module/Layouts.php:197 ../../Zotlabs/Module/Pubsites.php:47 +#: ../../Zotlabs/Module/Webpages.php:223 ../../include/page_widgets.php:42 +msgid "View" +msgstr "" + #: ../../Zotlabs/Module/Events.php:681 msgid "Month" msgstr "" @@ -3064,101 +2845,49 @@ msgstr "" msgid "Failed to remove event" msgstr "" -#: ../../Zotlabs/Module/Mail.php:38 -msgid "Unable to lookup recipient." -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:45 -msgid "Unable to communicate with requested channel." -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:52 -msgid "Cannot verify requested channel." -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:70 -msgid "Selected channel has private message restrictions. Send failed." -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:135 -msgid "Messages" -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:170 -msgid "Message recalled." -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:183 -msgid "Conversation removed." -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:198 ../../Zotlabs/Module/Mail.php:307 -msgid "Expires YYYY-MM-DD HH:MM" -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:226 -msgid "Requested channel is not in this network" -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:234 -msgid "Send Private Message" -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:235 ../../Zotlabs/Module/Mail.php:360 -msgid "To:" -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:238 ../../Zotlabs/Module/Mail.php:362 -msgid "Subject:" -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:243 ../../Zotlabs/Module/Mail.php:368 -#: ../../include/conversation.php:1232 -msgid "Attach file" -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:245 -msgid "Send" +#: ../../Zotlabs/Module/Manage.php:136 +#: ../../Zotlabs/Module/New_channel.php:121 +#, php-format +msgid "You have created %1$.0f of %2$.0f allowed channels." msgstr "" -#: ../../Zotlabs/Module/Mail.php:248 ../../Zotlabs/Module/Mail.php:373 -#: ../../include/conversation.php:1271 -msgid "Set expiration date" +#: ../../Zotlabs/Module/Manage.php:143 +msgid "Create a new channel" msgstr "" -#: ../../Zotlabs/Module/Mail.php:332 -msgid "Delete message" +#: ../../Zotlabs/Module/Manage.php:164 ../../Zotlabs/Lib/Apps.php:214 +#: ../../include/nav.php:210 +msgid "Channel Manager" msgstr "" -#: ../../Zotlabs/Module/Mail.php:333 -msgid "Delivery report" +#: ../../Zotlabs/Module/Manage.php:165 +msgid "Current Channel" msgstr "" -#: ../../Zotlabs/Module/Mail.php:334 -msgid "Recall message" +#: ../../Zotlabs/Module/Manage.php:167 +msgid "Switch to one of your channels by selecting it." msgstr "" -#: ../../Zotlabs/Module/Mail.php:336 -msgid "Message has been recalled." +#: ../../Zotlabs/Module/Manage.php:168 +msgid "Default Channel" msgstr "" -#: ../../Zotlabs/Module/Mail.php:353 -msgid "Delete Conversation" +#: ../../Zotlabs/Module/Manage.php:169 +msgid "Make Default" 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/Manage.php:172 +#, php-format +msgid "%d new messages" msgstr "" -#: ../../Zotlabs/Module/Mail.php:359 -msgid "Send Reply" +#: ../../Zotlabs/Module/Manage.php:173 +#, php-format +msgid "%d new introductions" msgstr "" -#: ../../Zotlabs/Module/Mail.php:364 -#, php-format -msgid "Your message for %s (%s):" +#: ../../Zotlabs/Module/Manage.php:175 +msgid "Delegated Channel" msgstr "" #: ../../Zotlabs/Module/Lostpass.php:19 @@ -3248,1044 +2977,561 @@ msgstr "" msgid "Set your current mood and tell your friends" 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." -msgstr "" - -#: ../../Zotlabs/Module/Manage.php:143 -msgid "Create a new channel" -msgstr "" - -#: ../../Zotlabs/Module/Manage.php:164 ../../Zotlabs/Lib/Apps.php:214 -#: ../../include/nav.php:210 -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 "%d new messages" -msgstr "" - -#: ../../Zotlabs/Module/Manage.php:173 -#, php-format -msgid "%d new introductions" -msgstr "" - -#: ../../Zotlabs/Module/Manage.php:175 -msgid "Delegated Channel" -msgstr "" - -#: ../../Zotlabs/Module/Notify.php:57 -#: ../../Zotlabs/Module/Notifications.php:98 -msgid "No more system notifications." -msgstr "" - -#: ../../Zotlabs/Module/Notify.php:61 -#: ../../Zotlabs/Module/Notifications.php:102 -msgid "System Notifications" -msgstr "" - -#: ../../Zotlabs/Module/Match.php:26 -msgid "Profile Match" -msgstr "" - -#: ../../Zotlabs/Module/Match.php:35 -msgid "No keywords to match. Please add keywords to your default profile." -msgstr "" - -#: ../../Zotlabs/Module/Match.php:67 -msgid "is interested in:" -msgstr "" - -#: ../../Zotlabs/Module/Match.php:74 -msgid "No matches" -msgstr "" - -#: ../../Zotlabs/Module/Photos.php:82 -msgid "Page owner information could not be retrieved." -msgstr "" - -#: ../../Zotlabs/Module/Photos.php:97 ../../Zotlabs/Module/Photos.php:745 -#: ../../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/Photos.php:103 ../../Zotlabs/Module/Photos.php:147 -msgid "Album not found." -msgstr "" - -#: ../../Zotlabs/Module/Photos.php:130 -msgid "Delete Album" -msgstr "" - -#: ../../Zotlabs/Module/Photos.php:151 -msgid "" -"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/Photos.php:208 ../../Zotlabs/Module/Photos.php:1059 -msgid "Delete Photo" -msgstr "" - -#: ../../Zotlabs/Module/Photos.php:531 -msgid "No photos selected" -msgstr "" - -#: ../../Zotlabs/Module/Photos.php:580 -msgid "Access to this item is restricted." -msgstr "" - -#: ../../Zotlabs/Module/Photos.php:619 -#, php-format -msgid "%1$.2f MB of %2$.2f MB photo storage used." -msgstr "" - -#: ../../Zotlabs/Module/Photos.php:622 -#, php-format -msgid "%1$.2f MB photo storage used." -msgstr "" - -#: ../../Zotlabs/Module/Photos.php:658 -msgid "Upload Photos" -msgstr "" - -#: ../../Zotlabs/Module/Photos.php:662 -msgid "Enter an album name" -msgstr "" - -#: ../../Zotlabs/Module/Photos.php:663 -msgid "or select an existing album (doubleclick)" -msgstr "" - -#: ../../Zotlabs/Module/Photos.php:664 -msgid "Create a status post for this upload" -msgstr "" - -#: ../../Zotlabs/Module/Photos.php:665 -msgid "Caption (optional):" -msgstr "" - -#: ../../Zotlabs/Module/Photos.php:666 -msgid "Description (optional):" -msgstr "" - -#: ../../Zotlabs/Module/Photos.php:697 -msgid "Album name could not be decoded" -msgstr "" - -#: ../../Zotlabs/Module/Photos.php:745 -msgid "Contact Photos" -msgstr "" - -#: ../../Zotlabs/Module/Photos.php:768 -msgid "Show Newest First" -msgstr "" - -#: ../../Zotlabs/Module/Photos.php:770 -msgid "Show Oldest First" -msgstr "" - -#: ../../Zotlabs/Module/Photos.php:794 ../../Zotlabs/Module/Photos.php:1337 -#: ../../Zotlabs/Module/Embedphotos.php:141 ../../include/widgets.php:1607 -msgid "View Photo" -msgstr "" - -#: ../../Zotlabs/Module/Photos.php:825 -#: ../../Zotlabs/Module/Embedphotos.php:157 ../../include/widgets.php:1624 -msgid "Edit Album" -msgstr "" - -#: ../../Zotlabs/Module/Photos.php:872 -msgid "Permission denied. Access to this item may be restricted." -msgstr "" - -#: ../../Zotlabs/Module/Photos.php:874 -msgid "Photo not available" -msgstr "" - -#: ../../Zotlabs/Module/Photos.php:932 -msgid "Use as profile photo" -msgstr "" - -#: ../../Zotlabs/Module/Photos.php:933 -msgid "Use as cover photo" -msgstr "" - -#: ../../Zotlabs/Module/Photos.php:940 -msgid "Private Photo" -msgstr "" - -#: ../../Zotlabs/Module/Photos.php:955 -msgid "View Full Size" -msgstr "" - -#: ../../Zotlabs/Module/Photos.php:1000 ../../Zotlabs/Module/Admin.php:1437 -#: ../../Zotlabs/Module/Tagrm.php:137 -msgid "Remove" -msgstr "" - -#: ../../Zotlabs/Module/Photos.php:1034 -msgid "Edit photo" -msgstr "" - -#: ../../Zotlabs/Module/Photos.php:1036 -msgid "Rotate CW (right)" -msgstr "" - -#: ../../Zotlabs/Module/Photos.php:1037 -msgid "Rotate CCW (left)" -msgstr "" - -#: ../../Zotlabs/Module/Photos.php:1040 -msgid "Enter a new album name" -msgstr "" - -#: ../../Zotlabs/Module/Photos.php:1041 -msgid "or select an existing one (doubleclick)" +#: ../../Zotlabs/Module/Menu.php:49 +msgid "Unable to update menu." msgstr "" -#: ../../Zotlabs/Module/Photos.php:1044 -msgid "Caption" +#: ../../Zotlabs/Module/Menu.php:60 +msgid "Unable to create menu." msgstr "" -#: ../../Zotlabs/Module/Photos.php:1046 -msgid "Add a Tag" +#: ../../Zotlabs/Module/Menu.php:98 ../../Zotlabs/Module/Menu.php:110 +msgid "Menu Name" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1054 -msgid "Example: @bob, @Barbara_Jensen, @jim@example.com" +#: ../../Zotlabs/Module/Menu.php:98 +msgid "Unique name (not visible on webpage) - required" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1057 -msgid "Flag as adult in album view" +#: ../../Zotlabs/Module/Menu.php:99 ../../Zotlabs/Module/Menu.php:111 +msgid "Menu Title" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1076 ../../Zotlabs/Lib/ThreadItem.php:262 -msgid "I like this (toggle)" +#: ../../Zotlabs/Module/Menu.php:99 +msgid "Visible on webpage - leave empty for no title" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1077 ../../Zotlabs/Lib/ThreadItem.php:263 -msgid "I don't like this (toggle)" +#: ../../Zotlabs/Module/Menu.php:100 +msgid "Allow Bookmarks" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1079 ../../Zotlabs/Lib/ThreadItem.php:398 -#: ../../include/conversation.php:743 -msgid "Please wait" +#: ../../Zotlabs/Module/Menu.php:100 ../../Zotlabs/Module/Menu.php:157 +msgid "Menu may be used to store saved bookmarks" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1095 ../../Zotlabs/Module/Photos.php:1213 -#: ../../Zotlabs/Lib/ThreadItem.php:708 -msgid "This is you" +#: ../../Zotlabs/Module/Menu.php:101 ../../Zotlabs/Module/Menu.php:159 +msgid "Submit and proceed" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1097 ../../Zotlabs/Module/Photos.php:1215 -#: ../../Zotlabs/Lib/ThreadItem.php:710 ../../include/js_strings.php:6 -msgid "Comment" +#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2263 +msgid "Menus" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1113 ../../include/conversation.php:577 -msgctxt "title" -msgid "Likes" +#: ../../Zotlabs/Module/Menu.php:114 ../../Zotlabs/Module/Blocks.php:157 +#: ../../Zotlabs/Module/Layouts.php:190 ../../Zotlabs/Module/Webpages.php:228 +#: ../../include/page_widgets.php:47 +msgid "Created" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1113 ../../include/conversation.php:577 -msgctxt "title" -msgid "Dislikes" +#: ../../Zotlabs/Module/Menu.php:115 ../../Zotlabs/Module/Blocks.php:158 +#: ../../Zotlabs/Module/Layouts.php:191 ../../Zotlabs/Module/Webpages.php:229 +#: ../../include/page_widgets.php:48 +msgid "Edited" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1114 ../../include/conversation.php:578 -msgctxt "title" -msgid "Agree" +#: ../../Zotlabs/Module/Menu.php:117 +msgid "Bookmarks allowed" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1114 ../../include/conversation.php:578 -msgctxt "title" -msgid "Disagree" +#: ../../Zotlabs/Module/Menu.php:119 +msgid "Delete this menu" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1114 ../../include/conversation.php:578 -msgctxt "title" -msgid "Abstain" +#: ../../Zotlabs/Module/Menu.php:120 ../../Zotlabs/Module/Menu.php:154 +msgid "Edit menu contents" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1115 ../../include/conversation.php:579 -msgctxt "title" -msgid "Attending" +#: ../../Zotlabs/Module/Menu.php:121 +msgid "Edit this menu" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1115 ../../include/conversation.php:579 -msgctxt "title" -msgid "Not attending" +#: ../../Zotlabs/Module/Menu.php:136 +msgid "Menu could not be deleted." msgstr "" -#: ../../Zotlabs/Module/Photos.php:1115 ../../include/conversation.php:579 -msgctxt "title" -msgid "Might attend" +#: ../../Zotlabs/Module/Menu.php:149 +msgid "Edit Menu" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1132 ../../Zotlabs/Module/Photos.php:1144 -#: ../../Zotlabs/Lib/ThreadItem.php:181 ../../Zotlabs/Lib/ThreadItem.php:193 -#: ../../include/conversation.php:1743 -msgid "View all" +#: ../../Zotlabs/Module/Menu.php:153 +msgid "Add or remove entries to this menu" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1136 ../../Zotlabs/Lib/ThreadItem.php:185 -#: ../../include/channel.php:1182 ../../include/conversation.php:1767 -#: ../../include/taxonomy.php:403 -msgctxt "noun" -msgid "Like" -msgid_plural "Likes" -msgstr[0] "" -msgstr[1] "" - -#: ../../Zotlabs/Module/Photos.php:1141 ../../Zotlabs/Lib/ThreadItem.php:190 -#: ../../include/conversation.php:1770 -msgctxt "noun" -msgid "Dislike" -msgid_plural "Dislikes" -msgstr[0] "" -msgstr[1] "" - -#: ../../Zotlabs/Module/Photos.php:1241 -msgid "Photo Tools" +#: ../../Zotlabs/Module/Menu.php:155 +msgid "Menu name" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1250 -msgid "In This Photo:" +#: ../../Zotlabs/Module/Menu.php:155 +msgid "Must be unique, only seen by you" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1255 -msgid "Map" +#: ../../Zotlabs/Module/Menu.php:156 +msgid "Menu title" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1263 ../../Zotlabs/Lib/ThreadItem.php:387 -msgctxt "noun" -msgid "Likes" +#: ../../Zotlabs/Module/Menu.php:156 +msgid "Menu title as seen by others" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1264 ../../Zotlabs/Lib/ThreadItem.php:388 -msgctxt "noun" -msgid "Dislikes" +#: ../../Zotlabs/Module/Menu.php:157 +msgid "Allow bookmarks" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1269 ../../Zotlabs/Lib/ThreadItem.php:393 -#: ../../include/acl_selectors.php:283 -msgid "Close" +#: ../../Zotlabs/Module/Notify.php:57 +#: ../../Zotlabs/Module/Notifications.php:98 +msgid "No more system notifications." msgstr "" -#: ../../Zotlabs/Module/Photos.php:1343 -msgid "View Album" +#: ../../Zotlabs/Module/Notify.php:61 +#: ../../Zotlabs/Module/Notifications.php:102 +msgid "System Notifications" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1354 ../../Zotlabs/Module/Photos.php:1367 -#: ../../Zotlabs/Module/Photos.php:1368 -msgid "Recent Photos" +#: ../../Zotlabs/Module/Match.php:26 +msgid "Profile Match" msgstr "" -#: ../../Zotlabs/Module/Settings.php:64 -msgid "Name is required" +#: ../../Zotlabs/Module/Match.php:35 +msgid "No keywords to match. Please add keywords to your default profile." msgstr "" -#: ../../Zotlabs/Module/Settings.php:68 -msgid "Key and Secret are required" +#: ../../Zotlabs/Module/Match.php:67 +msgid "is interested in:" msgstr "" -#: ../../Zotlabs/Module/Settings.php:72 ../../Zotlabs/Module/Settings.php:686 -#: ../../Zotlabs/Module/Admin.php:1435 ../../Zotlabs/Lib/Apps.php:334 -msgid "Update" +#: ../../Zotlabs/Module/Match.php:74 +msgid "No matches" msgstr "" -#: ../../Zotlabs/Module/Settings.php:138 +#: ../../Zotlabs/Module/Probe.php:28 ../../Zotlabs/Module/Probe.php:32 #, 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:184 -msgid "Token saved." -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:290 -msgid "Not valid email." -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:293 -msgid "Protected email address. Cannot change to that email." -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:302 -msgid "System failure storing new email. Please try again." -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:319 -msgid "Password verification failed." -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:326 -msgid "Passwords do not match. Password unchanged." -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:330 -msgid "Empty passwords are not allowed. Password unchanged." -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:344 -msgid "Password changed." -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:346 -msgid "Password update failed. Please try again." -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:595 -msgid "Settings updated." -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:659 ../../Zotlabs/Module/Settings.php:685 -#: ../../Zotlabs/Module/Settings.php:721 -msgid "Add application" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:662 -msgid "Name of application" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:663 ../../Zotlabs/Module/Settings.php:689 -msgid "Consumer Key" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:663 ../../Zotlabs/Module/Settings.php:664 -msgid "Automatically generated - change if desired. Max length 20" +msgid "Fetching URL returns error: %1$s" msgstr "" -#: ../../Zotlabs/Module/Settings.php:664 ../../Zotlabs/Module/Settings.php:690 -msgid "Consumer Secret" +#: ../../Zotlabs/Module/Setup.php:179 +msgid "$Projectname Server - Setup" msgstr "" -#: ../../Zotlabs/Module/Settings.php:665 ../../Zotlabs/Module/Settings.php:691 -msgid "Redirect" +#: ../../Zotlabs/Module/Setup.php:183 +msgid "Could not connect to database." msgstr "" -#: ../../Zotlabs/Module/Settings.php:665 +#: ../../Zotlabs/Module/Setup.php:187 msgid "" -"Redirect URI - leave blank unless your application specifically requires this" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:666 ../../Zotlabs/Module/Settings.php:692 -msgid "Icon url" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:666 ../../Zotlabs/Module/Sources.php:112 -#: ../../Zotlabs/Module/Sources.php:147 -msgid "Optional" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:677 -msgid "Application not found." -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:720 -msgid "Connected Apps" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:724 -msgid "Client key starts with" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:725 -msgid "No name" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:726 -msgid "Remove authorization" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:739 -msgid "No feature settings configured" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:746 -msgid "Feature/Addon Settings" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:769 -msgid "Account Settings" +"Could not connect to specified site URL. Possible SSL certificate or DNS " +"issue." msgstr "" -#: ../../Zotlabs/Module/Settings.php:770 -msgid "Current Password" +#: ../../Zotlabs/Module/Setup.php:194 +msgid "Could not create table." msgstr "" -#: ../../Zotlabs/Module/Settings.php:771 -msgid "Enter New Password" +#: ../../Zotlabs/Module/Setup.php:199 +msgid "Your site database has been installed." msgstr "" -#: ../../Zotlabs/Module/Settings.php:772 -msgid "Confirm New Password" +#: ../../Zotlabs/Module/Setup.php:203 +msgid "" +"You may need to import the file \"install/schema_xxx.sql\" manually using a " +"database client." msgstr "" -#: ../../Zotlabs/Module/Settings.php:772 -msgid "Leave password fields blank unless changing" +#: ../../Zotlabs/Module/Setup.php:204 ../../Zotlabs/Module/Setup.php:266 +#: ../../Zotlabs/Module/Setup.php:722 +msgid "Please see the file \"install/INSTALL.txt\"." msgstr "" -#: ../../Zotlabs/Module/Settings.php:774 -#: ../../Zotlabs/Module/Settings.php:1194 -msgid "Email Address:" +#: ../../Zotlabs/Module/Setup.php:263 +msgid "System check" msgstr "" -#: ../../Zotlabs/Module/Settings.php:775 -#: ../../Zotlabs/Module/Removeaccount.php:61 -msgid "Remove Account" +#: ../../Zotlabs/Module/Setup.php:268 +msgid "Check again" msgstr "" -#: ../../Zotlabs/Module/Settings.php:776 -msgid "Remove this account including all its channels" +#: ../../Zotlabs/Module/Setup.php:290 +msgid "Database connection" msgstr "" -#: ../../Zotlabs/Module/Settings.php:810 +#: ../../Zotlabs/Module/Setup.php:291 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 private content." +"In order to install $Projectname we need to know how to connect to your " +"database." msgstr "" -#: ../../Zotlabs/Module/Settings.php:812 +#: ../../Zotlabs/Module/Setup.php:292 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:847 ../../include/widgets.php:614 -msgid "Guest Access Tokens" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:854 -msgid "Login Name" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:855 -msgid "Login Password" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:856 -msgid "Expires (yyyy-mm-dd)" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:881 ../../Zotlabs/Module/Admin.php:677 -#: ../../Zotlabs/Module/Admin.php:678 -msgid "Off" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:881 ../../Zotlabs/Module/Admin.php:677 -#: ../../Zotlabs/Module/Admin.php:678 -msgid "On" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:888 -msgid "Additional Features" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:912 -msgid "Connector Settings" +"Please contact your hosting provider or site administrator if you have " +"questions about these settings." msgstr "" -#: ../../Zotlabs/Module/Settings.php:951 -msgid "No special theme for mobile devices" +#: ../../Zotlabs/Module/Setup.php:293 +msgid "" +"The database you specify below should already exist. If it does not, please " +"create it before continuing." msgstr "" -#: ../../Zotlabs/Module/Settings.php:954 -#, php-format -msgid "%s - (Experimental)" +#: ../../Zotlabs/Module/Setup.php:297 +msgid "Database Server Name" msgstr "" -#: ../../Zotlabs/Module/Settings.php:957 ../../Zotlabs/Module/Admin.php:410 -msgid "mobile" +#: ../../Zotlabs/Module/Setup.php:297 +msgid "Default is 127.0.0.1" msgstr "" -#: ../../Zotlabs/Module/Settings.php:996 -msgid "Display Settings" +#: ../../Zotlabs/Module/Setup.php:298 +msgid "Database Port" msgstr "" -#: ../../Zotlabs/Module/Settings.php:997 -msgid "Theme Settings" +#: ../../Zotlabs/Module/Setup.php:298 +msgid "Communication port number - use 0 for default" msgstr "" -#: ../../Zotlabs/Module/Settings.php:998 -msgid "Custom Theme Settings" +#: ../../Zotlabs/Module/Setup.php:299 +msgid "Database Login Name" msgstr "" -#: ../../Zotlabs/Module/Settings.php:999 -msgid "Content Settings" +#: ../../Zotlabs/Module/Setup.php:300 +msgid "Database Login Password" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1005 -msgid "Display Theme:" +#: ../../Zotlabs/Module/Setup.php:301 +msgid "Database Name" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1006 -msgid "Mobile Theme:" +#: ../../Zotlabs/Module/Setup.php:302 +msgid "Database Type" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1007 -msgid "Preload images before rendering the page" +#: ../../Zotlabs/Module/Setup.php:304 ../../Zotlabs/Module/Setup.php:344 +msgid "Site administrator email address" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1007 +#: ../../Zotlabs/Module/Setup.php:304 ../../Zotlabs/Module/Setup.php:344 msgid "" -"The subjective page load time will be longer but the page will be ready when " -"displayed" +"Your account email address must match this in order to use the web admin " +"panel." msgstr "" -#: ../../Zotlabs/Module/Settings.php:1008 -msgid "Enable user zoom on mobile devices" +#: ../../Zotlabs/Module/Setup.php:305 ../../Zotlabs/Module/Setup.php:346 +msgid "Website URL" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1009 -msgid "Update browser every xx seconds" +#: ../../Zotlabs/Module/Setup.php:305 ../../Zotlabs/Module/Setup.php:346 +msgid "Please use SSL (https) URL if available." msgstr "" -#: ../../Zotlabs/Module/Settings.php:1009 -msgid "Minimum of 10 seconds, no maximum" +#: ../../Zotlabs/Module/Setup.php:306 ../../Zotlabs/Module/Setup.php:349 +msgid "Please select a default timezone for your website" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1010 -msgid "Maximum number of conversations to load at any time:" +#: ../../Zotlabs/Module/Setup.php:333 +msgid "Site settings" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1010 -msgid "Maximum of 100 items" +#: ../../Zotlabs/Module/Setup.php:347 +msgid "Enable $Projectname <strong>advanced</strong> features?" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1011 -msgid "Show emoticons (smilies) as images" +#: ../../Zotlabs/Module/Setup.php:347 +msgid "" +"Some advanced features, while useful - may be best suited for technically " +"proficient audiences" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1012 -msgid "Link post titles to source" +#: ../../Zotlabs/Module/Setup.php:388 +msgid "PHP version 5.5 or greater is required." msgstr "" -#: ../../Zotlabs/Module/Settings.php:1013 -msgid "System Page Layout Editor - (advanced)" +#: ../../Zotlabs/Module/Setup.php:389 +msgid "PHP version" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1016 -msgid "Use blog/list mode on channel page" +#: ../../Zotlabs/Module/Setup.php:404 +msgid "Could not find a command line version of PHP in the web server PATH." msgstr "" -#: ../../Zotlabs/Module/Settings.php:1016 -#: ../../Zotlabs/Module/Settings.php:1017 -msgid "(comments displayed separately)" +#: ../../Zotlabs/Module/Setup.php:405 +msgid "" +"If you don't have a command line version of PHP installed on server, you " +"will not be able to run background polling via cron." msgstr "" -#: ../../Zotlabs/Module/Settings.php:1017 -msgid "Use blog/list mode on grid page" +#: ../../Zotlabs/Module/Setup.php:409 +msgid "PHP executable path" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1018 -msgid "Channel page max height of content (in pixels)" +#: ../../Zotlabs/Module/Setup.php:409 +msgid "" +"Enter full path to php executable. You can leave this blank to continue the " +"installation." msgstr "" -#: ../../Zotlabs/Module/Settings.php:1018 -#: ../../Zotlabs/Module/Settings.php:1019 -msgid "click to expand content exceeding this height" +#: ../../Zotlabs/Module/Setup.php:414 +msgid "Command line PHP" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1019 -msgid "Grid page max height of content (in pixels)" +#: ../../Zotlabs/Module/Setup.php:423 +msgid "" +"The command line version of PHP on your system does not have " +"\"register_argc_argv\" enabled." msgstr "" -#: ../../Zotlabs/Module/Settings.php:1048 -msgid "Nobody except yourself" +#: ../../Zotlabs/Module/Setup.php:424 +msgid "This is required for message delivery to work." msgstr "" -#: ../../Zotlabs/Module/Settings.php:1049 -msgid "Only those you specifically allow" +#: ../../Zotlabs/Module/Setup.php:427 +msgid "PHP register_argc_argv" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1050 -msgid "Approved connections" +#: ../../Zotlabs/Module/Setup.php:445 +#, php-format +msgid "" +"Your max allowed total upload size is set to %s. Maximum size of one file to " +"upload is set to %s. You are allowed to upload up to %d files at once." msgstr "" -#: ../../Zotlabs/Module/Settings.php:1051 -msgid "Any connections" +#: ../../Zotlabs/Module/Setup.php:450 +msgid "You can adjust these settings in the servers php.ini." msgstr "" -#: ../../Zotlabs/Module/Settings.php:1052 -msgid "Anybody on this website" +#: ../../Zotlabs/Module/Setup.php:452 +msgid "PHP upload limits" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1053 -msgid "Anybody in this network" +#: ../../Zotlabs/Module/Setup.php:475 +msgid "" +"Error: the \"openssl_pkey_new\" function on this system is not able to " +"generate encryption keys" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1054 -msgid "Anybody authenticated" +#: ../../Zotlabs/Module/Setup.php:476 +msgid "" +"If running under Windows, please see \"http://www.php.net/manual/en/openssl." +"installation.php\"." msgstr "" -#: ../../Zotlabs/Module/Settings.php:1055 -msgid "Anybody on the internet" +#: ../../Zotlabs/Module/Setup.php:479 +msgid "Generate encryption keys" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1129 -msgid "Publish your default profile in the network directory" +#: ../../Zotlabs/Module/Setup.php:491 +msgid "libCurl PHP module" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1134 -msgid "Allow us to suggest you as a potential friend to new members?" +#: ../../Zotlabs/Module/Setup.php:492 +msgid "GD graphics PHP module" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1143 -msgid "Your channel address is" +#: ../../Zotlabs/Module/Setup.php:493 +msgid "OpenSSL PHP module" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1185 -msgid "Channel Settings" +#: ../../Zotlabs/Module/Setup.php:494 +msgid "mysqli or postgres PHP module" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1192 -msgid "Basic Settings" +#: ../../Zotlabs/Module/Setup.php:495 +msgid "mb_string PHP module" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1193 ../../include/channel.php:1164 -msgid "Full Name:" +#: ../../Zotlabs/Module/Setup.php:496 +msgid "xml PHP module" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1195 -msgid "Your Timezone:" +#: ../../Zotlabs/Module/Setup.php:500 ../../Zotlabs/Module/Setup.php:502 +msgid "Apache mod_rewrite module" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1196 -msgid "Default Post Location:" +#: ../../Zotlabs/Module/Setup.php:500 +msgid "" +"Error: Apache webserver mod-rewrite module is required but not installed." msgstr "" -#: ../../Zotlabs/Module/Settings.php:1196 -msgid "Geographical location to display on your posts" +#: ../../Zotlabs/Module/Setup.php:506 ../../Zotlabs/Module/Setup.php:509 +msgid "proc_open" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1197 -msgid "Use Browser Location:" +#: ../../Zotlabs/Module/Setup.php:506 +msgid "" +"Error: proc_open is required but is either not installed or has been " +"disabled in php.ini" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1199 -msgid "Adult Content" +#: ../../Zotlabs/Module/Setup.php:514 +msgid "Error: libCURL PHP module required but not installed." msgstr "" -#: ../../Zotlabs/Module/Settings.php:1199 +#: ../../Zotlabs/Module/Setup.php:518 msgid "" -"This channel frequently or regularly publishes adult content. (Please tag " -"any adult material and/or nudity with #NSFW)" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1201 -msgid "Security and Privacy Settings" +"Error: GD graphics PHP module with JPEG support required but not installed." msgstr "" -#: ../../Zotlabs/Module/Settings.php:1204 -msgid "Your permissions are already configured. Click to view/adjust" +#: ../../Zotlabs/Module/Setup.php:522 +msgid "Error: openssl PHP module required but not installed." msgstr "" -#: ../../Zotlabs/Module/Settings.php:1206 -msgid "Hide my online presence" +#: ../../Zotlabs/Module/Setup.php:526 +msgid "" +"Error: mysqli or postgres PHP module required but neither are installed." msgstr "" -#: ../../Zotlabs/Module/Settings.php:1206 -msgid "Prevents displaying in your profile that you are online" +#: ../../Zotlabs/Module/Setup.php:530 +msgid "Error: mb_string PHP module required but not installed." msgstr "" -#: ../../Zotlabs/Module/Settings.php:1208 -msgid "Simple Privacy Settings:" +#: ../../Zotlabs/Module/Setup.php:534 +msgid "Error: xml PHP module required for DAV but not installed." msgstr "" -#: ../../Zotlabs/Module/Settings.php:1209 +#: ../../Zotlabs/Module/Setup.php:552 msgid "" -"Very Public - <em>extremely permissive (should be used with caution)</em>" +"The web installer needs to be able to create a file called \".htconfig.php\" " +"in the top folder of your web server and it is unable to do so." msgstr "" -#: ../../Zotlabs/Module/Settings.php:1210 +#: ../../Zotlabs/Module/Setup.php:553 msgid "" -"Typical - <em>default public, privacy when desired (similar to social " -"network permissions but with improved privacy)</em>" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1211 -msgid "Private - <em>default private, never open or public</em>" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1212 -msgid "Blocked - <em>default blocked to/from everybody</em>" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1214 -msgid "Allow others to tag your posts" +"This is most often a permission setting, as the web server may not be able " +"to write files in your folder - even if you can." msgstr "" -#: ../../Zotlabs/Module/Settings.php:1214 +#: ../../Zotlabs/Module/Setup.php:554 msgid "" -"Often used by the community to retro-actively flag inappropriate content" +"At the end of this procedure, we will give you a text to save in a file " +"named .htconfig.php in your Red top folder." msgstr "" -#: ../../Zotlabs/Module/Settings.php:1216 -msgid "Advanced Privacy Settings" +#: ../../Zotlabs/Module/Setup.php:555 +msgid "" +"You can alternatively skip this procedure and perform a manual installation. " +"Please see the file \"install/INSTALL.txt\" for instructions." msgstr "" -#: ../../Zotlabs/Module/Settings.php:1218 -msgid "Expire other channel content after this many days" +#: ../../Zotlabs/Module/Setup.php:558 +msgid ".htconfig.php is writable" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1218 -msgid "0 or blank to use the website limit." +#: ../../Zotlabs/Module/Setup.php:572 +msgid "" +"Red uses the Smarty3 template engine to render its web views. Smarty3 " +"compiles templates to PHP to speed up rendering." msgstr "" -#: ../../Zotlabs/Module/Settings.php:1218 +#: ../../Zotlabs/Module/Setup.php:573 #, php-format -msgid "This website expires after %d days." -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1218 -msgid "This website does not expire imported content." -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1218 -msgid "The website limit takes precedence if lower than your limit." -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1219 -msgid "Maximum Friend Requests/Day:" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1219 -msgid "May reduce spam activity" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1220 -msgid "Default Post and Publish Permissions" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1221 ../../Zotlabs/Module/Mitem.php:154 -#: ../../Zotlabs/Module/Mitem.php:231 -msgid "(click to open/close)" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1222 -msgid "Use my default audience setting for the type of object published" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1229 -msgid "Channel permissions category:" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1235 -msgid "Maximum private messages per day from unknown people:" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1235 -msgid "Useful to reduce spamming" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1238 -msgid "Notification Settings" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1239 -msgid "By default post a status message when:" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1240 -msgid "accepting a friend request" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1241 -msgid "joining a forum/community" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1242 -msgid "making an <em>interesting</em> profile change" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1243 -msgid "Send a notification email when:" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1244 -msgid "You receive a connection request" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1245 -msgid "Your connections are confirmed" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1246 -msgid "Someone writes on your profile wall" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1247 -msgid "Someone writes a followup comment" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1248 -msgid "You receive a private message" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1249 -msgid "You receive a friend suggestion" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1250 -msgid "You are tagged in a post" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1251 -msgid "You are poked/prodded/etc. in a post" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1254 -msgid "Show visual notifications including:" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1256 -msgid "Unseen grid activity" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1257 -msgid "Unseen channel activity" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1258 -msgid "Unseen private messages" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1258 -#: ../../Zotlabs/Module/Settings.php:1263 -#: ../../Zotlabs/Module/Settings.php:1264 -#: ../../Zotlabs/Module/Settings.php:1265 -msgid "Recommended" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1259 -msgid "Upcoming events" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1260 -msgid "Events today" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1261 -msgid "Upcoming birthdays" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1261 -msgid "Not available in all themes" +msgid "" +"In order to store these compiled templates, the web server needs to have " +"write access to the directory %s under the top level web folder." msgstr "" -#: ../../Zotlabs/Module/Settings.php:1262 -msgid "System (personal) notifications" +#: ../../Zotlabs/Module/Setup.php:574 ../../Zotlabs/Module/Setup.php:595 +msgid "" +"Please ensure that the user that your web server runs as (e.g. www-data) has " +"write access to this folder." msgstr "" -#: ../../Zotlabs/Module/Settings.php:1263 -msgid "System info messages" +#: ../../Zotlabs/Module/Setup.php:575 +#, php-format +msgid "" +"Note: as a security measure, you should give the web server write access to " +"%s only--not the template files (.tpl) that it contains." msgstr "" -#: ../../Zotlabs/Module/Settings.php:1264 -msgid "System critical alerts" +#: ../../Zotlabs/Module/Setup.php:578 +#, php-format +msgid "%s is writable" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1265 -msgid "New connections" +#: ../../Zotlabs/Module/Setup.php:594 +msgid "" +"This software uses the store directory to save uploaded files. The web " +"server needs to have write access to the store directory under the Red top " +"level folder" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1266 -msgid "System Registrations" +#: ../../Zotlabs/Module/Setup.php:598 +msgid "store is writable" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1267 +#: ../../Zotlabs/Module/Setup.php:631 msgid "" -"Also show new wall posts, private messages and connections under Notices" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1269 -msgid "Notify me of events this many days in advance" +"SSL certificate cannot be validated. Fix certificate or disable https access " +"to this site." msgstr "" -#: ../../Zotlabs/Module/Settings.php:1269 -msgid "Must be greater than 0" +#: ../../Zotlabs/Module/Setup.php:632 +msgid "" +"If you have https access to your website or allow connections to TCP port " +"443 (the https: port), you MUST use a browser-valid certificate. You MUST " +"NOT use self-signed certificates!" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1271 -msgid "Advanced Account/Page Type Settings" +#: ../../Zotlabs/Module/Setup.php:633 +msgid "" +"This restriction is incorporated because public posts from you may for " +"example contain references to images on your own hub." msgstr "" -#: ../../Zotlabs/Module/Settings.php:1272 -msgid "Change the behaviour of this account for special situations" +#: ../../Zotlabs/Module/Setup.php:634 +msgid "" +"If your certificate is not recognized, members of other sites (who may " +"themselves have valid certificates) will get a warning message on their own " +"site complaining about security issues." msgstr "" -#: ../../Zotlabs/Module/Settings.php:1275 +#: ../../Zotlabs/Module/Setup.php:635 msgid "" -"Please enable expert mode (in <a href=\"settings/features\">Settings > " -"Additional features</a>) to adjust!" +"This can cause usability issues elsewhere (not just on your own site) so we " +"must insist on this requirement." msgstr "" -#: ../../Zotlabs/Module/Settings.php:1276 -msgid "Miscellaneous Settings" +#: ../../Zotlabs/Module/Setup.php:636 +msgid "" +"Providers are available that issue free certificates which are browser-valid." msgstr "" -#: ../../Zotlabs/Module/Settings.php:1277 -msgid "Default photo upload folder" +#: ../../Zotlabs/Module/Setup.php:638 +msgid "" +"If you are confident that the certificate is valid and signed by a trusted " +"authority, check to see if you have failed to install an intermediate cert. " +"These are not normally required by browsers, but are required for server-to-" +"server communications." msgstr "" -#: ../../Zotlabs/Module/Settings.php:1277 -#: ../../Zotlabs/Module/Settings.php:1278 -msgid "%Y - current year, %m - current month" +#: ../../Zotlabs/Module/Setup.php:641 +msgid "SSL certificate validation" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1278 -msgid "Default file upload folder" +#: ../../Zotlabs/Module/Setup.php:647 +msgid "" +"Url rewrite in .htaccess is not working. Check your server configuration." +"Test: " msgstr "" -#: ../../Zotlabs/Module/Settings.php:1280 -msgid "Personal menu to display in your channel pages" +#: ../../Zotlabs/Module/Setup.php:650 +msgid "Url rewrite is working" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1281 ../../Zotlabs/Module/Removeme.php:64 -msgid "Remove Channel" +#: ../../Zotlabs/Module/Setup.php:659 +msgid "" +"The database configuration file \".htconfig.php\" could not be written. " +"Please use the enclosed text to create a configuration file in your web " +"server root." msgstr "" -#: ../../Zotlabs/Module/Settings.php:1282 -msgid "Remove this channel." +#: ../../Zotlabs/Module/Setup.php:683 +msgid "Errors encountered creating database tables." msgstr "" -#: ../../Zotlabs/Module/Settings.php:1283 -msgid "Firefox Share $Projectname provider" +#: ../../Zotlabs/Module/Setup.php:720 +msgid "<h1>What next</h1>" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1284 -msgid "Start calendar week on monday" +#: ../../Zotlabs/Module/Setup.php:721 +msgid "" +"IMPORTANT: You will need to [manually] setup a scheduled task for the poller." msgstr "" #: ../../Zotlabs/Module/Admin.php:77 @@ -4377,6 +3623,10 @@ msgstr "" msgid "Default" msgstr "" +#: ../../Zotlabs/Module/Admin.php:410 ../../Zotlabs/Module/Settings.php:987 +msgid "mobile" +msgstr "" + #: ../../Zotlabs/Module/Admin.php:412 msgid "experimental" msgstr "" @@ -4691,6 +3941,16 @@ msgstr "" msgid "0 for no expiration of imported content" msgstr "" +#: ../../Zotlabs/Module/Admin.php:677 ../../Zotlabs/Module/Admin.php:678 +#: ../../Zotlabs/Module/Settings.php:903 +msgid "Off" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:677 ../../Zotlabs/Module/Admin.php:678 +#: ../../Zotlabs/Module/Settings.php:903 +msgid "On" +msgstr "" + #: ../../Zotlabs/Module/Admin.php:678 #, php-format msgid "Lock feature %s" @@ -5042,7 +4302,7 @@ msgstr "" msgid "Disallow Code" msgstr "" -#: ../../Zotlabs/Module/Admin.php:1218 ../../include/conversation.php:1631 +#: ../../Zotlabs/Module/Admin.php:1218 ../../include/conversation.php:1641 msgid "Channel" msgstr "" @@ -5090,8 +4350,8 @@ msgid "Toggle" msgstr "" #: ../../Zotlabs/Module/Admin.php:1332 ../../Zotlabs/Module/Admin.php:1615 -#: ../../Zotlabs/Lib/Apps.php:216 ../../include/nav.php:212 -#: ../../include/widgets.php:647 +#: ../../Zotlabs/Lib/Apps.php:216 ../../include/widgets.php:647 +#: ../../include/nav.php:212 msgid "Settings" msgstr "" @@ -5163,10 +4423,20 @@ msgstr "" msgid "Install a New Plugin Repository" msgstr "" +#: ../../Zotlabs/Module/Admin.php:1435 ../../Zotlabs/Module/Settings.php:72 +#: ../../Zotlabs/Module/Settings.php:708 ../../Zotlabs/Lib/Apps.php:334 +msgid "Update" +msgstr "" + #: ../../Zotlabs/Module/Admin.php:1436 msgid "Switch branch" msgstr "" +#: ../../Zotlabs/Module/Admin.php:1437 ../../Zotlabs/Module/Photos.php:1000 +#: ../../Zotlabs/Module/Tagrm.php:137 +msgid "Remove" +msgstr "" + #: ../../Zotlabs/Module/Admin.php:1550 msgid "No themes found." msgstr "" @@ -5447,81 +4717,22 @@ msgid "" "to correctly use this feature." msgstr "" -#: ../../Zotlabs/Module/Wiki.php:34 -msgid "Not found" +#: ../../Zotlabs/Module/Api.php:60 ../../Zotlabs/Module/Api.php:81 +msgid "Authorize application connection" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:97 ../../Zotlabs/Lib/Apps.php:219 -#: ../../include/features.php:57 ../../include/nav.php:110 -#: ../../include/conversation.php:1715 ../../include/conversation.php:1718 -msgid "Wiki" +#: ../../Zotlabs/Module/Api.php:61 +msgid "Return to your app and insert this Security Code:" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:98 -msgid "Sandbox" +#: ../../Zotlabs/Module/Api.php:71 +msgid "Please login to continue." msgstr "" -#: ../../Zotlabs/Module/Wiki.php:100 +#: ../../Zotlabs/Module/Api.php:83 msgid "" -"\"# Wiki Sandbox\\n\\nContent you **edit** and **preview** here *will not be " -"saved*.\"" -msgstr "" - -#: ../../Zotlabs/Module/Wiki.php:169 -msgid "Revision Comparison" -msgstr "" - -#: ../../Zotlabs/Module/Wiki.php:170 -msgid "Revert" -msgstr "" - -#: ../../Zotlabs/Module/Wiki.php:201 -msgid "Enter the name of your new wiki:" -msgstr "" - -#: ../../Zotlabs/Module/Wiki.php:202 -msgid "Enter the name of the new page:" -msgstr "" - -#: ../../Zotlabs/Module/Wiki.php:203 -msgid "Enter the new name:" -msgstr "" - -#: ../../Zotlabs/Module/Wiki.php:209 ../../include/conversation.php:1151 -msgid "Embed image from photo albums" -msgstr "" - -#: ../../Zotlabs/Module/Wiki.php:210 ../../include/conversation.php:1235 -msgid "Embed an image from your albums" -msgstr "" - -#: ../../Zotlabs/Module/Wiki.php:212 ../../include/conversation.php:1237 -#: ../../include/conversation.php:1278 -msgid "OK" -msgstr "" - -#: ../../Zotlabs/Module/Wiki.php:213 ../../include/conversation.php:1187 -msgid "Choose images to embed" -msgstr "" - -#: ../../Zotlabs/Module/Wiki.php:214 ../../include/conversation.php:1188 -msgid "Choose an album" -msgstr "" - -#: ../../Zotlabs/Module/Wiki.php:215 ../../include/conversation.php:1189 -msgid "Choose a different album..." -msgstr "" - -#: ../../Zotlabs/Module/Wiki.php:216 ../../include/conversation.php:1190 -msgid "Error getting album list" -msgstr "" - -#: ../../Zotlabs/Module/Wiki.php:217 ../../include/conversation.php:1191 -msgid "Error getting photo link" -msgstr "" - -#: ../../Zotlabs/Module/Wiki.php:218 ../../include/conversation.php:1192 -msgid "Error getting album" +"Do you want to authorize this application to access your posts and contacts, " +"and/or create new posts for you?" msgstr "" #: ../../Zotlabs/Module/Siteinfo.php:19 @@ -5590,6 +4801,12 @@ msgstr "" msgid "Block Title" msgstr "" +#: ../../Zotlabs/Module/Blocks.php:161 ../../Zotlabs/Module/Layouts.php:193 +#: ../../Zotlabs/Module/Photos.php:1078 ../../Zotlabs/Module/Webpages.php:218 +#: ../../include/conversation.php:1226 +msgid "Share" +msgstr "" + #: ../../Zotlabs/Module/Layouts.php:183 ../../include/text.php:2264 msgid "Layouts" msgstr "" @@ -5648,6 +4865,14 @@ msgstr "" msgid "Rate" msgstr "" +#: ../../Zotlabs/Module/Profile_photo.php:115 +#: ../../Zotlabs/Module/Profile_photo.php:212 +#: ../../Zotlabs/Module/Profile_photo.php:311 +#: ../../Zotlabs/Module/Photos.php:97 ../../Zotlabs/Module/Photos.php:745 +#: ../../include/photo/photo_driver.php:718 +msgid "Profile Photos" +msgstr "" + #: ../../Zotlabs/Module/Profile_photo.php:186 msgid "" "Shift-reload the page or clear browser cache if the new photo does not " @@ -5678,321 +4903,401 @@ msgstr "" msgid "No connections in common." msgstr "" -#: ../../Zotlabs/Module/Register.php:49 -msgid "Maximum daily site registrations exceeded. Please try again tomorrow." +#: ../../Zotlabs/Module/Rmagic.php:35 +msgid "Authentication failed." msgstr "" -#: ../../Zotlabs/Module/Register.php:55 -msgid "" -"Please indicate acceptance of the Terms of Service. Registration failed." +#: ../../Zotlabs/Module/Rmagic.php:75 +msgid "Remote Authentication" msgstr "" -#: ../../Zotlabs/Module/Register.php:89 -msgid "Passwords do not match." +#: ../../Zotlabs/Module/Rmagic.php:76 +msgid "Enter your channel address (e.g. channel@example.com)" msgstr "" -#: ../../Zotlabs/Module/Register.php:131 -msgid "" -"Registration successful. Please check your email for validation instructions." +#: ../../Zotlabs/Module/Rmagic.php:77 +msgid "Authenticate" msgstr "" -#: ../../Zotlabs/Module/Register.php:137 -msgid "Your registration is pending approval by the site owner." +#: ../../Zotlabs/Module/Ratings.php:73 +msgid "No ratings" msgstr "" -#: ../../Zotlabs/Module/Register.php:140 -msgid "Your registration can not be processed." +#: ../../Zotlabs/Module/Ratings.php:104 +msgid "Rating: " msgstr "" -#: ../../Zotlabs/Module/Register.php:184 -msgid "Registration on this hub is disabled." +#: ../../Zotlabs/Module/Ratings.php:105 +msgid "Website: " msgstr "" -#: ../../Zotlabs/Module/Register.php:193 -msgid "Registration on this hub is by approval only." +#: ../../Zotlabs/Module/Ratings.php:107 +msgid "Description: " msgstr "" -#: ../../Zotlabs/Module/Register.php:194 -msgid "<a href=\"pubsites\">Register at another affiliated hub.</a>" +#: ../../Zotlabs/Module/Apps.php:47 ../../include/widgets.php:102 +#: ../../include/nav.php:167 +msgid "Apps" msgstr "" -#: ../../Zotlabs/Module/Register.php:204 +#: ../../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:216 +msgid "Privacy group is empty" +msgstr "" + +#: ../../Zotlabs/Module/Network.php:225 +msgid "Privacy group: " +msgstr "" + +#: ../../Zotlabs/Module/Network.php:251 +msgid "Invalid connection." +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 "" -"This site has exceeded the number of allowed daily account registrations. " -"Please try again tomorrow." +"Please enter your restrictions or conditions, such as paypal receipt, usage " +"guidelines, etc." msgstr "" -#: ../../Zotlabs/Module/Register.php:215 -msgid "Terms of Service" +#: ../../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/Register.php:221 -#, php-format -msgid "I accept the %s for this website" +#: ../../Zotlabs/Module/Connect.php:96 +msgid "" +"Potential connections will then see the following text before proceeding:" msgstr "" -#: ../../Zotlabs/Module/Register.php:223 -#, php-format -msgid "I am over 13 years of age and accept the %s for this website" +#: ../../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/Register.php:227 -msgid "Your email address" +#: ../../Zotlabs/Module/Connect.php:106 +msgid "(No specific instructions have been provided by the channel owner.)" msgstr "" -#: ../../Zotlabs/Module/Register.php:228 -msgid "Choose a password" +#: ../../Zotlabs/Module/Connect.php:114 +msgid "Restricted or Premium Channel" msgstr "" -#: ../../Zotlabs/Module/Register.php:229 -msgid "Please re-enter your password" +#: ../../Zotlabs/Module/Rbmark.php:94 +msgid "Select a bookmark folder" msgstr "" -#: ../../Zotlabs/Module/Register.php:230 -msgid "Please enter your invitation code" +#: ../../Zotlabs/Module/Rbmark.php:99 +msgid "Save Bookmark" msgstr "" -#: ../../Zotlabs/Module/Register.php:236 -msgid "no" +#: ../../Zotlabs/Module/Rbmark.php:100 +msgid "URL of bookmark" msgstr "" -#: ../../Zotlabs/Module/Register.php:236 -msgid "yes" +#: ../../Zotlabs/Module/Rbmark.php:105 +msgid "Or enter new bookmark folder name" msgstr "" -#: ../../Zotlabs/Module/Register.php:253 -msgid "Membership on this site is by invitation only." +#: ../../Zotlabs/Module/Photos.php:82 +msgid "Page owner information could not be retrieved." msgstr "" -#: ../../Zotlabs/Module/Register.php:265 ../../include/nav.php:151 -#: ../../boot.php:1695 -msgid "Register" +#: ../../Zotlabs/Module/Photos.php:103 ../../Zotlabs/Module/Photos.php:147 +msgid "Album not found." msgstr "" -#: ../../Zotlabs/Module/Register.php:266 +#: ../../Zotlabs/Module/Photos.php:130 +msgid "Delete Album" +msgstr "" + +#: ../../Zotlabs/Module/Photos.php:151 msgid "" -"This site may require email verification after submitting this form. If you " -"are returned to a login page, please check your email for instructions." +"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/Ratings.php:73 -msgid "No ratings" +#: ../../Zotlabs/Module/Photos.php:208 ../../Zotlabs/Module/Photos.php:1059 +msgid "Delete Photo" msgstr "" -#: ../../Zotlabs/Module/Ratings.php:104 -msgid "Rating: " +#: ../../Zotlabs/Module/Photos.php:531 +msgid "No photos selected" msgstr "" -#: ../../Zotlabs/Module/Ratings.php:105 -msgid "Website: " +#: ../../Zotlabs/Module/Photos.php:580 +msgid "Access to this item is restricted." msgstr "" -#: ../../Zotlabs/Module/Ratings.php:107 -msgid "Description: " +#: ../../Zotlabs/Module/Photos.php:619 +#, php-format +msgid "%1$.2f MB of %2$.2f MB photo storage used." msgstr "" -#: ../../Zotlabs/Module/Apps.php:47 ../../include/nav.php:167 -#: ../../include/widgets.php:102 -msgid "Apps" +#: ../../Zotlabs/Module/Photos.php:622 +#, php-format +msgid "%1$.2f MB photo storage used." msgstr "" -#: ../../Zotlabs/Module/Mitem.php:52 -msgid "Unable to create element." +#: ../../Zotlabs/Module/Photos.php:658 +msgid "Upload Photos" msgstr "" -#: ../../Zotlabs/Module/Mitem.php:76 -msgid "Unable to update menu element." +#: ../../Zotlabs/Module/Photos.php:662 +msgid "Enter an album name" msgstr "" -#: ../../Zotlabs/Module/Mitem.php:92 -msgid "Unable to add menu element." +#: ../../Zotlabs/Module/Photos.php:663 +msgid "or select an existing album (doubleclick)" msgstr "" -#: ../../Zotlabs/Module/Mitem.php:153 ../../Zotlabs/Module/Mitem.php:230 -msgid "Menu Item Permissions" +#: ../../Zotlabs/Module/Photos.php:664 +msgid "Create a status post for this upload" msgstr "" -#: ../../Zotlabs/Module/Mitem.php:160 ../../Zotlabs/Module/Mitem.php:176 -msgid "Link Name" +#: ../../Zotlabs/Module/Photos.php:665 +msgid "Caption (optional):" msgstr "" -#: ../../Zotlabs/Module/Mitem.php:161 ../../Zotlabs/Module/Mitem.php:239 -msgid "Link or Submenu Target" +#: ../../Zotlabs/Module/Photos.php:666 +msgid "Description (optional):" msgstr "" -#: ../../Zotlabs/Module/Mitem.php:161 -msgid "Enter URL of the link or select a menu name to create a submenu" +#: ../../Zotlabs/Module/Photos.php:697 +msgid "Album name could not be decoded" msgstr "" -#: ../../Zotlabs/Module/Mitem.php:162 ../../Zotlabs/Module/Mitem.php:240 -msgid "Use magic-auth if available" +#: ../../Zotlabs/Module/Photos.php:745 +msgid "Contact Photos" msgstr "" -#: ../../Zotlabs/Module/Mitem.php:163 ../../Zotlabs/Module/Mitem.php:241 -msgid "Open link in new window" +#: ../../Zotlabs/Module/Photos.php:768 +msgid "Show Newest First" msgstr "" -#: ../../Zotlabs/Module/Mitem.php:164 ../../Zotlabs/Module/Mitem.php:242 -msgid "Order in list" +#: ../../Zotlabs/Module/Photos.php:770 +msgid "Show Oldest First" msgstr "" -#: ../../Zotlabs/Module/Mitem.php:164 ../../Zotlabs/Module/Mitem.php:242 -msgid "Higher numbers will sink to bottom of listing" +#: ../../Zotlabs/Module/Photos.php:794 ../../Zotlabs/Module/Photos.php:1337 +#: ../../Zotlabs/Module/Embedphotos.php:141 ../../include/widgets.php:1607 +msgid "View Photo" msgstr "" -#: ../../Zotlabs/Module/Mitem.php:165 -msgid "Submit and finish" +#: ../../Zotlabs/Module/Photos.php:825 +#: ../../Zotlabs/Module/Embedphotos.php:157 ../../include/widgets.php:1624 +msgid "Edit Album" msgstr "" -#: ../../Zotlabs/Module/Mitem.php:166 -msgid "Submit and continue" +#: ../../Zotlabs/Module/Photos.php:872 +msgid "Permission denied. Access to this item may be restricted." msgstr "" -#: ../../Zotlabs/Module/Mitem.php:174 -msgid "Menu:" +#: ../../Zotlabs/Module/Photos.php:874 +msgid "Photo not available" msgstr "" -#: ../../Zotlabs/Module/Mitem.php:177 -msgid "Link Target" +#: ../../Zotlabs/Module/Photos.php:932 +msgid "Use as profile photo" msgstr "" -#: ../../Zotlabs/Module/Mitem.php:180 -msgid "Edit menu" +#: ../../Zotlabs/Module/Photos.php:933 +msgid "Use as cover photo" msgstr "" -#: ../../Zotlabs/Module/Mitem.php:183 -msgid "Edit element" +#: ../../Zotlabs/Module/Photos.php:940 +msgid "Private Photo" msgstr "" -#: ../../Zotlabs/Module/Mitem.php:184 -msgid "Drop element" +#: ../../Zotlabs/Module/Photos.php:955 +msgid "View Full Size" msgstr "" -#: ../../Zotlabs/Module/Mitem.php:185 -msgid "New element" +#: ../../Zotlabs/Module/Photos.php:1034 +msgid "Edit photo" msgstr "" -#: ../../Zotlabs/Module/Mitem.php:186 -msgid "Edit this menu container" +#: ../../Zotlabs/Module/Photos.php:1036 +msgid "Rotate CW (right)" msgstr "" -#: ../../Zotlabs/Module/Mitem.php:187 -msgid "Add menu element" +#: ../../Zotlabs/Module/Photos.php:1037 +msgid "Rotate CCW (left)" msgstr "" -#: ../../Zotlabs/Module/Mitem.php:188 -msgid "Delete this menu item" +#: ../../Zotlabs/Module/Photos.php:1040 +msgid "Enter a new album name" msgstr "" -#: ../../Zotlabs/Module/Mitem.php:189 -msgid "Edit this menu item" +#: ../../Zotlabs/Module/Photos.php:1041 +msgid "or select an existing one (doubleclick)" msgstr "" -#: ../../Zotlabs/Module/Mitem.php:206 -msgid "Menu item not found." +#: ../../Zotlabs/Module/Photos.php:1044 +msgid "Caption" msgstr "" -#: ../../Zotlabs/Module/Mitem.php:219 -msgid "Menu item deleted." +#: ../../Zotlabs/Module/Photos.php:1046 +msgid "Add a Tag" msgstr "" -#: ../../Zotlabs/Module/Mitem.php:221 -msgid "Menu item could not be deleted." +#: ../../Zotlabs/Module/Photos.php:1054 +msgid "Example: @bob, @Barbara_Jensen, @jim@example.com" msgstr "" -#: ../../Zotlabs/Module/Mitem.php:228 -msgid "Edit Menu Element" +#: ../../Zotlabs/Module/Photos.php:1057 +msgid "Flag as adult in album view" msgstr "" -#: ../../Zotlabs/Module/Mitem.php:238 -msgid "Link text" +#: ../../Zotlabs/Module/Photos.php:1076 ../../Zotlabs/Lib/ThreadItem.php:262 +msgid "I like this (toggle)" msgstr "" -#: ../../Zotlabs/Module/Connect.php:61 ../../Zotlabs/Module/Connect.php:109 -msgid "Continue" +#: ../../Zotlabs/Module/Photos.php:1077 ../../Zotlabs/Lib/ThreadItem.php:263 +msgid "I don't like this (toggle)" msgstr "" -#: ../../Zotlabs/Module/Connect.php:90 -msgid "Premium Channel Setup" +#: ../../Zotlabs/Module/Photos.php:1079 ../../Zotlabs/Lib/ThreadItem.php:398 +#: ../../include/conversation.php:743 +msgid "Please wait" msgstr "" -#: ../../Zotlabs/Module/Connect.php:92 -msgid "Enable premium channel connection restrictions" +#: ../../Zotlabs/Module/Photos.php:1095 ../../Zotlabs/Module/Photos.php:1213 +#: ../../Zotlabs/Lib/ThreadItem.php:708 +msgid "This is you" msgstr "" -#: ../../Zotlabs/Module/Connect.php:93 -msgid "" -"Please enter your restrictions or conditions, such as paypal receipt, usage " -"guidelines, etc." +#: ../../Zotlabs/Module/Photos.php:1097 ../../Zotlabs/Module/Photos.php:1215 +#: ../../Zotlabs/Lib/ThreadItem.php:710 ../../include/js_strings.php:6 +msgid "Comment" 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:" +#: ../../Zotlabs/Module/Photos.php:1113 ../../include/conversation.php:577 +msgctxt "title" +msgid "Likes" msgstr "" -#: ../../Zotlabs/Module/Connect.php:96 -msgid "" -"Potential connections will then see the following text before proceeding:" +#: ../../Zotlabs/Module/Photos.php:1113 ../../include/conversation.php:577 +msgctxt "title" +msgid "Dislikes" 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." +#: ../../Zotlabs/Module/Photos.php:1114 ../../include/conversation.php:578 +msgctxt "title" +msgid "Agree" msgstr "" -#: ../../Zotlabs/Module/Connect.php:106 -msgid "(No specific instructions have been provided by the channel owner.)" +#: ../../Zotlabs/Module/Photos.php:1114 ../../include/conversation.php:578 +msgctxt "title" +msgid "Disagree" msgstr "" -#: ../../Zotlabs/Module/Connect.php:114 -msgid "Restricted or Premium Channel" +#: ../../Zotlabs/Module/Photos.php:1114 ../../include/conversation.php:578 +msgctxt "title" +msgid "Abstain" msgstr "" -#: ../../Zotlabs/Module/Rbmark.php:94 -msgid "Select a bookmark folder" +#: ../../Zotlabs/Module/Photos.php:1115 ../../include/conversation.php:579 +msgctxt "title" +msgid "Attending" msgstr "" -#: ../../Zotlabs/Module/Rbmark.php:99 -msgid "Save Bookmark" +#: ../../Zotlabs/Module/Photos.php:1115 ../../include/conversation.php:579 +msgctxt "title" +msgid "Not attending" msgstr "" -#: ../../Zotlabs/Module/Rbmark.php:100 -msgid "URL of bookmark" +#: ../../Zotlabs/Module/Photos.php:1115 ../../include/conversation.php:579 +msgctxt "title" +msgid "Might attend" msgstr "" -#: ../../Zotlabs/Module/Rbmark.php:105 -msgid "Or enter new bookmark folder name" +#: ../../Zotlabs/Module/Photos.php:1132 ../../Zotlabs/Module/Photos.php:1144 +#: ../../Zotlabs/Lib/ThreadItem.php:181 ../../Zotlabs/Lib/ThreadItem.php:193 +#: ../../include/conversation.php:1753 +msgid "View all" msgstr "" -#: ../../Zotlabs/Module/Network.php:94 -msgid "No such group" +#: ../../Zotlabs/Module/Photos.php:1136 ../../Zotlabs/Lib/ThreadItem.php:185 +#: ../../include/conversation.php:1777 ../../include/taxonomy.php:403 +#: ../../include/channel.php:1182 +msgctxt "noun" +msgid "Like" +msgid_plural "Likes" +msgstr[0] "" +msgstr[1] "" + +#: ../../Zotlabs/Module/Photos.php:1141 ../../Zotlabs/Lib/ThreadItem.php:190 +#: ../../include/conversation.php:1780 +msgctxt "noun" +msgid "Dislike" +msgid_plural "Dislikes" +msgstr[0] "" +msgstr[1] "" + +#: ../../Zotlabs/Module/Photos.php:1241 +msgid "Photo Tools" msgstr "" -#: ../../Zotlabs/Module/Network.php:134 -msgid "No such channel" +#: ../../Zotlabs/Module/Photos.php:1250 +msgid "In This Photo:" msgstr "" -#: ../../Zotlabs/Module/Network.php:139 -msgid "forum" +#: ../../Zotlabs/Module/Photos.php:1255 +msgid "Map" msgstr "" -#: ../../Zotlabs/Module/Network.php:151 -msgid "Search Results For:" +#: ../../Zotlabs/Module/Photos.php:1263 ../../Zotlabs/Lib/ThreadItem.php:387 +msgctxt "noun" +msgid "Likes" msgstr "" -#: ../../Zotlabs/Module/Network.php:216 -msgid "Privacy group is empty" +#: ../../Zotlabs/Module/Photos.php:1264 ../../Zotlabs/Lib/ThreadItem.php:388 +msgctxt "noun" +msgid "Dislikes" msgstr "" -#: ../../Zotlabs/Module/Network.php:225 -msgid "Privacy group: " +#: ../../Zotlabs/Module/Photos.php:1269 ../../Zotlabs/Lib/ThreadItem.php:393 +#: ../../include/acl_selectors.php:188 +msgid "Close" msgstr "" -#: ../../Zotlabs/Module/Network.php:251 -msgid "Invalid connection." +#: ../../Zotlabs/Module/Photos.php:1343 +msgid "View Album" +msgstr "" + +#: ../../Zotlabs/Module/Photos.php:1354 ../../Zotlabs/Module/Photos.php:1367 +#: ../../Zotlabs/Module/Photos.php:1368 +msgid "Recent Photos" msgstr "" #: ../../Zotlabs/Module/Regmod.php:15 @@ -6042,6 +5347,11 @@ msgid "" "removed from the network" msgstr "" +#: ../../Zotlabs/Module/Removeaccount.php:61 +#: ../../Zotlabs/Module/Settings.php:797 +msgid "Remove Account" +msgstr "" + #: ../../Zotlabs/Module/Removeme.php:35 msgid "" "Channel removals are not allowed within 48 hours of changing the account " @@ -6066,6 +5376,10 @@ msgid "" "removed from the network" msgstr "" +#: ../../Zotlabs/Module/Removeme.php:64 ../../Zotlabs/Module/Settings.php:1323 +msgid "Remove Channel" +msgstr "" + #: ../../Zotlabs/Module/Uexport.php:55 ../../Zotlabs/Module/Uexport.php:56 msgid "Export Channel" msgstr "" @@ -6124,61 +5438,49 @@ msgid "" "or restore these in date order (oldest first)." msgstr "" -#: ../../Zotlabs/Module/Thing.php:114 -msgid "Thing updated" -msgstr "" - -#: ../../Zotlabs/Module/Thing.php:166 -msgid "Object store: failed" -msgstr "" - -#: ../../Zotlabs/Module/Thing.php:170 -msgid "Thing added" -msgstr "" - -#: ../../Zotlabs/Module/Thing.php:196 -#, php-format -msgid "OBJ: %1$s %2$s %3$s" +#: ../../Zotlabs/Module/Webpages.php:53 +msgid "Import Webpage Elements" msgstr "" -#: ../../Zotlabs/Module/Thing.php:259 -msgid "Show Thing" +#: ../../Zotlabs/Module/Webpages.php:54 +msgid "Import selected" msgstr "" -#: ../../Zotlabs/Module/Thing.php:266 -msgid "item not found." +#: ../../Zotlabs/Module/Webpages.php:214 ../../Zotlabs/Lib/Apps.php:218 +#: ../../include/conversation.php:1715 ../../include/nav.php:108 +msgid "Webpages" msgstr "" -#: ../../Zotlabs/Module/Thing.php:299 -msgid "Edit Thing" +#: ../../Zotlabs/Module/Webpages.php:225 ../../include/page_widgets.php:44 +msgid "Actions" msgstr "" -#: ../../Zotlabs/Module/Thing.php:301 ../../Zotlabs/Module/Thing.php:355 -msgid "Select a profile" +#: ../../Zotlabs/Module/Webpages.php:226 ../../include/page_widgets.php:45 +msgid "Page Link" msgstr "" -#: ../../Zotlabs/Module/Thing.php:305 ../../Zotlabs/Module/Thing.php:358 -msgid "Post an activity" +#: ../../Zotlabs/Module/Webpages.php:227 +msgid "Page Title" msgstr "" -#: ../../Zotlabs/Module/Thing.php:305 ../../Zotlabs/Module/Thing.php:358 -msgid "Only sends to viewers of the applicable profile" +#: ../../Zotlabs/Module/Webpages.php:258 +msgid "Invalid file type." msgstr "" -#: ../../Zotlabs/Module/Thing.php:307 ../../Zotlabs/Module/Thing.php:360 -msgid "Name of thing e.g. something" +#: ../../Zotlabs/Module/Webpages.php:270 +msgid "Error opening zip file" msgstr "" -#: ../../Zotlabs/Module/Thing.php:309 ../../Zotlabs/Module/Thing.php:361 -msgid "URL of thing (optional)" +#: ../../Zotlabs/Module/Webpages.php:281 +msgid "Invalid folder path." msgstr "" -#: ../../Zotlabs/Module/Thing.php:311 ../../Zotlabs/Module/Thing.php:362 -msgid "URL for photo of thing (optional)" +#: ../../Zotlabs/Module/Webpages.php:308 +msgid "No webpage elements detected." msgstr "" -#: ../../Zotlabs/Module/Thing.php:353 -msgid "Add Thing to your Profile" +#: ../../Zotlabs/Module/Webpages.php:382 +msgid "Import complete." msgstr "" #: ../../Zotlabs/Module/Search.php:216 @@ -6195,37 +5497,105 @@ msgstr "" msgid "No service class restrictions found." msgstr "" -#: ../../Zotlabs/Module/Rate.php:160 -msgid "Website:" +#: ../../Zotlabs/Module/Register.php:49 +msgid "Maximum daily site registrations exceeded. Please try again tomorrow." msgstr "" -#: ../../Zotlabs/Module/Rate.php:163 +#: ../../Zotlabs/Module/Register.php:55 +msgid "" +"Please indicate acceptance of the Terms of Service. Registration failed." +msgstr "" + +#: ../../Zotlabs/Module/Register.php:89 +msgid "Passwords do not match." +msgstr "" + +#: ../../Zotlabs/Module/Register.php:131 +msgid "" +"Registration successful. Please check your email for validation instructions." +msgstr "" + +#: ../../Zotlabs/Module/Register.php:137 +msgid "Your registration is pending approval by the site owner." +msgstr "" + +#: ../../Zotlabs/Module/Register.php:140 +msgid "Your registration can not be processed." +msgstr "" + +#: ../../Zotlabs/Module/Register.php:184 +msgid "Registration on this hub is disabled." +msgstr "" + +#: ../../Zotlabs/Module/Register.php:193 +msgid "Registration on this hub is by approval only." +msgstr "" + +#: ../../Zotlabs/Module/Register.php:194 +msgid "<a href=\"pubsites\">Register at another affiliated hub.</a>" +msgstr "" + +#: ../../Zotlabs/Module/Register.php:204 +msgid "" +"This site has exceeded the number of allowed daily account registrations. " +"Please try again tomorrow." +msgstr "" + +#: ../../Zotlabs/Module/Register.php:215 +msgid "Terms of Service" +msgstr "" + +#: ../../Zotlabs/Module/Register.php:221 #, php-format -msgid "Remote Channel [%s] (not yet known on this site)" +msgid "I accept the %s for this website" msgstr "" -#: ../../Zotlabs/Module/Rate.php:164 -msgid "Rating (this information is public)" +#: ../../Zotlabs/Module/Register.php:223 +#, php-format +msgid "I am over 13 years of age and accept the %s for this website" msgstr "" -#: ../../Zotlabs/Module/Rate.php:165 -msgid "Optionally explain your rating (this information is public)" +#: ../../Zotlabs/Module/Register.php:227 +msgid "Your email address" msgstr "" -#: ../../Zotlabs/Module/Rmagic.php:35 -msgid "Authentication failed." +#: ../../Zotlabs/Module/Register.php:228 +msgid "Choose a password" msgstr "" -#: ../../Zotlabs/Module/Rmagic.php:75 -msgid "Remote Authentication" +#: ../../Zotlabs/Module/Register.php:229 +msgid "Please re-enter your password" msgstr "" -#: ../../Zotlabs/Module/Rmagic.php:76 -msgid "Enter your channel address (e.g. channel@example.com)" +#: ../../Zotlabs/Module/Register.php:230 +msgid "Please enter your invitation code" msgstr "" -#: ../../Zotlabs/Module/Rmagic.php:77 -msgid "Authenticate" +#: ../../Zotlabs/Module/Register.php:236 +msgid "no" +msgstr "" + +#: ../../Zotlabs/Module/Register.php:236 +msgid "yes" +msgstr "" + +#: ../../Zotlabs/Module/Register.php:253 +msgid "Membership on this site is by invitation only." +msgstr "" + +#: ../../Zotlabs/Module/Register.php:265 ../../include/nav.php:151 +#: ../../boot.php:1695 +msgid "Register" +msgstr "" + +#: ../../Zotlabs/Module/Register.php:266 +msgid "" +"This site may require email verification after submitting this form. If you " +"are returned to a login page, please check your email for instructions." +msgstr "" + +#: ../../Zotlabs/Module/Rpost.php:135 ../../Zotlabs/Module/Editpost.php:106 +msgid "Edit post" msgstr "" #: ../../Zotlabs/Module/Sharedwithme.php:98 @@ -6244,8 +5614,12 @@ msgstr "" msgid "Remove this file" msgstr "" -#: ../../Zotlabs/Module/Follow.php:34 -msgid "Channel added." +#: ../../Zotlabs/Module/Acl.php:312 +msgid "network" +msgstr "" + +#: ../../Zotlabs/Module/Acl.php:322 +msgid "RSS" msgstr "" #: ../../Zotlabs/Module/Sources.php:37 @@ -6301,6 +5675,11 @@ msgid "" "separated)" msgstr "" +#: ../../Zotlabs/Module/Sources.php:112 ../../Zotlabs/Module/Sources.php:147 +#: ../../Zotlabs/Module/Settings.php:688 +msgid "Optional" +msgstr "" + #: ../../Zotlabs/Module/Sources.php:133 ../../Zotlabs/Module/Sources.php:161 msgid "Source not found." msgstr "" @@ -6345,8 +5724,8 @@ msgstr "" msgid "post" msgstr "" -#: ../../Zotlabs/Module/Tagger.php:57 ../../include/text.php:1953 -#: ../../include/conversation.php:150 +#: ../../Zotlabs/Module/Tagger.php:57 ../../include/conversation.php:150 +#: ../../include/text.php:1953 msgid "comment" msgstr "" @@ -6367,94 +5746,718 @@ msgstr "" msgid "Select a tag to remove: " msgstr "" -#: ../../Zotlabs/Module/Api.php:60 ../../Zotlabs/Module/Api.php:81 -msgid "Authorize application connection" +#: ../../Zotlabs/Module/Dreport.php:44 +msgid "Invalid message" msgstr "" -#: ../../Zotlabs/Module/Api.php:61 -msgid "Return to your app and insert this Security Code:" +#: ../../Zotlabs/Module/Dreport.php:76 +msgid "no results" msgstr "" -#: ../../Zotlabs/Module/Api.php:71 -msgid "Please login to continue." +#: ../../Zotlabs/Module/Dreport.php:91 +msgid "channel sync processed" msgstr "" -#: ../../Zotlabs/Module/Api.php:83 +#: ../../Zotlabs/Module/Dreport.php:95 +msgid "queued" +msgstr "" + +#: ../../Zotlabs/Module/Dreport.php:99 +msgid "posted" +msgstr "" + +#: ../../Zotlabs/Module/Dreport.php:103 +msgid "accepted for delivery" +msgstr "" + +#: ../../Zotlabs/Module/Dreport.php:107 +msgid "updated" +msgstr "" + +#: ../../Zotlabs/Module/Dreport.php:110 +msgid "update ignored" +msgstr "" + +#: ../../Zotlabs/Module/Dreport.php:113 +msgid "permission denied" +msgstr "" + +#: ../../Zotlabs/Module/Dreport.php:117 +msgid "recipient not found" +msgstr "" + +#: ../../Zotlabs/Module/Dreport.php:120 +msgid "mail recalled" +msgstr "" + +#: ../../Zotlabs/Module/Dreport.php:123 +msgid "duplicate mail received" +msgstr "" + +#: ../../Zotlabs/Module/Dreport.php:126 +msgid "mail delivered" +msgstr "" + +#: ../../Zotlabs/Module/Dreport.php:146 +#, php-format +msgid "Delivery report for %1$s" +msgstr "" + +#: ../../Zotlabs/Module/Dreport.php:149 +msgid "Options" +msgstr "" + +#: ../../Zotlabs/Module/Dreport.php:150 +msgid "Redeliver" +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:184 +msgid "Token saved." +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:312 +msgid "Not valid email." +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:315 +msgid "Protected email address. Cannot change to that email." +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:324 +msgid "System failure storing new email. Please try again." +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:341 +msgid "Password verification failed." +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:348 +msgid "Passwords do not match. Password unchanged." +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:352 +msgid "Empty passwords are not allowed. Password unchanged." +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:366 +msgid "Password changed." +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:368 +msgid "Password update failed. Please try again." +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:617 +msgid "Settings updated." +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:681 ../../Zotlabs/Module/Settings.php:707 +#: ../../Zotlabs/Module/Settings.php:743 +msgid "Add application" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:684 +msgid "Name of application" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:685 ../../Zotlabs/Module/Settings.php:711 +msgid "Consumer Key" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:685 ../../Zotlabs/Module/Settings.php:686 +msgid "Automatically generated - change if desired. Max length 20" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:686 ../../Zotlabs/Module/Settings.php:712 +msgid "Consumer Secret" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:687 ../../Zotlabs/Module/Settings.php:713 +msgid "Redirect" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:687 msgid "" -"Do you want to authorize this application to access your posts and contacts, " -"and/or create new posts for you?" +"Redirect URI - leave blank unless your application specifically requires this" msgstr "" -#: ../../Zotlabs/Module/Import.php:33 +#: ../../Zotlabs/Module/Settings.php:688 ../../Zotlabs/Module/Settings.php:714 +msgid "Icon url" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:699 +msgid "Application not found." +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:742 +msgid "Connected Apps" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:746 +msgid "Client key starts with" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:747 +msgid "No name" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:748 +msgid "Remove authorization" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:761 +msgid "No feature settings configured" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:768 +msgid "Feature/Addon Settings" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:791 +msgid "Account Settings" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:792 +msgid "Current Password" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:793 +msgid "Enter New Password" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:794 +msgid "Confirm New Password" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:794 +msgid "Leave password fields blank unless changing" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:796 +#: ../../Zotlabs/Module/Settings.php:1236 +msgid "Email Address:" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:798 +msgid "Remove this account including all its channels" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:832 +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 private content." +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:834 +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:869 ../../include/widgets.php:614 +msgid "Guest Access Tokens" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:876 +msgid "Login Name" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:877 +msgid "Login Password" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:878 +msgid "Expires (yyyy-mm-dd)" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:910 +msgid "Additional Features" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:934 +msgid "Connector Settings" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:981 +msgid "No special theme for mobile devices" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:984 #, php-format -msgid "Your service plan only allows %d channels." +msgid "%s - (Experimental)" msgstr "" -#: ../../Zotlabs/Module/Import.php:153 ../../include/import.php:107 -msgid "Cloned channel not found. Import failed." +#: ../../Zotlabs/Module/Settings.php:1035 +msgid "Display Settings" msgstr "" -#: ../../Zotlabs/Module/Import.php:163 -msgid "No channel. Import failed." +#: ../../Zotlabs/Module/Settings.php:1036 +msgid "Theme Settings" msgstr "" -#: ../../Zotlabs/Module/Import.php:520 -#: ../../include/Import/import_diaspora.php:142 -msgid "Import completed." +#: ../../Zotlabs/Module/Settings.php:1037 +msgid "Custom Theme Settings" msgstr "" -#: ../../Zotlabs/Module/Import.php:542 -msgid "You must be logged in to use this feature." +#: ../../Zotlabs/Module/Settings.php:1038 +msgid "Content Settings" msgstr "" -#: ../../Zotlabs/Module/Import.php:547 -msgid "Import Channel" +#: ../../Zotlabs/Module/Settings.php:1044 +msgid "Display Theme:" msgstr "" -#: ../../Zotlabs/Module/Import.php:548 +#: ../../Zotlabs/Module/Settings.php:1045 +msgid "Select scheme" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1047 +msgid "Mobile Theme:" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1048 +msgid "Preload images before rendering the page" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1048 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." +"The subjective page load time will be longer but the page will be ready when " +"displayed" msgstr "" -#: ../../Zotlabs/Module/Import.php:550 -msgid "Or provide the old server/hub details" +#: ../../Zotlabs/Module/Settings.php:1049 +msgid "Enable user zoom on mobile devices" msgstr "" -#: ../../Zotlabs/Module/Import.php:551 -msgid "Your old identity address (xyz@example.com)" +#: ../../Zotlabs/Module/Settings.php:1050 +msgid "Update browser every xx seconds" msgstr "" -#: ../../Zotlabs/Module/Import.php:552 -msgid "Your old login email address" +#: ../../Zotlabs/Module/Settings.php:1050 +msgid "Minimum of 10 seconds, no maximum" msgstr "" -#: ../../Zotlabs/Module/Import.php:553 -msgid "Your old login password" +#: ../../Zotlabs/Module/Settings.php:1051 +msgid "Maximum number of conversations to load at any time:" msgstr "" -#: ../../Zotlabs/Module/Import.php:554 +#: ../../Zotlabs/Module/Settings.php:1051 +msgid "Maximum of 100 items" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1052 +msgid "Show emoticons (smilies) as images" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1053 +msgid "Link post titles to source" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1054 +msgid "System Page Layout Editor - (advanced)" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1057 +msgid "Use blog/list mode on channel page" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1057 +#: ../../Zotlabs/Module/Settings.php:1058 +msgid "(comments displayed separately)" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1058 +msgid "Use blog/list mode on grid page" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1059 +msgid "Channel page max height of content (in pixels)" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1059 +#: ../../Zotlabs/Module/Settings.php:1060 +msgid "click to expand content exceeding this height" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1060 +msgid "Grid page max height of content (in pixels)" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1090 +msgid "Nobody except yourself" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1091 +msgid "Only those you specifically allow" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1092 +msgid "Approved connections" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1093 +msgid "Any connections" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1094 +msgid "Anybody on this website" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1095 +msgid "Anybody in this network" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1096 +msgid "Anybody authenticated" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1097 +msgid "Anybody on the internet" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1171 +msgid "Publish your default profile in the network directory" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1176 +msgid "Allow us to suggest you as a potential friend to new members?" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1185 +msgid "Your channel address is" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1227 +msgid "Channel Settings" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1234 +msgid "Basic Settings" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1235 ../../include/channel.php:1164 +msgid "Full Name:" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1237 +msgid "Your Timezone:" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1238 +msgid "Default Post Location:" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1238 +msgid "Geographical location to display on your posts" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1239 +msgid "Use Browser Location:" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1241 +msgid "Adult Content" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1241 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." +"This channel frequently or regularly publishes adult content. (Please tag " +"any adult material and/or nudity with #NSFW)" msgstr "" -#: ../../Zotlabs/Module/Import.php:555 -msgid "Make this hub my primary location" +#: ../../Zotlabs/Module/Settings.php:1243 +msgid "Security and Privacy Settings" msgstr "" -#: ../../Zotlabs/Module/Import.php:556 +#: ../../Zotlabs/Module/Settings.php:1246 +msgid "Your permissions are already configured. Click to view/adjust" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1248 +msgid "Hide my online presence" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1248 +msgid "Prevents displaying in your profile that you are online" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1250 +msgid "Simple Privacy Settings:" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1251 msgid "" -"Import existing posts if possible (experimental - limited by available memory" +"Very Public - <em>extremely permissive (should be used with caution)</em>" msgstr "" -#: ../../Zotlabs/Module/Import.php:557 +#: ../../Zotlabs/Module/Settings.php:1252 msgid "" -"This process may take several minutes to complete. Please submit the form " -"only once and leave this page open until finished." +"Typical - <em>default public, privacy when desired (similar to social " +"network permissions but with improved privacy)</em>" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1253 +msgid "Private - <em>default private, never open or public</em>" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1254 +msgid "Blocked - <em>default blocked to/from everybody</em>" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1256 +msgid "Allow others to tag your posts" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1256 +msgid "" +"Often used by the community to retro-actively flag inappropriate content" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1258 +msgid "Advanced Privacy Settings" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1260 +msgid "Expire other channel content after this many days" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1260 +msgid "0 or blank to use the website limit." +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1260 +#, php-format +msgid "This website expires after %d days." +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1260 +msgid "This website does not expire imported content." +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1260 +msgid "The website limit takes precedence if lower than your limit." +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1261 +msgid "Maximum Friend Requests/Day:" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1261 +msgid "May reduce spam activity" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1262 +msgid "Default Post and Publish Permissions" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1264 +msgid "Use my default audience setting for the type of object published" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1271 +msgid "Channel permissions category:" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1277 +msgid "Maximum private messages per day from unknown people:" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1277 +msgid "Useful to reduce spamming" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1280 +msgid "Notification Settings" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1281 +msgid "By default post a status message when:" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1282 +msgid "accepting a friend request" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1283 +msgid "joining a forum/community" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1284 +msgid "making an <em>interesting</em> profile change" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1285 +msgid "Send a notification email when:" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1286 +msgid "You receive a connection request" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1287 +msgid "Your connections are confirmed" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1288 +msgid "Someone writes on your profile wall" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1289 +msgid "Someone writes a followup comment" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1290 +msgid "You receive a private message" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1291 +msgid "You receive a friend suggestion" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1292 +msgid "You are tagged in a post" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1293 +msgid "You are poked/prodded/etc. in a post" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1296 +msgid "Show visual notifications including:" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1298 +msgid "Unseen grid activity" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1299 +msgid "Unseen channel activity" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1300 +msgid "Unseen private messages" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1300 +#: ../../Zotlabs/Module/Settings.php:1305 +#: ../../Zotlabs/Module/Settings.php:1306 +#: ../../Zotlabs/Module/Settings.php:1307 +msgid "Recommended" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1301 +msgid "Upcoming events" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1302 +msgid "Events today" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1303 +msgid "Upcoming birthdays" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1303 +msgid "Not available in all themes" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1304 +msgid "System (personal) notifications" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1305 +msgid "System info messages" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1306 +msgid "System critical alerts" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1307 +msgid "New connections" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1308 +msgid "System Registrations" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1309 +msgid "" +"Also show new wall posts, private messages and connections under Notices" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1311 +msgid "Notify me of events this many days in advance" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1311 +msgid "Must be greater than 0" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1313 +msgid "Advanced Account/Page Type Settings" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1314 +msgid "Change the behaviour of this account for special situations" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1317 +msgid "" +"Please enable expert mode (in <a href=\"settings/features\">Settings > " +"Additional features</a>) to adjust!" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1318 +msgid "Miscellaneous Settings" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1319 +msgid "Default photo upload folder" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1319 +#: ../../Zotlabs/Module/Settings.php:1320 +msgid "%Y - current year, %m - current month" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1320 +msgid "Default file upload folder" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1322 +msgid "Personal menu to display in your channel pages" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1324 +msgid "Remove this channel." +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1325 +msgid "Firefox Share $Projectname provider" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:1326 +msgid "Start calendar week on monday" msgstr "" #: ../../Zotlabs/Module/Viewconnections.php:65 @@ -6474,6 +6477,10 @@ msgstr "" msgid "Source of Item" msgstr "" +#: ../../Zotlabs/Module/Editpost.php:35 +msgid "Item is not editable" +msgstr "" + #: ../../Zotlabs/Module/Xchan.php:10 msgid "Xchan Lookup" msgstr "" @@ -6730,7 +6737,7 @@ msgstr "" msgid "Remote Diagnostics" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:212 ../../include/features.php:92 +#: ../../Zotlabs/Lib/Apps.php:212 ../../include/features.php:93 msgid "Suggest Channels" msgstr "" @@ -6747,8 +6754,8 @@ msgstr "" msgid "Channel Home" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:223 ../../include/nav.php:205 -#: ../../include/conversation.php:1669 ../../include/conversation.php:1672 +#: ../../Zotlabs/Lib/Apps.php:223 ../../include/conversation.php:1679 +#: ../../include/conversation.php:1682 ../../include/nav.php:205 msgid "Events" msgstr "" @@ -6801,12 +6808,12 @@ msgid "Purchase" msgstr "" #: ../../Zotlabs/Lib/PermissionDescription.php:31 -#: ../../include/acl_selectors.php:230 +#: ../../include/acl_selectors.php:124 msgid "Visible to your default audience" msgstr "" #: ../../Zotlabs/Lib/PermissionDescription.php:106 -#: ../../include/acl_selectors.php:266 +#: ../../include/acl_selectors.php:170 msgid "Only me" msgstr "" @@ -7007,23 +7014,23 @@ msgstr "" msgid "%s show all" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:712 ../../include/conversation.php:1227 +#: ../../Zotlabs/Lib/ThreadItem.php:712 ../../include/conversation.php:1233 msgid "Bold" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:713 ../../include/conversation.php:1228 +#: ../../Zotlabs/Lib/ThreadItem.php:713 ../../include/conversation.php:1234 msgid "Italic" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:714 ../../include/conversation.php:1229 +#: ../../Zotlabs/Lib/ThreadItem.php:714 ../../include/conversation.php:1235 msgid "Underline" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:715 ../../include/conversation.php:1230 +#: ../../Zotlabs/Lib/ThreadItem.php:715 ../../include/conversation.php:1236 msgid "Quote" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:716 ../../include/conversation.php:1231 +#: ../../Zotlabs/Lib/ThreadItem.php:716 ../../include/conversation.php:1237 msgid "Code" msgstr "" @@ -7052,100 +7059,389 @@ msgstr "" msgid "Cannot locate DNS info for database server '%s'" msgstr "" -#: ../../include/items.php:897 ../../include/items.php:942 -msgid "(Unknown)" +#: ../../include/auth.php:148 +msgid "Logged out." msgstr "" -#: ../../include/items.php:1141 -msgid "Visible to anybody on the internet." +#: ../../include/auth.php:275 +msgid "Failed authentication" msgstr "" -#: ../../include/items.php:1143 -msgid "Visible to you only." +#: ../../include/auth.php:286 +msgid "Login failed." msgstr "" -#: ../../include/items.php:1145 -msgid "Visible to anybody in this network." +#: ../../include/bbcode.php:123 ../../include/bbcode.php:878 +#: ../../include/bbcode.php:881 ../../include/bbcode.php:886 +#: ../../include/bbcode.php:889 ../../include/bbcode.php:892 +#: ../../include/bbcode.php:895 ../../include/bbcode.php:900 +#: ../../include/bbcode.php:903 ../../include/bbcode.php:908 +#: ../../include/bbcode.php:911 ../../include/bbcode.php:914 +#: ../../include/bbcode.php:917 +msgid "Image/photo" msgstr "" -#: ../../include/items.php:1147 -msgid "Visible to anybody authenticated." +#: ../../include/bbcode.php:162 ../../include/bbcode.php:928 +msgid "Encrypted content" msgstr "" -#: ../../include/items.php:1149 +#: ../../include/bbcode.php:178 #, php-format -msgid "Visible to anybody on %s." +msgid "Install %s element: " msgstr "" -#: ../../include/items.php:1151 -msgid "Visible to all connections." +#: ../../include/bbcode.php:182 +#, php-format +msgid "" +"This post contains an installable %s element, however you lack permissions " +"to install it on this site." msgstr "" -#: ../../include/items.php:1153 -msgid "Visible to approved connections." +#: ../../include/bbcode.php:261 +#, php-format +msgid "%1$s wrote the following %2$s %3$s" msgstr "" -#: ../../include/items.php:1155 -msgid "Visible to specific connections." +#: ../../include/bbcode.php:338 ../../include/bbcode.php:346 +msgid "Click to open/close" msgstr "" -#: ../../include/items.php:3918 -msgid "Privacy group is empty." +#: ../../include/bbcode.php:346 +msgid "spoiler" +msgstr "" + +#: ../../include/bbcode.php:619 ../../include/wiki.php:525 +msgid "Different viewers will see this text differently" +msgstr "" + +#: ../../include/bbcode.php:866 +msgid "$1 wrote:" +msgstr "" + +#: ../../include/follow.php:27 +msgid "Channel is blocked on this site." +msgstr "" + +#: ../../include/follow.php:32 +msgid "Channel location missing." +msgstr "" + +#: ../../include/follow.php:80 +msgid "Response from remote channel was incomplete." +msgstr "" + +#: ../../include/follow.php:97 +msgid "Channel was deleted and no longer exists." +msgstr "" + +#: ../../include/follow.php:147 ../../include/follow.php:183 +msgid "Protocol disabled." +msgstr "" + +#: ../../include/follow.php:171 +msgid "Channel discovery failed." msgstr "" -#: ../../include/items.php:3925 +#: ../../include/follow.php:210 +msgid "Cannot connect to yourself." +msgstr "" + +#: ../../include/api.php:1330 +msgid "Public Timeline" +msgstr "" + +#: ../../include/conversation.php:204 #, php-format -msgid "Privacy group: %s" +msgid "%1$s is now connected with %2$s" msgstr "" -#: ../../include/items.php:3937 -msgid "Connection not found." +#: ../../include/conversation.php:239 +#, php-format +msgid "%1$s poked %2$s" msgstr "" -#: ../../include/items.php:4290 -msgid "profile photo" +#: ../../include/conversation.php:243 ../../include/text.php:1013 +#: ../../include/text.php:1018 +msgid "poked" msgstr "" -#: ../../include/import.php:30 -msgid "" -"Cannot create a duplicate channel identifier on this system. Import failed." +#: ../../include/conversation.php:694 +#, php-format +msgid "View %s's profile @ %s" msgstr "" -#: ../../include/import.php:97 -msgid "Channel clone failed. Import failed." +#: ../../include/conversation.php:713 +msgid "Categories:" msgstr "" -#: ../../include/photos.php:114 +#: ../../include/conversation.php:714 +msgid "Filed under:" +msgstr "" + +#: ../../include/conversation.php:741 +msgid "View in context" +msgstr "" + +#: ../../include/conversation.php:851 +msgid "remove" +msgstr "" + +#: ../../include/conversation.php:855 ../../include/nav.php:251 +msgid "Loading..." +msgstr "" + +#: ../../include/conversation.php:856 +msgid "Delete Selected Items" +msgstr "" + +#: ../../include/conversation.php:952 +msgid "View Source" +msgstr "" + +#: ../../include/conversation.php:953 +msgid "Follow Thread" +msgstr "" + +#: ../../include/conversation.php:954 +msgid "Unfollow Thread" +msgstr "" + +#: ../../include/conversation.php:959 +msgid "Activity/Posts" +msgstr "" + +#: ../../include/conversation.php:961 +msgid "Edit Connection" +msgstr "" + +#: ../../include/conversation.php:962 +msgid "Message" +msgstr "" + +#: ../../include/conversation.php:1079 #, php-format -msgid "Image exceeds website size limit of %lu bytes" +msgid "%s likes this." msgstr "" -#: ../../include/photos.php:121 -msgid "Image file is empty." +#: ../../include/conversation.php:1079 +#, php-format +msgid "%s doesn't like this." msgstr "" -#: ../../include/photos.php:259 -msgid "Photo storage failed." +#: ../../include/conversation.php:1083 +#, 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:1085 +#, 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:1091 +msgid "and" msgstr "" -#: ../../include/photos.php:299 -msgid "a new photo" +#: ../../include/conversation.php:1094 +#, php-format +msgid ", and %d other people" +msgid_plural ", and %d other people" +msgstr[0] "" +msgstr[1] "" + +#: ../../include/conversation.php:1095 +#, php-format +msgid "%s like this." msgstr "" -#: ../../include/photos.php:303 +#: ../../include/conversation.php:1095 #, php-format -msgctxt "photo_upload" -msgid "%1$s posted %2$s to %3$s" +msgid "%s don't like this." +msgstr "" + +#: ../../include/conversation.php:1138 +msgid "Set your location" +msgstr "" + +#: ../../include/conversation.php:1139 +msgid "Clear browser location" +msgstr "" + +#: ../../include/conversation.php:1187 +msgid "Tag term:" +msgstr "" + +#: ../../include/conversation.php:1188 +msgid "Where are you right now?" +msgstr "" + +#: ../../include/conversation.php:1197 +msgid "Comments enabled" +msgstr "" + +#: ../../include/conversation.php:1198 +msgid "Comments disabled" +msgstr "" + +#: ../../include/conversation.php:1228 +msgid "Page link name" +msgstr "" + +#: ../../include/conversation.php:1231 +msgid "Post as" +msgstr "" + +#: ../../include/conversation.php:1245 +msgid "Toggle voting" +msgstr "" + +#: ../../include/conversation.php:1248 +msgid "Disable comments" +msgstr "" + +#: ../../include/conversation.php:1249 +msgid "Toggle comments" +msgstr "" + +#: ../../include/conversation.php:1257 +msgid "Categories (optional, comma-separated list)" +msgstr "" + +#: ../../include/conversation.php:1284 +msgid "Set publish date" +msgstr "" + +#: ../../include/conversation.php:1533 +msgid "Discover" +msgstr "" + +#: ../../include/conversation.php:1536 +msgid "Imported public streams" +msgstr "" + +#: ../../include/conversation.php:1541 +msgid "Commented Order" +msgstr "" + +#: ../../include/conversation.php:1544 +msgid "Sort by Comment Date" +msgstr "" + +#: ../../include/conversation.php:1548 +msgid "Posted Order" +msgstr "" + +#: ../../include/conversation.php:1551 +msgid "Sort by Post Date" +msgstr "" + +#: ../../include/conversation.php:1559 +msgid "Posts that mention or involve you" +msgstr "" + +#: ../../include/conversation.php:1568 +msgid "Activity Stream - by date" +msgstr "" + +#: ../../include/conversation.php:1574 +msgid "Starred" +msgstr "" + +#: ../../include/conversation.php:1577 +msgid "Favourite Posts" +msgstr "" + +#: ../../include/conversation.php:1584 +msgid "Spam" +msgstr "" + +#: ../../include/conversation.php:1587 +msgid "Posts flagged as SPAM" msgstr "" -#: ../../include/photos.php:506 ../../include/conversation.php:1655 +#: ../../include/conversation.php:1644 +msgid "Status Messages and Posts" +msgstr "" + +#: ../../include/conversation.php:1653 +msgid "About" +msgstr "" + +#: ../../include/conversation.php:1656 +msgid "Profile Details" +msgstr "" + +#: ../../include/conversation.php:1665 ../../include/photos.php:506 msgid "Photo Albums" msgstr "" -#: ../../include/photos.php:510 -msgid "Upload New Photos" +#: ../../include/conversation.php:1672 +msgid "Files and Storage" +msgstr "" + +#: ../../include/conversation.php:1692 ../../include/conversation.php:1695 +#: ../../include/widgets.php:850 +msgid "Chatrooms" +msgstr "" + +#: ../../include/conversation.php:1705 ../../include/nav.php:104 +msgid "Bookmarks" +msgstr "" + +#: ../../include/conversation.php:1708 +msgid "Saved Bookmarks" +msgstr "" + +#: ../../include/conversation.php:1718 +msgid "Manage Webpages" msgstr "" +#: ../../include/conversation.php:1783 +msgctxt "noun" +msgid "Attending" +msgid_plural "Attending" +msgstr[0] "" +msgstr[1] "" + +#: ../../include/conversation.php:1786 +msgctxt "noun" +msgid "Not Attending" +msgid_plural "Not Attending" +msgstr[0] "" +msgstr[1] "" + +#: ../../include/conversation.php:1789 +msgctxt "noun" +msgid "Undecided" +msgid_plural "Undecided" +msgstr[0] "" +msgstr[1] "" + +#: ../../include/conversation.php:1792 +msgctxt "noun" +msgid "Agree" +msgid_plural "Agrees" +msgstr[0] "" +msgstr[1] "" + +#: ../../include/conversation.php:1795 +msgctxt "noun" +msgid "Disagree" +msgid_plural "Disagrees" +msgstr[0] "" +msgstr[1] "" + +#: ../../include/conversation.php:1798 +msgctxt "noun" +msgid "Abstain" +msgid_plural "Abstains" +msgstr[0] "" +msgstr[1] "" + #: ../../include/features.php:50 msgid "General Features" msgstr "" @@ -7300,185 +7596,156 @@ msgid "Provide a class of post which others can vote on" msgstr "" #: ../../include/features.php:77 -msgid "Delayed Posting" +msgid "Disable Comments" msgstr "" #: ../../include/features.php:77 -msgid "Allow posts to be published at a later date" +msgid "Provide the option to disable comments for a post" msgstr "" #: ../../include/features.php:78 -msgid "Suppress Duplicate Posts/Comments" +msgid "Delayed Posting" msgstr "" #: ../../include/features.php:78 +msgid "Allow posts to be published at a later date" +msgstr "" + +#: ../../include/features.php:79 +msgid "Suppress Duplicate Posts/Comments" +msgstr "" + +#: ../../include/features.php:79 msgid "" "Prevent posts with identical content to be published with less than two " "minutes in between submissions." msgstr "" -#: ../../include/features.php:84 +#: ../../include/features.php:85 msgid "Network and Stream Filtering" msgstr "" -#: ../../include/features.php:85 +#: ../../include/features.php:86 msgid "Search by Date" msgstr "" -#: ../../include/features.php:85 +#: ../../include/features.php:86 msgid "Ability to select posts by date ranges" msgstr "" -#: ../../include/features.php:86 ../../include/group.php:311 +#: ../../include/features.php:87 ../../include/group.php:311 msgid "Privacy Groups" msgstr "" -#: ../../include/features.php:86 +#: ../../include/features.php:87 msgid "Enable management and selection of privacy groups" msgstr "" -#: ../../include/features.php:87 ../../include/widgets.php:281 +#: ../../include/features.php:88 ../../include/widgets.php:281 msgid "Saved Searches" msgstr "" -#: ../../include/features.php:87 +#: ../../include/features.php:88 msgid "Save search terms for re-use" msgstr "" -#: ../../include/features.php:88 +#: ../../include/features.php:89 msgid "Network Personal Tab" msgstr "" -#: ../../include/features.php:88 +#: ../../include/features.php:89 msgid "Enable tab to display only Network posts that you've interacted on" msgstr "" -#: ../../include/features.php:89 +#: ../../include/features.php:90 msgid "Network New Tab" msgstr "" -#: ../../include/features.php:89 +#: ../../include/features.php:90 msgid "Enable tab to display all new Network activity" msgstr "" -#: ../../include/features.php:90 +#: ../../include/features.php:91 msgid "Affinity Tool" msgstr "" -#: ../../include/features.php:90 +#: ../../include/features.php:91 msgid "Filter stream activity by depth of relationships" msgstr "" -#: ../../include/features.php:91 +#: ../../include/features.php:92 msgid "Connection Filtering" msgstr "" -#: ../../include/features.php:91 +#: ../../include/features.php:92 msgid "Filter incoming posts from connections based on keywords/content" msgstr "" -#: ../../include/features.php:92 +#: ../../include/features.php:93 msgid "Show channel suggestions" msgstr "" -#: ../../include/features.php:97 +#: ../../include/features.php:98 msgid "Post/Comment Tools" msgstr "" -#: ../../include/features.php:98 +#: ../../include/features.php:99 msgid "Community Tagging" msgstr "" -#: ../../include/features.php:98 +#: ../../include/features.php:99 msgid "Ability to tag existing posts" msgstr "" -#: ../../include/features.php:99 +#: ../../include/features.php:100 msgid "Post Categories" msgstr "" -#: ../../include/features.php:99 +#: ../../include/features.php:100 msgid "Add categories to your posts" msgstr "" -#: ../../include/features.php:100 +#: ../../include/features.php:101 msgid "Emoji Reactions" msgstr "" -#: ../../include/features.php:100 +#: ../../include/features.php:101 msgid "Add emoji reaction ability to posts" msgstr "" -#: ../../include/features.php:101 ../../include/widgets.php:310 +#: ../../include/features.php:102 ../../include/widgets.php:310 #: ../../include/contact_widgets.php:53 msgid "Saved Folders" msgstr "" -#: ../../include/features.php:101 +#: ../../include/features.php:102 msgid "Ability to file posts under folders" msgstr "" -#: ../../include/features.php:102 +#: ../../include/features.php:103 msgid "Dislike Posts" msgstr "" -#: ../../include/features.php:102 +#: ../../include/features.php:103 msgid "Ability to dislike posts/comments" msgstr "" -#: ../../include/features.php:103 +#: ../../include/features.php:104 msgid "Star Posts" msgstr "" -#: ../../include/features.php:103 +#: ../../include/features.php:104 msgid "Ability to mark special posts with a star indicator" msgstr "" -#: ../../include/features.php:104 +#: ../../include/features.php:105 msgid "Tag Cloud" msgstr "" -#: ../../include/features.php:104 +#: ../../include/features.php:105 msgid "Provide a personal tag cloud on your channel page" msgstr "" -#: ../../include/api.php:1337 -msgid "Public Timeline" -msgstr "" - -#: ../../include/acl_selectors.php:269 -msgid "Who can see this?" -msgstr "" - -#: ../../include/acl_selectors.php:270 -msgid "Custom selection" -msgstr "" - -#: ../../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/acl_selectors.php:272 -msgid "Show" -msgstr "" - -#: ../../include/acl_selectors.php:273 -msgid "Don't show" -msgstr "" - -#: ../../include/acl_selectors.php:279 -msgid "Other networks and post services" -msgstr "" - -#: ../../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/datetime.php:135 msgid "Birthday" msgstr "" @@ -7491,7 +7758,7 @@ msgstr "" msgid "YYYY-MM-DD or MM-DD" msgstr "" -#: ../../include/datetime.php:272 ../../boot.php:2549 +#: ../../include/datetime.php:272 ../../boot.php:2552 msgid "never" msgstr "" @@ -7564,6 +7831,33 @@ msgstr "" msgid "Happy Birthday %1$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:510 +msgid "Upload New Photos" +msgstr "" + #: ../../include/selectors.php:30 msgid "Frequently" msgstr "" @@ -7812,543 +8106,66 @@ msgstr "" msgid "Ask me" msgstr "" -#: ../../include/follow.php:27 -msgid "Channel is blocked on this site." -msgstr "" - -#: ../../include/follow.php:32 -msgid "Channel location missing." -msgstr "" - -#: ../../include/follow.php:80 -msgid "Response from remote channel was incomplete." -msgstr "" - -#: ../../include/follow.php:97 -msgid "Channel was deleted and no longer exists." -msgstr "" - -#: ../../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/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 "View all %s connections" -msgstr "" - -#: ../../include/text.php:1013 ../../include/text.php:1018 -msgid "poke" -msgstr "" - -#: ../../include/text.php:1013 ../../include/text.php:1018 -#: ../../include/conversation.php:243 -msgid "poked" -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" -msgstr "" - -#: ../../include/text.php:1023 -msgid "rebuffed" -msgstr "" - -#: ../../include/text.php:1035 -msgid "happy" -msgstr "" - -#: ../../include/text.php:1036 -msgid "sad" -msgstr "" - -#: ../../include/text.php:1037 -msgid "mellow" -msgstr "" - -#: ../../include/text.php:1038 -msgid "tired" -msgstr "" - -#: ../../include/text.php:1039 -msgid "perky" -msgstr "" - -#: ../../include/text.php:1040 -msgid "angry" -msgstr "" - -#: ../../include/text.php:1041 -msgid "stupefied" -msgstr "" - -#: ../../include/text.php:1042 -msgid "puzzled" -msgstr "" - -#: ../../include/text.php:1043 -msgid "interested" -msgstr "" - -#: ../../include/text.php:1044 -msgid "bitter" -msgstr "" - -#: ../../include/text.php:1045 -msgid "cheerful" -msgstr "" - -#: ../../include/text.php:1046 -msgid "alive" -msgstr "" - -#: ../../include/text.php:1047 -msgid "annoyed" -msgstr "" - -#: ../../include/text.php:1048 -msgid "anxious" -msgstr "" - -#: ../../include/text.php:1049 -msgid "cranky" -msgstr "" - -#: ../../include/text.php:1050 -msgid "disturbed" -msgstr "" - -#: ../../include/text.php:1051 -msgid "frustrated" -msgstr "" - -#: ../../include/text.php:1052 -msgid "depressed" -msgstr "" - -#: ../../include/text.php:1053 -msgid "motivated" -msgstr "" - -#: ../../include/text.php:1054 -msgid "relaxed" -msgstr "" - -#: ../../include/text.php:1055 -msgid "surprised" -msgstr "" - -#: ../../include/text.php:1239 ../../include/js_strings.php:70 -msgid "Monday" -msgstr "" - -#: ../../include/text.php:1239 ../../include/js_strings.php:71 -msgid "Tuesday" -msgstr "" - -#: ../../include/text.php:1239 ../../include/js_strings.php:72 -msgid "Wednesday" -msgstr "" - -#: ../../include/text.php:1239 ../../include/js_strings.php:73 -msgid "Thursday" -msgstr "" - -#: ../../include/text.php:1239 ../../include/js_strings.php:74 -msgid "Friday" -msgstr "" - -#: ../../include/text.php:1239 ../../include/js_strings.php:75 -msgid "Saturday" -msgstr "" - -#: ../../include/text.php:1239 ../../include/js_strings.php:69 -msgid "Sunday" -msgstr "" - -#: ../../include/text.php:1243 ../../include/js_strings.php:45 -msgid "January" -msgstr "" - -#: ../../include/text.php:1243 ../../include/js_strings.php:46 -msgid "February" -msgstr "" - -#: ../../include/text.php:1243 ../../include/js_strings.php:47 -msgid "March" -msgstr "" - -#: ../../include/text.php:1243 ../../include/js_strings.php:48 -msgid "April" -msgstr "" - -#: ../../include/text.php:1243 -msgid "May" -msgstr "" - -#: ../../include/text.php:1243 ../../include/js_strings.php:50 -msgid "June" -msgstr "" - -#: ../../include/text.php:1243 ../../include/js_strings.php:51 -msgid "July" -msgstr "" - -#: ../../include/text.php:1243 ../../include/js_strings.php:52 -msgid "August" -msgstr "" - -#: ../../include/text.php:1243 ../../include/js_strings.php:53 -msgid "September" -msgstr "" - -#: ../../include/text.php:1243 ../../include/js_strings.php:54 -msgid "October" -msgstr "" - -#: ../../include/text.php:1243 ../../include/js_strings.php:55 -msgid "November" -msgstr "" - -#: ../../include/text.php:1243 ../../include/js_strings.php:56 -msgid "December" -msgstr "" - -#: ../../include/text.php:1320 ../../include/text.php:1324 -msgid "Unknown Attachment" -msgstr "" - -#: ../../include/text.php:1326 -msgid "unknown" -msgstr "" - -#: ../../include/text.php:1362 -msgid "remove category" -msgstr "" - -#: ../../include/text.php:1439 -msgid "remove from file" -msgstr "" - -#: ../../include/text.php:1738 ../../include/text.php:1809 -msgid "default" -msgstr "" - -#: ../../include/text.php:1746 -msgid "Page layout" -msgstr "" - -#: ../../include/text.php:1746 -msgid "You can create your own with the layouts tool" -msgstr "" - -#: ../../include/text.php:1788 -msgid "Page content type" -msgstr "" - -#: ../../include/text.php:1821 -msgid "Select an alternate language" -msgstr "" - -#: ../../include/text.php:1958 -msgid "activity" -msgstr "" - -#: ../../include/text.php:2259 -msgid "Design Tools" -msgstr "" - -#: ../../include/text.php:2265 -msgid "Pages" -msgstr "" - -#: ../../include/text.php:2287 -msgid "Import website..." -msgstr "" - -#: ../../include/text.php:2288 -msgid "Select folder to import" -msgstr "" - -#: ../../include/text.php:2289 -msgid "Import from a zipped folder:" -msgstr "" - -#: ../../include/text.php:2290 -msgid "Import from cloud files:" -msgstr "" - -#: ../../include/text.php:2291 -msgid "/cloud/channel/path/to/folder" -msgstr "" - -#: ../../include/text.php:2292 -msgid "Enter path to website files" -msgstr "" - -#: ../../include/text.php:2293 -msgid "Select folder" -msgstr "" - -#: ../../include/nav.php:84 ../../include/nav.php:117 ../../boot.php:1712 -msgid "Logout" -msgstr "" - -#: ../../include/nav.php:84 ../../include/nav.php:117 -msgid "End this session" -msgstr "" - -#: ../../include/nav.php:87 ../../include/nav.php:148 -msgid "Home" -msgstr "" - -#: ../../include/nav.php:87 -msgid "Your posts and conversations" -msgstr "" - -#: ../../include/nav.php:88 -msgid "Your profile page" -msgstr "" - -#: ../../include/nav.php:90 -msgid "Manage/Edit profiles" -msgstr "" - -#: ../../include/nav.php:92 ../../include/channel.php:963 -msgid "Edit Profile" -msgstr "" - -#: ../../include/nav.php:92 -msgid "Edit your profile" -msgstr "" - -#: ../../include/nav.php:94 -msgid "Your photos" -msgstr "" - -#: ../../include/nav.php:95 -msgid "Your files" -msgstr "" - -#: ../../include/nav.php:98 -msgid "Your chatrooms" -msgstr "" - -#: ../../include/nav.php:104 ../../include/conversation.php:1695 -msgid "Bookmarks" -msgstr "" - -#: ../../include/nav.php:104 -msgid "Your bookmarks" -msgstr "" - -#: ../../include/nav.php:108 -msgid "Your webpages" -msgstr "" - -#: ../../include/nav.php:110 -msgid "Your wiki" -msgstr "" - -#: ../../include/nav.php:114 -msgid "Sign in" -msgstr "" - -#: ../../include/nav.php:131 -#, php-format -msgid "%s - click to logout" -msgstr "" - -#: ../../include/nav.php:134 -msgid "Remote authentication" -msgstr "" - -#: ../../include/nav.php:134 -msgid "Click to authenticate to your home hub" -msgstr "" - -#: ../../include/nav.php:148 -msgid "Home Page" -msgstr "" - -#: ../../include/nav.php:151 -msgid "Create an account" -msgstr "" - -#: ../../include/nav.php:163 -msgid "Help and documentation" -msgstr "" - -#: ../../include/nav.php:167 -msgid "Applications, utilities, links, games" -msgstr "" - -#: ../../include/nav.php:169 -msgid "Search site @name, #tag, ?docs, content" -msgstr "" - -#: ../../include/nav.php:171 -msgid "Channel Directory" -msgstr "" - -#: ../../include/nav.php:183 -msgid "Your grid" -msgstr "" - -#: ../../include/nav.php:184 -msgid "Mark all grid notifications seen" -msgstr "" - -#: ../../include/nav.php:186 -msgid "Channel home" -msgstr "" - -#: ../../include/nav.php:187 -msgid "Mark all channel notifications seen" -msgstr "" - -#: ../../include/nav.php:193 -msgid "Notices" -msgstr "" - -#: ../../include/nav.php:193 -msgid "Notifications" -msgstr "" - -#: ../../include/nav.php:194 -msgid "See all notifications" -msgstr "" - -#: ../../include/nav.php:197 -msgid "Private mail" -msgstr "" - -#: ../../include/nav.php:198 -msgid "See all private messages" +#: ../../include/permissions.php:29 +msgid "Can view my normal stream and posts" msgstr "" -#: ../../include/nav.php:199 -msgid "Mark all private messages seen" +#: ../../include/permissions.php:33 +msgid "Can view my webpages" msgstr "" -#: ../../include/nav.php:200 ../../include/widgets.php:667 -msgid "Inbox" +#: ../../include/permissions.php:37 +msgid "Can post on my channel page (\"wall\")" msgstr "" -#: ../../include/nav.php:201 ../../include/widgets.php:672 -msgid "Outbox" +#: ../../include/permissions.php:40 +msgid "Can like/dislike stuff" msgstr "" -#: ../../include/nav.php:202 ../../include/widgets.php:677 -msgid "New Message" +#: ../../include/permissions.php:40 +msgid "Profiles and things other than posts/comments" msgstr "" -#: ../../include/nav.php:205 -msgid "Event Calendar" +#: ../../include/permissions.php:42 +msgid "Can forward to all my channel contacts via post @mentions" msgstr "" -#: ../../include/nav.php:206 -msgid "See all events" +#: ../../include/permissions.php:42 +msgid "Advanced - useful for creating group forum channels" msgstr "" -#: ../../include/nav.php:207 -msgid "Mark all events seen" +#: ../../include/permissions.php:43 +msgid "Can chat with me (when available)" msgstr "" -#: ../../include/nav.php:210 -msgid "Manage Your Channels" +#: ../../include/permissions.php:44 +msgid "Can write to my file storage and photos" msgstr "" -#: ../../include/nav.php:212 -msgid "Account/Channel Settings" +#: ../../include/permissions.php:45 +msgid "Can edit my webpages" msgstr "" -#: ../../include/nav.php:220 ../../include/widgets.php:1524 -msgid "Admin" +#: ../../include/permissions.php:47 +msgid "Somewhat advanced - very useful in open communities" msgstr "" -#: ../../include/nav.php:220 -msgid "Site Setup and Configuration" +#: ../../include/permissions.php:49 +msgid "Can administer my channel resources" msgstr "" -#: ../../include/nav.php:251 ../../include/conversation.php:855 -msgid "Loading..." +#: ../../include/permissions.php:49 +msgid "Extremely advanced. Leave this alone unless you know what you are doing" msgstr "" -#: ../../include/nav.php:256 -msgid "@name, #tag, ?doc, content" +#: ../../include/security.php:109 +msgid "guest:" msgstr "" -#: ../../include/nav.php:257 -msgid "Please wait..." +#: ../../include/security.php:527 +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/bookmarks.php:35 @@ -8356,45 +8173,6 @@ msgstr "" msgid "%1$s's bookmarks" msgstr "" -#: ../../include/event.php:22 ../../include/event.php:69 -#: ../../include/bb2diaspora.php:485 -msgid "l F d, Y \\@ g:i A" -msgstr "" - -#: ../../include/event.php:30 ../../include/event.php:73 -#: ../../include/bb2diaspora.php:491 -msgid "Starts:" -msgstr "" - -#: ../../include/event.php:40 ../../include/event.php:77 -#: ../../include/bb2diaspora.php:499 -msgid "Finishes:" -msgstr "" - -#: ../../include/event.php:814 -msgid "This event has been added to your calendar." -msgstr "" - -#: ../../include/event.php:1014 -msgid "Not specified" -msgstr "" - -#: ../../include/event.php:1015 -msgid "Needs Action" -msgstr "" - -#: ../../include/event.php:1016 -msgid "Completed" -msgstr "" - -#: ../../include/event.php:1017 -msgid "In Process" -msgstr "" - -#: ../../include/event.php:1018 -msgid "Cancelled" -msgstr "" - #: ../../include/group.php:26 msgid "" "A deleted group with this name was revived. Existing item permissions " @@ -8434,221 +8212,269 @@ msgstr "" msgid "Title" msgstr "" -#: ../../include/channel.php:33 -msgid "Unable to obtain identity information from database" +#: ../../include/widgets.php:46 ../../include/widgets.php:429 +#: ../../include/taxonomy.php:188 ../../include/taxonomy.php:270 +#: ../../include/contact_widgets.php:91 +msgid "Categories" msgstr "" -#: ../../include/channel.php:67 -msgid "Empty name" +#: ../../include/widgets.php:103 +msgid "System" msgstr "" -#: ../../include/channel.php:70 -msgid "Name too long" +#: ../../include/widgets.php:106 +msgid "New App" msgstr "" -#: ../../include/channel.php:181 -msgid "No account identifier" +#: ../../include/widgets.php:154 +msgid "Suggestions" msgstr "" -#: ../../include/channel.php:193 -msgid "Nickname is required." +#: ../../include/widgets.php:155 +msgid "See more..." msgstr "" -#: ../../include/channel.php:207 -msgid "Reserved nickname. Please choose another." +#: ../../include/widgets.php:175 +#, php-format +msgid "You have %1$.0f of %2$.0f allowed connections." msgstr "" -#: ../../include/channel.php:212 -msgid "" -"Nickname has unsupported characters or is already being used on this site." +#: ../../include/widgets.php:181 +msgid "Add New Connection" msgstr "" -#: ../../include/channel.php:272 -msgid "Unable to retrieve created identity" +#: ../../include/widgets.php:182 +msgid "Enter channel address" msgstr "" -#: ../../include/channel.php:341 -msgid "Default Profile" +#: ../../include/widgets.php:183 +msgid "Examples: bob@example.com, https://example.com/barbara" msgstr "" -#: ../../include/channel.php:813 -msgid "Requested channel is not available." +#: ../../include/widgets.php:199 +msgid "Notes" msgstr "" -#: ../../include/channel.php:960 -msgid "Create New Profile" +#: ../../include/widgets.php:273 +msgid "Remove term" msgstr "" -#: ../../include/channel.php:980 -msgid "Visible to everybody" +#: ../../include/widgets.php:313 ../../include/widgets.php:432 +#: ../../include/contact_widgets.php:56 ../../include/contact_widgets.php:94 +msgid "Everything" msgstr "" -#: ../../include/channel.php:1053 ../../include/channel.php:1166 -msgid "Gender:" +#: ../../include/widgets.php:354 +msgid "Archives" msgstr "" -#: ../../include/channel.php:1054 ../../include/channel.php:1210 -msgid "Status:" +#: ../../include/widgets.php:516 +msgid "Refresh" msgstr "" -#: ../../include/channel.php:1055 ../../include/channel.php:1221 -msgid "Homepage:" +#: ../../include/widgets.php:556 +msgid "Account settings" msgstr "" -#: ../../include/channel.php:1056 -msgid "Online Now" +#: ../../include/widgets.php:562 +msgid "Channel settings" msgstr "" -#: ../../include/channel.php:1171 -msgid "Like this channel" +#: ../../include/widgets.php:571 +msgid "Additional features" msgstr "" -#: ../../include/channel.php:1195 -msgid "j F, Y" +#: ../../include/widgets.php:578 +msgid "Feature/Addon settings" msgstr "" -#: ../../include/channel.php:1196 -msgid "j F" +#: ../../include/widgets.php:584 +msgid "Display settings" msgstr "" -#: ../../include/channel.php:1203 -msgid "Birthday:" +#: ../../include/widgets.php:591 +msgid "Manage locations" msgstr "" -#: ../../include/channel.php:1216 -#, php-format -msgid "for %1$d %2$s" +#: ../../include/widgets.php:600 +msgid "Export channel" msgstr "" -#: ../../include/channel.php:1219 -msgid "Sexual Preference:" +#: ../../include/widgets.php:607 +msgid "Connected apps" msgstr "" -#: ../../include/channel.php:1225 -msgid "Tags:" +#: ../../include/widgets.php:631 +msgid "Premium Channel Settings" msgstr "" -#: ../../include/channel.php:1227 -msgid "Political Views:" +#: ../../include/widgets.php:660 +msgid "Private Mail Menu" msgstr "" -#: ../../include/channel.php:1229 -msgid "Religion:" +#: ../../include/widgets.php:662 +msgid "Combined View" msgstr "" -#: ../../include/channel.php:1233 -msgid "Hobbies/Interests:" +#: ../../include/widgets.php:667 ../../include/nav.php:200 +msgid "Inbox" msgstr "" -#: ../../include/channel.php:1235 -msgid "Likes:" +#: ../../include/widgets.php:672 ../../include/nav.php:201 +msgid "Outbox" msgstr "" -#: ../../include/channel.php:1237 -msgid "Dislikes:" +#: ../../include/widgets.php:677 ../../include/nav.php:202 +msgid "New Message" msgstr "" -#: ../../include/channel.php:1239 -msgid "Contact information and Social Networks:" +#: ../../include/widgets.php:694 ../../include/widgets.php:706 +msgid "Conversations" msgstr "" -#: ../../include/channel.php:1241 -msgid "My other channels:" +#: ../../include/widgets.php:698 +msgid "Received Messages" msgstr "" -#: ../../include/channel.php:1243 -msgid "Musical interests:" +#: ../../include/widgets.php:702 +msgid "Sent Messages" msgstr "" -#: ../../include/channel.php:1245 -msgid "Books, literature:" +#: ../../include/widgets.php:716 +msgid "No messages." msgstr "" -#: ../../include/channel.php:1247 -msgid "Television:" +#: ../../include/widgets.php:734 +msgid "Delete conversation" msgstr "" -#: ../../include/channel.php:1249 -msgid "Film/dance/culture/entertainment:" +#: ../../include/widgets.php:760 +msgid "Events Tools" msgstr "" -#: ../../include/channel.php:1251 -msgid "Love/Romance:" +#: ../../include/widgets.php:761 +msgid "Export Calendar" msgstr "" -#: ../../include/channel.php:1253 -msgid "Work/employment:" +#: ../../include/widgets.php:762 +msgid "Import Calendar" msgstr "" -#: ../../include/channel.php:1255 -msgid "School/education:" +#: ../../include/widgets.php:854 +msgid "Overview" msgstr "" -#: ../../include/channel.php:1276 -msgid "Like this thing" +#: ../../include/widgets.php:861 +msgid "Chat Members" msgstr "" -#: ../../include/network.php:704 -msgid "view full size" +#: ../../include/widgets.php:883 +msgid "Wiki List" msgstr "" -#: ../../include/network.php:1935 ../../include/account.php:317 -#: ../../include/account.php:344 ../../include/account.php:404 -msgid "Administrator" +#: ../../include/widgets.php:921 +msgid "Wiki Pages" msgstr "" -#: ../../include/network.php:1949 -msgid "No Subject" +#: ../../include/widgets.php:956 +msgid "Bookmarked Chatrooms" msgstr "" -#: ../../include/network.php:2203 ../../include/network.php:2204 -msgid "Friendica" +#: ../../include/widgets.php:979 +msgid "Suggested Chatrooms" msgstr "" -#: ../../include/network.php:2205 -msgid "OStatus" +#: ../../include/widgets.php:1125 ../../include/widgets.php:1237 +msgid "photo/image" msgstr "" -#: ../../include/network.php:2206 -msgid "GNU-Social" +#: ../../include/widgets.php:1180 +msgid "Click to show more" msgstr "" -#: ../../include/network.php:2207 -msgid "RSS/Atom" +#: ../../include/widgets.php:1331 +msgid "Rating Tools" msgstr "" -#: ../../include/network.php:2209 -msgid "Diaspora" +#: ../../include/widgets.php:1335 ../../include/widgets.php:1337 +msgid "Rate Me" msgstr "" -#: ../../include/network.php:2210 -msgid "Facebook" +#: ../../include/widgets.php:1340 +msgid "View Ratings" msgstr "" -#: ../../include/network.php:2211 -msgid "Zot" +#: ../../include/widgets.php:1424 +msgid "Forums" msgstr "" -#: ../../include/network.php:2212 -msgid "LinkedIn" +#: ../../include/widgets.php:1453 +msgid "Tasks" msgstr "" -#: ../../include/network.php:2213 -msgid "XMPP/IM" +#: ../../include/widgets.php:1462 +msgid "Documentation" msgstr "" -#: ../../include/network.php:2214 -msgid "MySpace" +#: ../../include/widgets.php:1464 +msgid "Project/Site Information" +msgstr "" + +#: ../../include/widgets.php:1465 +msgid "For Members" +msgstr "" + +#: ../../include/widgets.php:1466 +msgid "For Administrators" +msgstr "" + +#: ../../include/widgets.php:1467 +msgid "For Developers" +msgstr "" + +#: ../../include/widgets.php:1491 ../../include/widgets.php:1529 +msgid "Member registrations waiting for confirmation" +msgstr "" + +#: ../../include/widgets.php:1497 +msgid "Inspect queue" +msgstr "" + +#: ../../include/widgets.php:1499 +msgid "DB updates" +msgstr "" + +#: ../../include/widgets.php:1524 ../../include/nav.php:220 +msgid "Admin" +msgstr "" + +#: ../../include/widgets.php:1525 +msgid "Plugin Features" msgstr "" #: ../../include/bb2diaspora.php:398 msgid "Attachments:" msgstr "" +#: ../../include/bb2diaspora.php:485 ../../include/event.php:22 +#: ../../include/event.php:69 +msgid "l F d, Y \\@ g:i A" +msgstr "" + #: ../../include/bb2diaspora.php:487 msgid "$Projectname event notification:" msgstr "" +#: ../../include/bb2diaspora.php:491 ../../include/event.php:30 +#: ../../include/event.php:73 +msgid "Starts:" +msgstr "" + +#: ../../include/bb2diaspora.php:499 ../../include/event.php:40 +#: ../../include/event.php:77 +msgid "Finishes:" +msgstr "" + #: ../../include/js_strings.php:5 msgid "Delete this item?" msgstr "" @@ -8789,11 +8615,55 @@ msgstr "" msgid "timeago.numbers" msgstr "" +#: ../../include/js_strings.php:45 ../../include/text.php:1243 +msgid "January" +msgstr "" + +#: ../../include/js_strings.php:46 ../../include/text.php:1243 +msgid "February" +msgstr "" + +#: ../../include/js_strings.php:47 ../../include/text.php:1243 +msgid "March" +msgstr "" + +#: ../../include/js_strings.php:48 ../../include/text.php:1243 +msgid "April" +msgstr "" + #: ../../include/js_strings.php:49 msgctxt "long" msgid "May" msgstr "" +#: ../../include/js_strings.php:50 ../../include/text.php:1243 +msgid "June" +msgstr "" + +#: ../../include/js_strings.php:51 ../../include/text.php:1243 +msgid "July" +msgstr "" + +#: ../../include/js_strings.php:52 ../../include/text.php:1243 +msgid "August" +msgstr "" + +#: ../../include/js_strings.php:53 ../../include/text.php:1243 +msgid "September" +msgstr "" + +#: ../../include/js_strings.php:54 ../../include/text.php:1243 +msgid "October" +msgstr "" + +#: ../../include/js_strings.php:55 ../../include/text.php:1243 +msgid "November" +msgstr "" + +#: ../../include/js_strings.php:56 ../../include/text.php:1243 +msgid "December" +msgstr "" + #: ../../include/js_strings.php:57 msgid "Jan" msgstr "" @@ -8843,6 +8713,34 @@ msgstr "" msgid "Dec" msgstr "" +#: ../../include/js_strings.php:69 ../../include/text.php:1239 +msgid "Sunday" +msgstr "" + +#: ../../include/js_strings.php:70 ../../include/text.php:1239 +msgid "Monday" +msgstr "" + +#: ../../include/js_strings.php:71 ../../include/text.php:1239 +msgid "Tuesday" +msgstr "" + +#: ../../include/js_strings.php:72 ../../include/text.php:1239 +msgid "Wednesday" +msgstr "" + +#: ../../include/js_strings.php:73 ../../include/text.php:1239 +msgid "Thursday" +msgstr "" + +#: ../../include/js_strings.php:74 ../../include/text.php:1239 +msgid "Friday" +msgstr "" + +#: ../../include/js_strings.php:75 ../../include/text.php:1239 +msgid "Saturday" +msgstr "" + #: ../../include/js_strings.php:76 msgid "Sun" msgstr "" @@ -8896,789 +8794,896 @@ msgctxt "calendar" msgid "All day" msgstr "" -#: ../../include/security.php:109 -msgid "guest:" +#: ../../include/nav.php:84 ../../include/nav.php:117 ../../boot.php:1712 +msgid "Logout" msgstr "" -#: ../../include/security.php:527 -msgid "" -"The form security token was not correct. This probably happened because the " -"form has been opened for too long (>3 hours) before submitting it." +#: ../../include/nav.php:84 ../../include/nav.php:117 +msgid "End this session" msgstr "" -#: ../../include/account.php:28 -msgid "Not a valid email address" +#: ../../include/nav.php:87 ../../include/nav.php:148 +msgid "Home" msgstr "" -#: ../../include/account.php:30 -msgid "Your email domain is not among those allowed on this site" +#: ../../include/nav.php:87 +msgid "Your posts and conversations" msgstr "" -#: ../../include/account.php:36 -msgid "Your email address is already registered at this site." +#: ../../include/nav.php:88 +msgid "Your profile page" msgstr "" -#: ../../include/account.php:68 -msgid "An invitation is required." +#: ../../include/nav.php:90 +msgid "Manage/Edit profiles" msgstr "" -#: ../../include/account.php:72 -msgid "Invitation could not be verified." +#: ../../include/nav.php:92 ../../include/channel.php:963 +msgid "Edit Profile" msgstr "" -#: ../../include/account.php:122 -msgid "Please enter the required information." +#: ../../include/nav.php:92 +msgid "Edit your profile" msgstr "" -#: ../../include/account.php:189 -msgid "Failed to store account information." +#: ../../include/nav.php:94 +msgid "Your photos" msgstr "" -#: ../../include/account.php:249 -#, php-format -msgid "Registration confirmation for %s" +#: ../../include/nav.php:95 +msgid "Your files" msgstr "" -#: ../../include/account.php:315 -#, php-format -msgid "Registration request at %s" +#: ../../include/nav.php:98 +msgid "Your chatrooms" msgstr "" -#: ../../include/account.php:339 -msgid "your registration password" +#: ../../include/nav.php:104 +msgid "Your bookmarks" msgstr "" -#: ../../include/account.php:342 ../../include/account.php:402 -#, php-format -msgid "Registration details for %s" +#: ../../include/nav.php:108 +msgid "Your webpages" msgstr "" -#: ../../include/account.php:414 -msgid "Account approved." +#: ../../include/nav.php:110 +msgid "Your wiki" msgstr "" -#: ../../include/account.php:454 +#: ../../include/nav.php:114 +msgid "Sign in" +msgstr "" + +#: ../../include/nav.php:131 #, php-format -msgid "Registration revoked for %s" +msgid "%s - click to logout" msgstr "" -#: ../../include/account.php:739 ../../include/account.php:741 -msgid "Click here to upgrade." +#: ../../include/nav.php:134 +msgid "Remote authentication" msgstr "" -#: ../../include/account.php:747 -msgid "This action exceeds the limits set by your subscription plan." +#: ../../include/nav.php:134 +msgid "Click to authenticate to your home hub" msgstr "" -#: ../../include/account.php:752 -msgid "This action is not available under your subscription plan." +#: ../../include/nav.php:148 +msgid "Home Page" 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 -#: ../../include/bbcode.php:895 ../../include/bbcode.php:900 -#: ../../include/bbcode.php:903 ../../include/bbcode.php:908 -#: ../../include/bbcode.php:911 ../../include/bbcode.php:914 -#: ../../include/bbcode.php:917 -msgid "Image/photo" +#: ../../include/nav.php:151 +msgid "Create an account" msgstr "" -#: ../../include/bbcode.php:162 ../../include/bbcode.php:928 -msgid "Encrypted content" +#: ../../include/nav.php:163 +msgid "Help and documentation" msgstr "" -#: ../../include/bbcode.php:178 -#, php-format -msgid "Install %s element: " +#: ../../include/nav.php:167 +msgid "Applications, utilities, links, games" msgstr "" -#: ../../include/bbcode.php:182 -#, php-format -msgid "" -"This post contains an installable %s element, however you lack permissions " -"to install it on this site." +#: ../../include/nav.php:169 +msgid "Search site @name, #tag, ?docs, content" msgstr "" -#: ../../include/bbcode.php:261 -#, php-format -msgid "%1$s wrote the following %2$s %3$s" +#: ../../include/nav.php:171 +msgid "Channel Directory" msgstr "" -#: ../../include/bbcode.php:338 ../../include/bbcode.php:346 -msgid "Click to open/close" +#: ../../include/nav.php:183 +msgid "Your grid" msgstr "" -#: ../../include/bbcode.php:346 -msgid "spoiler" +#: ../../include/nav.php:184 +msgid "Mark all grid notifications seen" msgstr "" -#: ../../include/bbcode.php:619 ../../include/wiki.php:525 -msgid "Different viewers will see this text differently" +#: ../../include/nav.php:186 +msgid "Channel home" msgstr "" -#: ../../include/bbcode.php:866 -msgid "$1 wrote:" +#: ../../include/nav.php:187 +msgid "Mark all channel notifications seen" msgstr "" -#: ../../include/conversation.php:204 -#, php-format -msgid "%1$s is now connected with %2$s" +#: ../../include/nav.php:193 +msgid "Notices" msgstr "" -#: ../../include/conversation.php:239 -#, php-format -msgid "%1$s poked %2$s" +#: ../../include/nav.php:193 +msgid "Notifications" msgstr "" -#: ../../include/conversation.php:694 -#, php-format -msgid "View %s's profile @ %s" +#: ../../include/nav.php:194 +msgid "See all notifications" msgstr "" -#: ../../include/conversation.php:713 -msgid "Categories:" +#: ../../include/nav.php:197 +msgid "Private mail" msgstr "" -#: ../../include/conversation.php:714 -msgid "Filed under:" +#: ../../include/nav.php:198 +msgid "See all private messages" msgstr "" -#: ../../include/conversation.php:741 -msgid "View in context" +#: ../../include/nav.php:199 +msgid "Mark all private messages seen" msgstr "" -#: ../../include/conversation.php:851 -msgid "remove" +#: ../../include/nav.php:205 +msgid "Event Calendar" msgstr "" -#: ../../include/conversation.php:856 -msgid "Delete Selected Items" +#: ../../include/nav.php:206 +msgid "See all events" msgstr "" -#: ../../include/conversation.php:952 -msgid "View Source" +#: ../../include/nav.php:207 +msgid "Mark all events seen" msgstr "" -#: ../../include/conversation.php:953 -msgid "Follow Thread" +#: ../../include/nav.php:210 +msgid "Manage Your Channels" msgstr "" -#: ../../include/conversation.php:954 -msgid "Unfollow Thread" +#: ../../include/nav.php:212 +msgid "Account/Channel Settings" msgstr "" -#: ../../include/conversation.php:959 -msgid "Activity/Posts" +#: ../../include/nav.php:220 +msgid "Site Setup and Configuration" msgstr "" -#: ../../include/conversation.php:961 -msgid "Edit Connection" +#: ../../include/nav.php:256 +msgid "@name, #tag, ?doc, content" msgstr "" -#: ../../include/conversation.php:962 -msgid "Message" +#: ../../include/nav.php:257 +msgid "Please wait..." msgstr "" -#: ../../include/conversation.php:1079 -#, php-format -msgid "%s likes this." +#: ../../include/network.php:704 +msgid "view full size" msgstr "" -#: ../../include/conversation.php:1079 -#, php-format -msgid "%s doesn't like this." +#: ../../include/network.php:1935 ../../include/account.php:317 +#: ../../include/account.php:344 ../../include/account.php:404 +msgid "Administrator" msgstr "" -#: ../../include/conversation.php:1083 -#, 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/network.php:1949 +msgid "No Subject" +msgstr "" -#: ../../include/conversation.php:1085 -#, 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/network.php:2203 ../../include/network.php:2204 +msgid "Friendica" +msgstr "" -#: ../../include/conversation.php:1091 -msgid "and" +#: ../../include/network.php:2205 +msgid "OStatus" msgstr "" -#: ../../include/conversation.php:1094 -#, php-format -msgid ", and %d other people" -msgid_plural ", and %d other people" -msgstr[0] "" -msgstr[1] "" +#: ../../include/network.php:2206 +msgid "GNU-Social" +msgstr "" -#: ../../include/conversation.php:1095 +#: ../../include/network.php:2207 +msgid "RSS/Atom" +msgstr "" + +#: ../../include/network.php:2209 +msgid "Diaspora" +msgstr "" + +#: ../../include/network.php:2210 +msgid "Facebook" +msgstr "" + +#: ../../include/network.php:2211 +msgid "Zot" +msgstr "" + +#: ../../include/network.php:2212 +msgid "LinkedIn" +msgstr "" + +#: ../../include/network.php:2213 +msgid "XMPP/IM" +msgstr "" + +#: ../../include/network.php:2214 +msgid "MySpace" +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/items.php:899 ../../include/items.php:944 +msgid "(Unknown)" +msgstr "" + +#: ../../include/items.php:1143 +msgid "Visible to anybody on the internet." +msgstr "" + +#: ../../include/items.php:1145 +msgid "Visible to you only." +msgstr "" + +#: ../../include/items.php:1147 +msgid "Visible to anybody in this network." +msgstr "" + +#: ../../include/items.php:1149 +msgid "Visible to anybody authenticated." +msgstr "" + +#: ../../include/items.php:1151 #, php-format -msgid "%s like this." +msgid "Visible to anybody on %s." msgstr "" -#: ../../include/conversation.php:1095 +#: ../../include/items.php:1153 +msgid "Visible to all connections." +msgstr "" + +#: ../../include/items.php:1155 +msgid "Visible to approved connections." +msgstr "" + +#: ../../include/items.php:1157 +msgid "Visible to specific connections." +msgstr "" + +#: ../../include/items.php:3920 +msgid "Privacy group is empty." +msgstr "" + +#: ../../include/items.php:3927 #, php-format -msgid "%s don't like this." +msgid "Privacy group: %s" msgstr "" -#: ../../include/conversation.php:1134 -msgid "Set your location" +#: ../../include/items.php:3939 +msgid "Connection not found." msgstr "" -#: ../../include/conversation.php:1135 -msgid "Clear browser location" +#: ../../include/items.php:4292 +msgid "profile photo" msgstr "" -#: ../../include/conversation.php:1183 -msgid "Tag term:" +#: ../../include/text.php:404 +msgid "prev" msgstr "" -#: ../../include/conversation.php:1184 -msgid "Where are you right now?" +#: ../../include/text.php:406 +msgid "first" msgstr "" -#: ../../include/conversation.php:1222 -msgid "Page link name" +#: ../../include/text.php:435 +msgid "last" msgstr "" -#: ../../include/conversation.php:1225 -msgid "Post as" +#: ../../include/text.php:438 +msgid "next" msgstr "" -#: ../../include/conversation.php:1239 -msgid "Toggle voting" +#: ../../include/text.php:448 +msgid "older" msgstr "" -#: ../../include/conversation.php:1247 -msgid "Categories (optional, comma-separated list)" +#: ../../include/text.php:450 +msgid "newer" msgstr "" -#: ../../include/conversation.php:1274 -msgid "Set publish date" +#: ../../include/text.php:843 +msgid "No connections" msgstr "" -#: ../../include/conversation.php:1523 -msgid "Discover" +#: ../../include/text.php:868 +#, php-format +msgid "View all %s connections" msgstr "" -#: ../../include/conversation.php:1526 -msgid "Imported public streams" +#: ../../include/text.php:1013 ../../include/text.php:1018 +msgid "poke" msgstr "" -#: ../../include/conversation.php:1531 -msgid "Commented Order" +#: ../../include/text.php:1019 +msgid "ping" msgstr "" -#: ../../include/conversation.php:1534 -msgid "Sort by Comment Date" +#: ../../include/text.php:1019 +msgid "pinged" msgstr "" -#: ../../include/conversation.php:1538 -msgid "Posted Order" +#: ../../include/text.php:1020 +msgid "prod" msgstr "" -#: ../../include/conversation.php:1541 -msgid "Sort by Post Date" +#: ../../include/text.php:1020 +msgid "prodded" msgstr "" -#: ../../include/conversation.php:1549 -msgid "Posts that mention or involve you" +#: ../../include/text.php:1021 +msgid "slap" msgstr "" -#: ../../include/conversation.php:1558 -msgid "Activity Stream - by date" +#: ../../include/text.php:1021 +msgid "slapped" msgstr "" -#: ../../include/conversation.php:1564 -msgid "Starred" +#: ../../include/text.php:1022 +msgid "finger" msgstr "" -#: ../../include/conversation.php:1567 -msgid "Favourite Posts" +#: ../../include/text.php:1022 +msgid "fingered" msgstr "" -#: ../../include/conversation.php:1574 -msgid "Spam" +#: ../../include/text.php:1023 +msgid "rebuff" msgstr "" -#: ../../include/conversation.php:1577 -msgid "Posts flagged as SPAM" +#: ../../include/text.php:1023 +msgid "rebuffed" msgstr "" -#: ../../include/conversation.php:1634 -msgid "Status Messages and Posts" +#: ../../include/text.php:1035 +msgid "happy" msgstr "" -#: ../../include/conversation.php:1643 -msgid "About" +#: ../../include/text.php:1036 +msgid "sad" msgstr "" -#: ../../include/conversation.php:1646 -msgid "Profile Details" +#: ../../include/text.php:1037 +msgid "mellow" msgstr "" -#: ../../include/conversation.php:1662 -msgid "Files and Storage" +#: ../../include/text.php:1038 +msgid "tired" msgstr "" -#: ../../include/conversation.php:1682 ../../include/conversation.php:1685 -#: ../../include/widgets.php:850 -msgid "Chatrooms" +#: ../../include/text.php:1039 +msgid "perky" msgstr "" -#: ../../include/conversation.php:1698 -msgid "Saved Bookmarks" +#: ../../include/text.php:1040 +msgid "angry" msgstr "" -#: ../../include/conversation.php:1708 -msgid "Manage Webpages" +#: ../../include/text.php:1041 +msgid "stupefied" msgstr "" -#: ../../include/conversation.php:1773 -msgctxt "noun" -msgid "Attending" -msgid_plural "Attending" -msgstr[0] "" -msgstr[1] "" +#: ../../include/text.php:1042 +msgid "puzzled" +msgstr "" -#: ../../include/conversation.php:1776 -msgctxt "noun" -msgid "Not Attending" -msgid_plural "Not Attending" -msgstr[0] "" -msgstr[1] "" +#: ../../include/text.php:1043 +msgid "interested" +msgstr "" -#: ../../include/conversation.php:1779 -msgctxt "noun" -msgid "Undecided" -msgid_plural "Undecided" -msgstr[0] "" -msgstr[1] "" +#: ../../include/text.php:1044 +msgid "bitter" +msgstr "" -#: ../../include/conversation.php:1782 -msgctxt "noun" -msgid "Agree" -msgid_plural "Agrees" -msgstr[0] "" -msgstr[1] "" +#: ../../include/text.php:1045 +msgid "cheerful" +msgstr "" -#: ../../include/conversation.php:1785 -msgctxt "noun" -msgid "Disagree" -msgid_plural "Disagrees" -msgstr[0] "" -msgstr[1] "" +#: ../../include/text.php:1046 +msgid "alive" +msgstr "" -#: ../../include/conversation.php:1788 -msgctxt "noun" -msgid "Abstain" -msgid_plural "Abstains" -msgstr[0] "" -msgstr[1] "" +#: ../../include/text.php:1047 +msgid "annoyed" +msgstr "" -#: ../../include/oembed.php:340 -msgid "Embedded content" +#: ../../include/text.php:1048 +msgid "anxious" msgstr "" -#: ../../include/oembed.php:349 -msgid "Embedding disabled" +#: ../../include/text.php:1049 +msgid "cranky" msgstr "" -#: ../../include/activities.php:41 -msgid " and " +#: ../../include/text.php:1050 +msgid "disturbed" msgstr "" -#: ../../include/activities.php:49 -msgid "public profile" +#: ../../include/text.php:1051 +msgid "frustrated" msgstr "" -#: ../../include/activities.php:58 -#, php-format -msgid "%1$s changed %2$s to “%3$s”" +#: ../../include/text.php:1052 +msgid "depressed" msgstr "" -#: ../../include/activities.php:59 -#, php-format -msgid "Visit %1$s's %2$s" +#: ../../include/text.php:1053 +msgid "motivated" msgstr "" -#: ../../include/activities.php:62 -#, php-format -msgid "%1$s has an updated %2$s, changing %3$s." +#: ../../include/text.php:1054 +msgid "relaxed" msgstr "" -#: ../../include/taxonomy.php:188 ../../include/taxonomy.php:270 -#: ../../include/widgets.php:46 ../../include/widgets.php:429 -#: ../../include/contact_widgets.php:91 -msgid "Categories" +#: ../../include/text.php:1055 +msgid "surprised" msgstr "" -#: ../../include/taxonomy.php:228 ../../include/taxonomy.php:249 -msgid "Tags" +#: ../../include/text.php:1243 +msgid "May" msgstr "" -#: ../../include/taxonomy.php:293 -msgid "Keywords" +#: ../../include/text.php:1320 ../../include/text.php:1324 +msgid "Unknown Attachment" msgstr "" -#: ../../include/taxonomy.php:314 -msgid "have" +#: ../../include/text.php:1326 +msgid "unknown" msgstr "" -#: ../../include/taxonomy.php:314 -msgid "has" +#: ../../include/text.php:1362 +msgid "remove category" msgstr "" -#: ../../include/taxonomy.php:315 -msgid "want" +#: ../../include/text.php:1439 +msgid "remove from file" msgstr "" -#: ../../include/taxonomy.php:315 -msgid "wants" +#: ../../include/text.php:1738 ../../include/text.php:1809 +msgid "default" msgstr "" -#: ../../include/taxonomy.php:316 -msgid "likes" +#: ../../include/text.php:1746 +msgid "Page layout" msgstr "" -#: ../../include/taxonomy.php:317 -msgid "dislikes" +#: ../../include/text.php:1746 +msgid "You can create your own with the layouts tool" msgstr "" -#: ../../include/permissions.php:29 -msgid "Can view my normal stream and posts" +#: ../../include/text.php:1788 +msgid "Page content type" msgstr "" -#: ../../include/permissions.php:33 -msgid "Can view my webpages" +#: ../../include/text.php:1821 +msgid "Select an alternate language" msgstr "" -#: ../../include/permissions.php:37 -msgid "Can post on my channel page (\"wall\")" +#: ../../include/text.php:1958 +msgid "activity" msgstr "" -#: ../../include/permissions.php:40 -msgid "Can like/dislike stuff" +#: ../../include/text.php:2259 +msgid "Design Tools" msgstr "" -#: ../../include/permissions.php:40 -msgid "Profiles and things other than posts/comments" +#: ../../include/text.php:2265 +msgid "Pages" msgstr "" -#: ../../include/permissions.php:42 -msgid "Can forward to all my channel contacts via post @mentions" +#: ../../include/text.php:2287 +msgid "Import website..." msgstr "" -#: ../../include/permissions.php:42 -msgid "Advanced - useful for creating group forum channels" +#: ../../include/text.php:2288 +msgid "Select folder to import" msgstr "" -#: ../../include/permissions.php:43 -msgid "Can chat with me (when available)" +#: ../../include/text.php:2289 +msgid "Import from a zipped folder:" msgstr "" -#: ../../include/permissions.php:44 -msgid "Can write to my file storage and photos" +#: ../../include/text.php:2290 +msgid "Import from cloud files:" msgstr "" -#: ../../include/permissions.php:45 -msgid "Can edit my webpages" +#: ../../include/text.php:2291 +msgid "/cloud/channel/path/to/folder" msgstr "" -#: ../../include/permissions.php:47 -msgid "Somewhat advanced - very useful in open communities" +#: ../../include/text.php:2292 +msgid "Enter path to website files" msgstr "" -#: ../../include/permissions.php:49 -msgid "Can administer my channel resources" +#: ../../include/text.php:2293 +msgid "Select folder" msgstr "" -#: ../../include/permissions.php:49 -msgid "Extremely advanced. Leave this alone unless you know what you are doing" +#: ../../include/acl_selectors.php:174 +msgid "Who can see this?" msgstr "" -#: ../../include/widgets.php:103 -msgid "System" +#: ../../include/acl_selectors.php:175 +msgid "Custom selection" msgstr "" -#: ../../include/widgets.php:106 -msgid "New App" +#: ../../include/acl_selectors.php:176 +msgid "" +"Select \"Show\" to allow viewing. \"Don't show\" lets you override and limit " +"the scope of \"Show\"." msgstr "" -#: ../../include/widgets.php:154 -msgid "Suggestions" +#: ../../include/acl_selectors.php:177 +msgid "Show" msgstr "" -#: ../../include/widgets.php:155 -msgid "See more..." +#: ../../include/acl_selectors.php:178 +msgid "Don't show" msgstr "" -#: ../../include/widgets.php:175 +#: ../../include/acl_selectors.php:184 +msgid "Other networks and post services" +msgstr "" + +#: ../../include/acl_selectors.php:214 #, php-format -msgid "You have %1$.0f of %2$.0f allowed connections." +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/widgets.php:181 -msgid "Add New Connection" +#: ../../include/oembed.php:340 +msgid "Embedded content" msgstr "" -#: ../../include/widgets.php:182 -msgid "Enter channel address" +#: ../../include/oembed.php:349 +msgid "Embedding disabled" msgstr "" -#: ../../include/widgets.php:183 -msgid "Examples: bob@example.com, https://example.com/barbara" +#: ../../include/activities.php:41 +msgid " and " msgstr "" -#: ../../include/widgets.php:199 -msgid "Notes" +#: ../../include/activities.php:49 +msgid "public profile" msgstr "" -#: ../../include/widgets.php:273 -msgid "Remove term" +#: ../../include/activities.php:58 +#, php-format +msgid "%1$s changed %2$s to “%3$s”" msgstr "" -#: ../../include/widgets.php:313 ../../include/widgets.php:432 -#: ../../include/contact_widgets.php:56 ../../include/contact_widgets.php:94 -msgid "Everything" +#: ../../include/activities.php:59 +#, php-format +msgid "Visit %1$s's %2$s" msgstr "" -#: ../../include/widgets.php:354 -msgid "Archives" +#: ../../include/activities.php:62 +#, php-format +msgid "%1$s has an updated %2$s, changing %3$s." msgstr "" -#: ../../include/widgets.php:516 -msgid "Refresh" +#: ../../include/attach.php:248 ../../include/attach.php:334 +msgid "Item was not found." msgstr "" -#: ../../include/widgets.php:556 -msgid "Account settings" +#: ../../include/attach.php:500 +msgid "No source file." msgstr "" -#: ../../include/widgets.php:562 -msgid "Channel settings" +#: ../../include/attach.php:522 +msgid "Cannot locate file to replace" msgstr "" -#: ../../include/widgets.php:571 -msgid "Additional features" +#: ../../include/attach.php:540 +msgid "Cannot locate file to revise/update" msgstr "" -#: ../../include/widgets.php:578 -msgid "Feature/Addon settings" +#: ../../include/attach.php:675 +#, php-format +msgid "File exceeds size limit of %d" msgstr "" -#: ../../include/widgets.php:584 -msgid "Display settings" +#: ../../include/attach.php:689 +#, php-format +msgid "You have reached your limit of %1$.0f Mbytes attachment storage." msgstr "" -#: ../../include/widgets.php:591 -msgid "Manage locations" +#: ../../include/attach.php:847 +msgid "File upload failed. Possible system limit or action terminated." msgstr "" -#: ../../include/widgets.php:600 -msgid "Export channel" +#: ../../include/attach.php:860 +msgid "Stored file could not be verified. Upload failed." msgstr "" -#: ../../include/widgets.php:607 -msgid "Connected apps" +#: ../../include/attach.php:916 ../../include/attach.php:932 +msgid "Path not available." msgstr "" -#: ../../include/widgets.php:631 -msgid "Premium Channel Settings" +#: ../../include/attach.php:978 ../../include/attach.php:1130 +msgid "Empty pathname" msgstr "" -#: ../../include/widgets.php:660 -msgid "Private Mail Menu" +#: ../../include/attach.php:1004 +msgid "duplicate filename or path" msgstr "" -#: ../../include/widgets.php:662 -msgid "Combined View" +#: ../../include/attach.php:1026 +msgid "Path not found." msgstr "" -#: ../../include/widgets.php:694 ../../include/widgets.php:706 -msgid "Conversations" +#: ../../include/attach.php:1084 +msgid "mkdir failed." msgstr "" -#: ../../include/widgets.php:698 -msgid "Received Messages" +#: ../../include/attach.php:1088 +msgid "database storage failed." msgstr "" -#: ../../include/widgets.php:702 -msgid "Sent Messages" +#: ../../include/attach.php:1136 +msgid "Empty path" msgstr "" -#: ../../include/widgets.php:716 -msgid "No messages." +#: ../../include/taxonomy.php:228 ../../include/taxonomy.php:249 +msgid "Tags" msgstr "" -#: ../../include/widgets.php:734 -msgid "Delete conversation" +#: ../../include/taxonomy.php:293 +msgid "Keywords" msgstr "" -#: ../../include/widgets.php:760 -msgid "Events Tools" +#: ../../include/taxonomy.php:314 +msgid "have" msgstr "" -#: ../../include/widgets.php:761 -msgid "Export Calendar" +#: ../../include/taxonomy.php:314 +msgid "has" msgstr "" -#: ../../include/widgets.php:762 -msgid "Import Calendar" +#: ../../include/taxonomy.php:315 +msgid "want" msgstr "" -#: ../../include/widgets.php:854 -msgid "Overview" +#: ../../include/taxonomy.php:315 +msgid "wants" msgstr "" -#: ../../include/widgets.php:861 -msgid "Chat Members" +#: ../../include/taxonomy.php:316 +msgid "likes" msgstr "" -#: ../../include/widgets.php:883 -msgid "Wiki List" +#: ../../include/taxonomy.php:317 +msgid "dislikes" msgstr "" -#: ../../include/widgets.php:921 -msgid "Wiki Pages" +#: ../../include/zot.php:700 +msgid "Invalid data packet" msgstr "" -#: ../../include/widgets.php:956 -msgid "Bookmarked Chatrooms" +#: ../../include/zot.php:716 +msgid "Unable to verify channel signature" msgstr "" -#: ../../include/widgets.php:979 -msgid "Suggested Chatrooms" +#: ../../include/zot.php:2329 +#, php-format +msgid "Unable to verify site signature for %s" msgstr "" -#: ../../include/widgets.php:1125 ../../include/widgets.php:1237 -msgid "photo/image" +#: ../../include/zot.php:3706 +msgid "invalid target signature" msgstr "" -#: ../../include/widgets.php:1180 -msgid "Click to show more" +#: ../../include/channel.php:33 +msgid "Unable to obtain identity information from database" msgstr "" -#: ../../include/widgets.php:1331 -msgid "Rating Tools" +#: ../../include/channel.php:67 +msgid "Empty name" msgstr "" -#: ../../include/widgets.php:1335 ../../include/widgets.php:1337 -msgid "Rate Me" +#: ../../include/channel.php:70 +msgid "Name too long" msgstr "" -#: ../../include/widgets.php:1340 -msgid "View Ratings" +#: ../../include/channel.php:181 +msgid "No account identifier" msgstr "" -#: ../../include/widgets.php:1424 -msgid "Forums" +#: ../../include/channel.php:193 +msgid "Nickname is required." msgstr "" -#: ../../include/widgets.php:1453 -msgid "Tasks" +#: ../../include/channel.php:207 +msgid "Reserved nickname. Please choose another." msgstr "" -#: ../../include/widgets.php:1462 -msgid "Documentation" +#: ../../include/channel.php:212 +msgid "" +"Nickname has unsupported characters or is already being used on this site." msgstr "" -#: ../../include/widgets.php:1464 -msgid "Project/Site Information" +#: ../../include/channel.php:272 +msgid "Unable to retrieve created identity" msgstr "" -#: ../../include/widgets.php:1465 -msgid "For Members" +#: ../../include/channel.php:341 +msgid "Default Profile" msgstr "" -#: ../../include/widgets.php:1466 -msgid "For Administrators" +#: ../../include/channel.php:813 +msgid "Requested channel is not available." msgstr "" -#: ../../include/widgets.php:1467 -msgid "For Developers" +#: ../../include/channel.php:960 +msgid "Create New Profile" msgstr "" -#: ../../include/widgets.php:1491 ../../include/widgets.php:1529 -msgid "Member registrations waiting for confirmation" +#: ../../include/channel.php:980 +msgid "Visible to everybody" msgstr "" -#: ../../include/widgets.php:1497 -msgid "Inspect queue" +#: ../../include/channel.php:1053 ../../include/channel.php:1166 +msgid "Gender:" msgstr "" -#: ../../include/widgets.php:1499 -msgid "DB updates" +#: ../../include/channel.php:1054 ../../include/channel.php:1210 +msgid "Status:" msgstr "" -#: ../../include/widgets.php:1525 -msgid "Plugin Features" +#: ../../include/channel.php:1055 ../../include/channel.php:1221 +msgid "Homepage:" msgstr "" -#: ../../include/attach.php:248 ../../include/attach.php:334 -msgid "Item was not found." +#: ../../include/channel.php:1056 +msgid "Online Now" msgstr "" -#: ../../include/attach.php:500 -msgid "No source file." +#: ../../include/channel.php:1171 +msgid "Like this channel" msgstr "" -#: ../../include/attach.php:522 -msgid "Cannot locate file to replace" +#: ../../include/channel.php:1195 +msgid "j F, Y" msgstr "" -#: ../../include/attach.php:540 -msgid "Cannot locate file to revise/update" +#: ../../include/channel.php:1196 +msgid "j F" msgstr "" -#: ../../include/attach.php:675 -#, php-format -msgid "File exceeds size limit of %d" +#: ../../include/channel.php:1203 +msgid "Birthday:" msgstr "" -#: ../../include/attach.php:689 +#: ../../include/channel.php:1216 #, php-format -msgid "You have reached your limit of %1$.0f Mbytes attachment storage." +msgid "for %1$d %2$s" msgstr "" -#: ../../include/attach.php:847 -msgid "File upload failed. Possible system limit or action terminated." +#: ../../include/channel.php:1219 +msgid "Sexual Preference:" msgstr "" -#: ../../include/attach.php:860 -msgid "Stored file could not be verified. Upload failed." +#: ../../include/channel.php:1225 +msgid "Tags:" msgstr "" -#: ../../include/attach.php:916 ../../include/attach.php:932 -msgid "Path not available." +#: ../../include/channel.php:1227 +msgid "Political Views:" msgstr "" -#: ../../include/attach.php:978 ../../include/attach.php:1130 -msgid "Empty pathname" +#: ../../include/channel.php:1229 +msgid "Religion:" msgstr "" -#: ../../include/attach.php:1004 -msgid "duplicate filename or path" +#: ../../include/channel.php:1233 +msgid "Hobbies/Interests:" msgstr "" -#: ../../include/attach.php:1026 -msgid "Path not found." +#: ../../include/channel.php:1235 +msgid "Likes:" msgstr "" -#: ../../include/attach.php:1084 -msgid "mkdir failed." +#: ../../include/channel.php:1237 +msgid "Dislikes:" msgstr "" -#: ../../include/attach.php:1088 -msgid "database storage failed." +#: ../../include/channel.php:1239 +msgid "Contact information and Social Networks:" msgstr "" -#: ../../include/attach.php:1136 -msgid "Empty path" +#: ../../include/channel.php:1241 +msgid "My other channels:" +msgstr "" + +#: ../../include/channel.php:1243 +msgid "Musical interests:" +msgstr "" + +#: ../../include/channel.php:1245 +msgid "Books, literature:" +msgstr "" + +#: ../../include/channel.php:1247 +msgid "Television:" +msgstr "" + +#: ../../include/channel.php:1249 +msgid "Film/dance/culture/entertainment:" +msgstr "" + +#: ../../include/channel.php:1251 +msgid "Love/Romance:" +msgstr "" + +#: ../../include/channel.php:1253 +msgid "Work/employment:" +msgstr "" + +#: ../../include/channel.php:1255 +msgid "School/education:" +msgstr "" + +#: ../../include/channel.php:1276 +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/event.php:821 +msgid "This event has been added to your calendar." +msgstr "" + +#: ../../include/event.php:1021 +msgid "Not specified" +msgstr "" + +#: ../../include/event.php:1022 +msgid "Needs Action" +msgstr "" + +#: ../../include/event.php:1023 +msgid "Completed" +msgstr "" + +#: ../../include/event.php:1024 +msgid "In Process" +msgstr "" + +#: ../../include/event.php:1025 +msgid "Cancelled" msgstr "" #: ../../include/contact_widgets.php:11 @@ -9759,181 +9764,203 @@ msgstr "" msgid "Stored post could not be verified." msgstr "" -#: ../../include/auth.php:148 -msgid "Logged out." +#: ../../include/account.php:28 +msgid "Not a valid email address" msgstr "" -#: ../../include/auth.php:275 -msgid "Failed authentication" +#: ../../include/account.php:30 +msgid "Your email domain is not among those allowed on this site" msgstr "" -#: ../../include/auth.php:286 -msgid "Login failed." +#: ../../include/account.php:36 +msgid "Your email address is already registered at this site." msgstr "" -#: ../../include/connections.php:95 -msgid "New window" +#: ../../include/account.php:68 +msgid "An invitation is required." msgstr "" -#: ../../include/connections.php:96 -msgid "Open the selected location in a different window or browser tab" +#: ../../include/account.php:72 +msgid "Invitation could not be verified." msgstr "" -#: ../../include/connections.php:214 +#: ../../include/account.php:122 +msgid "Please enter the required information." +msgstr "" + +#: ../../include/account.php:189 +msgid "Failed to store account information." +msgstr "" + +#: ../../include/account.php:249 #, php-format -msgid "User '%s' deleted" +msgid "Registration confirmation for %s" msgstr "" -#: ../../include/zot.php:697 -msgid "Invalid data packet" +#: ../../include/account.php:315 +#, php-format +msgid "Registration request at %s" msgstr "" -#: ../../include/zot.php:713 -msgid "Unable to verify channel signature" +#: ../../include/account.php:339 +msgid "your registration password" msgstr "" -#: ../../include/zot.php:2326 +#: ../../include/account.php:342 ../../include/account.php:402 #, php-format -msgid "Unable to verify site signature for %s" +msgid "Registration details for %s" msgstr "" -#: ../../include/zot.php:3703 -msgid "invalid target signature" +#: ../../include/account.php:414 +msgid "Account approved." msgstr "" -#: ../../view/theme/redbasic/php/config.php:82 -msgid "Focus (Hubzilla default)" +#: ../../include/account.php:454 +#, php-format +msgid "Registration revoked for %s" msgstr "" -#: ../../view/theme/redbasic/php/config.php:103 -msgid "Theme settings" +#: ../../include/account.php:739 ../../include/account.php:741 +msgid "Click here to upgrade." msgstr "" -#: ../../view/theme/redbasic/php/config.php:104 -msgid "Select scheme" +#: ../../include/account.php:747 +msgid "This action exceeds the limits set by your subscription plan." msgstr "" -#: ../../view/theme/redbasic/php/config.php:105 +#: ../../include/account.php:752 +msgid "This action is not available under your subscription plan." +msgstr "" + +#: ../../view/theme/redbasic/php/config.php:6 +msgid "Focus (Hubzilla default)" +msgstr "" + +#: ../../view/theme/redbasic/php/config.php:110 +msgid "Theme settings" +msgstr "" + +#: ../../view/theme/redbasic/php/config.php:111 msgid "Narrow navbar" msgstr "" -#: ../../view/theme/redbasic/php/config.php:106 +#: ../../view/theme/redbasic/php/config.php:112 msgid "Navigation bar background color" msgstr "" -#: ../../view/theme/redbasic/php/config.php:107 +#: ../../view/theme/redbasic/php/config.php:113 msgid "Navigation bar gradient top color" msgstr "" -#: ../../view/theme/redbasic/php/config.php:108 +#: ../../view/theme/redbasic/php/config.php:114 msgid "Navigation bar gradient bottom color" msgstr "" -#: ../../view/theme/redbasic/php/config.php:109 +#: ../../view/theme/redbasic/php/config.php:115 msgid "Navigation active button gradient top color" msgstr "" -#: ../../view/theme/redbasic/php/config.php:110 +#: ../../view/theme/redbasic/php/config.php:116 msgid "Navigation active button gradient bottom color" msgstr "" -#: ../../view/theme/redbasic/php/config.php:111 +#: ../../view/theme/redbasic/php/config.php:117 msgid "Navigation bar border color " msgstr "" -#: ../../view/theme/redbasic/php/config.php:112 +#: ../../view/theme/redbasic/php/config.php:118 msgid "Navigation bar icon color " msgstr "" -#: ../../view/theme/redbasic/php/config.php:113 +#: ../../view/theme/redbasic/php/config.php:119 msgid "Navigation bar active icon color " msgstr "" -#: ../../view/theme/redbasic/php/config.php:114 +#: ../../view/theme/redbasic/php/config.php:120 msgid "link color" msgstr "" -#: ../../view/theme/redbasic/php/config.php:115 +#: ../../view/theme/redbasic/php/config.php:121 msgid "Set font-color for banner" msgstr "" -#: ../../view/theme/redbasic/php/config.php:116 +#: ../../view/theme/redbasic/php/config.php:122 msgid "Set the background color" msgstr "" -#: ../../view/theme/redbasic/php/config.php:117 +#: ../../view/theme/redbasic/php/config.php:123 msgid "Set the background image" msgstr "" -#: ../../view/theme/redbasic/php/config.php:118 +#: ../../view/theme/redbasic/php/config.php:124 msgid "Set the background color of items" msgstr "" -#: ../../view/theme/redbasic/php/config.php:119 +#: ../../view/theme/redbasic/php/config.php:125 msgid "Set the background color of comments" msgstr "" -#: ../../view/theme/redbasic/php/config.php:120 +#: ../../view/theme/redbasic/php/config.php:126 msgid "Set the border color of comments" msgstr "" -#: ../../view/theme/redbasic/php/config.php:121 +#: ../../view/theme/redbasic/php/config.php:127 msgid "Set the indent for comments" msgstr "" -#: ../../view/theme/redbasic/php/config.php:122 +#: ../../view/theme/redbasic/php/config.php:128 msgid "Set the basic color for item icons" msgstr "" -#: ../../view/theme/redbasic/php/config.php:123 +#: ../../view/theme/redbasic/php/config.php:129 msgid "Set the hover color for item icons" msgstr "" -#: ../../view/theme/redbasic/php/config.php:124 +#: ../../view/theme/redbasic/php/config.php:130 msgid "Set font-size for the entire application" msgstr "" -#: ../../view/theme/redbasic/php/config.php:124 +#: ../../view/theme/redbasic/php/config.php:130 msgid "Example: 14px" msgstr "" -#: ../../view/theme/redbasic/php/config.php:125 +#: ../../view/theme/redbasic/php/config.php:131 msgid "Set font-size for posts and comments" msgstr "" -#: ../../view/theme/redbasic/php/config.php:126 +#: ../../view/theme/redbasic/php/config.php:132 msgid "Set font-color for posts and comments" msgstr "" -#: ../../view/theme/redbasic/php/config.php:127 +#: ../../view/theme/redbasic/php/config.php:133 msgid "Set radius of corners" msgstr "" -#: ../../view/theme/redbasic/php/config.php:128 +#: ../../view/theme/redbasic/php/config.php:134 msgid "Set shadow depth of photos" msgstr "" -#: ../../view/theme/redbasic/php/config.php:129 +#: ../../view/theme/redbasic/php/config.php:135 msgid "Set maximum width of content region in pixel" msgstr "" -#: ../../view/theme/redbasic/php/config.php:129 +#: ../../view/theme/redbasic/php/config.php:135 msgid "Leave empty for default width" msgstr "" -#: ../../view/theme/redbasic/php/config.php:130 +#: ../../view/theme/redbasic/php/config.php:136 msgid "Left align page content" msgstr "" -#: ../../view/theme/redbasic/php/config.php:131 +#: ../../view/theme/redbasic/php/config.php:137 msgid "Set minimum opacity of nav bar - to hide it" msgstr "" -#: ../../view/theme/redbasic/php/config.php:132 +#: ../../view/theme/redbasic/php/config.php:138 msgid "Set size of conversation author photo" msgstr "" -#: ../../view/theme/redbasic/php/config.php:133 +#: ../../view/theme/redbasic/php/config.php:139 msgid "Set size of followup author photos" msgstr "" @@ -9979,24 +10006,24 @@ msgstr "" msgid "Forgot your password?" msgstr "" -#: ../../boot.php:2286 +#: ../../boot.php:2289 msgid "toggle mobile" msgstr "" -#: ../../boot.php:2441 +#: ../../boot.php:2444 msgid "Website SSL certificate is not valid. Please correct." msgstr "" -#: ../../boot.php:2444 +#: ../../boot.php:2447 #, php-format msgid "[hubzilla] Website SSL error for %s" msgstr "" -#: ../../boot.php:2548 +#: ../../boot.php:2551 msgid "Cron/Scheduled tasks not running." msgstr "" -#: ../../boot.php:2552 +#: ../../boot.php:2555 #, php-format msgid "[hubzilla] Cron tasks not running on %s" msgstr "" diff --git a/view/css/conversation.css b/view/css/conversation.css index 5af0c55e7..6c5171545 100644 --- a/view/css/conversation.css +++ b/view/css/conversation.css @@ -1,6 +1,6 @@ /* jot */ -.jothidden input { +.jothidden input[type="text"] { border: 0px; margin: 0px; height: 39px; @@ -70,6 +70,10 @@ margin-bottom: 30px; } +#profile-jot-plugin-wrapper { + margin-top: 10px; +} + #profile-rotator-wrapper { float: left; } @@ -78,14 +82,6 @@ padding: 15px 0px 0px 15px; } -.profile-jot-net { - float: left; - margin-right: 10px; - margin-top: 5px; - margin-bottom: 5px; - padding: 5px; -} - /* conversation */ .thread-wrapper.toplevel_item { diff --git a/view/js/acl.js b/view/js/acl.js index eb7b7f523..c1685e137 100644 --- a/view/js/acl.js +++ b/view/js/acl.js @@ -100,13 +100,6 @@ ACL.prototype.on_submit = function() { $(that.deny_cid).each(function(i,v) { that.form_id.append("<input class='acl-field' type='hidden' name='contact_deny[]' value='"+v+"'>"); }); - - var formfields = $('.profile-jot-net input').serializeArray(); - - $.each(formfields, function(i, field) { - that.form_id.append("<input class='acl-field' type='hidden' name='"+field.name+"' value='"+field.value+"'>"); - }); - }; ACL.prototype.search = function() { @@ -283,6 +276,7 @@ ACL.prototype.update_view = function(value) { /* jot acl */ $('#jot-perms-icon, #dialog-perms-icon').removeClass('fa-lock').addClass('fa-unlock'); + $('#dbtn-jotnets').show(); $('.profile-jot-net input').attr('disabled', false); } @@ -295,6 +289,7 @@ ACL.prototype.update_view = function(value) { /* jot acl */ $('#jot-perms-icon, #dialog-perms-icon').removeClass('fa-unlock').addClass('fa-lock'); + $('#dbtn-jotnets').hide(); $('.profile-jot-net input').attr('disabled', 'disabled'); } @@ -306,6 +301,7 @@ ACL.prototype.update_view = function(value) { /* jot acl */ $('#jot-perms-icon, #dialog-perms-icon').removeClass('fa-unlock').addClass('fa-lock'); + $('#dbtn-jotnets').hide(); $('.profile-jot-net input').attr('disabled', 'disabled'); } @@ -317,10 +313,12 @@ ACL.prototype.update_view = function(value) { /* jot acl */ if(that.allow_gid.length === 0 && that.allow_cid.length === 0 && that.deny_gid.length === 0 && that.deny_cid.length === 0 && value === 'custom') { $('#jot-perms-icon, #dialog-perms-icon').removeClass('fa-lock').addClass('fa-unlock'); + $('#dbtn-jotnets').show(); $('.profile-jot-net input').attr('disabled', false); } else { $('#jot-perms-icon, #dialog-perms-icon').removeClass('fa-unlock').addClass('fa-lock'); + $('#dbtn-jotnets').hide(); $('.profile-jot-net input').attr('disabled', 'disabled'); } } diff --git a/view/tpl/acl_selector.tpl b/view/tpl/acl_selector.tpl index 70ef4469a..dbdbd6a56 100755 --- a/view/tpl/acl_selector.tpl +++ b/view/tpl/acl_selector.tpl @@ -27,16 +27,6 @@ </div> {{/if}} - {{if $jotnets}} - <div class="jotnets-wrapper" role="tab" id="jotnets-wrapper"> - <a data-toggle="collapse" class="btn btn-block btn-default" href="#jotnets-collapse" aria-expanded="false" aria-controls="jotnets-collapse">{{$jnetModalTitle}} <span class="caret"></span></a> - </div> - <div id="jotnets-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="acl-select"> - {{$jotnets}} - <div class="clear"></div> - </div> - {{/if}} - <div id="acl-wrapper"> <div id="acl-list"> <div id="acl-search-wrapper"> @@ -47,13 +37,14 @@ <div id="acl-list-content"></div> </div> </div> - <span id="acl-fields"></span> </div> + <div class="acl-list-item" rel="acl-template" style="display:none"> <img data-src="{0}"><p>{1}</p> <button class="acl-button-hide btn btn-xs btn-default"><i class="fa fa-times"></i> {{$hide}}</button> <button class="acl-button-show btn btn-xs btn-default"><i class="fa fa-check"></i> {{$show}}</button> </div> + </div> <div class="modal-footer clear"> <button type="button" class="btn btn-default" data-dismiss="modal">{{$aclModalDismiss}}</button> diff --git a/view/tpl/admin_plugins_details.tpl b/view/tpl/admin_plugins_details.tpl index b8cc72a04..309fc9569 100755 --- a/view/tpl/admin_plugins_details.tpl +++ b/view/tpl/admin_plugins_details.tpl @@ -24,6 +24,9 @@ {{if $info.minphpversion}} <p class="versionlimit">{{$str_minphpversion}}{{$info.minphpversion}}</p> {{/if}} + {{if $info.serverroles}} + <p class="versionlimit">{{$str_serverroles}}{{$info.serverroles}}</p> + {{/if}} {{if $info.requires}} <p class="versionlimit">{{$str_requires}}{{$info.requires}}</p> {{/if}} diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index 20357b66f..a3bfad842 100755 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -80,10 +80,10 @@ </button> {{/if}} {{if $embedPhotos}} - <button id="embed-photo-wrapper" class="btn btn-default btn-sm" title="{{$embedPhotos}}" onclick="initializeEmbedPhotoDialog();return false;"> - <i id="embed-photo" class="fa fa-file-image-o jot-icons"></i> - </button> - {{/if}} + <button id="embed-photo-wrapper" class="btn btn-default btn-sm" title="{{$embedPhotos}}" onclick="initializeEmbedPhotoDialog();return false;"> + <i id="embed-photo" class="fa fa-file-image-o jot-icons"></i> + </button> + {{/if}} </div> <div class="btn-group hidden-xs hidden-sm"> {{if $setloc}} @@ -130,7 +130,7 @@ <button type="button" id="more-tools" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" aria-expanded="false"> <i id="more-tools-icon" class="fa fa-caret-down jot-icons"></i> </button> - <ul class="dropdown-menu dropdown-menu" role="menu"> + <ul class="dropdown-menu" role="menu"> {{if $visitor}} {{if $writefiles}} <li><a id="wall-file-upload-sub" href="#" ><i class="fa fa-paperclip"></i> {{$attach}}</a></li> @@ -173,17 +173,42 @@ <i class="fa fa-eye jot-icons" ></i> </button> {{/if}} + {{if $jotnets}} + <button id="dbtn-jotnets" class="btn btn-default btn-sm" data-toggle="modal" data-target="#jotnetsModal" type="button" title="{{$jotnets_label}}" style="{{if $lockstate == 'lock'}}display: none;{{/if}}"> + <i class="fa fa-share-alt jot-icons"></i> + </button> + {{/if}} {{if $showacl}} - <button id="dbtn-acl" class="acl-select btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" title="{{$permset}}" type="button" data-form_id="profile-jot-form"> + <button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" title="{{$permset}}" type="button" data-form_id="profile-jot-form"> <i id="jot-perms-icon" class="fa fa-{{$lockstate}} jot-icons"></i>{{if $bang}} <i class="fa fa-exclamation jot-icons"></i>{{/if}} </button> {{/if}} - <button id="dbtn-submit" class="acl-submit btn btn-primary btn-sm" type="submit" tabindex=3 name="button-submit">{{$share}}</button> + <button id="dbtn-submit" class="btn btn-primary btn-sm" type="submit" tabindex="3" name="button-submit">{{$share}}</button> </div> - <div id="profile-jot-perms-end"></div> + <div class="clear"></div> + {{if $jotplugins}} <div id="profile-jot-plugin-wrapper"> {{$jotplugins}} </div> + {{/if}} + {{if $jotnets}} + <div class="modal" id="jotnetsModal" tabindex="-1" role="dialog" aria-labelledby="jotnetsModalLabel" aria-hidden="true"> + <div class="modal-dialog"> + <div class="modal-content"> + <div class="modal-header"> + <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> + <h4 class="modal-title" id="expiryModalLabel">{{$jotnets_label}}</h4> + </div> + <div class="modal-body"> + {{$jotnets}} + </div> + <div class="modal-footer"> + <button type="button" class="btn btn-default" data-dismiss="modal">Close</button> + </div> + </div><!-- /.modal-content --> + </div><!-- /.modal-dialog --> + </div><!-- /.modal --> + {{/if}} </div> <div id="profile-jot-text-loading"></div> <div id="profile-jot-end" class="clear"></div> @@ -197,70 +222,78 @@ {{if $feature_expire}} <!-- Modal for item expiry--> <div class="modal" id="expiryModal" tabindex="-1" role="dialog" aria-labelledby="expiryModalLabel" aria-hidden="true"> - <div class="modal-dialog"> - <div class="modal-content"> - <div class="modal-header"> - <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> - <h4 class="modal-title" id="expiryModalLabel">{{$expires}}</h4> - </div> - <!-- <div class="modal-body"> --> - <div class="modal-body form-group" style="width:90%"> - <div class='date'><input type='text' placeholder='yyyy-mm-dd HH:MM' name='start_text' id='expiration-date' class="form-control" /></div><script type='text/javascript'>$(function () {var picker = $('#expiration-date').datetimepicker({format:'Y-m-d H:i', minDate: 0 }); })</script> - </div> - <!-- </div> --> - <div class="modal-footer"> - <button type="button" class="btn btn-default" data-dismiss="modal">{{$expiryModalCANCEL}}</button> - <button id="expiry-modal-OKButton" type="button" class="btn btn-primary">{{$expiryModalOK}}</button> - </div> - </div><!-- /.modal-content --> - </div><!-- /.modal-dialog --> + <div class="modal-dialog"> + <div class="modal-content"> + <div class="modal-header"> + <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> + <h4 class="modal-title" id="expiryModalLabel">{{$expires}}</h4> + </div> + <div class="modal-body form-group" style="width:90%"> + <div class="date"> + <input type="text" placeholder="yyyy-mm-dd HH:MM" name="start_text" id="expiration-date" class="form-control" /> + </div> + <script> + $(function () { + var picker = $('#expiration-date').datetimepicker({format:'Y-m-d H:i', minDate: 0 }); + }); + </script> + </div> + <div class="modal-footer"> + <button type="button" class="btn btn-default" data-dismiss="modal">{{$expiryModalCANCEL}}</button> + <button id="expiry-modal-OKButton" type="button" class="btn btn-primary">{{$expiryModalOK}}</button> + </div> + </div><!-- /.modal-content --> + </div><!-- /.modal-dialog --> </div><!-- /.modal --> {{/if}} {{if $feature_future}} -<!-- Modal for item created--> <div class="modal" id="createdModal" tabindex="-1" role="dialog" aria-labelledby="createdModalLabel" aria-hidden="true"> - <div class="modal-dialog"> - <div class="modal-content"> - <div class="modal-header"> - <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> - <h4 class="modal-title" id="createdModalLabel">{{$future_txt}}</h4> - </div> - <!-- <div class="modal-body"> --> - <div class="modal-body form-group" style="width:90%"> - <div class='date'><input type='text' placeholder='yyyy-mm-dd HH:MM' name='created_text' id='created-date' class="form-control" /></div><script type='text/javascript'>$(function () {var picker = $('#created-date').datetimepicker({format:'Y-m-d H:i', minDate: 0 }); })</script> - </div> - <!-- </div> --> - <div class="modal-footer"> - <button type="button" class="btn btn-default" data-dismiss="modal">{{$expiryModalCANCEL}}</button> - <button id="created-modal-OKButton" type="button" class="btn btn-primary">{{$expiryModalOK}}</button> - </div> - </div><!-- /.modal-content --> - </div><!-- /.modal-dialog --> + <div class="modal-dialog"> + <div class="modal-content"> + <div class="modal-header"> + <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> + <h4 class="modal-title" id="createdModalLabel">{{$future_txt}}</h4> + </div> + <div class="modal-body form-group" style="width:90%"> + <div class="date"> + <input type="text" placeholder="yyyy-mm-dd HH:MM" name="created_text" id="created-date" class="form-control" /> + </div> + <script> + $(function () { + var picker = $('#created-date').datetimepicker({format:'Y-m-d H:i', minDate: 0 }); + }); + </script> + </div> + <div class="modal-footer"> + <button type="button" class="btn btn-default" data-dismiss="modal">{{$expiryModalCANCEL}}</button> + <button id="created-modal-OKButton" type="button" class="btn btn-primary">{{$expiryModalOK}}</button> + </div> + </div><!-- /.modal-content --> + </div><!-- /.modal-dialog --> </div><!-- /.modal --> {{/if}} {{if $embedPhotos}} <div class="modal" id="embedPhotoModal" tabindex="-1" role="dialog" aria-labelledby="embedPhotoLabel" aria-hidden="true"> - <div class="modal-dialog"> - <div class="modal-content"> - <div class="modal-header"> - <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> - <h4 class="modal-title" id="embedPhotoModalLabel">{{$embedPhotosModalTitle}}</h4> - </div> - <div class="modal-body" id="embedPhotoModalBody" > - <div id="embedPhotoModalBodyAlbumListDialog" class="hide"> - <div id="embedPhotoModalBodyAlbumList"></div> - </div> - <div id="embedPhotoModalBodyAlbumDialog" class="hide"> - </div> - </div> - <div class="modal-footer"> - <button type="button" class="btn btn-default" data-dismiss="modal">{{$embedPhotosModalCancel}}</button> - <button id="embed-photo-OKButton" type="button" class="btn btn-primary">{{$embedPhotosModalOK}}</button> - </div> - </div><!-- /.modal-content --> - </div><!-- /.modal-dialog --> + <div class="modal-dialog"> + <div class="modal-content"> + <div class="modal-header"> + <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> + <h4 class="modal-title" id="embedPhotoModalLabel">{{$embedPhotosModalTitle}}</h4> + </div> + <div class="modal-body" id="embedPhotoModalBody" > + <div id="embedPhotoModalBodyAlbumListDialog" class="hide"> + <div id="embedPhotoModalBodyAlbumList"></div> + </div> + <div id="embedPhotoModalBodyAlbumDialog" class="hide"></div> + </div> + <div class="modal-footer"> + <button type="button" class="btn btn-default" data-dismiss="modal">{{$embedPhotosModalCancel}}</button> + <button id="embed-photo-OKButton" type="button" class="btn btn-primary">{{$embedPhotosModalOK}}</button> + </div> + </div><!-- /.modal-content --> + </div><!-- /.modal-dialog --> </div><!-- /.modal --> {{/if}} diff --git a/view/tpl/msg-header.tpl b/view/tpl/msg-header.tpl index 3407e152c..013e1cfdc 100755 --- a/view/tpl/msg-header.tpl +++ b/view/tpl/msg-header.tpl @@ -1,52 +1,9 @@ -<script language="javascript" type="text/javascript" src="{{$baseurl}}/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script> +<script type="text/javascript" src="view/js/ajaxupload.js" ></script> <script language="javascript" type="text/javascript"> -var plaintext = '{{$editselect}}'; - -if(plaintext != 'none') { - tinyMCE.init({ - theme : "advanced", - mode : "specific_textareas", - editor_selector: /(profile-jot-text|prvmail-text)/, - plugins : "bbcode,paste", - theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor", - theme_advanced_buttons2 : "", - theme_advanced_buttons3 : "", - theme_advanced_toolbar_location : "top", - theme_advanced_toolbar_align : "center", - theme_advanced_blockformats : "blockquote,code", - gecko_spellcheck : true, - paste_text_sticky : true, - entity_encoding : "raw", - add_unload_trigger : false, - remove_linebreaks : false, - force_p_newlines : false, - force_br_newlines : true, - forced_root_block : '', - convert_urls: false, - content_css: "{{$baseurl}}/view/custom_tinymce.css", - //Character count - theme_advanced_path : false, - setup : function(ed) { - ed.onInit.add(function(ed) { - ed.pasteAsPlainText = true; - var editorId = ed.editorId; - var textarea = $('#'+editorId); - if (typeof(textarea.attr('tabindex')) != "undefined") { - $('#'+editorId+'_ifr').attr('tabindex', textarea.attr('tabindex')); - textarea.attr('tabindex', null); - } - }); - } - }); -} -else $("#prvmail-text").editor_autocomplete(baseurl+"/acl"); -</script> -<script type="text/javascript" src="view/js/ajaxupload.js" ></script> -<script> $(document).ready(function() { var file_uploader = new window.AjaxUpload( @@ -114,12 +71,8 @@ else } function addmailtext(data) { - if(plaintext == 'none') { - var currentText = $("#prvmail-text").val(); - $("#prvmail-text").val(currentText + data); - } - else - tinyMCE.execCommand('mceInsertRawHTML',false,data); + var currentText = $("#prvmail-text").val(); + $("#prvmail-text").val(currentText + data); } diff --git a/view/tpl/profed_head.tpl b/view/tpl/profed_head.tpl index 103960a76..ce774052a 100755 --- a/view/tpl/profed_head.tpl +++ b/view/tpl/profed_head.tpl @@ -1,36 +1,2 @@ -<script language="javascript" type="text/javascript" - src="{{$baseurl}}/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script> - <script language="javascript" type="text/javascript"> - - -tinyMCE.init({ - theme : "advanced", - mode : "{{$editselect}}", - plugins : "bbcode,paste", - theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code", - theme_advanced_buttons2 : "", - theme_advanced_buttons3 : "", - theme_advanced_toolbar_location : "top", - theme_advanced_toolbar_align : "center", - theme_advanced_blockformats : "blockquote,code", - gecko_spellcheck : true, - paste_text_sticky : true, - entity_encoding : "raw", - add_unload_trigger : false, - remove_linebreaks : false, - force_p_newlines : false, - force_br_newlines : true, - forced_root_block : '', - content_css: "{{$baseurl}}/view/custom_tinymce.css", - theme_advanced_path : false, - setup : function(ed) { - ed.onInit.add(function(ed) { - ed.pasteAsPlainText = true; - }); - } - -}); - - -</script> +<script language="javascript" type="text/javascript"></script> |