diff options
| author | zottel <github@zottel.net> | 2016-08-10 13:49:48 +0200 |
|---|---|---|
| committer | zottel <github@zottel.net> | 2016-08-10 13:49:48 +0200 |
| commit | 8706cbe1c413ed8fcfb7dcb35c7b319d2d1116bb (patch) | |
| tree | 499ab4cac571c35f6d0758f157ed85af46c8b57c | |
| parent | 6ba142fd33a74a7bdb4f3dfc8c0c0f507c293a2e (diff) | |
| parent | 7a557d31e026705fc3bd2d4f39c4c679449cef56 (diff) | |
| download | volse-hubzilla-8706cbe1c413ed8fcfb7dcb35c7b319d2d1116bb.tar.gz volse-hubzilla-8706cbe1c413ed8fcfb7dcb35c7b319d2d1116bb.tar.bz2 volse-hubzilla-8706cbe1c413ed8fcfb7dcb35c7b319d2d1116bb.zip | |
Merge remote-tracking branch 'upstream/dev' into dev
70 files changed, 2837 insertions, 2514 deletions
diff --git a/Zotlabs/Lib/System.php b/Zotlabs/Lib/System.php index c52a90338..4479bf597 100644 --- a/Zotlabs/Lib/System.php +++ b/Zotlabs/Lib/System.php @@ -43,8 +43,8 @@ class System { static public function get_server_role() { - if(UNO) - return 'basic'; + if(is_array(\App::$config) && is_array(\App::$config['system']) && \App::$config['system']['server_role']) + return \App::$config['system']['server_role']; return 'pro'; } diff --git a/Zotlabs/Lib/ThreadItem.php b/Zotlabs/Lib/ThreadItem.php index 638afeb6b..eee3b2a4f 100644 --- a/Zotlabs/Lib/ThreadItem.php +++ b/Zotlabs/Lib/ThreadItem.php @@ -245,10 +245,11 @@ class ThreadItem { ); } + $server_role = get_config('system','server_role'); $has_bookmarks = false; if(is_array($item['term'])) { foreach($item['term'] as $t) { - if(!UNO && $t['ttype'] == TERM_BOOKMARK) + if(($server_role != 'basic') && ($t['ttype'] == TERM_BOOKMARK)) $has_bookmarks = true; } } diff --git a/Zotlabs/Module/Channel.php b/Zotlabs/Module/Channel.php index c74802ec5..59cb9f06c 100644 --- a/Zotlabs/Module/Channel.php +++ b/Zotlabs/Module/Channel.php @@ -133,6 +133,7 @@ class Channel extends \Zotlabs\Web\Controller { 'nickname' => \App::$profile['channel_address'], 'lockstate' => (((strlen(\App::$profile['channel_allow_cid'])) || (strlen(\App::$profile['channel_allow_gid'])) || (strlen(\App::$profile['channel_deny_cid'])) || (strlen(\App::$profile['channel_deny_gid']))) ? 'lock' : 'unlock'), 'acl' => (($is_owner) ? populate_acl($channel_acl,true, \Zotlabs\Lib\PermissionDescription::fromGlobalPermission('view_stream'), get_post_aclDialogDescription(), 'acl_dialog_post') : ''), + 'permissions' => (($is_owner) ? $channel_acl : ''), 'showacl' => (($is_owner) ? 'yes' : ''), 'bang' => '', 'visitor' => (($is_owner || $observer) ? true : false), @@ -363,4 +364,4 @@ class Channel extends \Zotlabs\Web\Controller { return $o; } -}
\ No newline at end of file +} diff --git a/Zotlabs/Module/Chat.php b/Zotlabs/Module/Chat.php index ff55a9319..2c0e7a155 100644 --- a/Zotlabs/Module/Chat.php +++ b/Zotlabs/Module/Chat.php @@ -218,14 +218,13 @@ class Chat extends \Zotlabs\Web\Controller { notice( t('Feature disabled.') . EOL); return $o; } - - + $acl = new \Zotlabs\Access\AccessList($channel); $channel_acl = $acl->get(); - + $lockstate = (($channel_acl['allow_cid'] || $channel_acl['allow_gid'] || $channel_acl['deny_cid'] || $channel_acl['deny_gid']) ? 'lock' : 'unlock'); require_once('include/acl_selectors.php'); - + $chatroom_new = ''; if(local_channel()) { $chatroom_new = replace_macros(get_markup_template('chatroom_new.tpl'),array( @@ -234,12 +233,16 @@ class Chat extends \Zotlabs\Web\Controller { '$chat_expire' => array('chat_expire',t('Expiration of chats (minutes)'),120,''), '$permissions' => t('Permissions'), '$acl' => populate_acl($channel_acl,false), + '$allow_cid' => acl2json($channel_acl['allow_cid']), + '$allow_gid' => acl2json($channel_acl['allow_gid']), + '$deny_cid' => acl2json($channel_acl['deny_cid']), + '$deny_gid' => acl2json($channel_acl['deny_gid']), '$lockstate' => $lockstate, '$submit' => t('Submit') )); } - + $rooms = Zlib\Chatroom::roomlist(\App::$profile['profile_uid']); $o .= replace_macros(get_markup_template('chatrooms.tpl'), array( diff --git a/Zotlabs/Module/Connedit.php b/Zotlabs/Module/Connedit.php index 93ee30999..8fa6f0e96 100644 --- a/Zotlabs/Module/Connedit.php +++ b/Zotlabs/Module/Connedit.php @@ -152,11 +152,16 @@ class Connedit extends \Zotlabs\Web\Controller { $new_friend = false; + // only store a record and notify the directory if the rating changed + if(! $is_self) { $signed = $orig_record[0]['abook_xchan'] . '.' . $rating . '.' . $rating_text; - $sig = base64url_encode(rsa_sign($signed,$channel['channel_prvkey'])); + + $rated = ((intval($rating) || strlen($rating_text)) ? true : false); + + $record = 0; $z = q("select * from xlink where xlink_xchan = '%s' and xlink_link = '%s' and xlink_static = 1 limit 1", dbesc($channel['channel_hash']), @@ -164,17 +169,20 @@ class Connedit extends \Zotlabs\Web\Controller { ); if($z) { - $record = $z[0]['xlink_id']; - $w = q("update xlink set xlink_rating = '%d', xlink_rating_text = '%s', xlink_sig = '%s', xlink_updated = '%s' - where xlink_id = %d", - intval($rating), - dbesc($rating_text), - dbesc($sig), - dbesc(datetime_convert()), - intval($record) - ); + if(($z[0]['xlink_rating'] != $rating) || ($z[0]['xlink_rating_text'] != $rating_text)) { + $record = $z[0]['xlink_id']; + $w = q("update xlink set xlink_rating = '%d', xlink_rating_text = '%s', xlink_sig = '%s', xlink_updated = '%s' + where xlink_id = %d", + intval($rating), + dbesc($rating_text), + dbesc($sig), + dbesc(datetime_convert()), + intval($record) + ); + } } - else { + elseif($rated) { + // only create a record if there's something to save $w = q("insert into xlink ( xlink_xchan, xlink_link, xlink_rating, xlink_rating_text, xlink_sig, xlink_updated, xlink_static ) values ( '%s', '%s', %d, '%s', '%s', '%s', 1 ) ", dbesc($channel['channel_hash']), dbesc($orig_record[0]['abook_xchan']), diff --git a/Zotlabs/Module/Display.php b/Zotlabs/Module/Display.php index d1d4edc7d..35ed0c894 100644 --- a/Zotlabs/Module/Display.php +++ b/Zotlabs/Module/Display.php @@ -65,6 +65,7 @@ class Display extends \Zotlabs\Web\Controller { 'lockstate' => (($group || $cid || $channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'), 'acl' => populate_acl($channel_acl), + 'permissions' => $channel_acl, 'bang' => '', 'visitor' => true, 'profile_uid' => local_channel(), diff --git a/Zotlabs/Module/Editwebpage.php b/Zotlabs/Module/Editwebpage.php index a55f81101..2da8871a2 100644 --- a/Zotlabs/Module/Editwebpage.php +++ b/Zotlabs/Module/Editwebpage.php @@ -151,6 +151,7 @@ class Editwebpage extends \Zotlabs\Web\Controller { 'post_id' => $post_id, 'visitor' => ($is_owner) ? true : false, 'acl' => populate_acl($itm[0],false,\Zotlabs\Lib\PermissionDescription::fromGlobalPermission('view_pages')), + 'permissions' => $itm[0], 'showacl' => ($is_owner) ? true : false, 'mimetype' => $mimetype, 'mimeselect' => true, diff --git a/Zotlabs/Module/Events.php b/Zotlabs/Module/Events.php index def5c437b..d27de9989 100644 --- a/Zotlabs/Module/Events.php +++ b/Zotlabs/Module/Events.php @@ -435,6 +435,10 @@ class Events extends \Zotlabs\Web\Controller { $acl = new \Zotlabs\Access\AccessList($channel); $perm_defaults = $acl->get(); + + $permissions = ((x($orig_event)) ? $orig_event : $perm_defaults); + + //print_r(acl2json($permissions['allow_gid'])); killme(); $tpl = get_markup_template('event_form.tpl'); @@ -467,10 +471,16 @@ class Events extends \Zotlabs\Web\Controller { '$sh_checked' => $sh_checked, '$share' => array('share', t('Share this event'), $sh_checked, '', array(t('No'),t('Yes'))), '$preview' => t('Preview'), - '$permissions' => t('Permission settings'), + '$perms_label' => t('Permission settings'), // populating the acl dialog was a permission description from view_stream because Cal.php, which // displays events, says "since we don't currently have an event permission - use the stream permission" '$acl' => (($orig_event['event_xchan']) ? '' : populate_acl(((x($orig_event)) ? $orig_event : $perm_defaults), false, \Zotlabs\Lib\PermissionDescription::fromGlobalPermission('view_stream'))), + + '$allow_cid' => acl2json($permissions['allow_cid']), + '$allow_gid' => acl2json($permissions['allow_gid']), + '$deny_cid' => acl2json($permissions['deny_cid']), + '$deny_gid' => acl2json($permissions['deny_gid']), + '$submit' => t('Submit'), '$advanced' => t('Advanced Options') diff --git a/Zotlabs/Module/Filestorage.php b/Zotlabs/Module/Filestorage.php index c3ef22e32..a401f4822 100644 --- a/Zotlabs/Module/Filestorage.php +++ b/Zotlabs/Module/Filestorage.php @@ -141,7 +141,7 @@ class Filestorage extends \Zotlabs\Web\Controller { // Encode path that is used for link so it's a valid URL // Keep slashes as slashes, otherwise mod_rewrite doesn't work correctly $encoded_path = str_replace('%2F', '/', rawurlencode($cloudpath)); - + $o = replace_macros(get_markup_template('attach_edit.tpl'), array( '$header' => t('Edit file permissions'), '$file' => $f, @@ -151,6 +151,10 @@ class Filestorage extends \Zotlabs\Web\Controller { '$channelnick' => $channel['channel_address'], '$permissions' => t('Permissions'), '$aclselect' => $aclselect_e, + '$allow_cid' => acl2json($f['allow_cid']), + '$allow_gid' => acl2json($f['allow_gid']), + '$deny_cid' => acl2json($f['deny_cid']), + '$deny_gid' => acl2json($f['deny_gid']), '$lockstate' => $lockstate, '$permset' => t('Set/edit permissions'), '$recurse' => array('recurse', t('Include all files and sub folders'), 0, '', array(t('No'), t('Yes'))), @@ -161,7 +165,7 @@ class Filestorage extends \Zotlabs\Web\Controller { '$submit' => t('Submit'), '$attach_btn_title' => t('Share this file'), '$link_btn_title' => t('Show URL to this file'), - '$notify' => array('notify', t('Notify your contacts about this file'), 0, '', array(t('No'), t('Yes'))) + '$notify' => array('notify', t('Notify your contacts about this file'), 0, '', array(t('No'), t('Yes'))), )); echo $o; diff --git a/Zotlabs/Module/Mitem.php b/Zotlabs/Module/Mitem.php index b64b50c8e..28f51b81b 100644 --- a/Zotlabs/Module/Mitem.php +++ b/Zotlabs/Module/Mitem.php @@ -147,12 +147,16 @@ class Mitem extends \Zotlabs\Web\Controller { else { $display = (($r) ? 'none' : 'block'); } - + $create = replace_macros(get_markup_template('mitemedit.tpl'), array( '$menu_id' => \App::$data['menu']['menu_id'], '$permissions' => t('Menu Item Permissions'), '$permdesc' => t("\x28click to open/close\x29"), '$aclselect' => populate_acl($acl->get(),false), + '$allow_cid' => acl2json($acl->get()['allow_cid']), + '$allow_gid' => acl2json($acl->get()['allow_gid']), + '$deny_cid' => acl2json($acl->get()['deny_cid']), + '$deny_gid' => acl2json($acl->get()['deny_gid']), '$mitem_desc' => array('mitem_desc', t('Link Name'), '', 'Visible name of the link','*'), '$mitem_link' => array('mitem_link', t('Link or Submenu Target'), '', t('Enter URL of the link or select a menu name to create a submenu'), '*', 'list="menu-names"'), '$usezid' => array('usezid', t('Use magic-auth if available'), true, '', array(t('No'), t('Yes'))), @@ -226,6 +230,10 @@ class Mitem extends \Zotlabs\Web\Controller { '$permissions' => t('Menu Item Permissions'), '$permdesc' => t("\x28click to open/close\x29"), '$aclselect' => populate_acl($mitem,false), + '$allow_cid' => acl2json($mitem['allow_cid']), + '$allow_gid' => acl2json($mitem['allow_gid']), + '$deny_cid' => acl2json($mitem['deny_cid']), + '$deny_gid' => acl2json($mitem['deny_gid']), '$mitem_id' => intval(argv(2)), '$mitem_desc' => array('mitem_desc', t('Link text'), $mitem['mitem_desc'], '','*'), '$mitem_link' => array('mitem_link', t('Link or Submenu Target'), $mitem['mitem_link'], 'Enter URL of the link or select a menu name to create a submenu', '*', 'list="menu-names"'), diff --git a/Zotlabs/Module/Network.php b/Zotlabs/Module/Network.php index 3b88cd8d6..0128adc2c 100644 --- a/Zotlabs/Module/Network.php +++ b/Zotlabs/Module/Network.php @@ -170,6 +170,7 @@ class Network extends \Zotlabs\Web\Controller { 'nickname' => $channel['channel_address'], 'lockstate' => (($private_editing || $channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'), 'acl' => populate_acl((($private_editing) ? $def_acl : $channel_acl), true, \Zotlabs\Lib\PermissionDescription::fromGlobalPermission('view_stream'), get_post_aclDialogDescription(), 'acl_dialog_post'), + 'permissions' => (($private_editing) ? $def_acl : $channel_acl), 'bang' => (($private_editing) ? '!' : ''), 'visitor' => true, 'profile_uid' => local_channel(), diff --git a/Zotlabs/Module/Photos.php b/Zotlabs/Module/Photos.php index 1eeab1461..6aeac7af7 100644 --- a/Zotlabs/Module/Photos.php +++ b/Zotlabs/Module/Photos.php @@ -668,6 +668,10 @@ class Photos extends \Zotlabs\Web\Controller { '$selname' => $selname, '$permissions' => t('Permissions'), '$aclselect' => $aclselect, + '$allow_cid' => acl2json($channel_acl['allow_cid']), + '$allow_gid' => acl2json($channel_acl['allow_gid']), + '$deny_cid' => acl2json($channel_acl['deny_cid']), + '$deny_gid' => acl2json($channel_acl['deny_gid']), '$lockstate' => $lockstate, '$uploader' => $ret['addon_text'], '$default' => (($ret['default_upload']) ? true : false), @@ -1016,7 +1020,7 @@ class Photos extends \Zotlabs\Web\Controller { // FIXME - remove this when we move to conversation module $r = $r[0]['children']; - + $edit = null; if($can_post) { $album_e = $ph[0]['album']; @@ -1042,6 +1046,10 @@ class Photos extends \Zotlabs\Web\Controller { 'tag_label' => t('Add a Tag'), 'permissions' => t('Permissions'), 'aclselect' => $aclselect_e, + 'allow_cid' => acl2json($ph[0]['allow_cid']), + 'allow_gid' => acl2json($ph[0]['allow_gid']), + 'deny_cid' => acl2json($ph[0]['deny_cid']), + 'deny_gid' => acl2json($ph[0]['deny_gid']), 'lockstate' => $lockstate[0], 'help_tags' => t('Example: @bob, @Barbara_Jensen, @jim@example.com'), 'item_id' => ((count($linked_items)) ? $link_item['id'] : 0), diff --git a/Zotlabs/Module/Rate.php b/Zotlabs/Module/Rate.php index da23b840e..2f769b36b 100644 --- a/Zotlabs/Module/Rate.php +++ b/Zotlabs/Module/Rate.php @@ -43,7 +43,7 @@ class Rate extends \Zotlabs\Web\Controller { } - function post() { + function post() { if(! local_channel()) return; diff --git a/Zotlabs/Module/Register.php b/Zotlabs/Module/Register.php index 45123b88d..4cdd27001 100644 --- a/Zotlabs/Module/Register.php +++ b/Zotlabs/Module/Register.php @@ -151,7 +151,7 @@ class Register extends \Zotlabs\Web\Controller { $new_channel = false; $next_page = 'new_channel'; - if(get_config('system','auto_channel_create') || UNO) { + if(get_config('system','auto_channel_create') || get_config('system','server_role') == 'basic') { $new_channel = auto_channel_create($result['account']['account_id']); if($new_channel['success']) { $channel_id = $new_channel['channel']['channel_id']; @@ -234,9 +234,12 @@ class Register extends \Zotlabs\Web\Controller { $privacy_role = ((x($_REQUEST,'permissions_role')) ? $_REQUEST['permissions_role'] : ""); $role = array('permissions_role' , t('Channel role and privacy'), ($privacy_role) ? $privacy_role : 'social', t('Select a channel role with your privacy requirements.') . ' <a href="help/roles" target="_blank">' . t('Read more about roles') . '</a>',get_roles()); $tos = array('tos', $label_tos, '', '', array(t('no'),t('yes'))); - - $auto_create = ((UNO) || (get_config('system','auto_channel_create')) ? true : false); - $default_role = ((UNO) ? 'social' : get_config('system','default_permissions_role')); + + $server_role = get_config('system','server_role'); + + + $auto_create = (($server_role == 'basic') || (get_config('system','auto_channel_create')) ? true : false); + $default_role = (($server_role == 'basic') ? 'social' : get_config('system','default_permissions_role')); require_once('include/bbcode.php'); diff --git a/Zotlabs/Module/Rpost.php b/Zotlabs/Module/Rpost.php index 9e3043d10..525f053de 100644 --- a/Zotlabs/Module/Rpost.php +++ b/Zotlabs/Module/Rpost.php @@ -116,6 +116,7 @@ class Rpost extends \Zotlabs\Web\Controller { 'nickname' => $channel['channel_address'], 'lockstate' => (($acl->is_private()) ? 'lock' : 'unlock'), 'acl' => populate_acl($channel_acl, true, \Zotlabs\Lib\PermissionDescription::fromGlobalPermission('view_stream'), get_post_aclDialogDescription(), 'acl_dialog_post'), + 'permissions' => $channel_acl, 'bang' => '', 'visitor' => true, 'profile_uid' => local_channel(), diff --git a/Zotlabs/Module/Settings.php b/Zotlabs/Module/Settings.php index 57a0aa535..12157944f 100644 --- a/Zotlabs/Module/Settings.php +++ b/Zotlabs/Module/Settings.php @@ -1220,6 +1220,10 @@ class Settings extends \Zotlabs\Web\Controller { '$permissions' => t('Default Post and Publish Permissions'), '$permdesc' => t("\x28click to open/close\x29"), '$aclselect' => populate_acl($perm_defaults, false, \Zotlabs\Lib\PermissionDescription::fromDescription(t('Use my default audience setting for the type of object published'))), + '$allow_cid' => acl2json($perm_defaults['allow_cid']), + '$allow_gid' => acl2json($perm_defaults['allow_gid']), + '$deny_cid' => acl2json($perm_defaults['deny_cid']), + '$deny_gid' => acl2json($perm_defaults['deny_gid']), '$suggestme' => $suggestme, '$group_select' => $group_select, '$role' => array('permissions_role' , t('Channel permissions category:'), $permissions_role, '', get_roles()), @@ -1282,7 +1286,7 @@ class Settings extends \Zotlabs\Web\Controller { call_hooks('settings_form',$o); - $o .= '</form>' . "\r\n"; + //$o .= '</form>' . "\r\n"; return $o; } diff --git a/Zotlabs/Module/Setup.php b/Zotlabs/Module/Setup.php index 802f0c216..4553b6866 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'])) ? 1 : 0); + $advanced = ((intval($_POST['advanced'])) ? 'pro' : 'basic'); if($siteurl != z_root()) { $test = z_fetch_url($siteurl."/setup/testrewrite"); @@ -124,17 +124,17 @@ class Setup extends \Zotlabs\Web\Controller { $tpl = get_intltext_template('htconfig.tpl'); $txt = replace_macros($tpl,array( - '$dbhost' => $dbhost, - '$dbport' => $dbport, - '$dbuser' => $dbuser, - '$dbpass' => $dbpass, - '$dbdata' => $dbdata, - '$dbtype' => $dbtype, - '$uno' => 1 - $advanced, - '$timezone' => $timezone, - '$siteurl' => $siteurl, - '$site_id' => random_string(), - '$phpath' => $phpath, + '$dbhost' => $dbhost, + '$dbport' => $dbport, + '$dbuser' => $dbuser, + '$dbpass' => $dbpass, + '$dbdata' => $dbdata, + '$dbtype' => $dbtype, + '$server_role' => $advanced, + '$timezone' => $timezone, + '$siteurl' => $siteurl, + '$site_id' => random_string(), + '$phpath' => $phpath, '$adminmail' => $adminmail )); diff --git a/Zotlabs/Module/Thing.php b/Zotlabs/Module/Thing.php index 65fc0588e..a7ac63f73 100644 --- a/Zotlabs/Module/Thing.php +++ b/Zotlabs/Module/Thing.php @@ -312,6 +312,10 @@ class Thing extends \Zotlabs\Web\Controller { '$imgurl' => $r[0]['obj_imgurl'], '$permissions' => t('Permissions'), '$aclselect' => populate_acl($channel_acl,false), + '$allow_cid' => acl2json($channel_acl['allow_cid']), + '$allow_gid' => acl2json($channel_acl['allow_gid']), + '$deny_cid' => acl2json($channel_acl['deny_cid']), + '$deny_gid' => acl2json($channel_acl['deny_gid']), '$lockstate' => $lockstate, '$submit' => t('Submit') )); @@ -358,6 +362,10 @@ class Thing extends \Zotlabs\Web\Controller { '$img_lbl' => t('URL for photo of thing (optional)'), '$permissions' => t('Permissions'), '$aclselect' => populate_acl($channel_acl,false), + '$allow_cid' => acl2json($channel_acl['allow_cid']), + '$allow_gid' => acl2json($channel_acl['allow_gid']), + '$deny_cid' => acl2json($channel_acl['deny_cid']), + '$deny_gid' => acl2json($channel_acl['deny_gid']), '$lockstate' => $lockstate, '$submit' => t('Submit') )); diff --git a/Zotlabs/Module/Webpages.php b/Zotlabs/Module/Webpages.php index d3199f223..0a48d43c6 100644 --- a/Zotlabs/Module/Webpages.php +++ b/Zotlabs/Module/Webpages.php @@ -127,6 +127,7 @@ class Webpages extends \Zotlabs\Web\Controller { 'nickname' => \App::$profile['channel_address'], 'lockstate' => (($channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'), 'acl' => (($is_owner) ? populate_acl($channel_acl,false, \Zotlabs\Lib\PermissionDescription::fromGlobalPermission('view_pages')) : ''), + 'permissions' => (($is_owner) ? $channel_acl : ''), 'showacl' => (($is_owner) ? true : false), 'visitor' => true, 'hide_location' => true, diff --git a/Zotlabs/Module/Wiki.php b/Zotlabs/Module/Wiki.php index 55a52ea6d..bb4e9179c 100644 --- a/Zotlabs/Module/Wiki.php +++ b/Zotlabs/Module/Wiki.php @@ -74,11 +74,16 @@ class Wiki extends \Zotlabs\Web\Controller { // Initialize the ACL to the channel default permissions $x = array( 'lockstate' => (( $local_observer['channel_allow_cid'] || - $local_observer['channel_allow_gid'] || - $local_observer['channel_deny_cid'] || - $local_observer['channel_deny_gid']) - ? 'lock' : 'unlock'), + $local_observer['channel_allow_gid'] || + $local_observer['channel_deny_cid'] || + $local_observer['channel_deny_gid']) + ? 'lock' : 'unlock' + ), 'acl' => populate_acl($channel_acl), + 'allow_cid' => acl2json($channel_acl['allow_cid']), + 'allow_gid' => acl2json($channel_acl['allow_gid']), + 'deny_cid' => acl2json($channel_acl['deny_cid']), + 'deny_gid' => acl2json($channel_acl['deny_gid']), 'bang' => '' ); } else { @@ -142,8 +147,8 @@ class Wiki extends \Zotlabs\Web\Controller { } $content = ($p['content'] !== '' ? htmlspecialchars_decode($p['content'],ENT_COMPAT) : '"# New page\n"'); // Render the Markdown-formatted page content in HTML - require_once('library/markdown.php'); - $html = wiki_generate_toc(purify_html(Markdown(json_decode($content)))); + require_once('library/markdown.php'); + $html = wiki_generate_toc(purify_html(Markdown(wiki_bbcode(json_decode($content))))); $renderedContent = wiki_convert_links($html,argv(0).'/'.argv(1).'/'.$wikiUrlName); $hide_editor = false; $showPageControls = $wiki_editor; @@ -186,6 +191,10 @@ class Wiki extends \Zotlabs\Web\Controller { '$page' => $pageUrlName, '$lockstate' => $x['lockstate'], '$acl' => $x['acl'], + '$allow_cid' => $x['allow_cid'], + '$allow_gid' => $x['allow_gid'], + '$deny_cid' => $x['deny_cid'], + '$deny_gid' => $x['deny_gid'], '$bang' => $x['bang'], '$content' => $content, '$renderedContent' => $renderedContent, @@ -221,6 +230,7 @@ class Wiki extends \Zotlabs\Web\Controller { $content = $_POST['content']; $resource_id = $_POST['resource_id']; require_once('library/markdown.php'); + $content = wiki_bbcode($content); $html = wiki_generate_toc(purify_html(Markdown($content))); $w = wiki_get_wiki($resource_id); $wikiURL = argv(0).'/'.argv(1).'/'.$w['urlName']; diff --git a/Zotlabs/Storage/Browser.php b/Zotlabs/Storage/Browser.php index 93c55bd4c..e72c4fb62 100644 --- a/Zotlabs/Storage/Browser.php +++ b/Zotlabs/Storage/Browser.php @@ -279,7 +279,7 @@ class Browser extends DAV\Browser\Plugin { $aclselect = null; $lockstate = ''; - if($this->auth-owner_id) { + if($this->auth->owner_id) { $channel = channelx_by_n($this->auth->owner_id); if($channel) { $acl = new \Zotlabs\Access\AccessList($channel); @@ -324,8 +324,13 @@ class Browser extends DAV\Browser\Plugin { '$quota' => $quota, '$channick' => $this->auth->owner_nick, '$aclselect' => $aclselect, + '$allow_cid' => acl2json($channel_acl['allow_cid']), + '$allow_gid' => acl2json($channel_acl['allow_gid']), + '$deny_cid' => acl2json($channel_acl['deny_cid']), + '$deny_gid' => acl2json($channel_acl['deny_gid']), '$lockstate' => $lockstate, '$return_url' => \App::$cmd, + '$path' => trim(str_replace('cloud/' . $this->auth->owner_nick, '', $path),'/'), '$dragdroptext' => t('Drop files here to immediately upload') )); } @@ -602,15 +602,22 @@ function sys_boot() { @include('.htconfig.php'); - if(! defined('UNO')) - define('UNO', 0); - if(array_key_exists('default_timezone',get_defined_vars())) { App::$config['system']['timezone'] = $default_timezone; } $a->convert(); + if(defined('UNO')) { + if(UNO) + App::$config['system']['server_role'] = 'basic'; + else + App::$config['system']['server_role'] = 'pro'; + } + + if(! (array_key_exists('server_role',App::$config['system']) && App::$config['system']['server_role'])) + App::$config['system']['server_role'] = 'pro'; + App::$timezone = ((App::$config['system']['timezone']) ? App::$config['system']['timezone'] : 'UTC'); date_default_timezone_set(App::$timezone); @@ -633,7 +640,6 @@ function sys_boot() { * Load configs from db. Overwrite configs from .htconfig.php */ - load_config('config'); load_config('system'); load_config('feature'); diff --git a/include/account.php b/include/account.php index 142ad1bea..5c44f13ca 100644 --- a/include/account.php +++ b/include/account.php @@ -407,7 +407,7 @@ function account_allow($hash) { pop_lang(); - if(get_config('system','auto_channel_create') || UNO) + if(get_config('system','auto_channel_create') || get_config('system','server_role') === 'basic') auto_channel_create($register[0]['uid']); if ($res) { @@ -511,7 +511,7 @@ function account_approve($hash) { - if(get_config('system','auto_channel_create') || UNO) + if(get_config('system','auto_channel_create') || get_config('system','server_role') === 'basic') auto_channel_create($register[0]['uid']); else { $_SESSION['login_return_url'] = 'new_channel'; diff --git a/include/attach.php b/include/attach.php index f3fb12293..e15f08bd4 100644 --- a/include/attach.php +++ b/include/attach.php @@ -578,7 +578,7 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) { $pathname = filepath_macro($album); } } - else { + if(! $pathname) { $pathname = filepath_macro($upload_path); } @@ -1977,4 +1977,4 @@ function get_filename_by_cloudname($cloudname, $channel, $storepath) { } } return null; -}
\ No newline at end of file +} diff --git a/include/bbcode.php b/include/bbcode.php index 7f7be4300..db3a1011b 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -667,7 +667,7 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $cache = false) } // Remove bookmarks from UNO - if (UNO) + if (get_config('system','server_role') === 'basic') $Text = str_replace('<span class="bookmark-identifier">#^</span>', '', $Text); // Perform MAIL Search diff --git a/include/channel.php b/include/channel.php index c07cd14e2..62c35e3ff 100644 --- a/include/channel.php +++ b/include/channel.php @@ -423,14 +423,6 @@ function create_identity($arr) { set_pconfig($ret['channel']['channel_id'],'system','attach_path','%Y-%m'); } - // UNO: channel defaults, incl addons (addons specific pconfig will only work after the relevant addon is enabled by the admin). It's located here, so members can modify these defaults after the channel is created. - if(UNO) { - //diaspora protocol addon - set_pconfig($ret['channel']['channel_id'],'system','diaspora_allowed', '1'); - set_pconfig($ret['channel']['channel_id'],'system','diaspora_public_comments', '1'); - set_pconfig($ret['channel']['channel_id'],'system','prevent_tag_hijacking', '0'); - } - // auto-follow any of the hub's pre-configured channel choices. // Only do this if it's the first channel for this account; // otherwise it could get annoying. Don't make this list too big @@ -1077,6 +1069,7 @@ function profile_sidebar($profile, $block = 0, $show_connect = true, $zcard = fa $diaspora = array( 'podloc' => z_root(), 'guid' => $profile['channel_guid'] . str_replace('.','',App::get_hostname()), + 'pubkey' => pemtorsa($profile['channel_pubkey']), 'searchable' => (($block) ? 'false' : 'true'), 'nickname' => $profile['channel_address'], 'fullname' => $profile['channel_name'], diff --git a/include/conversation.php b/include/conversation.php index 1efca37f3..b53498d20 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -802,6 +802,7 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional', $ continue; } + $item['pagedrop'] = $page_dropping; if($item['id'] == $item['parent']) { @@ -1253,6 +1254,10 @@ function status_editor($a, $x, $popup = false) { '$visitor' => $x['visitor'], '$lockstate' => $x['lockstate'], '$acl' => $x['acl'], + '$allow_cid' => acl2json($x['permissions']['allow_cid']), + '$allow_gid' => acl2json($x['permissions']['allow_gid']), + '$deny_cid' => acl2json($x['permissions']['deny_cid']), + '$deny_gid' => acl2json($x['permissions']['deny_gid']), '$mimeselect' => $mimeselect, '$layoutselect' => $layoutselect, '$showacl' => ((array_key_exists('showacl', $x)) ? $x['showacl'] : true), @@ -1705,7 +1710,7 @@ function profile_tabs($a, $is_owner = false, $nickname = null){ ); } - if(feature_enabled($uid,'wiki') && (! UNO)) { + if(feature_enabled($uid,'wiki') && (get_config('system','server_role') !== 'basic')) { $tabs[] = array( 'label' => t('Wiki'), 'url' => z_root() . '/wiki/' . $nickname, diff --git a/include/features.php b/include/features.php index 2d71aa9be..041c028c6 100644 --- a/include/features.php +++ b/include/features.php @@ -38,7 +38,9 @@ function get_feature_default($feature) { function get_features($filtered = true) { - if(UNO && $filtered) + $server_role = get_config('system','server_role'); + + if($server_role === 'basic' && $filtered) return array(); $arr = array( @@ -52,7 +54,7 @@ function get_features($filtered = true) { array('advanced_profiles', t('Advanced Profiles'), t('Additional profile sections and selections'),false,get_config('feature_lock','advanced_profiles')), array('profile_export', t('Profile Import/Export'), t('Save and load profile details across sites/channels'),false,get_config('feature_lock','profile_export')), array('webpages', t('Web Pages'), t('Provide managed web pages on your channel'),false,get_config('feature_lock','webpages')), - array('wiki', t('Wiki'), t('Provide a wiki for your channel'),((UNO) ? false : true),get_config('feature_lock','wiki')), + array('wiki', t('Wiki'), t('Provide a wiki for your channel'),(($server_role === 'basic') ? false : true),get_config('feature_lock','wiki')), array('hide_rating', t('Hide Rating'), t('Hide the rating buttons on your channel and profile pages. Note: People can still rate you somewhere else.'),false,get_config('feature_lock','hide_rating')), array('private_notes', t('Private Notes'), t('Enables a tool to store notes and reminders (note: not encrypted)'),false,get_config('feature_lock','private_notes')), array('nav_channel_select', t('Navigation Channel Select'), t('Change channels directly from within the navigation dropdown menu'),false,get_config('feature_lock','nav_channel_select')), diff --git a/include/nav.php b/include/nav.php index 1fb0e98dc..025da71b3 100644 --- a/include/nav.php +++ b/include/nav.php @@ -61,13 +61,15 @@ EOT; '$banner' => $banner )); + $server_role = get_config('system','server_role'); + $basic = (($server_role === 'basic') ? true : false); // nav links: array of array('href', 'text', 'extra css classes', 'title') $nav = Array(); /** * Display login or logout - */ + */ $nav['usermenu']=array(); $userinfo = null; @@ -76,7 +78,7 @@ EOT; if(local_channel()) { - if($chans && count($chans) > 1 && feature_enabled(local_channel(),'nav_channel_select') && (! UNO)) + if($chans && count($chans) > 1 && feature_enabled(local_channel(),'nav_channel_select') && (! $basic)) $nav['channels'] = $chans; $nav['logout'] = Array('logout',t('Logout'), "", t('End this session'),'logout_nav_btn'); @@ -84,7 +86,7 @@ EOT; // user menu $nav['usermenu'][] = Array('channel/' . $channel['channel_address'], t('Home'), "", t('Your posts and conversations'),'channel_nav_btn'); $nav['usermenu'][] = Array('profile/' . $channel['channel_address'], t('View Profile'), "", t('Your profile page'),'profile_nav_btn'); - if(feature_enabled(local_channel(),'multi_profiles') && (! UNO)) + if(feature_enabled(local_channel(),'multi_profiles') && (! $basic)) $nav['usermenu'][] = Array('profiles', t('Edit Profiles'),"", t('Manage/Edit profiles'),'profiles_nav_btn'); else $nav['usermenu'][] = Array('profiles/' . $prof[0]['id'], t('Edit Profile'),"", t('Edit your profile'),'profiles_nav_btn'); @@ -92,19 +94,19 @@ EOT; $nav['usermenu'][] = Array('photos/' . $channel['channel_address'], t('Photos'), "", t('Your photos'),'photos_nav_btn'); $nav['usermenu'][] = Array('cloud/' . $channel['channel_address'],t('Files'),"",t('Your files'),'cloud_nav_btn'); - if((! UNO) && feature_enabled(local_channel(),'ajaxchat')) + if((! $basic) && feature_enabled(local_channel(),'ajaxchat')) $nav['usermenu'][] = Array('chat/' . $channel['channel_address'], t('Chat'),"",t('Your chatrooms'),'chat_nav_btn'); require_once('include/menu.php'); $has_bookmarks = menu_list_count(local_channel(),'',MENU_BOOKMARK) + menu_list_count(local_channel(),'',MENU_SYSTEM|MENU_BOOKMARK); - if(($has_bookmarks) && (! UNO)) { + if(($has_bookmarks) && (! $basic)) { $nav['usermenu'][] = Array('bookmarks', t('Bookmarks'), "", t('Your bookmarks'),'bookmarks_nav_btn'); } - if(feature_enabled($channel['channel_id'],'webpages') && (! UNO)) + if(feature_enabled($channel['channel_id'],'webpages') && (! $basic)) $nav['usermenu'][] = Array('webpages/' . $channel['channel_address'],t('Webpages'),"",t('Your webpages'),'webpages_nav_btn'); - if(feature_enabled($channel['channel_id'],'wiki') && (! UNO)) + if(feature_enabled($channel['channel_id'],'wiki') && (! $basic)) $nav['usermenu'][] = Array('wiki/' . $channel['channel_address'],t('Wiki'),"",t('Your wiki'),'wiki_nav_btn'); } else { @@ -161,7 +163,7 @@ EOT; $nav['help'] = array($help_url, t('Help'), "", t('Help and documentation'), 'help_nav_btn', $context_help, $enable_context_help); } - if(! UNO) + if(! $basic) $nav['apps'] = array('apps', t('Apps'), "", t('Applications, utilities, links, games'),'apps_nav_btn'); $nav['search'] = array('search', t('Search'), "", t('Search site @name, #tag, ?docs, content')); @@ -204,7 +206,7 @@ EOT; $nav['all_events']['all']=array('events', t('See all events'), "", ""); $nav['all_events']['mark'] = array('', t('Mark all events seen'), '',''); - if(! UNO) + if(! $basic) $nav['manage'] = array('manage', t('Channel Manager'), "", t('Manage Your Channels'),'manage_nav_btn'); $nav['settings'] = array('settings', t('Settings'),"", t('Account/Channel Settings'),'settings_nav_btn'); diff --git a/include/network.php b/include/network.php index 47863b680..fe001b362 100644 --- a/include/network.php +++ b/include/network.php @@ -1343,13 +1343,18 @@ function discover_by_webbie($webbie) { $fullname = $vcard['fn']; if($vcard['photo'] && (strpos($vcard['photo'],'http') !== 0)) $vcard['photo'] = $diaspora_base . '/' . $vcard['photo']; - if(($vcard['key']) && (! $pubkey)) - $pubkey = $vcard['key']; + if(($vcard['public_key']) && (! $pubkey)) { + $diaspora_key = $vcard['public_key']; + if(strstr($diaspora_key,'RSA ')) + $pubkey = rsatopem($diaspora_key); + else + $pubkey = $diaspora_key; + } if(! $avatar) $avatar = $vcard['photo']; if($diaspora) { - if(($vcard['guid']) && (! $diaspora_guid)) - $diaspora_guid = $vcard['guid']; + if(($vcard['uid']) && (! $diaspora_guid)) + $diaspora_guid = $vcard['uid']; if(($vcard['url']) && (! $diaspora_base)) $diaspora_base = $vcard['url']; diff --git a/include/oembed.php b/include/oembed.php index fe3a3c33c..5c6f6be79 100755 --- a/include/oembed.php +++ b/include/oembed.php @@ -216,8 +216,8 @@ function oembed_fetch_url($embedurl){ logger('oembed html was purified. original: ' . $orig . ' purified: ' . $j->html, LOGGER_DEBUG, LOG_INFO); } - $orig_len = trim(mb_strlen($orig)); - $new_len = trim(mb_strlen($j->html)); + $orig_len = mb_strlen(trim($orig)); + $new_len = mb_strlen(trim($j->html)); if(! $new_len) $j->type = 'error'; elseif($orig_len) { diff --git a/include/text.php b/include/text.php index d508f8ab3..ac210b336 100644 --- a/include/text.php +++ b/include/text.php @@ -1179,6 +1179,7 @@ function smilies($s, $sample = false) { $s = preg_replace_callback('{<(pre|code)>.*?</\1>}ism', 'smile_shield', $s); $s = preg_replace_callback('/<[a-z]+ .*?>/ism', 'smile_shield', $s); + $params = list_smilies(); $params['string'] = $s; @@ -1192,6 +1193,7 @@ function smilies($s, $sample = false) { $s = str_replace($params['texts'],$params['icons'],$params['string']); } + $s = preg_replace_callback('/<!--base64:(.*?)-->/ism', 'smile_unshield', $s); return $s; @@ -1204,11 +1206,11 @@ function smilies($s, $sample = false) { * @return string */ function smile_shield($m) { - return '<!--base64:' . base64url_encode($m[0]) . '-->'; + return '<!--base64:' . base64special_encode($m[0]) . '-->'; } function smile_unshield($m) { - return base64url_decode($m[1]); + return base64special_decode($m[1]); } /** @@ -1603,7 +1605,9 @@ function prepare_text($text, $content_type = 'text/bbcode', $cache = false) { $s = bbcode($text,false,true,$cache); else $s = smilies(bbcode($text,false,true,$cache)); + $s = zidify_links($s); + break; } @@ -1853,6 +1857,26 @@ function base64url_decode($s) { return base64_decode(strtr($s,'-_','+/')); } + +function base64special_encode($s, $strip_padding = true) { + + $s = strtr(base64_encode($s),'+/',',.'); + + if($strip_padding) + $s = str_replace('=','',$s); + + return $s; +} + +function base64special_decode($s) { + if(is_array($s)) { + logger('base64url_decode: illegal input: ' . print_r(debug_backtrace(), true)); + return $s; + } + return base64_decode(strtr($s,',.','+/')); +} + + /** * @ Return a div to clear floats. * @@ -2824,6 +2848,12 @@ function expand_acl($s) { return $ret; } +function acl2json($s) { + $s = expand_acl($s); + $s = json_encode($s); + return $s; +} + // When editing a webpage - a dropdown is needed to select a page layout // On submit, the pdl_select value (which is the mid of an item with item_type = ITEM_TYPE_PDL) is stored in diff --git a/include/widgets.php b/include/widgets.php index 5477dc1e4..68db74703 100644 --- a/include/widgets.php +++ b/include/widgets.php @@ -595,7 +595,7 @@ function widget_settings_menu($arr) { } // IF can go away when UNO export and import is fully functional - if(! UNO) { + if(get_config('system','server_role') !== 'basic') { $tabs[] = array( 'label' => t('Export channel'), 'url' => z_root() . '/uexport', @@ -609,7 +609,7 @@ function widget_settings_menu($arr) { 'selected' => ((argv(1) === 'oauth') ? 'active' : ''), ); - if(! UNO) { + if(get_config('system','server_role') !== 'basic') { $tabs[] = array( 'label' => t('Guest Access Tokens'), 'url' => z_root() . '/settings/tokens', diff --git a/include/wiki.php b/include/wiki.php index 424b2d9a0..d52308b08 100644 --- a/include/wiki.php +++ b/include/wiki.php @@ -495,6 +495,12 @@ function wiki_convert_links($s, $wikiURL) { return $s; } +/** + * Replace the instances of the string [toc] with a list element that will be populated by + * a table of contents by the JavaScript library + * @param string $s + * @return string + */ function wiki_generate_toc($s) { if (strpos($s,'[toc]') !== false) { @@ -505,6 +511,39 @@ function wiki_generate_toc($s) { return $s; } +/** + * Converts a select set of bbcode tags. Much of the code is copied from include/bbcode.php + * @param string $s + * @return string + */ +function wiki_bbcode($s) { + + $s = str_replace(array('[baseurl]', '[sitename]'), array(z_root(), get_config('system', 'sitename')), $s); + + $observer = App::get_observer(); + if ($observer) { + $s1 = '<span class="bb_observer" title="' . t('Different viewers will see this text differently') . '">'; + $s2 = '</span>'; + $obsBaseURL = $observer['xchan_connurl']; + $obsBaseURL = preg_replace("/\/poco\/.*$/", '', $obsBaseURL); + $s = str_replace('[observer.baseurl]', $obsBaseURL, $s); + $s = str_replace('[observer.url]', $observer['xchan_url'], $s); + $s = str_replace('[observer.name]', $s1 . $observer['xchan_name'] . $s2, $s); + $s = str_replace('[observer.address]', $s1 . $observer['xchan_addr'] . $s2, $s); + $s = str_replace('[observer.webname]', substr($observer['xchan_addr'], 0, strpos($observer['xchan_addr'], '@')), $s); + $s = str_replace('[observer.photo]', '', $s); + } else { + $s = str_replace('[observer.baseurl]', '', $s); + $s = str_replace('[observer.url]', '', $s); + $s = str_replace('[observer.name]', '', $s); + $s = str_replace('[observer.address]', '', $s); + $s = str_replace('[observer.webname]', '', $s); + $s = str_replace('[observer.photo]', '', $s); + } + + return $s; +} + // This function is derived from // http://stackoverflow.com/questions/32068537/generate-table-of-contents-from-markdown-in-php function wiki_toc($content) { diff --git a/include/zot.php b/include/zot.php index 73d9ef950..4e443652f 100644 --- a/include/zot.php +++ b/include/zot.php @@ -2251,7 +2251,7 @@ function check_location_move($sender_hash,$locations) { if(! $locations) return; - if(! UNO) + if(get_config('system','server_role') !== 'basic') return; if(count($locations) != 1) @@ -2929,7 +2929,7 @@ function import_site($arr, $pubkey) { */ function build_sync_packet($uid = 0, $packet = null, $groups_changed = false) { - if(UNO) + if(get_config('system','server_role') === 'basic') return; logger('build_sync_packet'); @@ -3077,7 +3077,7 @@ function build_sync_packet($uid = 0, $packet = null, $groups_changed = false) { */ function process_channel_sync_delivery($sender, $arr, $deliveries) { - if(UNO) + if(get_config('system','server_role') === 'basic') return; require_once('include/import.php'); diff --git a/install/htconfig.sample.php b/install/htconfig.sample.php index c46805171..e5c743ac1 100755 --- a/install/htconfig.sample.php +++ b/install/htconfig.sample.php @@ -19,8 +19,6 @@ $db_pass = 'mysqlpassword'; $db_data = 'mysqldatabasename'; $db_type = 0; // use 1 for postgres, 0 for mysql -define( 'UNO', 0 ); - /* * Notice: Many of the following settings will be available in the admin panel * after a successful site install. Once they are set in the admin panel, they @@ -46,6 +44,14 @@ App::$config['system']['sitename'] = "Hubzilla"; App::$config['system']['location_hash'] = 'if the auto install failed, put a unique random string here'; +// 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 + +App::$config['system']['server_role'] = 'pro'; + + // These lines set additional security headers to be sent with all responses // You may wish to set transport_security_header to 0 if your server already sends // this header. content_security_policy may need to be disabled if you wish to diff --git a/util/hmessages.po b/util/hmessages.po index adcd924de..75311641c 100644 --- a/util/hmessages.po +++ b/util/hmessages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-07-29 00:02-0700\n" +"POT-Creation-Date: 2016-08-05 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" @@ -18,83 +18,83 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" #: ../../Zotlabs/Access/PermissionRoles.php:182 -#: ../../include/permissions.php:904 +#: ../../include/permissions.php:939 msgid "Social Networking" msgstr "" #: ../../Zotlabs/Access/PermissionRoles.php:183 -#: ../../include/permissions.php:904 +#: ../../include/permissions.php:939 msgid "Social - Mostly Public" msgstr "" #: ../../Zotlabs/Access/PermissionRoles.php:184 -#: ../../include/permissions.php:904 +#: ../../include/permissions.php:939 msgid "Social - Restricted" msgstr "" #: ../../Zotlabs/Access/PermissionRoles.php:185 -#: ../../include/permissions.php:904 +#: ../../include/permissions.php:939 msgid "Social - Private" msgstr "" #: ../../Zotlabs/Access/PermissionRoles.php:188 -#: ../../include/permissions.php:905 +#: ../../include/permissions.php:940 msgid "Community Forum" msgstr "" #: ../../Zotlabs/Access/PermissionRoles.php:189 -#: ../../include/permissions.php:905 +#: ../../include/permissions.php:940 msgid "Forum - Mostly Public" msgstr "" #: ../../Zotlabs/Access/PermissionRoles.php:190 -#: ../../include/permissions.php:905 +#: ../../include/permissions.php:940 msgid "Forum - Restricted" msgstr "" #: ../../Zotlabs/Access/PermissionRoles.php:191 -#: ../../include/permissions.php:905 +#: ../../include/permissions.php:940 msgid "Forum - Private" msgstr "" #: ../../Zotlabs/Access/PermissionRoles.php:194 -#: ../../include/permissions.php:906 +#: ../../include/permissions.php:941 msgid "Feed Republish" msgstr "" #: ../../Zotlabs/Access/PermissionRoles.php:195 -#: ../../include/permissions.php:906 +#: ../../include/permissions.php:941 msgid "Feed - Mostly Public" msgstr "" #: ../../Zotlabs/Access/PermissionRoles.php:196 -#: ../../include/permissions.php:906 +#: ../../include/permissions.php:941 msgid "Feed - Restricted" msgstr "" #: ../../Zotlabs/Access/PermissionRoles.php:199 -#: ../../include/permissions.php:907 +#: ../../include/permissions.php:942 msgid "Special Purpose" msgstr "" #: ../../Zotlabs/Access/PermissionRoles.php:200 -#: ../../include/permissions.php:907 +#: ../../include/permissions.php:942 msgid "Special - Celebrity/Soapbox" msgstr "" #: ../../Zotlabs/Access/PermissionRoles.php:201 -#: ../../include/permissions.php:907 +#: ../../include/permissions.php:942 msgid "Special - Group Repository" msgstr "" #: ../../Zotlabs/Access/PermissionRoles.php:204 ../../include/selectors.php:49 #: ../../include/selectors.php:66 ../../include/selectors.php:104 -#: ../../include/selectors.php:140 ../../include/permissions.php:908 +#: ../../include/selectors.php:140 ../../include/permissions.php:943 msgid "Other" msgstr "" #: ../../Zotlabs/Access/PermissionRoles.php:205 -#: ../../include/permissions.php:908 +#: ../../include/permissions.php:943 msgid "Custom/Expert Mode" msgstr "" @@ -102,19 +102,19 @@ msgstr "" msgid "Can view my channel stream and posts" msgstr "" -#: ../../Zotlabs/Access/Permissions.php:31 ../../include/permissions.php:33 +#: ../../Zotlabs/Access/Permissions.php:31 ../../include/permissions.php:36 msgid "Can send me their channel stream and posts" msgstr "" -#: ../../Zotlabs/Access/Permissions.php:32 ../../include/permissions.php:27 +#: ../../Zotlabs/Access/Permissions.php:32 ../../include/permissions.php:30 msgid "Can view my default channel profile" msgstr "" -#: ../../Zotlabs/Access/Permissions.php:33 ../../include/permissions.php:28 +#: ../../Zotlabs/Access/Permissions.php:33 ../../include/permissions.php:31 msgid "Can view my connections" msgstr "" -#: ../../Zotlabs/Access/Permissions.php:34 ../../include/permissions.php:29 +#: ../../Zotlabs/Access/Permissions.php:34 ../../include/permissions.php:32 msgid "Can view my file storage and photos" msgstr "" @@ -134,11 +134,11 @@ msgstr "" msgid "Can post on my channel (wall) page" msgstr "" -#: ../../Zotlabs/Access/Permissions.php:39 ../../include/permissions.php:35 +#: ../../Zotlabs/Access/Permissions.php:39 ../../include/permissions.php:38 msgid "Can comment on or like my posts" msgstr "" -#: ../../Zotlabs/Access/Permissions.php:40 ../../include/permissions.php:36 +#: ../../Zotlabs/Access/Permissions.php:40 ../../include/permissions.php:39 msgid "Can send me private mail messages" msgstr "" @@ -154,7 +154,7 @@ msgstr "" msgid "Can chat with me" msgstr "" -#: ../../Zotlabs/Access/Permissions.php:44 ../../include/permissions.php:44 +#: ../../Zotlabs/Access/Permissions.php:44 ../../include/permissions.php:47 msgid "Can source my public posts in derived channels" msgstr "" @@ -166,7 +166,7 @@ msgstr "" msgid "parent" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:131 ../../include/text.php:2605 +#: ../../Zotlabs/Storage/Browser.php:131 ../../include/text.php:2633 msgid "Collection" msgstr "" @@ -194,13 +194,13 @@ msgstr "" #: ../../Zotlabs/Module/Photos.php:1241 #: ../../Zotlabs/Module/Embedphotos.php:147 ../../Zotlabs/Lib/Apps.php:490 #: ../../Zotlabs/Lib/Apps.php:565 ../../include/conversation.php:1035 -#: ../../include/widgets.php:1599 +#: ../../include/widgets.php:1613 msgid "Unknown" msgstr "" #: ../../Zotlabs/Storage/Browser.php:226 ../../Zotlabs/Module/Fbrowser.php:85 -#: ../../Zotlabs/Lib/Apps.php:217 ../../include/conversation.php:1654 -#: ../../include/nav.php:93 +#: ../../Zotlabs/Lib/Apps.php:217 ../../include/nav.php:93 +#: ../../include/conversation.php:1654 msgid "Files" msgstr "" @@ -213,9 +213,10 @@ msgid "Shared" msgstr "" #: ../../Zotlabs/Storage/Browser.php:230 ../../Zotlabs/Storage/Browser.php:321 -#: ../../Zotlabs/Module/Menu.php:118 ../../Zotlabs/Module/New_channel.php:142 +#: ../../Zotlabs/Module/Webpages.php:215 +#: ../../Zotlabs/Module/New_channel.php:142 #: ../../Zotlabs/Module/Blocks.php:159 ../../Zotlabs/Module/Layouts.php:184 -#: ../../Zotlabs/Module/Webpages.php:193 +#: ../../Zotlabs/Module/Menu.php:118 msgid "Create" msgstr "" @@ -223,12 +224,12 @@ msgstr "" #: ../../Zotlabs/Module/Photos.php:823 ../../Zotlabs/Module/Photos.php:1362 #: ../../Zotlabs/Module/Cover_photo.php:357 #: ../../Zotlabs/Module/Profile_photo.php:390 -#: ../../Zotlabs/Module/Embedphotos.php:159 ../../include/widgets.php:1612 +#: ../../Zotlabs/Module/Embedphotos.php:159 ../../include/widgets.php:1626 msgid "Upload" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:235 ../../Zotlabs/Module/Settings.php:646 -#: ../../Zotlabs/Module/Settings.php:672 ../../Zotlabs/Module/Chat.php:247 +#: ../../Zotlabs/Storage/Browser.php:235 ../../Zotlabs/Module/Settings.php:662 +#: ../../Zotlabs/Module/Settings.php:688 ../../Zotlabs/Module/Chat.php:247 #: ../../Zotlabs/Module/Admin.php:1223 #: ../../Zotlabs/Module/Sharedwithme.php:99 msgid "Name" @@ -254,14 +255,14 @@ msgstr "" #: ../../Zotlabs/Module/Editblock.php:109 #: ../../Zotlabs/Module/Editlayout.php:114 #: ../../Zotlabs/Module/Editwebpage.php:145 -#: ../../Zotlabs/Module/Editpost.php:84 ../../Zotlabs/Module/Settings.php:706 -#: ../../Zotlabs/Module/Menu.php:112 ../../Zotlabs/Module/Admin.php:2113 +#: ../../Zotlabs/Module/Editpost.php:84 ../../Zotlabs/Module/Settings.php:722 +#: ../../Zotlabs/Module/Webpages.php:216 ../../Zotlabs/Module/Admin.php:2113 #: ../../Zotlabs/Module/Blocks.php:160 ../../Zotlabs/Module/Layouts.php:192 -#: ../../Zotlabs/Module/Thing.php:260 ../../Zotlabs/Module/Webpages.php:194 +#: ../../Zotlabs/Module/Menu.php:112 ../../Zotlabs/Module/Thing.php:260 #: ../../Zotlabs/Lib/Apps.php:341 ../../Zotlabs/Lib/ThreadItem.php:106 -#: ../../include/channel.php:976 ../../include/channel.php:980 #: ../../include/page_widgets.php:9 ../../include/page_widgets.php:39 -#: ../../include/menu.php:108 +#: ../../include/menu.php:113 ../../include/channel.php:967 +#: ../../include/channel.php:971 msgid "Edit" msgstr "" @@ -269,13 +270,13 @@ msgstr "" #: ../../Zotlabs/Module/Connections.php:263 #: ../../Zotlabs/Module/Editblock.php:134 #: ../../Zotlabs/Module/Editlayout.php:137 -#: ../../Zotlabs/Module/Editwebpage.php:169 ../../Zotlabs/Module/Group.php:177 -#: ../../Zotlabs/Module/Connedit.php:602 ../../Zotlabs/Module/Settings.php:707 +#: ../../Zotlabs/Module/Editwebpage.php:169 +#: ../../Zotlabs/Module/Settings.php:723 ../../Zotlabs/Module/Webpages.php:218 +#: ../../Zotlabs/Module/Group.php:177 ../../Zotlabs/Module/Connedit.php:610 #: ../../Zotlabs/Module/Admin.php:1039 ../../Zotlabs/Module/Admin.php:1213 #: ../../Zotlabs/Module/Admin.php:2114 ../../Zotlabs/Module/Blocks.php:162 -#: ../../Zotlabs/Module/Thing.php:261 ../../Zotlabs/Module/Webpages.php:196 -#: ../../Zotlabs/Lib/Apps.php:342 ../../Zotlabs/Lib/ThreadItem.php:126 -#: ../../include/conversation.php:660 +#: ../../Zotlabs/Module/Thing.php:261 ../../Zotlabs/Lib/Apps.php:342 +#: ../../Zotlabs/Lib/ThreadItem.php:126 ../../include/conversation.php:660 msgid "Delete" msgstr "" @@ -308,11 +309,11 @@ msgstr "" #: ../../Zotlabs/Web/Router.php:65 ../../Zotlabs/Web/WebServer.php:128 #: ../../Zotlabs/Module/Achievements.php:34 #: ../../Zotlabs/Module/Network.php:15 ../../Zotlabs/Module/Photos.php:73 -#: ../../Zotlabs/Module/Authtest.php:16 ../../Zotlabs/Module/Like.php:181 -#: ../../Zotlabs/Module/Bookmarks.php:61 ../../Zotlabs/Module/Page.php:35 -#: ../../Zotlabs/Module/Page.php:91 ../../Zotlabs/Module/Connections.php:33 +#: ../../Zotlabs/Module/Authtest.php:16 ../../Zotlabs/Module/Bookmarks.php:61 +#: ../../Zotlabs/Module/Page.php:35 ../../Zotlabs/Module/Page.php:91 +#: ../../Zotlabs/Module/Connections.php:33 #: ../../Zotlabs/Module/Cover_photo.php:277 -#: ../../Zotlabs/Module/Cover_photo.php:290 ../../Zotlabs/Module/Mail.php:121 +#: ../../Zotlabs/Module/Cover_photo.php:290 #: ../../Zotlabs/Module/Channel.php:104 ../../Zotlabs/Module/Channel.php:225 #: ../../Zotlabs/Module/Channel.php:266 ../../Zotlabs/Module/Editblock.php:67 #: ../../Zotlabs/Module/Editlayout.php:67 @@ -320,23 +321,23 @@ msgstr "" #: ../../Zotlabs/Module/Editwebpage.php:68 #: ../../Zotlabs/Module/Editwebpage.php:89 #: ../../Zotlabs/Module/Editwebpage.php:104 -#: ../../Zotlabs/Module/Editwebpage.php:126 ../../Zotlabs/Module/Group.php:13 -#: ../../Zotlabs/Module/Appman.php:75 ../../Zotlabs/Module/Pdledit.php:26 -#: ../../Zotlabs/Module/Filestorage.php:23 +#: ../../Zotlabs/Module/Editwebpage.php:126 +#: ../../Zotlabs/Module/Editpost.php:17 ../../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/Events.php:264 ../../Zotlabs/Module/Manage.php:10 -#: ../../Zotlabs/Module/Connedit.php:390 ../../Zotlabs/Module/Editpost.php:17 -#: ../../Zotlabs/Module/Block.php:26 ../../Zotlabs/Module/Block.php:76 -#: ../../Zotlabs/Module/Settings.php:626 ../../Zotlabs/Module/Invite.php:17 -#: ../../Zotlabs/Module/Invite.php:91 ../../Zotlabs/Module/Locs.php:87 -#: ../../Zotlabs/Module/Profiles.php:203 ../../Zotlabs/Module/Profiles.php:601 -#: ../../Zotlabs/Module/Menu.php:78 ../../Zotlabs/Module/Message.php:18 -#: ../../Zotlabs/Module/Item.php:213 ../../Zotlabs/Module/Item.php:221 -#: ../../Zotlabs/Module/Item.php:1071 ../../Zotlabs/Module/Mood.php:116 -#: ../../Zotlabs/Module/Chat.php:100 ../../Zotlabs/Module/Chat.php:105 -#: ../../Zotlabs/Module/Mitem.php:115 ../../Zotlabs/Module/New_channel.php:77 +#: ../../Zotlabs/Module/Settings.php:642 ../../Zotlabs/Module/Events.php:264 +#: ../../Zotlabs/Module/Webpages.php:95 ../../Zotlabs/Module/Group.php:13 +#: ../../Zotlabs/Module/Mail.php:121 ../../Zotlabs/Module/Block.php:26 +#: ../../Zotlabs/Module/Block.php:76 ../../Zotlabs/Module/Connedit.php:398 +#: ../../Zotlabs/Module/Invite.php:17 ../../Zotlabs/Module/Invite.php:91 +#: ../../Zotlabs/Module/Locs.php:87 ../../Zotlabs/Module/Item.php:213 +#: ../../Zotlabs/Module/Item.php:221 ../../Zotlabs/Module/Item.php:1071 +#: ../../Zotlabs/Module/Message.php:18 ../../Zotlabs/Module/Mood.php:116 +#: ../../Zotlabs/Module/Like.php:181 ../../Zotlabs/Module/Chat.php:100 +#: ../../Zotlabs/Module/Chat.php:105 ../../Zotlabs/Module/Mitem.php:115 +#: ../../Zotlabs/Module/New_channel.php:77 #: ../../Zotlabs/Module/New_channel.php:104 #: ../../Zotlabs/Module/Notifications.php:70 ../../Zotlabs/Module/Poke.php:137 #: ../../Zotlabs/Module/Profile.php:68 ../../Zotlabs/Module/Profile.php:76 @@ -346,23 +347,25 @@ msgstr "" #: ../../Zotlabs/Module/Profile_photo.php:265 #: ../../Zotlabs/Module/Profile_photo.php:278 #: ../../Zotlabs/Module/Common.php:39 ../../Zotlabs/Module/Rate.php:113 -#: ../../Zotlabs/Module/Register.php:77 ../../Zotlabs/Module/Regmod.php:21 -#: ../../Zotlabs/Module/Service_limits.php:11 +#: ../../Zotlabs/Module/Manage.php:10 ../../Zotlabs/Module/Register.php:77 +#: ../../Zotlabs/Module/Regmod.php:21 +#: ../../Zotlabs/Module/Service_limits.php:11 ../../Zotlabs/Module/Menu.php:78 #: ../../Zotlabs/Module/Setup.php:215 ../../Zotlabs/Module/Sharedwithme.php:11 #: ../../Zotlabs/Module/Thing.php:274 ../../Zotlabs/Module/Thing.php:294 #: ../../Zotlabs/Module/Thing.php:331 ../../Zotlabs/Module/Sources.php:74 -#: ../../Zotlabs/Module/Suggest.php:30 ../../Zotlabs/Module/Webpages.php:73 +#: ../../Zotlabs/Module/Suggest.php:30 ../../Zotlabs/Module/Profiles.php:203 +#: ../../Zotlabs/Module/Profiles.php:601 #: ../../Zotlabs/Module/Viewconnections.php:28 #: ../../Zotlabs/Module/Viewconnections.php:33 #: ../../Zotlabs/Module/Viewsrc.php:18 ../../Zotlabs/Module/Api.php:13 #: ../../Zotlabs/Module/Api.php:18 ../../Zotlabs/Lib/Chatroom.php:137 -#: ../../include/attach.php:141 ../../include/attach.php:189 -#: ../../include/attach.php:252 ../../include/attach.php:266 -#: ../../include/attach.php:273 ../../include/attach.php:338 -#: ../../include/attach.php:352 ../../include/attach.php:359 -#: ../../include/attach.php:439 ../../include/attach.php:901 -#: ../../include/attach.php:972 ../../include/attach.php:1124 -#: ../../include/photos.php:27 ../../include/items.php:3448 +#: ../../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 msgid "Permission denied." msgstr "" @@ -377,8 +380,8 @@ 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/Dreport.php:66 ../../Zotlabs/Module/Group.php:72 +#: ../../Zotlabs/Module/Import_items.php:114 ../../Zotlabs/Module/Like.php:283 #: ../../Zotlabs/Module/Profperm.php:28 ../../Zotlabs/Module/Subthread.php:62 #: ../../include/items.php:384 msgid "Permission denied" @@ -399,10 +402,11 @@ msgstr "" #: ../../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/Filestorage.php:59 +#: ../../Zotlabs/Module/Webpages.php:33 ../../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 -#: ../../Zotlabs/Module/Webpages.php:33 ../../include/channel.php:876 +#: ../../include/channel.php:867 msgid "Requested profile is not available." msgstr "" @@ -586,14 +590,14 @@ msgstr "" #: ../../Zotlabs/Module/Photos.php:664 #: ../../Zotlabs/Module/Filestorage.php:156 #: ../../Zotlabs/Module/Filestorage.php:164 -#: ../../Zotlabs/Module/Events.php:458 ../../Zotlabs/Module/Events.php:459 -#: ../../Zotlabs/Module/Events.php:468 ../../Zotlabs/Module/Connedit.php:403 -#: ../../Zotlabs/Module/Connedit.php:685 ../../Zotlabs/Module/Settings.php:635 -#: ../../Zotlabs/Module/Profiles.php:647 ../../Zotlabs/Module/Menu.php:100 -#: ../../Zotlabs/Module/Menu.php:157 ../../Zotlabs/Module/Mitem.php:158 -#: ../../Zotlabs/Module/Mitem.php:159 ../../Zotlabs/Module/Mitem.php:232 -#: ../../Zotlabs/Module/Mitem.php:233 ../../Zotlabs/Module/Admin.php:459 -#: ../../Zotlabs/Module/Removeme.php:63 ../../Zotlabs/Module/Api.php:89 +#: ../../Zotlabs/Module/Settings.php:651 ../../Zotlabs/Module/Events.php:458 +#: ../../Zotlabs/Module/Events.php:459 ../../Zotlabs/Module/Events.php:468 +#: ../../Zotlabs/Module/Connedit.php:411 ../../Zotlabs/Module/Connedit.php:693 +#: ../../Zotlabs/Module/Mitem.php:158 ../../Zotlabs/Module/Mitem.php:159 +#: ../../Zotlabs/Module/Mitem.php:232 ../../Zotlabs/Module/Mitem.php:233 +#: ../../Zotlabs/Module/Admin.php:459 ../../Zotlabs/Module/Removeme.php:63 +#: ../../Zotlabs/Module/Menu.php:100 ../../Zotlabs/Module/Menu.php:157 +#: ../../Zotlabs/Module/Profiles.php:647 ../../Zotlabs/Module/Api.php:89 #: ../../include/dir_fns.php:143 ../../include/dir_fns.php:144 #: ../../include/dir_fns.php:145 ../../view/theme/redbasic/php/config.php:105 #: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1711 @@ -603,13 +607,13 @@ msgstr "" #: ../../Zotlabs/Module/Photos.php:664 #: ../../Zotlabs/Module/Filestorage.php:156 #: ../../Zotlabs/Module/Filestorage.php:164 -#: ../../Zotlabs/Module/Events.php:458 ../../Zotlabs/Module/Events.php:459 -#: ../../Zotlabs/Module/Events.php:468 ../../Zotlabs/Module/Connedit.php:403 -#: ../../Zotlabs/Module/Settings.php:635 ../../Zotlabs/Module/Profiles.php:647 -#: ../../Zotlabs/Module/Menu.php:100 ../../Zotlabs/Module/Menu.php:157 -#: ../../Zotlabs/Module/Mitem.php:158 ../../Zotlabs/Module/Mitem.php:159 -#: ../../Zotlabs/Module/Mitem.php:232 ../../Zotlabs/Module/Mitem.php:233 -#: ../../Zotlabs/Module/Admin.php:461 ../../Zotlabs/Module/Removeme.php:63 +#: ../../Zotlabs/Module/Settings.php:651 ../../Zotlabs/Module/Events.php:458 +#: ../../Zotlabs/Module/Events.php:459 ../../Zotlabs/Module/Events.php:468 +#: ../../Zotlabs/Module/Connedit.php:411 ../../Zotlabs/Module/Mitem.php:158 +#: ../../Zotlabs/Module/Mitem.php:159 ../../Zotlabs/Module/Mitem.php:232 +#: ../../Zotlabs/Module/Mitem.php:233 ../../Zotlabs/Module/Admin.php:461 +#: ../../Zotlabs/Module/Removeme.php:63 ../../Zotlabs/Module/Menu.php:100 +#: ../../Zotlabs/Module/Menu.php:157 ../../Zotlabs/Module/Profiles.php:647 #: ../../Zotlabs/Module/Api.php:88 ../../include/dir_fns.php:143 #: ../../include/dir_fns.php:144 ../../include/dir_fns.php:145 #: ../../view/theme/redbasic/php/config.php:105 @@ -634,18 +638,18 @@ msgstr "" #: ../../Zotlabs/Module/Photos.php:675 ../../Zotlabs/Module/Photos.php:1050 #: ../../Zotlabs/Module/Photos.php:1090 ../../Zotlabs/Module/Photos.php:1208 -#: ../../Zotlabs/Module/Import.php:560 ../../Zotlabs/Module/Mail.php:370 -#: ../../Zotlabs/Module/Group.php:85 ../../Zotlabs/Module/Appman.php:126 -#: ../../Zotlabs/Module/Pdledit.php:66 +#: ../../Zotlabs/Module/Appman.php:126 ../../Zotlabs/Module/Pdledit.php:66 #: ../../Zotlabs/Module/Filestorage.php:161 -#: ../../Zotlabs/Module/Events.php:474 ../../Zotlabs/Module/Connedit.php:778 -#: ../../Zotlabs/Module/Settings.php:644 ../../Zotlabs/Module/Settings.php:757 -#: ../../Zotlabs/Module/Settings.php:806 ../../Zotlabs/Module/Settings.php:832 -#: ../../Zotlabs/Module/Settings.php:855 ../../Zotlabs/Module/Settings.php:943 -#: ../../Zotlabs/Module/Settings.php:1129 +#: ../../Zotlabs/Module/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/Events.php:474 +#: ../../Zotlabs/Module/Group.php:85 ../../Zotlabs/Module/Mail.php:370 +#: ../../Zotlabs/Module/Connedit.php:786 #: ../../Zotlabs/Module/Import_items.php:122 #: ../../Zotlabs/Module/Invite.php:146 ../../Zotlabs/Module/Locs.php:121 -#: ../../Zotlabs/Module/Profiles.php:687 ../../Zotlabs/Module/Mood.php:139 +#: ../../Zotlabs/Module/Import.php:560 ../../Zotlabs/Module/Mood.php:139 #: ../../Zotlabs/Module/Chat.php:196 ../../Zotlabs/Module/Chat.php:238 #: ../../Zotlabs/Module/Mitem.php:235 ../../Zotlabs/Module/Admin.php:492 #: ../../Zotlabs/Module/Admin.php:688 ../../Zotlabs/Module/Admin.php:771 @@ -657,9 +661,10 @@ msgstr "" #: ../../Zotlabs/Module/Connect.php:98 ../../Zotlabs/Module/Setup.php:312 #: ../../Zotlabs/Module/Setup.php:353 ../../Zotlabs/Module/Thing.php:316 #: ../../Zotlabs/Module/Thing.php:362 ../../Zotlabs/Module/Sources.php:114 -#: ../../Zotlabs/Module/Sources.php:149 ../../Zotlabs/Module/Xchan.php:15 -#: ../../Zotlabs/Lib/ThreadItem.php:710 ../../include/js_strings.php:22 -#: ../../include/widgets.php:763 ../../view/theme/redbasic/php/config.php:99 +#: ../../Zotlabs/Module/Sources.php:149 ../../Zotlabs/Module/Profiles.php:687 +#: ../../Zotlabs/Module/Xchan.php:15 ../../Zotlabs/Lib/ThreadItem.php:710 +#: ../../include/js_strings.php:22 ../../include/widgets.php:763 +#: ../../view/theme/redbasic/php/config.php:99 msgid "Submit" msgstr "" @@ -680,12 +685,12 @@ msgid "Show Oldest First" msgstr "" #: ../../Zotlabs/Module/Photos.php:790 ../../Zotlabs/Module/Photos.php:1329 -#: ../../Zotlabs/Module/Embedphotos.php:141 ../../include/widgets.php:1593 +#: ../../Zotlabs/Module/Embedphotos.php:141 ../../include/widgets.php:1607 msgid "View Photo" msgstr "" #: ../../Zotlabs/Module/Photos.php:821 -#: ../../Zotlabs/Module/Embedphotos.php:157 ../../include/widgets.php:1610 +#: ../../Zotlabs/Module/Embedphotos.php:157 ../../include/widgets.php:1624 msgid "Edit Album" msgstr "" @@ -774,8 +779,8 @@ msgstr "" msgid "I don't like this (toggle)" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1070 ../../Zotlabs/Module/Blocks.php:161 -#: ../../Zotlabs/Module/Layouts.php:193 ../../Zotlabs/Module/Webpages.php:195 +#: ../../Zotlabs/Module/Photos.php:1070 ../../Zotlabs/Module/Webpages.php:217 +#: ../../Zotlabs/Module/Blocks.php:161 ../../Zotlabs/Module/Layouts.php:193 #: ../../include/conversation.php:1219 msgid "Share" msgstr "" @@ -796,8 +801,8 @@ msgid "Comment" msgstr "" #: ../../Zotlabs/Module/Photos.php:1091 ../../Zotlabs/Module/Events.php:469 -#: ../../Zotlabs/Module/Webpages.php:201 ../../Zotlabs/Lib/ThreadItem.php:719 -#: ../../include/conversation.php:1198 ../../include/page_widgets.php:43 +#: ../../Zotlabs/Module/Webpages.php:223 ../../Zotlabs/Lib/ThreadItem.php:719 +#: ../../include/page_widgets.php:43 ../../include/conversation.php:1198 msgid "Preview" msgstr "" @@ -848,8 +853,8 @@ msgid "View all" msgstr "" #: ../../Zotlabs/Module/Photos.php:1128 ../../Zotlabs/Lib/ThreadItem.php:185 -#: ../../include/channel.php:1198 ../../include/conversation.php:1762 -#: ../../include/taxonomy.php:403 +#: ../../include/conversation.php:1762 ../../include/taxonomy.php:403 +#: ../../include/channel.php:1189 msgctxt "noun" msgid "Like" msgid_plural "Likes" @@ -919,13 +924,13 @@ msgstr "" msgid "Homepage: " msgstr "" -#: ../../Zotlabs/Module/Directory.php:306 ../../include/channel.php:1223 +#: ../../Zotlabs/Module/Directory.php:306 ../../include/channel.php:1214 msgid "Age:" msgstr "" -#: ../../Zotlabs/Module/Directory.php:311 ../../include/channel.php:1066 -#: ../../include/event.php:52 ../../include/event.php:84 -#: ../../include/bb2diaspora.php:507 +#: ../../Zotlabs/Module/Directory.php:311 ../../include/event.php:52 +#: ../../include/event.php:84 ../../include/bb2diaspora.php:507 +#: ../../include/channel.php:1057 msgid "Location:" msgstr "" @@ -933,18 +938,18 @@ msgstr "" msgid "Description:" msgstr "" -#: ../../Zotlabs/Module/Directory.php:322 ../../include/channel.php:1239 +#: ../../Zotlabs/Module/Directory.php:322 ../../include/channel.php:1230 msgid "Hometown:" msgstr "" -#: ../../Zotlabs/Module/Directory.php:324 ../../include/channel.php:1247 +#: ../../Zotlabs/Module/Directory.php:324 ../../include/channel.php:1238 msgid "About:" msgstr "" #: ../../Zotlabs/Module/Directory.php:325 ../../Zotlabs/Module/Match.php:68 -#: ../../Zotlabs/Module/Suggest.php:56 ../../include/channel.php:1051 -#: ../../include/conversation.php:959 ../../include/connections.php:78 -#: ../../include/widgets.php:147 ../../include/widgets.php:184 +#: ../../Zotlabs/Module/Suggest.php:56 ../../include/connections.php:78 +#: ../../include/conversation.php:959 ../../include/widgets.php:147 +#: ../../include/widgets.php:184 ../../include/channel.php:1042 msgid "Connect" msgstr "" @@ -1020,221 +1025,72 @@ msgstr "" msgid "No entries (some entries may be hidden)." msgstr "" -#: ../../Zotlabs/Module/Import.php:33 -#, php-format -msgid "Your service plan only allows %d channels." -msgstr "" - -#: ../../Zotlabs/Module/Import.php:71 ../../Zotlabs/Module/Import_items.php:42 -msgid "Nothing to import." -msgstr "" - -#: ../../Zotlabs/Module/Import.php:95 ../../Zotlabs/Module/Import_items.php:66 -msgid "Unable to download data from old server" -msgstr "" - -#: ../../Zotlabs/Module/Import.php:101 -#: ../../Zotlabs/Module/Import_items.php:72 -msgid "Imported file is empty." -msgstr "" - -#: ../../Zotlabs/Module/Import.php:123 -#: ../../Zotlabs/Module/Import_items.php:88 +#: ../../Zotlabs/Module/Probe.php:28 ../../Zotlabs/Module/Probe.php:32 #, php-format -msgid "Warning: Database versions differ by %1$d updates." -msgstr "" - -#: ../../Zotlabs/Module/Import.php:153 ../../include/import.php:107 -msgid "Cloned channel not found. Import failed." -msgstr "" - -#: ../../Zotlabs/Module/Import.php:163 -msgid "No channel. Import failed." -msgstr "" - -#: ../../Zotlabs/Module/Import.php:520 -#: ../../include/Import/import_diaspora.php:142 -msgid "Import completed." -msgstr "" - -#: ../../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 "" -"Use this form to import an existing channel from a different server/hub. You " -"may retrieve the channel identity from the old server/hub via the network or " -"provide an export file." -msgstr "" - -#: ../../Zotlabs/Module/Import.php:549 -#: ../../Zotlabs/Module/Import_items.php:121 -msgid "File to Upload" -msgstr "" - -#: ../../Zotlabs/Module/Import.php:550 -msgid "Or provide the old server/hub details" -msgstr "" - -#: ../../Zotlabs/Module/Import.php:551 -msgid "Your old identity address (xyz@example.com)" -msgstr "" - -#: ../../Zotlabs/Module/Import.php:552 -msgid "Your old login email address" -msgstr "" - -#: ../../Zotlabs/Module/Import.php:553 -msgid "Your old login password" -msgstr "" - -#: ../../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/Import.php:555 -msgid "Make this hub my primary location" -msgstr "" - -#: ../../Zotlabs/Module/Import.php:556 -msgid "" -"Import existing posts if possible (experimental - limited by available memory" -msgstr "" - -#: ../../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:19 -msgid "Like/Dislike" -msgstr "" - -#: ../../Zotlabs/Module/Like.php:24 -msgid "This action is restricted to members." -msgstr "" - -#: ../../Zotlabs/Module/Like.php:25 -msgid "" -"Please <a href=\"rmagic\">login with your $Projectname ID</a> or <a href=" -"\"register\">register as a new $Projectname member</a> to continue." -msgstr "" - -#: ../../Zotlabs/Module/Like.php:105 ../../Zotlabs/Module/Like.php:131 -#: ../../Zotlabs/Module/Like.php:169 -msgid "Invalid request." -msgstr "" - -#: ../../Zotlabs/Module/Like.php:117 ../../include/conversation.php:126 -msgid "channel" -msgstr "" - -#: ../../Zotlabs/Module/Like.php:146 -msgid "thing" +msgid "Fetching URL returns error: %1$s" msgstr "" -#: ../../Zotlabs/Module/Like.php:192 -msgid "Channel unavailable." +#: ../../Zotlabs/Module/Rmagic.php:35 +msgid "Authentication failed." msgstr "" -#: ../../Zotlabs/Module/Like.php:240 -msgid "Previous action reversed." +#: ../../Zotlabs/Module/Rmagic.php:75 +msgid "Remote Authentication" msgstr "" -#: ../../Zotlabs/Module/Like.php:370 ../../Zotlabs/Module/Subthread.php:87 -#: ../../Zotlabs/Module/Tagger.php:47 ../../include/conversation.php:120 -#: ../../include/text.php:1921 -msgid "photo" +#: ../../Zotlabs/Module/Rmagic.php:76 +msgid "Enter your channel address (e.g. channel@example.com)" msgstr "" -#: ../../Zotlabs/Module/Like.php:370 ../../Zotlabs/Module/Subthread.php:87 -#: ../../include/conversation.php:148 ../../include/text.php:1927 -msgid "status" +#: ../../Zotlabs/Module/Rmagic.php:77 +msgid "Authenticate" msgstr "" -#: ../../Zotlabs/Module/Like.php:372 ../../Zotlabs/Module/Events.php:253 -#: ../../Zotlabs/Module/Tagger.php:51 ../../include/conversation.php:123 -#: ../../include/event.php:951 ../../include/text.php:1924 -msgid "event" +#: ../../Zotlabs/Module/Bookmarks.php:53 +msgid "Bookmark added" msgstr "" -#: ../../Zotlabs/Module/Like.php:419 ../../include/conversation.php:164 -#, php-format -msgid "%1$s likes %2$s's %3$s" +#: ../../Zotlabs/Module/Bookmarks.php:75 +msgid "My Bookmarks" 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/Bookmarks.php:86 +msgid "My Connections Bookmarks" msgstr "" -#: ../../Zotlabs/Module/Like.php:423 -#, php-format -msgid "%1$s agrees with %2$s's %3$s" +#: ../../Zotlabs/Module/Impel.php:41 ../../include/bbcode.php:192 +msgid "webpage" msgstr "" -#: ../../Zotlabs/Module/Like.php:425 -#, php-format -msgid "%1$s doesn't agree with %2$s's %3$s" +#: ../../Zotlabs/Module/Impel.php:46 ../../include/bbcode.php:198 +msgid "block" msgstr "" -#: ../../Zotlabs/Module/Like.php:427 -#, php-format -msgid "%1$s abstains from a decision on %2$s's %3$s" +#: ../../Zotlabs/Module/Impel.php:51 ../../include/bbcode.php:195 +msgid "layout" msgstr "" -#: ../../Zotlabs/Module/Like.php:429 -#, php-format -msgid "%1$s is attending %2$s's %3$s" +#: ../../Zotlabs/Module/Impel.php:58 ../../include/bbcode.php:201 +msgid "menu" msgstr "" -#: ../../Zotlabs/Module/Like.php:431 +#: ../../Zotlabs/Module/Impel.php:191 #, php-format -msgid "%1$s is not attending %2$s's %3$s" +msgid "%s element installed" msgstr "" -#: ../../Zotlabs/Module/Like.php:433 +#: ../../Zotlabs/Module/Impel.php:194 #, php-format -msgid "%1$s may attend %2$s's %3$s" -msgstr "" - -#: ../../Zotlabs/Module/Like.php:536 -msgid "Action completed." -msgstr "" - -#: ../../Zotlabs/Module/Like.php:537 -msgid "Thank you." -msgstr "" - -#: ../../Zotlabs/Module/Bookmarks.php:53 -msgid "Bookmark added" -msgstr "" - -#: ../../Zotlabs/Module/Bookmarks.php:75 -msgid "My Bookmarks" -msgstr "" - -#: ../../Zotlabs/Module/Bookmarks.php:86 -msgid "My Connections Bookmarks" +msgid "%s element installation failed" msgstr "" #: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:222 -#: ../../include/conversation.php:1647 ../../include/nav.php:92 +#: ../../include/nav.php:92 ../../include/conversation.php:1647 msgid "Photos" msgstr "" #: ../../Zotlabs/Module/Fbrowser.php:66 ../../Zotlabs/Module/Fbrowser.php:88 -#: ../../Zotlabs/Module/Settings.php:645 ../../Zotlabs/Module/Settings.php:671 +#: ../../Zotlabs/Module/Settings.php:661 ../../Zotlabs/Module/Settings.php:687 #: ../../Zotlabs/Module/Admin.php:1406 ../../Zotlabs/Module/Tagrm.php:15 #: ../../Zotlabs/Module/Tagrm.php:138 ../../Zotlabs/Module/Wiki.php:166 #: ../../Zotlabs/Module/Wiki.php:202 ../../include/conversation.php:1235 @@ -1315,7 +1171,7 @@ msgstr "" #: ../../Zotlabs/Module/Connections.php:92 #: ../../Zotlabs/Module/Connections.php:107 -#: ../../Zotlabs/Module/Connedit.php:624 ../../include/widgets.php:497 +#: ../../Zotlabs/Module/Connedit.php:632 ../../include/widgets.php:497 msgid "All" msgstr "" @@ -1399,7 +1255,7 @@ msgid "Ignore connection" msgstr "" #: ../../Zotlabs/Module/Connections.php:277 -#: ../../Zotlabs/Module/Connedit.php:578 +#: ../../Zotlabs/Module/Connedit.php:586 #: ../../Zotlabs/Module/Notifications.php:55 msgid "Ignore" msgstr "" @@ -1481,7 +1337,7 @@ msgstr "" msgid "%1$s updated their %2$s" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:240 ../../include/channel.php:1726 +#: ../../Zotlabs/Module/Cover_photo.php:240 ../../include/channel.php:1717 msgid "cover photo" msgstr "" @@ -1507,7 +1363,7 @@ msgid "Upload Cover Photo" msgstr "" #: ../../Zotlabs/Module/Cover_photo.php:361 -#: ../../Zotlabs/Module/Settings.php:1080 +#: ../../Zotlabs/Module/Settings.php:1138 #: ../../Zotlabs/Module/Profile_photo.php:396 msgid "or" msgstr "" @@ -1537,123 +1393,8 @@ msgstr "" msgid "Done Editing" 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:197 ../../Zotlabs/Module/Mail.php:306 -#: ../../Zotlabs/Module/Chat.php:205 ../../include/conversation.php:1181 -msgid "Please enter a link URL:" -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:241 ../../Zotlabs/Module/Invite.php:135 -msgid "Your message:" -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:243 ../../Zotlabs/Module/Mail.php:368 -#: ../../include/conversation.php:1231 -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:1146 -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:1266 -msgid "Set expiration date" -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:250 ../../Zotlabs/Module/Mail.php:375 -#: ../../Zotlabs/Module/Chat.php:206 ../../Zotlabs/Lib/ThreadItem.php:722 -#: ../../include/conversation.php:1271 -msgid "Encrypt text" -msgstr "" - -#: ../../Zotlabs/Module/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):" +#: ../../Zotlabs/Module/Follow.php:34 +msgid "Channel added." msgstr "" #: ../../Zotlabs/Module/Channel.php:28 ../../Zotlabs/Module/Chat.php:25 @@ -1693,6 +1434,13 @@ msgstr "" msgid "Block Name" msgstr "" +#: ../../Zotlabs/Module/Editblock.php:111 +#: ../../Zotlabs/Module/Editwebpage.php:146 ../../Zotlabs/Module/Mail.php:244 +#: ../../Zotlabs/Module/Mail.php:369 ../../Zotlabs/Module/Chat.php:207 +#: ../../include/conversation.php:1146 +msgid "Insert web link" +msgstr "" + #: ../../Zotlabs/Module/Editblock.php:124 ../../include/conversation.php:1243 msgid "Title (optional)" msgstr "" @@ -1723,57 +1471,12 @@ msgstr "" msgid "Edit Webpage" msgstr "" -#: ../../Zotlabs/Module/Group.php:24 -msgid "Privacy group created." -msgstr "" - -#: ../../Zotlabs/Module/Group.php:30 -msgid "Could not create privacy group." -msgstr "" - -#: ../../Zotlabs/Module/Group.php:42 ../../Zotlabs/Module/Group.php:141 -#: ../../include/items.php:3902 -msgid "Privacy group not found." -msgstr "" - -#: ../../Zotlabs/Module/Group.php:58 -msgid "Privacy group updated." -msgstr "" - -#: ../../Zotlabs/Module/Group.php:90 -msgid "Create a group of channels." -msgstr "" - -#: ../../Zotlabs/Module/Group.php:91 ../../Zotlabs/Module/Group.php:184 -msgid "Privacy group name: " -msgstr "" - -#: ../../Zotlabs/Module/Group.php:93 ../../Zotlabs/Module/Group.php:187 -msgid "Members are visible to other channels" -msgstr "" - -#: ../../Zotlabs/Module/Group.php:111 -msgid "Privacy group removed." -msgstr "" - -#: ../../Zotlabs/Module/Group.php:113 -msgid "Unable to remove privacy group." -msgstr "" - -#: ../../Zotlabs/Module/Group.php:183 -msgid "Privacy group editor" -msgstr "" - -#: ../../Zotlabs/Module/Group.php:197 -msgid "Members" -msgstr "" - -#: ../../Zotlabs/Module/Group.php:199 -msgid "All Connected Channels" +#: ../../Zotlabs/Module/Editpost.php:35 +msgid "Item is not editable" msgstr "" -#: ../../Zotlabs/Module/Group.php:231 -msgid "Click on a channel to add or remove." +#: ../../Zotlabs/Module/Editpost.php:106 ../../Zotlabs/Module/Rpost.php:134 +msgid "Edit post" msgstr "" #: ../../Zotlabs/Module/Appman.php:37 ../../Zotlabs/Module/Appman.php:53 @@ -1953,527 +1656,6 @@ 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" -msgstr "" - -#: ../../Zotlabs/Module/Events.php:25 -msgid "Calendar entries imported." -msgstr "" - -#: ../../Zotlabs/Module/Events.php:27 -msgid "No calendar entries found." -msgstr "" - -#: ../../Zotlabs/Module/Events.php:104 -msgid "Event can not end before it has started." -msgstr "" - -#: ../../Zotlabs/Module/Events.php:106 ../../Zotlabs/Module/Events.php:115 -#: ../../Zotlabs/Module/Events.php:135 -msgid "Unable to generate preview." -msgstr "" - -#: ../../Zotlabs/Module/Events.php:113 -msgid "Event title and start time are required." -msgstr "" - -#: ../../Zotlabs/Module/Events.php:133 ../../Zotlabs/Module/Events.php:258 -msgid "Event not found." -msgstr "" - -#: ../../Zotlabs/Module/Events.php:448 -msgid "Edit event title" -msgstr "" - -#: ../../Zotlabs/Module/Events.php:448 -msgid "Event title" -msgstr "" - -#: ../../Zotlabs/Module/Events.php:450 -msgid "Categories (comma-separated list)" -msgstr "" - -#: ../../Zotlabs/Module/Events.php:451 -msgid "Edit Category" -msgstr "" - -#: ../../Zotlabs/Module/Events.php:451 -msgid "Category" -msgstr "" - -#: ../../Zotlabs/Module/Events.php:454 -msgid "Edit start date and time" -msgstr "" - -#: ../../Zotlabs/Module/Events.php:454 -msgid "Start date and time" -msgstr "" - -#: ../../Zotlabs/Module/Events.php:455 ../../Zotlabs/Module/Events.php:458 -msgid "Finish date and time are not known or not relevant" -msgstr "" - -#: ../../Zotlabs/Module/Events.php:457 -msgid "Edit finish date and time" -msgstr "" - -#: ../../Zotlabs/Module/Events.php:457 -msgid "Finish date and time" -msgstr "" - -#: ../../Zotlabs/Module/Events.php:459 ../../Zotlabs/Module/Events.php:460 -msgid "Adjust for viewer timezone" -msgstr "" - -#: ../../Zotlabs/Module/Events.php:459 -msgid "" -"Important for events that happen in a particular place. Not practical for " -"global holidays." -msgstr "" - -#: ../../Zotlabs/Module/Events.php:461 -msgid "Edit Description" -msgstr "" - -#: ../../Zotlabs/Module/Events.php:463 -msgid "Edit Location" -msgstr "" - -#: ../../Zotlabs/Module/Events.php:463 ../../Zotlabs/Module/Locs.php:117 -#: ../../Zotlabs/Module/Profiles.php:477 ../../Zotlabs/Module/Profiles.php:698 -#: ../../Zotlabs/Module/Pubsites.php:41 ../../include/js_strings.php:25 -msgid "Location" -msgstr "" - -#: ../../Zotlabs/Module/Events.php:466 ../../Zotlabs/Module/Events.php:468 -msgid "Share this event" -msgstr "" - -#: ../../Zotlabs/Module/Events.php:470 ../../include/conversation.php:1247 -msgid "Permission settings" -msgstr "" - -#: ../../Zotlabs/Module/Events.php:475 -msgid "Advanced Options" -msgstr "" - -#: ../../Zotlabs/Module/Events.php:587 ../../Zotlabs/Module/Cal.php:259 -msgid "l, F j" -msgstr "" - -#: ../../Zotlabs/Module/Events.php:609 -msgid "Edit event" -msgstr "" - -#: ../../Zotlabs/Module/Events.php:611 -msgid "Delete event" -msgstr "" - -#: ../../Zotlabs/Module/Events.php:636 ../../Zotlabs/Module/Cal.php:308 -#: ../../include/text.php:1712 -msgid "Link to Source" -msgstr "" - -#: ../../Zotlabs/Module/Events.php:645 -msgid "calendar" -msgstr "" - -#: ../../Zotlabs/Module/Events.php:664 ../../Zotlabs/Module/Cal.php:331 -msgid "Edit Event" -msgstr "" - -#: ../../Zotlabs/Module/Events.php:664 ../../Zotlabs/Module/Cal.php:331 -msgid "Create Event" -msgstr "" - -#: ../../Zotlabs/Module/Events.php:667 ../../Zotlabs/Module/Cal.php:334 -msgid "Export" -msgstr "" - -#: ../../Zotlabs/Module/Events.php:670 ../../Zotlabs/Module/Blocks.php:166 -#: ../../Zotlabs/Module/Layouts.php:197 ../../Zotlabs/Module/Pubsites.php:47 -#: ../../Zotlabs/Module/Webpages.php:200 ../../include/page_widgets.php:42 -msgid "View" -msgstr "" - -#: ../../Zotlabs/Module/Events.php:671 -msgid "Month" -msgstr "" - -#: ../../Zotlabs/Module/Events.php:672 -msgid "Week" -msgstr "" - -#: ../../Zotlabs/Module/Events.php:673 -msgid "Day" -msgstr "" - -#: ../../Zotlabs/Module/Events.php:676 ../../Zotlabs/Module/Cal.php:341 -msgid "Today" -msgstr "" - -#: ../../Zotlabs/Module/Events.php:707 -msgid "Event removed" -msgstr "" - -#: ../../Zotlabs/Module/Events.php:710 -msgid "Failed to remove event" -msgstr "" - -#: ../../Zotlabs/Module/Manage.php:136 -#: ../../Zotlabs/Module/New_channel.php:121 -#, php-format -msgid "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:143 ../../Zotlabs/Module/Profiles.php:778 -#: ../../Zotlabs/Module/Chat.php:252 -msgid "Create New" -msgstr "" - -#: ../../Zotlabs/Module/Manage.php:164 ../../Zotlabs/Lib/Apps.php:214 -#: ../../include/nav.php:208 -msgid "Channel Manager" -msgstr "" - -#: ../../Zotlabs/Module/Manage.php:165 -msgid "Current Channel" -msgstr "" - -#: ../../Zotlabs/Module/Manage.php:167 -msgid "Switch to one of your channels by selecting it." -msgstr "" - -#: ../../Zotlabs/Module/Manage.php:168 -msgid "Default Channel" -msgstr "" - -#: ../../Zotlabs/Module/Manage.php:169 -msgid "Make Default" -msgstr "" - -#: ../../Zotlabs/Module/Manage.php:172 -#, php-format -msgid "%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/Connedit.php:80 -msgid "Could not access contact record." -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:104 -msgid "Could not locate selected profile." -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:248 -msgid "Connection updated." -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:250 -msgid "Failed to update connection record." -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:300 -msgid "is now connected to" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:435 -msgid "Could not access address book record." -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:455 -msgid "Refresh failed - channel is currently unavailable." -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:470 ../../Zotlabs/Module/Connedit.php:479 -#: ../../Zotlabs/Module/Connedit.php:488 ../../Zotlabs/Module/Connedit.php:497 -#: ../../Zotlabs/Module/Connedit.php:510 -msgid "Unable to set address book parameters." -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:533 -msgid "Connection has been removed." -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:549 ../../Zotlabs/Lib/Apps.php:221 -#: ../../include/conversation.php:957 ../../include/nav.php:86 -msgid "View Profile" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:552 -#, php-format -msgid "View %s's profile" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:556 -msgid "Refresh Permissions" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:559 -msgid "Fetch updated permissions" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:563 -msgid "Recent Activity" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:566 -msgid "View recent posts and comments" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:570 ../../Zotlabs/Module/Admin.php:1041 -msgid "Unblock" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:570 ../../Zotlabs/Module/Admin.php:1040 -msgid "Block" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:573 -msgid "Block (or Unblock) all communications with this connection" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:574 -msgid "This connection is blocked!" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:578 -msgid "Unignore" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:581 -msgid "Ignore (or Unignore) all inbound communications from this connection" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:582 -msgid "This connection is ignored!" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:586 -msgid "Unarchive" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:586 -msgid "Archive" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:589 -msgid "" -"Archive (or Unarchive) this connection - mark channel dead but keep content" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:590 -msgid "This connection is archived!" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:594 -msgid "Unhide" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:594 -msgid "Hide" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:597 -msgid "Hide or Unhide this connection from your other connections" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:598 -msgid "This connection is hidden!" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:605 -msgid "Delete this connection" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:620 ../../include/widgets.php:493 -msgid "Me" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:621 ../../include/widgets.php:494 -msgid "Family" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:622 ../../Zotlabs/Module/Settings.php:391 -#: ../../Zotlabs/Module/Settings.php:395 ../../Zotlabs/Module/Settings.php:396 -#: ../../Zotlabs/Module/Settings.php:399 ../../Zotlabs/Module/Settings.php:410 -#: ../../include/channel.php:402 ../../include/channel.php:403 -#: ../../include/channel.php:410 ../../include/selectors.php:123 -#: ../../include/widgets.php:495 -msgid "Friends" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:623 ../../include/widgets.php:496 -msgid "Acquaintances" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:685 -msgid "Approve this connection" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:685 -msgid "Accept connection to allow communication" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:690 -msgid "Set Affinity" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:693 -msgid "Set Profile" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:696 -msgid "Set Affinity & Profile" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:745 -msgid "none" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:749 ../../include/widgets.php:623 -msgid "Connection Default Permissions" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:749 ../../include/items.php:3935 -#, php-format -msgid "Connection: %s" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:750 -msgid "Apply these permissions automatically" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:750 -msgid "Connection requests will be approved without your interaction" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:752 -msgid "This connection's primary address is" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:753 -msgid "Available locations:" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:757 -msgid "" -"The permissions indicated on this page will be applied to all new " -"connections." -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:758 -msgid "Connection Tools" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:760 -msgid "Slide to adjust your degree of friendship" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:761 ../../Zotlabs/Module/Rate.php:159 -#: ../../include/js_strings.php:20 -msgid "Rating" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:762 -msgid "Slide to adjust your rating" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:763 ../../Zotlabs/Module/Connedit.php:768 -msgid "Optionally explain your rating" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:765 -msgid "Custom Filter" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:766 -msgid "Only import posts with this text" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:766 ../../Zotlabs/Module/Connedit.php:767 -msgid "" -"words one per line or #tags or /patterns/ or lang=xx, leave blank to import " -"all posts" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:767 -msgid "Do not import posts with this text" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:769 -msgid "This information is public!" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:774 -msgid "Connection Pending Approval" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:777 -msgid "inherited" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:779 -#, php-format -msgid "" -"Please choose the profile you would like to display to %s when viewing your " -"profile securely." -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:781 -msgid "Their Settings" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:782 -msgid "My Settings" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:784 -msgid "Individual Permissions" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:785 -msgid "" -"Some permissions may be inherited from your channel's <a href=\"settings" -"\"><strong>privacy settings</strong></a>, which have higher priority than " -"individual settings. You can <strong>not</strong> change those settings here." -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:786 -msgid "" -"Some permissions may be inherited from your channel's <a href=\"settings" -"\"><strong>privacy settings</strong></a>, which have higher priority than " -"individual settings. You can change those settings here but they wont have " -"any impact unless the inherited setting changes." -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:787 -msgid "Last update:" -msgstr "" - -#: ../../Zotlabs/Module/Editpost.php:35 -msgid "Item is not editable" -msgstr "" - -#: ../../Zotlabs/Module/Editpost.php:106 ../../Zotlabs/Module/Rpost.php:134 -msgid "Edit post" -msgstr "" - #: ../../Zotlabs/Module/Settings.php:64 msgid "Name is required" msgstr "" @@ -2482,7 +1664,7 @@ msgstr "" msgid "Key and Secret are required" msgstr "" -#: ../../Zotlabs/Module/Settings.php:72 ../../Zotlabs/Module/Settings.php:670 +#: ../../Zotlabs/Module/Settings.php:72 ../../Zotlabs/Module/Settings.php:686 #: ../../Zotlabs/Module/Admin.php:1435 ../../Zotlabs/Lib/Apps.php:334 msgid "Update" msgstr "" @@ -2496,1190 +1678,1521 @@ msgstr "" msgid "Name and Password are required." msgstr "" -#: ../../Zotlabs/Module/Settings.php:168 +#: ../../Zotlabs/Module/Settings.php:184 msgid "Token saved." msgstr "" -#: ../../Zotlabs/Module/Settings.php:274 +#: ../../Zotlabs/Module/Settings.php:290 msgid "Not valid email." msgstr "" -#: ../../Zotlabs/Module/Settings.php:277 +#: ../../Zotlabs/Module/Settings.php:293 msgid "Protected email address. Cannot change to that email." msgstr "" -#: ../../Zotlabs/Module/Settings.php:286 +#: ../../Zotlabs/Module/Settings.php:302 msgid "System failure storing new email. Please try again." msgstr "" -#: ../../Zotlabs/Module/Settings.php:303 +#: ../../Zotlabs/Module/Settings.php:319 msgid "Password verification failed." msgstr "" -#: ../../Zotlabs/Module/Settings.php:310 +#: ../../Zotlabs/Module/Settings.php:326 msgid "Passwords do not match. Password unchanged." msgstr "" -#: ../../Zotlabs/Module/Settings.php:314 +#: ../../Zotlabs/Module/Settings.php:330 msgid "Empty passwords are not allowed. Password unchanged." msgstr "" -#: ../../Zotlabs/Module/Settings.php:328 +#: ../../Zotlabs/Module/Settings.php:344 msgid "Password changed." msgstr "" -#: ../../Zotlabs/Module/Settings.php:330 +#: ../../Zotlabs/Module/Settings.php:346 msgid "Password update failed. Please try again." msgstr "" -#: ../../Zotlabs/Module/Settings.php:579 +#: ../../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 ../../Zotlabs/Module/Connedit.php:630 +#: ../../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/Settings.php:595 msgid "Settings updated." msgstr "" -#: ../../Zotlabs/Module/Settings.php:643 ../../Zotlabs/Module/Settings.php:669 -#: ../../Zotlabs/Module/Settings.php:705 +#: ../../Zotlabs/Module/Settings.php:659 ../../Zotlabs/Module/Settings.php:685 +#: ../../Zotlabs/Module/Settings.php:721 msgid "Add application" msgstr "" -#: ../../Zotlabs/Module/Settings.php:646 +#: ../../Zotlabs/Module/Settings.php:662 msgid "Name of application" msgstr "" -#: ../../Zotlabs/Module/Settings.php:647 ../../Zotlabs/Module/Settings.php:673 +#: ../../Zotlabs/Module/Settings.php:663 ../../Zotlabs/Module/Settings.php:689 msgid "Consumer Key" msgstr "" -#: ../../Zotlabs/Module/Settings.php:647 ../../Zotlabs/Module/Settings.php:648 +#: ../../Zotlabs/Module/Settings.php:663 ../../Zotlabs/Module/Settings.php:664 msgid "Automatically generated - change if desired. Max length 20" msgstr "" -#: ../../Zotlabs/Module/Settings.php:648 ../../Zotlabs/Module/Settings.php:674 +#: ../../Zotlabs/Module/Settings.php:664 ../../Zotlabs/Module/Settings.php:690 msgid "Consumer Secret" msgstr "" -#: ../../Zotlabs/Module/Settings.php:649 ../../Zotlabs/Module/Settings.php:675 +#: ../../Zotlabs/Module/Settings.php:665 ../../Zotlabs/Module/Settings.php:691 msgid "Redirect" msgstr "" -#: ../../Zotlabs/Module/Settings.php:649 +#: ../../Zotlabs/Module/Settings.php:665 msgid "" "Redirect URI - leave blank unless your application specifically requires this" msgstr "" -#: ../../Zotlabs/Module/Settings.php:650 ../../Zotlabs/Module/Settings.php:676 +#: ../../Zotlabs/Module/Settings.php:666 ../../Zotlabs/Module/Settings.php:692 msgid "Icon url" msgstr "" -#: ../../Zotlabs/Module/Settings.php:650 ../../Zotlabs/Module/Sources.php:112 +#: ../../Zotlabs/Module/Settings.php:666 ../../Zotlabs/Module/Sources.php:112 #: ../../Zotlabs/Module/Sources.php:147 msgid "Optional" msgstr "" -#: ../../Zotlabs/Module/Settings.php:661 +#: ../../Zotlabs/Module/Settings.php:677 msgid "Application not found." msgstr "" -#: ../../Zotlabs/Module/Settings.php:704 +#: ../../Zotlabs/Module/Settings.php:720 msgid "Connected Apps" msgstr "" -#: ../../Zotlabs/Module/Settings.php:708 +#: ../../Zotlabs/Module/Settings.php:724 msgid "Client key starts with" msgstr "" -#: ../../Zotlabs/Module/Settings.php:709 +#: ../../Zotlabs/Module/Settings.php:725 msgid "No name" msgstr "" -#: ../../Zotlabs/Module/Settings.php:710 +#: ../../Zotlabs/Module/Settings.php:726 msgid "Remove authorization" msgstr "" -#: ../../Zotlabs/Module/Settings.php:723 +#: ../../Zotlabs/Module/Settings.php:739 msgid "No feature settings configured" msgstr "" -#: ../../Zotlabs/Module/Settings.php:730 +#: ../../Zotlabs/Module/Settings.php:746 msgid "Feature/Addon Settings" msgstr "" -#: ../../Zotlabs/Module/Settings.php:753 +#: ../../Zotlabs/Module/Settings.php:769 msgid "Account Settings" msgstr "" -#: ../../Zotlabs/Module/Settings.php:754 +#: ../../Zotlabs/Module/Settings.php:770 msgid "Current Password" msgstr "" -#: ../../Zotlabs/Module/Settings.php:755 +#: ../../Zotlabs/Module/Settings.php:771 msgid "Enter New Password" msgstr "" -#: ../../Zotlabs/Module/Settings.php:756 +#: ../../Zotlabs/Module/Settings.php:772 msgid "Confirm New Password" msgstr "" -#: ../../Zotlabs/Module/Settings.php:756 +#: ../../Zotlabs/Module/Settings.php:772 msgid "Leave password fields blank unless changing" msgstr "" -#: ../../Zotlabs/Module/Settings.php:758 -#: ../../Zotlabs/Module/Settings.php:1136 +#: ../../Zotlabs/Module/Settings.php:774 +#: ../../Zotlabs/Module/Settings.php:1194 msgid "Email Address:" msgstr "" -#: ../../Zotlabs/Module/Settings.php:759 +#: ../../Zotlabs/Module/Settings.php:775 #: ../../Zotlabs/Module/Removeaccount.php:61 msgid "Remove Account" msgstr "" -#: ../../Zotlabs/Module/Settings.php:760 +#: ../../Zotlabs/Module/Settings.php:776 msgid "Remove this account including all its channels" msgstr "" -#: ../../Zotlabs/Module/Settings.php:789 +#: ../../Zotlabs/Module/Settings.php:810 msgid "" "Use this form to create temporary access identifiers to share things with " "non-members. These identities may be used in Access Control Lists and " -"visitors may login using these credentials to access the private content." +"visitors may login using these credentials to access private content." msgstr "" -#: ../../Zotlabs/Module/Settings.php:791 +#: ../../Zotlabs/Module/Settings.php:812 msgid "" "You may also provide <em>dropbox</em> style access links to friends and " "associates by adding the Login Password to any specific site URL as shown. " "Examples:" msgstr "" -#: ../../Zotlabs/Module/Settings.php:796 ../../include/widgets.php:614 +#: ../../Zotlabs/Module/Settings.php:847 ../../include/widgets.php:614 msgid "Guest Access Tokens" msgstr "" -#: ../../Zotlabs/Module/Settings.php:803 +#: ../../Zotlabs/Module/Settings.php:854 msgid "Login Name" msgstr "" -#: ../../Zotlabs/Module/Settings.php:804 +#: ../../Zotlabs/Module/Settings.php:855 msgid "Login Password" msgstr "" -#: ../../Zotlabs/Module/Settings.php:805 +#: ../../Zotlabs/Module/Settings.php:856 msgid "Expires (yyyy-mm-dd)" msgstr "" -#: ../../Zotlabs/Module/Settings.php:823 ../../Zotlabs/Module/Admin.php:677 +#: ../../Zotlabs/Module/Settings.php:857 ../../Zotlabs/Module/Connedit.php:789 +msgid "Their Settings" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:858 ../../Zotlabs/Module/Connedit.php:790 +msgid "My Settings" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:860 ../../Zotlabs/Module/Connedit.php:785 +msgid "inherited" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:862 ../../Zotlabs/Module/Connedit.php:792 +msgid "Individual Permissions" +msgstr "" + +#: ../../Zotlabs/Module/Settings.php:863 ../../Zotlabs/Module/Connedit.php:793 +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/Settings.php:881 ../../Zotlabs/Module/Admin.php:677 #: ../../Zotlabs/Module/Admin.php:678 msgid "Off" msgstr "" -#: ../../Zotlabs/Module/Settings.php:823 ../../Zotlabs/Module/Admin.php:677 +#: ../../Zotlabs/Module/Settings.php:881 ../../Zotlabs/Module/Admin.php:677 #: ../../Zotlabs/Module/Admin.php:678 msgid "On" msgstr "" -#: ../../Zotlabs/Module/Settings.php:830 +#: ../../Zotlabs/Module/Settings.php:888 msgid "Additional Features" msgstr "" -#: ../../Zotlabs/Module/Settings.php:854 +#: ../../Zotlabs/Module/Settings.php:912 msgid "Connector Settings" msgstr "" -#: ../../Zotlabs/Module/Settings.php:893 +#: ../../Zotlabs/Module/Settings.php:951 msgid "No special theme for mobile devices" msgstr "" -#: ../../Zotlabs/Module/Settings.php:896 +#: ../../Zotlabs/Module/Settings.php:954 #, php-format msgid "%s - (Experimental)" msgstr "" -#: ../../Zotlabs/Module/Settings.php:899 ../../Zotlabs/Module/Admin.php:410 +#: ../../Zotlabs/Module/Settings.php:957 ../../Zotlabs/Module/Admin.php:410 msgid "mobile" msgstr "" -#: ../../Zotlabs/Module/Settings.php:938 +#: ../../Zotlabs/Module/Settings.php:996 msgid "Display Settings" msgstr "" -#: ../../Zotlabs/Module/Settings.php:939 +#: ../../Zotlabs/Module/Settings.php:997 msgid "Theme Settings" msgstr "" -#: ../../Zotlabs/Module/Settings.php:940 +#: ../../Zotlabs/Module/Settings.php:998 msgid "Custom Theme Settings" msgstr "" -#: ../../Zotlabs/Module/Settings.php:941 +#: ../../Zotlabs/Module/Settings.php:999 msgid "Content Settings" msgstr "" -#: ../../Zotlabs/Module/Settings.php:947 +#: ../../Zotlabs/Module/Settings.php:1005 msgid "Display Theme:" msgstr "" -#: ../../Zotlabs/Module/Settings.php:948 +#: ../../Zotlabs/Module/Settings.php:1006 msgid "Mobile Theme:" msgstr "" -#: ../../Zotlabs/Module/Settings.php:949 +#: ../../Zotlabs/Module/Settings.php:1007 msgid "Preload images before rendering the page" msgstr "" -#: ../../Zotlabs/Module/Settings.php:949 +#: ../../Zotlabs/Module/Settings.php:1007 msgid "" "The subjective page load time will be longer but the page will be ready when " "displayed" msgstr "" -#: ../../Zotlabs/Module/Settings.php:950 +#: ../../Zotlabs/Module/Settings.php:1008 msgid "Enable user zoom on mobile devices" msgstr "" -#: ../../Zotlabs/Module/Settings.php:951 +#: ../../Zotlabs/Module/Settings.php:1009 msgid "Update browser every xx seconds" msgstr "" -#: ../../Zotlabs/Module/Settings.php:951 +#: ../../Zotlabs/Module/Settings.php:1009 msgid "Minimum of 10 seconds, no maximum" msgstr "" -#: ../../Zotlabs/Module/Settings.php:952 +#: ../../Zotlabs/Module/Settings.php:1010 msgid "Maximum number of conversations to load at any time:" msgstr "" -#: ../../Zotlabs/Module/Settings.php:952 +#: ../../Zotlabs/Module/Settings.php:1010 msgid "Maximum of 100 items" msgstr "" -#: ../../Zotlabs/Module/Settings.php:953 +#: ../../Zotlabs/Module/Settings.php:1011 msgid "Show emoticons (smilies) as images" msgstr "" -#: ../../Zotlabs/Module/Settings.php:954 +#: ../../Zotlabs/Module/Settings.php:1012 msgid "Link post titles to source" msgstr "" -#: ../../Zotlabs/Module/Settings.php:955 +#: ../../Zotlabs/Module/Settings.php:1013 msgid "System Page Layout Editor - (advanced)" msgstr "" -#: ../../Zotlabs/Module/Settings.php:958 +#: ../../Zotlabs/Module/Settings.php:1016 msgid "Use blog/list mode on channel page" msgstr "" -#: ../../Zotlabs/Module/Settings.php:958 ../../Zotlabs/Module/Settings.php:959 +#: ../../Zotlabs/Module/Settings.php:1016 +#: ../../Zotlabs/Module/Settings.php:1017 msgid "(comments displayed separately)" msgstr "" -#: ../../Zotlabs/Module/Settings.php:959 +#: ../../Zotlabs/Module/Settings.php:1017 msgid "Use blog/list mode on grid page" msgstr "" -#: ../../Zotlabs/Module/Settings.php:960 +#: ../../Zotlabs/Module/Settings.php:1018 msgid "Channel page max height of content (in pixels)" msgstr "" -#: ../../Zotlabs/Module/Settings.php:960 ../../Zotlabs/Module/Settings.php:961 +#: ../../Zotlabs/Module/Settings.php:1018 +#: ../../Zotlabs/Module/Settings.php:1019 msgid "click to expand content exceeding this height" msgstr "" -#: ../../Zotlabs/Module/Settings.php:961 +#: ../../Zotlabs/Module/Settings.php:1019 msgid "Grid page max height of content (in pixels)" msgstr "" -#: ../../Zotlabs/Module/Settings.php:990 +#: ../../Zotlabs/Module/Settings.php:1048 msgid "Nobody except yourself" msgstr "" -#: ../../Zotlabs/Module/Settings.php:991 +#: ../../Zotlabs/Module/Settings.php:1049 msgid "Only those you specifically allow" msgstr "" -#: ../../Zotlabs/Module/Settings.php:992 +#: ../../Zotlabs/Module/Settings.php:1050 msgid "Approved connections" msgstr "" -#: ../../Zotlabs/Module/Settings.php:993 +#: ../../Zotlabs/Module/Settings.php:1051 msgid "Any connections" msgstr "" -#: ../../Zotlabs/Module/Settings.php:994 +#: ../../Zotlabs/Module/Settings.php:1052 msgid "Anybody on this website" msgstr "" -#: ../../Zotlabs/Module/Settings.php:995 +#: ../../Zotlabs/Module/Settings.php:1053 msgid "Anybody in this network" msgstr "" -#: ../../Zotlabs/Module/Settings.php:996 +#: ../../Zotlabs/Module/Settings.php:1054 msgid "Anybody authenticated" msgstr "" -#: ../../Zotlabs/Module/Settings.php:997 +#: ../../Zotlabs/Module/Settings.php:1055 msgid "Anybody on the internet" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1071 +#: ../../Zotlabs/Module/Settings.php:1129 msgid "Publish your default profile in the network directory" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1076 +#: ../../Zotlabs/Module/Settings.php:1134 msgid "Allow us to suggest you as a potential friend to new members?" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1085 +#: ../../Zotlabs/Module/Settings.php:1143 msgid "Your channel address is" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1127 +#: ../../Zotlabs/Module/Settings.php:1185 msgid "Channel Settings" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1134 +#: ../../Zotlabs/Module/Settings.php:1192 msgid "Basic Settings" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1135 ../../include/channel.php:1180 +#: ../../Zotlabs/Module/Settings.php:1193 ../../include/channel.php:1171 msgid "Full Name:" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1137 +#: ../../Zotlabs/Module/Settings.php:1195 msgid "Your Timezone:" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1138 +#: ../../Zotlabs/Module/Settings.php:1196 msgid "Default Post Location:" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1138 +#: ../../Zotlabs/Module/Settings.php:1196 msgid "Geographical location to display on your posts" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1139 +#: ../../Zotlabs/Module/Settings.php:1197 msgid "Use Browser Location:" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1141 +#: ../../Zotlabs/Module/Settings.php:1199 msgid "Adult Content" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1141 +#: ../../Zotlabs/Module/Settings.php:1199 msgid "" "This channel frequently or regularly publishes adult content. (Please tag " "any adult material and/or nudity with #NSFW)" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1143 +#: ../../Zotlabs/Module/Settings.php:1201 msgid "Security and Privacy Settings" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1146 +#: ../../Zotlabs/Module/Settings.php:1204 msgid "Your permissions are already configured. Click to view/adjust" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1148 +#: ../../Zotlabs/Module/Settings.php:1206 msgid "Hide my online presence" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1148 +#: ../../Zotlabs/Module/Settings.php:1206 msgid "Prevents displaying in your profile that you are online" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1150 +#: ../../Zotlabs/Module/Settings.php:1208 msgid "Simple Privacy Settings:" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1151 +#: ../../Zotlabs/Module/Settings.php:1209 msgid "" "Very Public - <em>extremely permissive (should be used with caution)</em>" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1152 +#: ../../Zotlabs/Module/Settings.php:1210 msgid "" "Typical - <em>default public, privacy when desired (similar to social " "network permissions but with improved privacy)</em>" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1153 +#: ../../Zotlabs/Module/Settings.php:1211 msgid "Private - <em>default private, never open or public</em>" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1154 +#: ../../Zotlabs/Module/Settings.php:1212 msgid "Blocked - <em>default blocked to/from everybody</em>" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1156 +#: ../../Zotlabs/Module/Settings.php:1214 msgid "Allow others to tag your posts" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1156 +#: ../../Zotlabs/Module/Settings.php:1214 msgid "" "Often used by the community to retro-actively flag inappropriate content" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1158 +#: ../../Zotlabs/Module/Settings.php:1216 msgid "Advanced Privacy Settings" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1160 +#: ../../Zotlabs/Module/Settings.php:1218 msgid "Expire other channel content after this many days" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1160 +#: ../../Zotlabs/Module/Settings.php:1218 msgid "0 or blank to use the website limit." msgstr "" -#: ../../Zotlabs/Module/Settings.php:1160 +#: ../../Zotlabs/Module/Settings.php:1218 #, php-format msgid "This website expires after %d days." msgstr "" -#: ../../Zotlabs/Module/Settings.php:1160 +#: ../../Zotlabs/Module/Settings.php:1218 msgid "This website does not expire imported content." msgstr "" -#: ../../Zotlabs/Module/Settings.php:1160 +#: ../../Zotlabs/Module/Settings.php:1218 msgid "The website limit takes precedence if lower than your limit." msgstr "" -#: ../../Zotlabs/Module/Settings.php:1161 +#: ../../Zotlabs/Module/Settings.php:1219 msgid "Maximum Friend Requests/Day:" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1161 +#: ../../Zotlabs/Module/Settings.php:1219 msgid "May reduce spam activity" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1162 +#: ../../Zotlabs/Module/Settings.php:1220 msgid "Default Post and Publish Permissions" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1163 ../../Zotlabs/Module/Mitem.php:154 +#: ../../Zotlabs/Module/Settings.php:1221 ../../Zotlabs/Module/Mitem.php:154 #: ../../Zotlabs/Module/Mitem.php:227 msgid "(click to open/close)" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1164 +#: ../../Zotlabs/Module/Settings.php:1222 msgid "Use my default audience setting for the type of object published" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1167 +#: ../../Zotlabs/Module/Settings.php:1225 msgid "Channel permissions category:" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1173 +#: ../../Zotlabs/Module/Settings.php:1231 msgid "Maximum private messages per day from unknown people:" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1173 +#: ../../Zotlabs/Module/Settings.php:1231 msgid "Useful to reduce spamming" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1176 +#: ../../Zotlabs/Module/Settings.php:1234 msgid "Notification Settings" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1177 +#: ../../Zotlabs/Module/Settings.php:1235 msgid "By default post a status message when:" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1178 +#: ../../Zotlabs/Module/Settings.php:1236 msgid "accepting a friend request" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1179 +#: ../../Zotlabs/Module/Settings.php:1237 msgid "joining a forum/community" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1180 +#: ../../Zotlabs/Module/Settings.php:1238 msgid "making an <em>interesting</em> profile change" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1181 +#: ../../Zotlabs/Module/Settings.php:1239 msgid "Send a notification email when:" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1182 +#: ../../Zotlabs/Module/Settings.php:1240 msgid "You receive a connection request" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1183 +#: ../../Zotlabs/Module/Settings.php:1241 msgid "Your connections are confirmed" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1184 +#: ../../Zotlabs/Module/Settings.php:1242 msgid "Someone writes on your profile wall" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1185 +#: ../../Zotlabs/Module/Settings.php:1243 msgid "Someone writes a followup comment" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1186 +#: ../../Zotlabs/Module/Settings.php:1244 msgid "You receive a private message" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1187 +#: ../../Zotlabs/Module/Settings.php:1245 msgid "You receive a friend suggestion" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1188 +#: ../../Zotlabs/Module/Settings.php:1246 msgid "You are tagged in a post" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1189 +#: ../../Zotlabs/Module/Settings.php:1247 msgid "You are poked/prodded/etc. in a post" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1192 +#: ../../Zotlabs/Module/Settings.php:1250 msgid "Show visual notifications including:" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1194 +#: ../../Zotlabs/Module/Settings.php:1252 msgid "Unseen grid activity" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1195 +#: ../../Zotlabs/Module/Settings.php:1253 msgid "Unseen channel activity" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1196 +#: ../../Zotlabs/Module/Settings.php:1254 msgid "Unseen private messages" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1196 -#: ../../Zotlabs/Module/Settings.php:1201 -#: ../../Zotlabs/Module/Settings.php:1202 -#: ../../Zotlabs/Module/Settings.php:1203 +#: ../../Zotlabs/Module/Settings.php:1254 +#: ../../Zotlabs/Module/Settings.php:1259 +#: ../../Zotlabs/Module/Settings.php:1260 +#: ../../Zotlabs/Module/Settings.php:1261 msgid "Recommended" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1197 +#: ../../Zotlabs/Module/Settings.php:1255 msgid "Upcoming events" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1198 +#: ../../Zotlabs/Module/Settings.php:1256 msgid "Events today" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1199 +#: ../../Zotlabs/Module/Settings.php:1257 msgid "Upcoming birthdays" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1199 +#: ../../Zotlabs/Module/Settings.php:1257 msgid "Not available in all themes" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1200 +#: ../../Zotlabs/Module/Settings.php:1258 msgid "System (personal) notifications" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1201 +#: ../../Zotlabs/Module/Settings.php:1259 msgid "System info messages" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1202 +#: ../../Zotlabs/Module/Settings.php:1260 msgid "System critical alerts" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1203 +#: ../../Zotlabs/Module/Settings.php:1261 msgid "New connections" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1204 +#: ../../Zotlabs/Module/Settings.php:1262 msgid "System Registrations" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1205 +#: ../../Zotlabs/Module/Settings.php:1263 msgid "" "Also show new wall posts, private messages and connections under Notices" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1207 +#: ../../Zotlabs/Module/Settings.php:1265 msgid "Notify me of events this many days in advance" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1207 +#: ../../Zotlabs/Module/Settings.php:1265 msgid "Must be greater than 0" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1209 +#: ../../Zotlabs/Module/Settings.php:1267 msgid "Advanced Account/Page Type Settings" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1210 +#: ../../Zotlabs/Module/Settings.php:1268 msgid "Change the behaviour of this account for special situations" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1213 +#: ../../Zotlabs/Module/Settings.php:1271 msgid "" "Please enable expert mode (in <a href=\"settings/features\">Settings > " "Additional features</a>) to adjust!" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1214 +#: ../../Zotlabs/Module/Settings.php:1272 msgid "Miscellaneous Settings" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1215 +#: ../../Zotlabs/Module/Settings.php:1273 msgid "Default photo upload folder" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1215 -#: ../../Zotlabs/Module/Settings.php:1216 +#: ../../Zotlabs/Module/Settings.php:1273 +#: ../../Zotlabs/Module/Settings.php:1274 msgid "%Y - current year, %m - current month" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1216 +#: ../../Zotlabs/Module/Settings.php:1274 msgid "Default file upload folder" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1218 +#: ../../Zotlabs/Module/Settings.php:1276 msgid "Personal menu to display in your channel pages" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1219 ../../Zotlabs/Module/Removeme.php:64 +#: ../../Zotlabs/Module/Settings.php:1277 ../../Zotlabs/Module/Removeme.php:64 msgid "Remove Channel" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1220 +#: ../../Zotlabs/Module/Settings.php:1278 msgid "Remove this channel." msgstr "" -#: ../../Zotlabs/Module/Settings.php:1221 +#: ../../Zotlabs/Module/Settings.php:1279 msgid "Firefox Share $Projectname provider" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1222 +#: ../../Zotlabs/Module/Settings.php:1280 msgid "Start calendar week on monday" msgstr "" -#: ../../Zotlabs/Module/Import_items.php:104 -msgid "Import completed" +#: ../../Zotlabs/Module/Events.php:25 +msgid "Calendar entries imported." msgstr "" -#: ../../Zotlabs/Module/Import_items.php:119 -msgid "Import Items" +#: ../../Zotlabs/Module/Events.php:27 +msgid "No calendar entries found." msgstr "" -#: ../../Zotlabs/Module/Import_items.php:120 -msgid "Use this form to import existing posts and content from an export file." +#: ../../Zotlabs/Module/Events.php:104 +msgid "Event can not end before it has started." msgstr "" -#: ../../Zotlabs/Module/Invite.php:29 -msgid "Total invitation limit exceeded." +#: ../../Zotlabs/Module/Events.php:106 ../../Zotlabs/Module/Events.php:115 +#: ../../Zotlabs/Module/Events.php:135 +msgid "Unable to generate preview." msgstr "" -#: ../../Zotlabs/Module/Invite.php:53 -#, php-format -msgid "%s : Not a valid email address." +#: ../../Zotlabs/Module/Events.php:113 +msgid "Event title and start time are required." msgstr "" -#: ../../Zotlabs/Module/Invite.php:63 -msgid "Please join us on $Projectname" +#: ../../Zotlabs/Module/Events.php:133 ../../Zotlabs/Module/Events.php:258 +msgid "Event not found." msgstr "" -#: ../../Zotlabs/Module/Invite.php:74 -msgid "Invitation limit exceeded. Please contact your site administrator." +#: ../../Zotlabs/Module/Events.php:253 ../../Zotlabs/Module/Like.php:372 +#: ../../Zotlabs/Module/Tagger.php:51 ../../include/event.php:951 +#: ../../include/conversation.php:123 ../../include/text.php:1924 +msgid "event" msgstr "" -#: ../../Zotlabs/Module/Invite.php:79 -#, php-format -msgid "%s : Message delivery failed." +#: ../../Zotlabs/Module/Events.php:448 +msgid "Edit event title" msgstr "" -#: ../../Zotlabs/Module/Invite.php:83 -#, php-format -msgid "%d message sent." -msgid_plural "%d messages sent." -msgstr[0] "" -msgstr[1] "" +#: ../../Zotlabs/Module/Events.php:448 +msgid "Event title" +msgstr "" -#: ../../Zotlabs/Module/Invite.php:102 -msgid "You have no more invitations available" +#: ../../Zotlabs/Module/Events.php:450 +msgid "Categories (comma-separated list)" msgstr "" -#: ../../Zotlabs/Module/Invite.php:133 -msgid "Send invitations" +#: ../../Zotlabs/Module/Events.php:451 +msgid "Edit Category" msgstr "" -#: ../../Zotlabs/Module/Invite.php:134 -msgid "Enter email addresses, one per line:" +#: ../../Zotlabs/Module/Events.php:451 +msgid "Category" msgstr "" -#: ../../Zotlabs/Module/Invite.php:136 -msgid "Please join my community on $Projectname." +#: ../../Zotlabs/Module/Events.php:454 +msgid "Edit start date and time" msgstr "" -#: ../../Zotlabs/Module/Invite.php:138 -msgid "You will need to supply this invitation code:" +#: ../../Zotlabs/Module/Events.php:454 +msgid "Start date and time" msgstr "" -#: ../../Zotlabs/Module/Invite.php:139 -msgid "1. Register at any $Projectname location (they are all inter-connected)" +#: ../../Zotlabs/Module/Events.php:455 ../../Zotlabs/Module/Events.php:458 +msgid "Finish date and time are not known or not relevant" msgstr "" -#: ../../Zotlabs/Module/Invite.php:141 -msgid "2. Enter my $Projectname network address into the site searchbar." +#: ../../Zotlabs/Module/Events.php:457 +msgid "Edit finish date and time" msgstr "" -#: ../../Zotlabs/Module/Invite.php:142 -msgid "or visit" +#: ../../Zotlabs/Module/Events.php:457 +msgid "Finish date and time" msgstr "" -#: ../../Zotlabs/Module/Invite.php:144 -msgid "3. Click [Connect]" +#: ../../Zotlabs/Module/Events.php:459 ../../Zotlabs/Module/Events.php:460 +msgid "Adjust for viewer timezone" msgstr "" -#: ../../Zotlabs/Module/Locs.php:25 ../../Zotlabs/Module/Locs.php:54 -msgid "Location not found." +#: ../../Zotlabs/Module/Events.php:459 +msgid "" +"Important for events that happen in a particular place. Not practical for " +"global holidays." msgstr "" -#: ../../Zotlabs/Module/Locs.php:62 -msgid "Location lookup failed." +#: ../../Zotlabs/Module/Events.php:461 +msgid "Edit Description" msgstr "" -#: ../../Zotlabs/Module/Locs.php:66 -msgid "" -"Please select another location to become primary before removing the primary " -"location." +#: ../../Zotlabs/Module/Events.php:463 +msgid "Edit Location" msgstr "" -#: ../../Zotlabs/Module/Locs.php:95 -msgid "Syncing locations" +#: ../../Zotlabs/Module/Events.php:463 ../../Zotlabs/Module/Locs.php:117 +#: ../../Zotlabs/Module/Pubsites.php:41 ../../Zotlabs/Module/Profiles.php:477 +#: ../../Zotlabs/Module/Profiles.php:698 ../../include/js_strings.php:25 +msgid "Location" msgstr "" -#: ../../Zotlabs/Module/Locs.php:105 -msgid "No locations found." +#: ../../Zotlabs/Module/Events.php:466 ../../Zotlabs/Module/Events.php:468 +msgid "Share this event" msgstr "" -#: ../../Zotlabs/Module/Locs.php:116 -msgid "Manage Channel Locations" +#: ../../Zotlabs/Module/Events.php:470 ../../include/conversation.php:1247 +msgid "Permission settings" msgstr "" -#: ../../Zotlabs/Module/Locs.php:118 ../../Zotlabs/Module/Profiles.php:470 -#: ../../Zotlabs/Module/Admin.php:1224 -msgid "Address" +#: ../../Zotlabs/Module/Events.php:475 +msgid "Advanced Options" msgstr "" -#: ../../Zotlabs/Module/Locs.php:119 -msgid "Primary" +#: ../../Zotlabs/Module/Events.php:587 ../../Zotlabs/Module/Cal.php:259 +msgid "l, F j" msgstr "" -#: ../../Zotlabs/Module/Locs.php:120 ../../Zotlabs/Module/Menu.php:113 -msgid "Drop" +#: ../../Zotlabs/Module/Events.php:609 +msgid "Edit event" msgstr "" -#: ../../Zotlabs/Module/Locs.php:122 -msgid "Sync Now" +#: ../../Zotlabs/Module/Events.php:611 +msgid "Delete event" msgstr "" -#: ../../Zotlabs/Module/Locs.php:123 -msgid "Please wait several minutes between consecutive operations." +#: ../../Zotlabs/Module/Events.php:636 ../../Zotlabs/Module/Cal.php:308 +#: ../../include/text.php:1712 +msgid "Link to Source" msgstr "" -#: ../../Zotlabs/Module/Locs.php:124 +#: ../../Zotlabs/Module/Events.php:645 +msgid "calendar" +msgstr "" + +#: ../../Zotlabs/Module/Events.php:664 ../../Zotlabs/Module/Cal.php:331 +msgid "Edit Event" +msgstr "" + +#: ../../Zotlabs/Module/Events.php:664 ../../Zotlabs/Module/Cal.php:331 +msgid "Create Event" +msgstr "" + +#: ../../Zotlabs/Module/Events.php:667 ../../Zotlabs/Module/Cal.php:334 +msgid "Export" +msgstr "" + +#: ../../Zotlabs/Module/Events.php:670 ../../Zotlabs/Module/Webpages.php:222 +#: ../../Zotlabs/Module/Blocks.php:166 ../../Zotlabs/Module/Layouts.php:197 +#: ../../Zotlabs/Module/Pubsites.php:47 ../../include/page_widgets.php:42 +msgid "View" +msgstr "" + +#: ../../Zotlabs/Module/Events.php:671 +msgid "Month" +msgstr "" + +#: ../../Zotlabs/Module/Events.php:672 +msgid "Week" +msgstr "" + +#: ../../Zotlabs/Module/Events.php:673 +msgid "Day" +msgstr "" + +#: ../../Zotlabs/Module/Events.php:676 ../../Zotlabs/Module/Cal.php:341 +msgid "Today" +msgstr "" + +#: ../../Zotlabs/Module/Events.php:707 +msgid "Event removed" +msgstr "" + +#: ../../Zotlabs/Module/Events.php:710 +msgid "Failed to remove event" +msgstr "" + +#: ../../Zotlabs/Module/Webpages.php:53 +msgid "Import Webpage Elements" +msgstr "" + +#: ../../Zotlabs/Module/Webpages.php:54 +msgid "Import selected" +msgstr "" + +#: ../../Zotlabs/Module/Webpages.php:213 ../../Zotlabs/Lib/Apps.php:218 +#: ../../include/nav.php:106 ../../include/conversation.php:1700 +msgid "Webpages" +msgstr "" + +#: ../../Zotlabs/Module/Webpages.php:224 ../../include/page_widgets.php:44 +msgid "Actions" +msgstr "" + +#: ../../Zotlabs/Module/Webpages.php:225 ../../include/page_widgets.php:45 +msgid "Page Link" +msgstr "" + +#: ../../Zotlabs/Module/Webpages.php:226 +msgid "Page Title" +msgstr "" + +#: ../../Zotlabs/Module/Webpages.php:227 ../../Zotlabs/Module/Blocks.php:157 +#: ../../Zotlabs/Module/Layouts.php:190 ../../Zotlabs/Module/Menu.php:114 +#: ../../include/page_widgets.php:47 +msgid "Created" +msgstr "" + +#: ../../Zotlabs/Module/Webpages.php:228 ../../Zotlabs/Module/Blocks.php:158 +#: ../../Zotlabs/Module/Layouts.php:191 ../../Zotlabs/Module/Menu.php:115 +#: ../../include/page_widgets.php:48 +msgid "Edited" +msgstr "" + +#: ../../Zotlabs/Module/Webpages.php:257 +msgid "Invalid file type." +msgstr "" + +#: ../../Zotlabs/Module/Webpages.php:269 +msgid "Error opening zip file" +msgstr "" + +#: ../../Zotlabs/Module/Webpages.php:280 +msgid "Invalid folder path." +msgstr "" + +#: ../../Zotlabs/Module/Webpages.php:307 +msgid "No webpage elements detected." +msgstr "" + +#: ../../Zotlabs/Module/Webpages.php:381 +msgid "Import complete." +msgstr "" + +#: ../../Zotlabs/Module/Group.php:24 +msgid "Privacy group created." +msgstr "" + +#: ../../Zotlabs/Module/Group.php:30 +msgid "Could not create privacy group." +msgstr "" + +#: ../../Zotlabs/Module/Group.php:42 ../../Zotlabs/Module/Group.php:141 +#: ../../include/items.php:3902 +msgid "Privacy group not found." +msgstr "" + +#: ../../Zotlabs/Module/Group.php:58 +msgid "Privacy group updated." +msgstr "" + +#: ../../Zotlabs/Module/Group.php:90 +msgid "Create a group of channels." +msgstr "" + +#: ../../Zotlabs/Module/Group.php:91 ../../Zotlabs/Module/Group.php:184 +msgid "Privacy group name: " +msgstr "" + +#: ../../Zotlabs/Module/Group.php:93 ../../Zotlabs/Module/Group.php:187 +msgid "Members are visible to other channels" +msgstr "" + +#: ../../Zotlabs/Module/Group.php:111 +msgid "Privacy group removed." +msgstr "" + +#: ../../Zotlabs/Module/Group.php:113 +msgid "Unable to remove privacy group." +msgstr "" + +#: ../../Zotlabs/Module/Group.php:183 +msgid "Privacy group editor" +msgstr "" + +#: ../../Zotlabs/Module/Group.php:197 +msgid "Members" +msgstr "" + +#: ../../Zotlabs/Module/Group.php:199 +msgid "All Connected Channels" +msgstr "" + +#: ../../Zotlabs/Module/Group.php:231 +msgid "Click on a channel to add or remove." +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:197 ../../Zotlabs/Module/Mail.php:306 +#: ../../Zotlabs/Module/Chat.php:205 ../../include/conversation.php:1181 +msgid "Please enter a link URL:" +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:241 ../../Zotlabs/Module/Invite.php:135 +msgid "Your message:" +msgstr "" + +#: ../../Zotlabs/Module/Mail.php:243 ../../Zotlabs/Module/Mail.php:368 +#: ../../include/conversation.php:1231 +msgid "Attach file" +msgstr "" + +#: ../../Zotlabs/Module/Mail.php:245 +msgid "Send" +msgstr "" + +#: ../../Zotlabs/Module/Mail.php:248 ../../Zotlabs/Module/Mail.php:373 +#: ../../include/conversation.php:1266 +msgid "Set expiration date" +msgstr "" + +#: ../../Zotlabs/Module/Mail.php:250 ../../Zotlabs/Module/Mail.php:375 +#: ../../Zotlabs/Module/Chat.php:206 ../../Zotlabs/Lib/ThreadItem.php:722 +#: ../../include/conversation.php:1271 +msgid "Encrypt text" +msgstr "" + +#: ../../Zotlabs/Module/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 "" -"When possible, drop a location by logging into that website/hub and removing " -"your channel." +"No secure communications available. You <strong>may</strong> be able to " +"respond from the sender's profile page." msgstr "" -#: ../../Zotlabs/Module/Locs.php:125 -msgid "Use this form to drop the location if the hub is no longer operating." +#: ../../Zotlabs/Module/Mail.php:359 +msgid "Send Reply" msgstr "" -#: ../../Zotlabs/Module/Magic.php:71 -msgid "Hub not found." +#: ../../Zotlabs/Module/Mail.php:364 +#, php-format +msgid "Your message for %s (%s):" msgstr "" -#: ../../Zotlabs/Module/Follow.php:34 -msgid "Channel added." +#: ../../Zotlabs/Module/Connedit.php:80 +msgid "Could not access contact record." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:24 ../../Zotlabs/Module/Profiles.php:189 -#: ../../Zotlabs/Module/Profiles.php:246 ../../Zotlabs/Module/Profiles.php:625 -msgid "Profile not found." +#: ../../Zotlabs/Module/Connedit.php:104 +msgid "Could not locate selected profile." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:44 -msgid "Profile deleted." +#: ../../Zotlabs/Module/Connedit.php:256 +msgid "Connection updated." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:68 ../../Zotlabs/Module/Profiles.php:104 -msgid "Profile-" +#: ../../Zotlabs/Module/Connedit.php:258 +msgid "Failed to update connection record." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:89 ../../Zotlabs/Module/Profiles.php:132 -msgid "New profile created." +#: ../../Zotlabs/Module/Connedit.php:308 +msgid "is now connected to" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:110 -msgid "Profile unavailable to clone." +#: ../../Zotlabs/Module/Connedit.php:443 +msgid "Could not access address book record." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:151 -msgid "Profile unavailable to export." +#: ../../Zotlabs/Module/Connedit.php:463 +msgid "Refresh failed - channel is currently unavailable." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:256 -msgid "Profile Name is required." +#: ../../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." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:427 -msgid "Marital Status" +#: ../../Zotlabs/Module/Connedit.php:541 +msgid "Connection has been removed." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:431 -msgid "Romantic Partner" +#: ../../Zotlabs/Module/Connedit.php:557 ../../Zotlabs/Lib/Apps.php:221 +#: ../../include/nav.php:86 ../../include/conversation.php:957 +msgid "View Profile" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:435 ../../Zotlabs/Module/Profiles.php:736 -msgid "Likes" +#: ../../Zotlabs/Module/Connedit.php:560 +#, php-format +msgid "View %s's profile" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:439 ../../Zotlabs/Module/Profiles.php:737 -msgid "Dislikes" +#: ../../Zotlabs/Module/Connedit.php:564 +msgid "Refresh Permissions" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:443 ../../Zotlabs/Module/Profiles.php:744 -msgid "Work/Employment" +#: ../../Zotlabs/Module/Connedit.php:567 +msgid "Fetch updated permissions" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:446 -msgid "Religion" +#: ../../Zotlabs/Module/Connedit.php:571 +msgid "Recent Activity" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:450 -msgid "Political Views" +#: ../../Zotlabs/Module/Connedit.php:574 +msgid "View recent posts and comments" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:454 -msgid "Gender" +#: ../../Zotlabs/Module/Connedit.php:578 ../../Zotlabs/Module/Admin.php:1041 +msgid "Unblock" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:458 -msgid "Sexual Preference" +#: ../../Zotlabs/Module/Connedit.php:578 ../../Zotlabs/Module/Admin.php:1040 +msgid "Block" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:462 -msgid "Homepage" +#: ../../Zotlabs/Module/Connedit.php:581 +msgid "Block (or Unblock) all communications with this connection" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:466 -msgid "Interests" +#: ../../Zotlabs/Module/Connedit.php:582 +msgid "This connection is blocked!" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:560 -msgid "Profile updated." +#: ../../Zotlabs/Module/Connedit.php:586 +msgid "Unignore" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:644 -msgid "Hide your connections list from viewers of this profile" +#: ../../Zotlabs/Module/Connedit.php:589 +msgid "Ignore (or Unignore) all inbound communications from this connection" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:686 -msgid "Edit Profile Details" +#: ../../Zotlabs/Module/Connedit.php:590 +msgid "This connection is ignored!" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:688 -msgid "View this profile" +#: ../../Zotlabs/Module/Connedit.php:594 +msgid "Unarchive" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:689 ../../Zotlabs/Module/Profiles.php:771 -#: ../../include/channel.php:998 -msgid "Edit visibility" +#: ../../Zotlabs/Module/Connedit.php:594 +msgid "Archive" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:690 -msgid "Profile Tools" +#: ../../Zotlabs/Module/Connedit.php:597 +msgid "" +"Archive (or Unarchive) this connection - mark channel dead but keep content" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:691 -msgid "Change cover photo" +#: ../../Zotlabs/Module/Connedit.php:598 +msgid "This connection is archived!" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:692 ../../include/channel.php:969 -msgid "Change profile photo" +#: ../../Zotlabs/Module/Connedit.php:602 +msgid "Unhide" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:693 -msgid "Create a new profile using these settings" +#: ../../Zotlabs/Module/Connedit.php:602 +msgid "Hide" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:694 -msgid "Clone this profile" +#: ../../Zotlabs/Module/Connedit.php:605 +msgid "Hide or Unhide this connection from your other connections" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:695 -msgid "Delete this profile" +#: ../../Zotlabs/Module/Connedit.php:606 +msgid "This connection is hidden!" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:696 -msgid "Add profile things" +#: ../../Zotlabs/Module/Connedit.php:613 +msgid "Delete this connection" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:697 ../../include/conversation.php:1541 -#: ../../include/widgets.php:105 -msgid "Personal" +#: ../../Zotlabs/Module/Connedit.php:628 ../../include/widgets.php:493 +msgid "Me" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:699 -msgid "Relation" +#: ../../Zotlabs/Module/Connedit.php:629 ../../include/widgets.php:494 +msgid "Family" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:700 ../../include/datetime.php:48 -msgid "Miscellaneous" +#: ../../Zotlabs/Module/Connedit.php:631 ../../include/widgets.php:496 +msgid "Acquaintances" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:702 -msgid "Import profile from file" +#: ../../Zotlabs/Module/Connedit.php:693 +msgid "Approve this connection" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:703 -msgid "Export profile to file" +#: ../../Zotlabs/Module/Connedit.php:693 +msgid "Accept connection to allow communication" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:704 -msgid "Your gender" +#: ../../Zotlabs/Module/Connedit.php:698 +msgid "Set Affinity" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:705 -msgid "Marital status" +#: ../../Zotlabs/Module/Connedit.php:701 +msgid "Set Profile" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:706 -msgid "Sexual preference" +#: ../../Zotlabs/Module/Connedit.php:704 +msgid "Set Affinity & Profile" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:709 -msgid "Profile name" +#: ../../Zotlabs/Module/Connedit.php:753 +msgid "none" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:711 -msgid "This is your default profile." +#: ../../Zotlabs/Module/Connedit.php:757 ../../include/widgets.php:623 +msgid "Connection Default Permissions" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:713 -msgid "Your full name" +#: ../../Zotlabs/Module/Connedit.php:757 ../../include/items.php:3935 +#, php-format +msgid "Connection: %s" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:714 -msgid "Title/Description" +#: ../../Zotlabs/Module/Connedit.php:758 +msgid "Apply these permissions automatically" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:717 -msgid "Street address" +#: ../../Zotlabs/Module/Connedit.php:758 +msgid "Connection requests will be approved without your interaction" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:718 -msgid "Locality/City" +#: ../../Zotlabs/Module/Connedit.php:760 +msgid "This connection's primary address is" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:719 -msgid "Region/State" +#: ../../Zotlabs/Module/Connedit.php:761 +msgid "Available locations:" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:720 -msgid "Postal/Zip code" +#: ../../Zotlabs/Module/Connedit.php:765 +msgid "" +"The permissions indicated on this page will be applied to all new " +"connections." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:721 -msgid "Country" +#: ../../Zotlabs/Module/Connedit.php:766 +msgid "Connection Tools" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:726 -msgid "Who (if applicable)" +#: ../../Zotlabs/Module/Connedit.php:768 +msgid "Slide to adjust your degree of friendship" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:726 -msgid "Examples: cathy123, Cathy Williams, cathy@example.com" +#: ../../Zotlabs/Module/Connedit.php:769 ../../Zotlabs/Module/Rate.php:159 +#: ../../include/js_strings.php:20 +msgid "Rating" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:727 -msgid "Since (date)" +#: ../../Zotlabs/Module/Connedit.php:770 +msgid "Slide to adjust your rating" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:730 -msgid "Tell us about yourself" +#: ../../Zotlabs/Module/Connedit.php:771 ../../Zotlabs/Module/Connedit.php:776 +msgid "Optionally explain your rating" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:731 -msgid "Homepage URL" +#: ../../Zotlabs/Module/Connedit.php:773 +msgid "Custom Filter" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:732 -msgid "Hometown" +#: ../../Zotlabs/Module/Connedit.php:774 +msgid "Only import posts with this text" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:733 -msgid "Political views" +#: ../../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" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:734 -msgid "Religious views" +#: ../../Zotlabs/Module/Connedit.php:775 +msgid "Do not import posts with this text" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:735 -msgid "Keywords used in directory listings" +#: ../../Zotlabs/Module/Connedit.php:777 +msgid "This information is public!" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:735 -msgid "Example: fishing photography software" +#: ../../Zotlabs/Module/Connedit.php:782 +msgid "Connection Pending Approval" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:738 -msgid "Musical interests" +#: ../../Zotlabs/Module/Connedit.php:787 +#, php-format +msgid "" +"Please choose the profile you would like to display to %s when viewing your " +"profile securely." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:739 -msgid "Books, literature" +#: ../../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." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:740 -msgid "Television" +#: ../../Zotlabs/Module/Connedit.php:795 +msgid "Last update:" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:741 -msgid "Film/Dance/Culture/Entertainment" +#: ../../Zotlabs/Module/Import_items.php:42 ../../Zotlabs/Module/Import.php:71 +msgid "Nothing to import." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:742 -msgid "Hobbies/Interests" +#: ../../Zotlabs/Module/Import_items.php:66 ../../Zotlabs/Module/Import.php:95 +msgid "Unable to download data from old server" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:743 -msgid "Love/Romance" +#: ../../Zotlabs/Module/Import_items.php:72 +#: ../../Zotlabs/Module/Import.php:101 +msgid "Imported file is empty." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:745 -msgid "School/Education" +#: ../../Zotlabs/Module/Import_items.php:88 +#: ../../Zotlabs/Module/Import.php:123 +#, php-format +msgid "Warning: Database versions differ by %1$d updates." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:746 -msgid "Contact information and social networks" +#: ../../Zotlabs/Module/Import_items.php:104 +msgid "Import completed" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:747 -msgid "My other channels" +#: ../../Zotlabs/Module/Import_items.php:119 +msgid "Import Items" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:767 ../../include/channel.php:994 -msgid "Profile Image" +#: ../../Zotlabs/Module/Import_items.php:120 +msgid "Use this form to import existing posts and content from an export file." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:777 ../../include/channel.php:976 -#: ../../include/nav.php:88 -msgid "Edit Profiles" +#: ../../Zotlabs/Module/Import_items.php:121 +#: ../../Zotlabs/Module/Import.php:549 +msgid "File to Upload" msgstr "" -#: ../../Zotlabs/Module/Menu.php:49 -msgid "Unable to update menu." +#: ../../Zotlabs/Module/Invite.php:29 +msgid "Total invitation limit exceeded." msgstr "" -#: ../../Zotlabs/Module/Menu.php:60 -msgid "Unable to create menu." +#: ../../Zotlabs/Module/Invite.php:53 +#, php-format +msgid "%s : Not a valid email address." msgstr "" -#: ../../Zotlabs/Module/Menu.php:98 ../../Zotlabs/Module/Menu.php:110 -msgid "Menu Name" +#: ../../Zotlabs/Module/Invite.php:63 +msgid "Please join us on $Projectname" msgstr "" -#: ../../Zotlabs/Module/Menu.php:98 -msgid "Unique name (not visible on webpage) - required" +#: ../../Zotlabs/Module/Invite.php:74 +msgid "Invitation limit exceeded. Please contact your site administrator." msgstr "" -#: ../../Zotlabs/Module/Menu.php:99 ../../Zotlabs/Module/Menu.php:111 -msgid "Menu Title" +#: ../../Zotlabs/Module/Invite.php:79 +#, php-format +msgid "%s : Message delivery failed." msgstr "" -#: ../../Zotlabs/Module/Menu.php:99 -msgid "Visible on webpage - leave empty for no title" +#: ../../Zotlabs/Module/Invite.php:83 +#, php-format +msgid "%d message sent." +msgid_plural "%d messages sent." +msgstr[0] "" +msgstr[1] "" + +#: ../../Zotlabs/Module/Invite.php:102 +msgid "You have no more invitations available" msgstr "" -#: ../../Zotlabs/Module/Menu.php:100 -msgid "Allow Bookmarks" +#: ../../Zotlabs/Module/Invite.php:133 +msgid "Send invitations" msgstr "" -#: ../../Zotlabs/Module/Menu.php:100 ../../Zotlabs/Module/Menu.php:157 -msgid "Menu may be used to store saved bookmarks" +#: ../../Zotlabs/Module/Invite.php:134 +msgid "Enter email addresses, one per line:" msgstr "" -#: ../../Zotlabs/Module/Menu.php:101 ../../Zotlabs/Module/Menu.php:159 -msgid "Submit and proceed" +#: ../../Zotlabs/Module/Invite.php:136 +msgid "Please join my community on $Projectname." msgstr "" -#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2239 -msgid "Menus" +#: ../../Zotlabs/Module/Invite.php:138 +msgid "You will need to supply this invitation code:" msgstr "" -#: ../../Zotlabs/Module/Menu.php:114 ../../Zotlabs/Module/Blocks.php:157 -#: ../../Zotlabs/Module/Layouts.php:190 ../../Zotlabs/Module/Webpages.php:205 -#: ../../include/page_widgets.php:47 -msgid "Created" +#: ../../Zotlabs/Module/Invite.php:139 +msgid "1. Register at any $Projectname location (they are all inter-connected)" msgstr "" -#: ../../Zotlabs/Module/Menu.php:115 ../../Zotlabs/Module/Blocks.php:158 -#: ../../Zotlabs/Module/Layouts.php:191 ../../Zotlabs/Module/Webpages.php:206 -#: ../../include/page_widgets.php:48 -msgid "Edited" +#: ../../Zotlabs/Module/Invite.php:141 +msgid "2. Enter my $Projectname network address into the site searchbar." msgstr "" -#: ../../Zotlabs/Module/Menu.php:117 -msgid "Bookmarks allowed" +#: ../../Zotlabs/Module/Invite.php:142 +msgid "or visit" msgstr "" -#: ../../Zotlabs/Module/Menu.php:119 -msgid "Delete this menu" +#: ../../Zotlabs/Module/Invite.php:144 +msgid "3. Click [Connect]" msgstr "" -#: ../../Zotlabs/Module/Menu.php:120 ../../Zotlabs/Module/Menu.php:154 -msgid "Edit menu contents" +#: ../../Zotlabs/Module/Locs.php:25 ../../Zotlabs/Module/Locs.php:54 +msgid "Location not found." msgstr "" -#: ../../Zotlabs/Module/Menu.php:121 -msgid "Edit this menu" +#: ../../Zotlabs/Module/Locs.php:62 +msgid "Location lookup failed." msgstr "" -#: ../../Zotlabs/Module/Menu.php:136 -msgid "Menu could not be deleted." +#: ../../Zotlabs/Module/Locs.php:66 +msgid "" +"Please select another location to become primary before removing the primary " +"location." msgstr "" -#: ../../Zotlabs/Module/Menu.php:144 ../../Zotlabs/Module/Mitem.php:28 -msgid "Menu not found." +#: ../../Zotlabs/Module/Locs.php:95 +msgid "Syncing locations" msgstr "" -#: ../../Zotlabs/Module/Menu.php:149 -msgid "Edit Menu" +#: ../../Zotlabs/Module/Locs.php:105 +msgid "No locations found." msgstr "" -#: ../../Zotlabs/Module/Menu.php:153 -msgid "Add or remove entries to this menu" +#: ../../Zotlabs/Module/Locs.php:116 +msgid "Manage Channel Locations" msgstr "" -#: ../../Zotlabs/Module/Menu.php:155 -msgid "Menu name" +#: ../../Zotlabs/Module/Locs.php:118 ../../Zotlabs/Module/Admin.php:1224 +#: ../../Zotlabs/Module/Profiles.php:470 +msgid "Address" msgstr "" -#: ../../Zotlabs/Module/Menu.php:155 -msgid "Must be unique, only seen by you" +#: ../../Zotlabs/Module/Locs.php:119 +msgid "Primary" msgstr "" -#: ../../Zotlabs/Module/Menu.php:156 -msgid "Menu title" +#: ../../Zotlabs/Module/Locs.php:120 ../../Zotlabs/Module/Menu.php:113 +msgid "Drop" msgstr "" -#: ../../Zotlabs/Module/Menu.php:156 -msgid "Menu title as seen by others" +#: ../../Zotlabs/Module/Locs.php:122 +msgid "Sync Now" msgstr "" -#: ../../Zotlabs/Module/Menu.php:157 -msgid "Allow bookmarks" +#: ../../Zotlabs/Module/Locs.php:123 +msgid "Please wait several minutes between consecutive operations." msgstr "" -#: ../../Zotlabs/Module/Menu.php:166 ../../Zotlabs/Module/Mitem.php:120 -#: ../../Zotlabs/Module/Xchan.php:41 -msgid "Not found." +#: ../../Zotlabs/Module/Locs.php:124 +msgid "" +"When possible, drop a location by logging into that website/hub and removing " +"your channel." +msgstr "" + +#: ../../Zotlabs/Module/Locs.php:125 +msgid "Use this form to drop the location if the hub is no longer operating." +msgstr "" + +#: ../../Zotlabs/Module/Magic.php:71 +msgid "Hub not found." +msgstr "" + +#: ../../Zotlabs/Module/Acl.php:312 +msgid "network" +msgstr "" + +#: ../../Zotlabs/Module/Acl.php:322 +msgid "RSS" msgstr "" #: ../../Zotlabs/Module/Item.php:179 @@ -3716,6 +3229,78 @@ msgstr "" msgid "You have reached your limit of %1$.0f webpages." msgstr "" +#: ../../Zotlabs/Module/Import.php:33 +#, php-format +msgid "Your service plan only allows %d channels." +msgstr "" + +#: ../../Zotlabs/Module/Import.php:153 ../../include/import.php:107 +msgid "Cloned channel not found. Import failed." +msgstr "" + +#: ../../Zotlabs/Module/Import.php:163 +msgid "No channel. Import failed." +msgstr "" + +#: ../../Zotlabs/Module/Import.php:520 +#: ../../include/Import/import_diaspora.php:142 +msgid "Import completed." +msgstr "" + +#: ../../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 "" +"Use this form to import an existing channel from a different server/hub. You " +"may retrieve the channel identity from the old server/hub via the network or " +"provide an export file." +msgstr "" + +#: ../../Zotlabs/Module/Import.php:550 +msgid "Or provide the old server/hub details" +msgstr "" + +#: ../../Zotlabs/Module/Import.php:551 +msgid "Your old identity address (xyz@example.com)" +msgstr "" + +#: ../../Zotlabs/Module/Import.php:552 +msgid "Your old login email address" +msgstr "" + +#: ../../Zotlabs/Module/Import.php:553 +msgid "Your old login password" +msgstr "" + +#: ../../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/Import.php:555 +msgid "Make this hub my primary location" +msgstr "" + +#: ../../Zotlabs/Module/Import.php:556 +msgid "" +"Import existing posts if possible (experimental - limited by available memory" +msgstr "" + +#: ../../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/Lostpass.php:19 msgid "No valid account found." msgstr "" @@ -3803,12 +3388,98 @@ msgstr "" msgid "Set your current mood and tell your friends" msgstr "" -#: ../../Zotlabs/Module/Acl.php:312 -msgid "network" +#: ../../Zotlabs/Module/Like.php:19 +msgid "Like/Dislike" msgstr "" -#: ../../Zotlabs/Module/Acl.php:322 -msgid "RSS" +#: ../../Zotlabs/Module/Like.php:24 +msgid "This action is restricted to members." +msgstr "" + +#: ../../Zotlabs/Module/Like.php:25 +msgid "" +"Please <a href=\"rmagic\">login with your $Projectname ID</a> or <a href=" +"\"register\">register as a new $Projectname member</a> to continue." +msgstr "" + +#: ../../Zotlabs/Module/Like.php:105 ../../Zotlabs/Module/Like.php:131 +#: ../../Zotlabs/Module/Like.php:169 +msgid "Invalid request." +msgstr "" + +#: ../../Zotlabs/Module/Like.php:117 ../../include/conversation.php:126 +msgid "channel" +msgstr "" + +#: ../../Zotlabs/Module/Like.php:146 +msgid "thing" +msgstr "" + +#: ../../Zotlabs/Module/Like.php:192 +msgid "Channel unavailable." +msgstr "" + +#: ../../Zotlabs/Module/Like.php:240 +msgid "Previous action reversed." +msgstr "" + +#: ../../Zotlabs/Module/Like.php:370 ../../Zotlabs/Module/Subthread.php:87 +#: ../../Zotlabs/Module/Tagger.php:47 ../../include/conversation.php:120 +#: ../../include/text.php:1921 +msgid "photo" +msgstr "" + +#: ../../Zotlabs/Module/Like.php:370 ../../Zotlabs/Module/Subthread.php:87 +#: ../../include/conversation.php:148 ../../include/text.php:1927 +msgid "status" +msgstr "" + +#: ../../Zotlabs/Module/Like.php:419 ../../include/conversation.php:164 +#, php-format +msgid "%1$s likes %2$s's %3$s" +msgstr "" + +#: ../../Zotlabs/Module/Like.php:421 ../../include/conversation.php:167 +#, php-format +msgid "%1$s doesn't like %2$s's %3$s" +msgstr "" + +#: ../../Zotlabs/Module/Like.php:423 +#, php-format +msgid "%1$s agrees with %2$s's %3$s" +msgstr "" + +#: ../../Zotlabs/Module/Like.php:425 +#, php-format +msgid "%1$s doesn't agree with %2$s's %3$s" +msgstr "" + +#: ../../Zotlabs/Module/Like.php:427 +#, php-format +msgid "%1$s abstains from a decision on %2$s's %3$s" +msgstr "" + +#: ../../Zotlabs/Module/Like.php:429 +#, php-format +msgid "%1$s is attending %2$s's %3$s" +msgstr "" + +#: ../../Zotlabs/Module/Like.php:431 +#, php-format +msgid "%1$s is not attending %2$s's %3$s" +msgstr "" + +#: ../../Zotlabs/Module/Like.php:433 +#, php-format +msgid "%1$s may attend %2$s's %3$s" +msgstr "" + +#: ../../Zotlabs/Module/Like.php:538 +msgid "Action completed." +msgstr "" + +#: ../../Zotlabs/Module/Like.php:539 +msgid "Thank you." msgstr "" #: ../../Zotlabs/Module/Notify.php:57 @@ -3886,6 +3557,11 @@ msgstr "" msgid "No chatrooms available" msgstr "" +#: ../../Zotlabs/Module/Chat.php:252 ../../Zotlabs/Module/Manage.php:143 +#: ../../Zotlabs/Module/Profiles.php:778 +msgid "Create New" +msgstr "" + #: ../../Zotlabs/Module/Chat.php:255 msgid "Expiration" msgstr "" @@ -3894,6 +3570,10 @@ msgstr "" msgid "min" msgstr "" +#: ../../Zotlabs/Module/Mitem.php:28 ../../Zotlabs/Module/Menu.php:144 +msgid "Menu not found." +msgstr "" + #: ../../Zotlabs/Module/Mitem.php:52 msgid "Unable to create element." msgstr "" @@ -3906,6 +3586,11 @@ msgstr "" msgid "Unable to add menu element." msgstr "" +#: ../../Zotlabs/Module/Mitem.php:120 ../../Zotlabs/Module/Menu.php:166 +#: ../../Zotlabs/Module/Xchan.php:41 +msgid "Not found." +msgstr "" + #: ../../Zotlabs/Module/Mitem.php:153 ../../Zotlabs/Module/Mitem.php:226 msgid "Menu Item Permissions" msgstr "" @@ -4091,7 +3776,7 @@ msgstr "" msgid "Site settings updated." msgstr "" -#: ../../Zotlabs/Module/Admin.php:400 ../../include/text.php:2829 +#: ../../Zotlabs/Module/Admin.php:400 ../../include/text.php:2858 msgid "Default" msgstr "" @@ -4123,7 +3808,7 @@ msgstr "" msgid "My site offers free accounts with optional paid upgrades" msgstr "" -#: ../../Zotlabs/Module/Admin.php:491 ../../include/widgets.php:1476 +#: ../../Zotlabs/Module/Admin.php:491 ../../include/widgets.php:1490 msgid "Site" msgstr "" @@ -4462,7 +4147,7 @@ msgid "" "embedded content from that site is explicitly blocked." msgstr "" -#: ../../Zotlabs/Module/Admin.php:756 ../../include/widgets.php:1479 +#: ../../Zotlabs/Module/Admin.php:756 ../../include/widgets.php:1493 msgid "Security" msgstr "" @@ -4629,7 +4314,7 @@ msgid "Account '%s' unblocked" msgstr "" #: ../../Zotlabs/Module/Admin.php:1031 ../../Zotlabs/Module/Admin.php:1044 -#: ../../include/widgets.php:1477 +#: ../../include/widgets.php:1491 msgid "Accounts" msgstr "" @@ -4740,7 +4425,7 @@ msgstr "" msgid "Channel '%s' code disallowed" msgstr "" -#: ../../Zotlabs/Module/Admin.php:1210 ../../include/widgets.php:1478 +#: ../../Zotlabs/Module/Admin.php:1210 ../../include/widgets.php:1492 msgid "Channels" msgstr "" @@ -4799,7 +4484,7 @@ msgid "Enable" msgstr "" #: ../../Zotlabs/Module/Admin.php:1330 ../../Zotlabs/Module/Admin.php:1420 -#: ../../include/widgets.php:1481 +#: ../../include/widgets.php:1495 msgid "Plugins" msgstr "" @@ -4894,7 +4579,7 @@ msgid "Screenshot" msgstr "" #: ../../Zotlabs/Module/Admin.php:1613 ../../Zotlabs/Module/Admin.php:1647 -#: ../../include/widgets.php:1482 +#: ../../include/widgets.php:1496 msgid "Themes" msgstr "" @@ -4910,8 +4595,8 @@ msgstr "" msgid "Log settings updated." msgstr "" -#: ../../Zotlabs/Module/Admin.php:1732 ../../include/widgets.php:1503 -#: ../../include/widgets.php:1513 +#: ../../Zotlabs/Module/Admin.php:1732 ../../include/widgets.php:1517 +#: ../../include/widgets.php:1527 msgid "Logs" msgstr "" @@ -4977,7 +4662,7 @@ msgstr "" msgid "Edit Profile Field" msgstr "" -#: ../../Zotlabs/Module/Admin.php:2106 ../../include/widgets.php:1484 +#: ../../Zotlabs/Module/Admin.php:2106 ../../include/widgets.php:1498 msgid "Profile Fields" msgstr "" @@ -5005,6 +4690,12 @@ msgstr "" msgid "Create Custom Field" msgstr "" +#: ../../Zotlabs/Module/New_channel.php:121 +#: ../../Zotlabs/Module/Manage.php:136 +#, php-format +msgid "You have created %1$.0f of %2$.0f allowed channels." +msgstr "" + #: ../../Zotlabs/Module/New_channel.php:128 #: ../../Zotlabs/Module/Register.php:231 msgid "Name or caption" @@ -5138,7 +4829,7 @@ msgstr "" msgid "Profile Visibility Editor" msgstr "" -#: ../../Zotlabs/Module/Profperm.php:117 ../../include/channel.php:1290 +#: ../../Zotlabs/Module/Profperm.php:117 ../../include/channel.php:1281 msgid "Profile" msgstr "" @@ -5165,22 +4856,6 @@ msgid "" "to correctly use this feature." msgstr "" -#: ../../Zotlabs/Module/Rmagic.php:35 -msgid "Authentication failed." -msgstr "" - -#: ../../Zotlabs/Module/Rmagic.php:75 -msgid "Remote Authentication" -msgstr "" - -#: ../../Zotlabs/Module/Rmagic.php:76 -msgid "Enter your channel address (e.g. channel@example.com)" -msgstr "" - -#: ../../Zotlabs/Module/Rmagic.php:77 -msgid "Authenticate" -msgstr "" - #: ../../Zotlabs/Module/Siteinfo.php:19 #, php-format msgid "Version %s" @@ -5263,7 +4938,7 @@ msgstr "" msgid "Download PDL file" msgstr "" -#: ../../Zotlabs/Module/Pubsites.php:22 ../../include/widgets.php:1337 +#: ../../Zotlabs/Module/Pubsites.php:22 ../../include/widgets.php:1351 msgid "Public Hubs" msgstr "" @@ -5319,7 +4994,7 @@ msgstr "" msgid "Permissions denied." msgstr "" -#: ../../Zotlabs/Module/Cal.php:337 +#: ../../Zotlabs/Module/Cal.php:337 ../../include/text.php:2262 msgid "Import" msgstr "" @@ -5373,6 +5048,45 @@ msgstr "" msgid "Apps" 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:208 +msgid "Channel Manager" +msgstr "" + +#: ../../Zotlabs/Module/Manage.php:165 +msgid "Current Channel" +msgstr "" + +#: ../../Zotlabs/Module/Manage.php:167 +msgid "Switch to one of your channels by selecting it." +msgstr "" + +#: ../../Zotlabs/Module/Manage.php:168 +msgid "Default Channel" +msgstr "" + +#: ../../Zotlabs/Module/Manage.php:169 +msgid "Make Default" +msgstr "" + +#: ../../Zotlabs/Module/Manage.php:172 +#, php-format +msgid "%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/Connect.php:61 ../../Zotlabs/Module/Connect.php:109 msgid "Continue" msgstr "" @@ -5672,30 +5386,92 @@ msgstr "" msgid "No service class restrictions found." msgstr "" -#: ../../Zotlabs/Module/Impel.php:41 ../../include/bbcode.php:192 -msgid "webpage" +#: ../../Zotlabs/Module/Menu.php:49 +msgid "Unable to update menu." msgstr "" -#: ../../Zotlabs/Module/Impel.php:46 ../../include/bbcode.php:198 -msgid "block" +#: ../../Zotlabs/Module/Menu.php:60 +msgid "Unable to create menu." msgstr "" -#: ../../Zotlabs/Module/Impel.php:51 ../../include/bbcode.php:195 -msgid "layout" +#: ../../Zotlabs/Module/Menu.php:98 ../../Zotlabs/Module/Menu.php:110 +msgid "Menu Name" msgstr "" -#: ../../Zotlabs/Module/Impel.php:58 ../../include/bbcode.php:201 -msgid "menu" +#: ../../Zotlabs/Module/Menu.php:98 +msgid "Unique name (not visible on webpage) - required" msgstr "" -#: ../../Zotlabs/Module/Impel.php:187 -#, php-format -msgid "%s element installed" +#: ../../Zotlabs/Module/Menu.php:99 ../../Zotlabs/Module/Menu.php:111 +msgid "Menu Title" msgstr "" -#: ../../Zotlabs/Module/Impel.php:190 -#, php-format -msgid "%s element installation failed" +#: ../../Zotlabs/Module/Menu.php:99 +msgid "Visible on webpage - leave empty for no title" +msgstr "" + +#: ../../Zotlabs/Module/Menu.php:100 +msgid "Allow Bookmarks" +msgstr "" + +#: ../../Zotlabs/Module/Menu.php:100 ../../Zotlabs/Module/Menu.php:157 +msgid "Menu may be used to store saved bookmarks" +msgstr "" + +#: ../../Zotlabs/Module/Menu.php:101 ../../Zotlabs/Module/Menu.php:159 +msgid "Submit and proceed" +msgstr "" + +#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2239 +msgid "Menus" +msgstr "" + +#: ../../Zotlabs/Module/Menu.php:117 +msgid "Bookmarks allowed" +msgstr "" + +#: ../../Zotlabs/Module/Menu.php:119 +msgid "Delete this menu" +msgstr "" + +#: ../../Zotlabs/Module/Menu.php:120 ../../Zotlabs/Module/Menu.php:154 +msgid "Edit menu contents" +msgstr "" + +#: ../../Zotlabs/Module/Menu.php:121 +msgid "Edit this menu" +msgstr "" + +#: ../../Zotlabs/Module/Menu.php:136 +msgid "Menu could not be deleted." +msgstr "" + +#: ../../Zotlabs/Module/Menu.php:149 +msgid "Edit Menu" +msgstr "" + +#: ../../Zotlabs/Module/Menu.php:153 +msgid "Add or remove entries to this menu" +msgstr "" + +#: ../../Zotlabs/Module/Menu.php:155 +msgid "Menu name" +msgstr "" + +#: ../../Zotlabs/Module/Menu.php:155 +msgid "Must be unique, only seen by you" +msgstr "" + +#: ../../Zotlabs/Module/Menu.php:156 +msgid "Menu title" +msgstr "" + +#: ../../Zotlabs/Module/Menu.php:156 +msgid "Menu title as seen by others" +msgstr "" + +#: ../../Zotlabs/Module/Menu.php:157 +msgid "Allow bookmarks" msgstr "" #: ../../Zotlabs/Module/Setup.php:179 @@ -6316,21 +6092,280 @@ msgstr "" msgid "Select a tag to remove: " msgstr "" -#: ../../Zotlabs/Module/Webpages.php:191 ../../Zotlabs/Lib/Apps.php:218 -#: ../../include/conversation.php:1700 ../../include/nav.php:106 -msgid "Webpages" +#: ../../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/Webpages.php:202 ../../include/page_widgets.php:44 -msgid "Actions" +#: ../../Zotlabs/Module/Profiles.php:44 +msgid "Profile deleted." msgstr "" -#: ../../Zotlabs/Module/Webpages.php:203 ../../include/page_widgets.php:45 -msgid "Page Link" +#: ../../Zotlabs/Module/Profiles.php:68 ../../Zotlabs/Module/Profiles.php:104 +msgid "Profile-" msgstr "" -#: ../../Zotlabs/Module/Webpages.php:204 -msgid "Page Title" +#: ../../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." +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:151 +msgid "Profile unavailable to export." +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:256 +msgid "Profile Name is required." +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:427 +msgid "Marital Status" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:431 +msgid "Romantic Partner" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:435 ../../Zotlabs/Module/Profiles.php:736 +msgid "Likes" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:439 ../../Zotlabs/Module/Profiles.php:737 +msgid "Dislikes" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:443 ../../Zotlabs/Module/Profiles.php:744 +msgid "Work/Employment" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:446 +msgid "Religion" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:450 +msgid "Political Views" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:454 +msgid "Gender" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:458 +msgid "Sexual Preference" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:462 +msgid "Homepage" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:466 +msgid "Interests" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:560 +msgid "Profile updated." +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:644 +msgid "Hide your connections list from viewers of this profile" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:686 +msgid "Edit Profile Details" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:688 +msgid "View this profile" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:689 ../../Zotlabs/Module/Profiles.php:771 +#: ../../include/channel.php:989 +msgid "Edit visibility" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:690 +msgid "Profile Tools" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:691 +msgid "Change cover photo" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:692 ../../include/channel.php:960 +msgid "Change profile photo" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:693 +msgid "Create a new profile using these settings" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:694 +msgid "Clone this profile" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:695 +msgid "Delete this profile" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:696 +msgid "Add profile things" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:697 ../../include/conversation.php:1541 +#: ../../include/widgets.php:105 +msgid "Personal" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:699 +msgid "Relation" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:700 ../../include/datetime.php:48 +msgid "Miscellaneous" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:702 +msgid "Import profile from file" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:703 +msgid "Export profile to file" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:704 +msgid "Your gender" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:705 +msgid "Marital status" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:706 +msgid "Sexual preference" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:709 +msgid "Profile name" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:711 +msgid "This is your default profile." +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:713 +msgid "Your full name" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:714 +msgid "Title/Description" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:717 +msgid "Street address" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:718 +msgid "Locality/City" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:719 +msgid "Region/State" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:720 +msgid "Postal/Zip code" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:721 +msgid "Country" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:726 +msgid "Who (if applicable)" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:726 +msgid "Examples: cathy123, Cathy Williams, cathy@example.com" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:727 +msgid "Since (date)" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:730 +msgid "Tell us about yourself" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:731 +msgid "Homepage URL" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:732 +msgid "Hometown" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:733 +msgid "Political views" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:734 +msgid "Religious views" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:735 +msgid "Keywords used in directory listings" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:735 +msgid "Example: fishing photography software" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:738 +msgid "Musical interests" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:739 +msgid "Books, literature" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:740 +msgid "Television" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:741 +msgid "Film/Dance/Culture/Entertainment" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:742 +msgid "Hobbies/Interests" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:743 +msgid "Love/Romance" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:745 +msgid "School/Education" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:746 +msgid "Contact information and social networks" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:747 +msgid "My other channels" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:767 ../../include/channel.php:985 +msgid "Profile Image" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:777 ../../include/nav.php:88 +#: ../../include/channel.php:967 +msgid "Edit Profiles" msgstr "" #: ../../Zotlabs/Module/Wiki.php:34 @@ -6338,8 +6373,8 @@ msgid "Not found" msgstr "" #: ../../Zotlabs/Module/Wiki.php:92 ../../Zotlabs/Lib/Apps.php:219 -#: ../../include/conversation.php:1710 ../../include/conversation.php:1713 #: ../../include/features.php:55 ../../include/nav.php:108 +#: ../../include/conversation.php:1710 ../../include/conversation.php:1713 msgid "Wiki" msgstr "" @@ -6718,8 +6753,8 @@ msgstr "" msgid "Channel Home" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:223 ../../include/conversation.php:1664 -#: ../../include/conversation.php:1667 ../../include/nav.php:203 +#: ../../Zotlabs/Lib/Apps.php:223 ../../include/nav.php:203 +#: ../../include/conversation.php:1664 ../../include/conversation.php:1667 msgid "Events" msgstr "" @@ -6751,7 +6786,7 @@ msgstr "" msgid "Invite" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:235 ../../include/widgets.php:1480 +#: ../../Zotlabs/Lib/Apps.php:235 ../../include/widgets.php:1494 msgid "Features" msgstr "" @@ -7023,8 +7058,97 @@ msgstr "" msgid "Cannot locate DNS info for database server '%s'" msgstr "" -#: ../../include/api.php:1327 -msgid "Public Timeline" +#: ../../include/items.php:897 ../../include/items.php:942 +msgid "(Unknown)" +msgstr "" + +#: ../../include/items.php:1141 +msgid "Visible to anybody on the internet." +msgstr "" + +#: ../../include/items.php:1143 +msgid "Visible to you only." +msgstr "" + +#: ../../include/items.php:1145 +msgid "Visible to anybody in this network." +msgstr "" + +#: ../../include/items.php:1147 +msgid "Visible to anybody authenticated." +msgstr "" + +#: ../../include/items.php:1149 +#, php-format +msgid "Visible to anybody on %s." +msgstr "" + +#: ../../include/items.php:1151 +msgid "Visible to all connections." +msgstr "" + +#: ../../include/items.php:1153 +msgid "Visible to approved connections." +msgstr "" + +#: ../../include/items.php:1155 +msgid "Visible to specific connections." +msgstr "" + +#: ../../include/items.php:3918 +msgid "Privacy group is empty." +msgstr "" + +#: ../../include/items.php:3925 +#, php-format +msgid "Privacy group: %s" +msgstr "" + +#: ../../include/items.php:3937 +msgid "Connection not found." +msgstr "" + +#: ../../include/items.php:4290 +msgid "profile photo" +msgstr "" + +#: ../../include/oembed.php:336 +msgid "Embedded content" +msgstr "" + +#: ../../include/oembed.php:345 +msgid "Embedding disabled" +msgstr "" + +#: ../../include/photos.php:114 +#, php-format +msgid "Image exceeds website size limit of %lu bytes" +msgstr "" + +#: ../../include/photos.php:121 +msgid "Image file is empty." +msgstr "" + +#: ../../include/photos.php:259 +msgid "Photo storage failed." +msgstr "" + +#: ../../include/photos.php:299 +msgid "a new photo" +msgstr "" + +#: ../../include/photos.php:303 +#, php-format +msgctxt "photo_upload" +msgid "%1$s posted %2$s to %3$s" +msgstr "" + +#: ../../include/photos.php:506 ../../include/conversation.php:1650 +msgid "Photo Albums" +msgstr "" + +#: ../../include/photos.php:510 +msgid "Upload New Photos" msgstr "" #: ../../include/account.php:28 @@ -7218,162 +7342,14 @@ msgstr "" msgid "Happy Birthday %1$s" msgstr "" -#: ../../include/channel.php:33 -msgid "Unable to obtain identity information from database" -msgstr "" - -#: ../../include/channel.php:67 -msgid "Empty name" -msgstr "" - -#: ../../include/channel.php:70 -msgid "Name too long" -msgstr "" - -#: ../../include/channel.php:181 -msgid "No account identifier" -msgstr "" - -#: ../../include/channel.php:193 -msgid "Nickname is required." -msgstr "" - -#: ../../include/channel.php:207 -msgid "Reserved nickname. Please choose another." +#: ../../include/security.php:109 +msgid "guest:" msgstr "" -#: ../../include/channel.php:212 +#: ../../include/security.php:527 msgid "" -"Nickname has unsupported characters or is already being used on this site." -msgstr "" - -#: ../../include/channel.php:272 -msgid "Unable to retrieve created identity" -msgstr "" - -#: ../../include/channel.php:341 -msgid "Default Profile" -msgstr "" - -#: ../../include/channel.php:830 -msgid "Requested channel is not available." -msgstr "" - -#: ../../include/channel.php:977 -msgid "Create New Profile" -msgstr "" - -#: ../../include/channel.php:980 ../../include/nav.php:90 -msgid "Edit Profile" -msgstr "" - -#: ../../include/channel.php:997 -msgid "Visible to everybody" -msgstr "" - -#: ../../include/channel.php:1070 ../../include/channel.php:1182 -msgid "Gender:" -msgstr "" - -#: ../../include/channel.php:1071 ../../include/channel.php:1226 -msgid "Status:" -msgstr "" - -#: ../../include/channel.php:1072 ../../include/channel.php:1237 -msgid "Homepage:" -msgstr "" - -#: ../../include/channel.php:1073 -msgid "Online Now" -msgstr "" - -#: ../../include/channel.php:1187 -msgid "Like this channel" -msgstr "" - -#: ../../include/channel.php:1211 -msgid "j F, Y" -msgstr "" - -#: ../../include/channel.php:1212 -msgid "j F" -msgstr "" - -#: ../../include/channel.php:1219 -msgid "Birthday:" -msgstr "" - -#: ../../include/channel.php:1232 -#, php-format -msgid "for %1$d %2$s" -msgstr "" - -#: ../../include/channel.php:1235 -msgid "Sexual Preference:" -msgstr "" - -#: ../../include/channel.php:1241 -msgid "Tags:" -msgstr "" - -#: ../../include/channel.php:1243 -msgid "Political Views:" -msgstr "" - -#: ../../include/channel.php:1245 -msgid "Religion:" -msgstr "" - -#: ../../include/channel.php:1249 -msgid "Hobbies/Interests:" -msgstr "" - -#: ../../include/channel.php:1251 -msgid "Likes:" -msgstr "" - -#: ../../include/channel.php:1253 -msgid "Dislikes:" -msgstr "" - -#: ../../include/channel.php:1255 -msgid "Contact information and Social Networks:" -msgstr "" - -#: ../../include/channel.php:1257 -msgid "My other channels:" -msgstr "" - -#: ../../include/channel.php:1259 -msgid "Musical interests:" -msgstr "" - -#: ../../include/channel.php:1261 -msgid "Books, literature:" -msgstr "" - -#: ../../include/channel.php:1263 -msgid "Television:" -msgstr "" - -#: ../../include/channel.php:1265 -msgid "Film/dance/culture/entertainment:" -msgstr "" - -#: ../../include/channel.php:1267 -msgid "Love/Romance:" -msgstr "" - -#: ../../include/channel.php:1269 -msgid "Work/employment:" -msgstr "" - -#: ../../include/channel.php:1271 -msgid "School/education:" -msgstr "" - -#: ../../include/channel.php:1292 -msgid "Like this thing" +"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/selectors.php:30 @@ -7624,282 +7600,19 @@ msgstr "" msgid "Ask me" msgstr "" -#: ../../include/conversation.php:204 -#, php-format -msgid "%1$s is now connected with %2$s" -msgstr "" - -#: ../../include/conversation.php:239 -#, php-format -msgid "%1$s poked %2$s" -msgstr "" - -#: ../../include/conversation.php:243 ../../include/text.php:1013 -#: ../../include/text.php:1018 -msgid "poked" -msgstr "" - -#: ../../include/conversation.php:694 -#, php-format -msgid "View %s's profile @ %s" -msgstr "" - -#: ../../include/conversation.php:713 -msgid "Categories:" -msgstr "" - -#: ../../include/conversation.php:714 -msgid "Filed under:" -msgstr "" - -#: ../../include/conversation.php:741 -msgid "View in context" -msgstr "" - -#: ../../include/conversation.php:850 -msgid "remove" -msgstr "" - -#: ../../include/conversation.php:854 ../../include/nav.php:249 -msgid "Loading..." -msgstr "" - -#: ../../include/conversation.php:855 -msgid "Delete Selected Items" -msgstr "" - -#: ../../include/conversation.php:951 -msgid "View Source" -msgstr "" - -#: ../../include/conversation.php:952 -msgid "Follow Thread" -msgstr "" - -#: ../../include/conversation.php:953 -msgid "Unfollow Thread" -msgstr "" - -#: ../../include/conversation.php:958 -msgid "Activity/Posts" -msgstr "" - -#: ../../include/conversation.php:960 -msgid "Edit Connection" -msgstr "" - -#: ../../include/conversation.php:961 -msgid "Message" -msgstr "" - -#: ../../include/conversation.php:1078 -#, php-format -msgid "%s likes this." -msgstr "" - -#: ../../include/conversation.php:1078 -#, php-format -msgid "%s doesn't like this." -msgstr "" - -#: ../../include/conversation.php:1082 -#, php-format -msgid "<span %1$s>%2$d people</span> like this." -msgid_plural "<span %1$s>%2$d people</span> like this." -msgstr[0] "" -msgstr[1] "" - -#: ../../include/conversation.php:1084 -#, php-format -msgid "<span %1$s>%2$d people</span> don't like this." -msgid_plural "<span %1$s>%2$d people</span> don't like this." -msgstr[0] "" -msgstr[1] "" - -#: ../../include/conversation.php:1090 -msgid "and" +#: ../../include/connections.php:95 +msgid "New window" msgstr "" -#: ../../include/conversation.php:1093 -#, php-format -msgid ", and %d other people" -msgid_plural ", and %d other people" -msgstr[0] "" -msgstr[1] "" - -#: ../../include/conversation.php:1094 -#, php-format -msgid "%s like this." +#: ../../include/connections.php:96 +msgid "Open the selected location in a different window or browser tab" msgstr "" -#: ../../include/conversation.php:1094 +#: ../../include/connections.php:214 #, php-format -msgid "%s don't like this." -msgstr "" - -#: ../../include/conversation.php:1133 -msgid "Set your location" -msgstr "" - -#: ../../include/conversation.php:1134 -msgid "Clear browser location" -msgstr "" - -#: ../../include/conversation.php:1182 -msgid "Tag term:" -msgstr "" - -#: ../../include/conversation.php:1183 -msgid "Where are you right now?" -msgstr "" - -#: ../../include/conversation.php:1221 -msgid "Page link name" -msgstr "" - -#: ../../include/conversation.php:1224 -msgid "Post as" -msgstr "" - -#: ../../include/conversation.php:1238 -msgid "Toggle voting" -msgstr "" - -#: ../../include/conversation.php:1246 -msgid "Categories (optional, comma-separated list)" -msgstr "" - -#: ../../include/conversation.php:1269 -msgid "Set publish date" -msgstr "" - -#: ../../include/conversation.php:1518 -msgid "Discover" -msgstr "" - -#: ../../include/conversation.php:1521 -msgid "Imported public streams" -msgstr "" - -#: ../../include/conversation.php:1526 -msgid "Commented Order" -msgstr "" - -#: ../../include/conversation.php:1529 -msgid "Sort by Comment Date" -msgstr "" - -#: ../../include/conversation.php:1533 -msgid "Posted Order" -msgstr "" - -#: ../../include/conversation.php:1536 -msgid "Sort by Post Date" -msgstr "" - -#: ../../include/conversation.php:1544 -msgid "Posts that mention or involve you" -msgstr "" - -#: ../../include/conversation.php:1553 -msgid "Activity Stream - by date" -msgstr "" - -#: ../../include/conversation.php:1559 -msgid "Starred" -msgstr "" - -#: ../../include/conversation.php:1562 -msgid "Favourite Posts" -msgstr "" - -#: ../../include/conversation.php:1569 -msgid "Spam" -msgstr "" - -#: ../../include/conversation.php:1572 -msgid "Posts flagged as SPAM" -msgstr "" - -#: ../../include/conversation.php:1629 -msgid "Status Messages and Posts" -msgstr "" - -#: ../../include/conversation.php:1638 -msgid "About" -msgstr "" - -#: ../../include/conversation.php:1641 -msgid "Profile Details" -msgstr "" - -#: ../../include/conversation.php:1650 ../../include/photos.php:506 -msgid "Photo Albums" -msgstr "" - -#: ../../include/conversation.php:1657 -msgid "Files and Storage" -msgstr "" - -#: ../../include/conversation.php:1677 ../../include/conversation.php:1680 -#: ../../include/widgets.php:836 -msgid "Chatrooms" -msgstr "" - -#: ../../include/conversation.php:1690 ../../include/nav.php:102 -msgid "Bookmarks" -msgstr "" - -#: ../../include/conversation.php:1693 -msgid "Saved Bookmarks" -msgstr "" - -#: ../../include/conversation.php:1703 -msgid "Manage Webpages" +msgid "User '%s' deleted" msgstr "" -#: ../../include/conversation.php:1768 -msgctxt "noun" -msgid "Attending" -msgid_plural "Attending" -msgstr[0] "" -msgstr[1] "" - -#: ../../include/conversation.php:1771 -msgctxt "noun" -msgid "Not Attending" -msgid_plural "Not Attending" -msgstr[0] "" -msgstr[1] "" - -#: ../../include/conversation.php:1774 -msgctxt "noun" -msgid "Undecided" -msgid_plural "Undecided" -msgstr[0] "" -msgstr[1] "" - -#: ../../include/conversation.php:1777 -msgctxt "noun" -msgid "Agree" -msgid_plural "Agrees" -msgstr[0] "" -msgstr[1] "" - -#: ../../include/conversation.php:1780 -msgctxt "noun" -msgid "Disagree" -msgid_plural "Disagrees" -msgstr[0] "" -msgstr[1] "" - -#: ../../include/conversation.php:1783 -msgctxt "noun" -msgid "Abstain" -msgid_plural "Abstains" -msgstr[0] "" -msgstr[1] "" - #: ../../include/bookmarks.php:35 #, php-format msgid "%1$s's bookmarks" @@ -8207,8 +7920,8 @@ msgstr "" msgid "Add emoji reaction ability to posts" msgstr "" -#: ../../include/features.php:99 ../../include/contact_widgets.php:53 -#: ../../include/widgets.php:310 +#: ../../include/features.php:99 ../../include/widgets.php:310 +#: ../../include/contact_widgets.php:53 msgid "Saved Folders" msgstr "" @@ -8295,6 +8008,10 @@ msgstr "" msgid "Manage/Edit profiles" msgstr "" +#: ../../include/nav.php:90 ../../include/channel.php:971 +msgid "Edit Profile" +msgstr "" + #: ../../include/nav.php:90 msgid "Edit your profile" msgstr "" @@ -8311,6 +8028,10 @@ msgstr "" msgid "Your chatrooms" msgstr "" +#: ../../include/nav.php:102 ../../include/conversation.php:1690 +msgid "Bookmarks" +msgstr "" + #: ../../include/nav.php:102 msgid "Your bookmarks" msgstr "" @@ -8436,7 +8157,7 @@ msgstr "" msgid "Account/Channel Settings" msgstr "" -#: ../../include/nav.php:218 ../../include/widgets.php:1510 +#: ../../include/nav.php:218 ../../include/widgets.php:1524 msgid "Admin" msgstr "" @@ -8444,6 +8165,10 @@ msgstr "" msgid "Site Setup and Configuration" msgstr "" +#: ../../include/nav.php:249 ../../include/conversation.php:854 +msgid "Loading..." +msgstr "" + #: ../../include/nav.php:254 msgid "@name, #tag, ?doc, content" msgstr "" @@ -8508,91 +8233,21 @@ msgstr "" msgid "Title" msgstr "" -#: ../../include/connections.php:95 -msgid "New window" -msgstr "" - -#: ../../include/connections.php:96 -msgid "Open the selected location in a different window or browser tab" -msgstr "" - -#: ../../include/connections.php:214 -#, php-format -msgid "User '%s' deleted" -msgstr "" - -#: ../../include/attach.php:247 ../../include/attach.php:333 -msgid "Item was not found." -msgstr "" - -#: ../../include/attach.php:499 -msgid "No source file." -msgstr "" - -#: ../../include/attach.php:521 -msgid "Cannot locate file to replace" -msgstr "" - -#: ../../include/attach.php:539 -msgid "Cannot locate file to revise/update" +#: ../../include/zot.php:697 +msgid "Invalid data packet" msgstr "" -#: ../../include/attach.php:674 -#, php-format -msgid "File exceeds size limit of %d" +#: ../../include/zot.php:713 +msgid "Unable to verify channel signature" msgstr "" -#: ../../include/attach.php:688 +#: ../../include/zot.php:2326 #, php-format -msgid "You have reached your limit of %1$.0f Mbytes attachment storage." -msgstr "" - -#: ../../include/attach.php:846 -msgid "File upload failed. Possible system limit or action terminated." -msgstr "" - -#: ../../include/attach.php:859 -msgid "Stored file could not be verified. Upload failed." -msgstr "" - -#: ../../include/attach.php:915 ../../include/attach.php:931 -msgid "Path not available." -msgstr "" - -#: ../../include/attach.php:977 ../../include/attach.php:1129 -msgid "Empty pathname" -msgstr "" - -#: ../../include/attach.php:1003 -msgid "duplicate filename or path" -msgstr "" - -#: ../../include/attach.php:1025 -msgid "Path not found." -msgstr "" - -#: ../../include/attach.php:1083 -msgid "mkdir failed." -msgstr "" - -#: ../../include/attach.php:1087 -msgid "database storage failed." -msgstr "" - -#: ../../include/attach.php:1135 -msgid "Empty path" -msgstr "" - -#: ../../include/auth.php:147 -msgid "Logged out." -msgstr "" - -#: ../../include/auth.php:274 -msgid "Failed authentication" +msgid "Unable to verify site signature for %s" msgstr "" -#: ../../include/auth.php:285 -msgid "Login failed." +#: ../../include/zot.php:3703 +msgid "invalid target signature" msgstr "" #: ../../include/bb2diaspora.php:398 @@ -8969,6 +8624,274 @@ msgctxt "calendar" msgid "All day" msgstr "" +#: ../../include/api.php:1327 +msgid "Public Timeline" +msgstr "" + +#: ../../include/conversation.php:204 +#, php-format +msgid "%1$s is now connected with %2$s" +msgstr "" + +#: ../../include/conversation.php:239 +#, php-format +msgid "%1$s poked %2$s" +msgstr "" + +#: ../../include/conversation.php:243 ../../include/text.php:1013 +#: ../../include/text.php:1018 +msgid "poked" +msgstr "" + +#: ../../include/conversation.php:694 +#, php-format +msgid "View %s's profile @ %s" +msgstr "" + +#: ../../include/conversation.php:713 +msgid "Categories:" +msgstr "" + +#: ../../include/conversation.php:714 +msgid "Filed under:" +msgstr "" + +#: ../../include/conversation.php:741 +msgid "View in context" +msgstr "" + +#: ../../include/conversation.php:850 +msgid "remove" +msgstr "" + +#: ../../include/conversation.php:855 +msgid "Delete Selected Items" +msgstr "" + +#: ../../include/conversation.php:951 +msgid "View Source" +msgstr "" + +#: ../../include/conversation.php:952 +msgid "Follow Thread" +msgstr "" + +#: ../../include/conversation.php:953 +msgid "Unfollow Thread" +msgstr "" + +#: ../../include/conversation.php:958 +msgid "Activity/Posts" +msgstr "" + +#: ../../include/conversation.php:960 +msgid "Edit Connection" +msgstr "" + +#: ../../include/conversation.php:961 +msgid "Message" +msgstr "" + +#: ../../include/conversation.php:1078 +#, php-format +msgid "%s likes this." +msgstr "" + +#: ../../include/conversation.php:1078 +#, php-format +msgid "%s doesn't like this." +msgstr "" + +#: ../../include/conversation.php:1082 +#, php-format +msgid "<span %1$s>%2$d people</span> like this." +msgid_plural "<span %1$s>%2$d people</span> like this." +msgstr[0] "" +msgstr[1] "" + +#: ../../include/conversation.php:1084 +#, php-format +msgid "<span %1$s>%2$d people</span> don't like this." +msgid_plural "<span %1$s>%2$d people</span> don't like this." +msgstr[0] "" +msgstr[1] "" + +#: ../../include/conversation.php:1090 +msgid "and" +msgstr "" + +#: ../../include/conversation.php:1093 +#, php-format +msgid ", and %d other people" +msgid_plural ", and %d other people" +msgstr[0] "" +msgstr[1] "" + +#: ../../include/conversation.php:1094 +#, php-format +msgid "%s like this." +msgstr "" + +#: ../../include/conversation.php:1094 +#, php-format +msgid "%s don't like this." +msgstr "" + +#: ../../include/conversation.php:1133 +msgid "Set your location" +msgstr "" + +#: ../../include/conversation.php:1134 +msgid "Clear browser location" +msgstr "" + +#: ../../include/conversation.php:1182 +msgid "Tag term:" +msgstr "" + +#: ../../include/conversation.php:1183 +msgid "Where are you right now?" +msgstr "" + +#: ../../include/conversation.php:1221 +msgid "Page link name" +msgstr "" + +#: ../../include/conversation.php:1224 +msgid "Post as" +msgstr "" + +#: ../../include/conversation.php:1238 +msgid "Toggle voting" +msgstr "" + +#: ../../include/conversation.php:1246 +msgid "Categories (optional, comma-separated list)" +msgstr "" + +#: ../../include/conversation.php:1269 +msgid "Set publish date" +msgstr "" + +#: ../../include/conversation.php:1518 +msgid "Discover" +msgstr "" + +#: ../../include/conversation.php:1521 +msgid "Imported public streams" +msgstr "" + +#: ../../include/conversation.php:1526 +msgid "Commented Order" +msgstr "" + +#: ../../include/conversation.php:1529 +msgid "Sort by Comment Date" +msgstr "" + +#: ../../include/conversation.php:1533 +msgid "Posted Order" +msgstr "" + +#: ../../include/conversation.php:1536 +msgid "Sort by Post Date" +msgstr "" + +#: ../../include/conversation.php:1544 +msgid "Posts that mention or involve you" +msgstr "" + +#: ../../include/conversation.php:1553 +msgid "Activity Stream - by date" +msgstr "" + +#: ../../include/conversation.php:1559 +msgid "Starred" +msgstr "" + +#: ../../include/conversation.php:1562 +msgid "Favourite Posts" +msgstr "" + +#: ../../include/conversation.php:1569 +msgid "Spam" +msgstr "" + +#: ../../include/conversation.php:1572 +msgid "Posts flagged as SPAM" +msgstr "" + +#: ../../include/conversation.php:1629 +msgid "Status Messages and Posts" +msgstr "" + +#: ../../include/conversation.php:1638 +msgid "About" +msgstr "" + +#: ../../include/conversation.php:1641 +msgid "Profile Details" +msgstr "" + +#: ../../include/conversation.php:1657 +msgid "Files and Storage" +msgstr "" + +#: ../../include/conversation.php:1677 ../../include/conversation.php:1680 +#: ../../include/widgets.php:850 +msgid "Chatrooms" +msgstr "" + +#: ../../include/conversation.php:1693 +msgid "Saved Bookmarks" +msgstr "" + +#: ../../include/conversation.php:1703 +msgid "Manage Webpages" +msgstr "" + +#: ../../include/conversation.php:1768 +msgctxt "noun" +msgid "Attending" +msgid_plural "Attending" +msgstr[0] "" +msgstr[1] "" + +#: ../../include/conversation.php:1771 +msgctxt "noun" +msgid "Not Attending" +msgid_plural "Not Attending" +msgstr[0] "" +msgstr[1] "" + +#: ../../include/conversation.php:1774 +msgctxt "noun" +msgid "Undecided" +msgid_plural "Undecided" +msgstr[0] "" +msgstr[1] "" + +#: ../../include/conversation.php:1777 +msgctxt "noun" +msgid "Agree" +msgid_plural "Agrees" +msgstr[0] "" +msgstr[1] "" + +#: ../../include/conversation.php:1780 +msgctxt "noun" +msgid "Disagree" +msgid_plural "Disagrees" +msgstr[0] "" +msgstr[1] "" + +#: ../../include/conversation.php:1783 +msgctxt "noun" +msgid "Abstain" +msgid_plural "Abstains" +msgstr[0] "" +msgstr[1] "" + #: ../../include/follow.php:27 msgid "Channel is blocked on this site." msgstr "" @@ -9006,31 +8929,191 @@ msgstr "" msgid "Channel clone failed. Import failed." msgstr "" -#: ../../include/photos.php:114 +#: ../../include/permissions.php:29 +msgid "Can view my normal stream and posts" +msgstr "" + +#: ../../include/permissions.php:33 +msgid "Can view my webpages" +msgstr "" + +#: ../../include/permissions.php:37 +msgid "Can post on my channel page (\"wall\")" +msgstr "" + +#: ../../include/permissions.php:40 +msgid "Can like/dislike stuff" +msgstr "" + +#: ../../include/permissions.php:40 +msgid "Profiles and things other than posts/comments" +msgstr "" + +#: ../../include/permissions.php:42 +msgid "Can forward to all my channel contacts via post @mentions" +msgstr "" + +#: ../../include/permissions.php:42 +msgid "Advanced - useful for creating group forum channels" +msgstr "" + +#: ../../include/permissions.php:43 +msgid "Can chat with me (when available)" +msgstr "" + +#: ../../include/permissions.php:44 +msgid "Can write to my file storage and photos" +msgstr "" + +#: ../../include/permissions.php:45 +msgid "Can edit my webpages" +msgstr "" + +#: ../../include/permissions.php:47 +msgid "Somewhat advanced - very useful in open communities" +msgstr "" + +#: ../../include/permissions.php:49 +msgid "Can administer my channel resources" +msgstr "" + +#: ../../include/permissions.php:49 +msgid "Extremely advanced. Leave this alone unless you know what you are doing" +msgstr "" + +#: ../../include/activities.php:41 +msgid " and " +msgstr "" + +#: ../../include/activities.php:49 +msgid "public profile" +msgstr "" + +#: ../../include/activities.php:58 #, php-format -msgid "Image exceeds website size limit of %lu bytes" +msgid "%1$s changed %2$s to “%3$s”" msgstr "" -#: ../../include/photos.php:121 -msgid "Image file is empty." +#: ../../include/activities.php:59 +#, php-format +msgid "Visit %1$s's %2$s" msgstr "" -#: ../../include/photos.php:259 -msgid "Photo storage failed." +#: ../../include/activities.php:62 +#, php-format +msgid "%1$s has an updated %2$s, changing %3$s." msgstr "" -#: ../../include/photos.php:299 -msgid "a new photo" +#: ../../include/attach.php:248 ../../include/attach.php:334 +msgid "Item was not found." msgstr "" -#: ../../include/photos.php:303 +#: ../../include/attach.php:500 +msgid "No source file." +msgstr "" + +#: ../../include/attach.php:522 +msgid "Cannot locate file to replace" +msgstr "" + +#: ../../include/attach.php:540 +msgid "Cannot locate file to revise/update" +msgstr "" + +#: ../../include/attach.php:675 #, php-format -msgctxt "photo_upload" -msgid "%1$s posted %2$s to %3$s" +msgid "File exceeds size limit of %d" msgstr "" -#: ../../include/photos.php:510 -msgid "Upload New Photos" +#: ../../include/attach.php:689 +#, php-format +msgid "You have reached your limit of %1$.0f Mbytes attachment storage." +msgstr "" + +#: ../../include/attach.php:847 +msgid "File upload failed. Possible system limit or action terminated." +msgstr "" + +#: ../../include/attach.php:860 +msgid "Stored file could not be verified. Upload failed." +msgstr "" + +#: ../../include/attach.php:916 ../../include/attach.php:932 +msgid "Path not available." +msgstr "" + +#: ../../include/attach.php:978 ../../include/attach.php:1130 +msgid "Empty pathname" +msgstr "" + +#: ../../include/attach.php:1004 +msgid "duplicate filename or path" +msgstr "" + +#: ../../include/attach.php:1026 +msgid "Path not found." +msgstr "" + +#: ../../include/attach.php:1084 +msgid "mkdir failed." +msgstr "" + +#: ../../include/attach.php:1088 +msgid "database storage failed." +msgstr "" + +#: ../../include/attach.php:1136 +msgid "Empty path" +msgstr "" + +#: ../../include/taxonomy.php:188 ../../include/taxonomy.php:270 +#: ../../include/widgets.php:46 ../../include/widgets.php:429 +#: ../../include/contact_widgets.php:91 +msgid "Categories" +msgstr "" + +#: ../../include/taxonomy.php:228 ../../include/taxonomy.php:249 +msgid "Tags" +msgstr "" + +#: ../../include/taxonomy.php:293 +msgid "Keywords" +msgstr "" + +#: ../../include/taxonomy.php:314 +msgid "have" +msgstr "" + +#: ../../include/taxonomy.php:314 +msgid "has" +msgstr "" + +#: ../../include/taxonomy.php:315 +msgid "want" +msgstr "" + +#: ../../include/taxonomy.php:315 +msgid "wants" +msgstr "" + +#: ../../include/taxonomy.php:316 +msgid "likes" +msgstr "" + +#: ../../include/taxonomy.php:317 +msgid "dislikes" +msgstr "" + +#: ../../include/auth.php:148 +msgid "Logged out." +msgstr "" + +#: ../../include/auth.php:275 +msgid "Failed authentication" +msgstr "" + +#: ../../include/auth.php:286 +msgid "Login failed." msgstr "" #: ../../include/text.php:404 @@ -9246,502 +9329,482 @@ msgstr "" msgid "Pages" msgstr "" -#: ../../include/zot.php:697 -msgid "Invalid data packet" +#: ../../include/text.php:2263 +msgid "Import website..." msgstr "" -#: ../../include/zot.php:713 -msgid "Unable to verify channel signature" +#: ../../include/text.php:2264 +msgid "Select folder to import" msgstr "" -#: ../../include/zot.php:2326 -#, php-format -msgid "Unable to verify site signature for %s" +#: ../../include/text.php:2265 +msgid "Import from a zipped folder:" msgstr "" -#: ../../include/zot.php:3703 -msgid "invalid target signature" +#: ../../include/text.php:2266 +msgid "Import from cloud files:" msgstr "" -#: ../../include/activities.php:41 -msgid " and " +#: ../../include/text.php:2267 +msgid "/cloud/channel/path/to/folder" msgstr "" -#: ../../include/activities.php:49 -msgid "public profile" +#: ../../include/text.php:2268 +msgid "Enter path to website files" msgstr "" -#: ../../include/activities.php:58 -#, php-format -msgid "%1$s changed %2$s to “%3$s”" +#: ../../include/text.php:2269 +msgid "Select folder" msgstr "" -#: ../../include/activities.php:59 -#, php-format -msgid "Visit %1$s's %2$s" +#: ../../include/widgets.php:103 +msgid "System" msgstr "" -#: ../../include/activities.php:62 -#, php-format -msgid "%1$s has an updated %2$s, changing %3$s." +#: ../../include/widgets.php:106 +msgid "New App" msgstr "" -#: ../../include/taxonomy.php:188 ../../include/taxonomy.php:270 -#: ../../include/contact_widgets.php:91 ../../include/widgets.php:46 -#: ../../include/widgets.php:429 -msgid "Categories" +#: ../../include/widgets.php:154 +msgid "Suggestions" msgstr "" -#: ../../include/taxonomy.php:228 ../../include/taxonomy.php:249 -msgid "Tags" +#: ../../include/widgets.php:155 +msgid "See more..." msgstr "" -#: ../../include/taxonomy.php:293 -msgid "Keywords" +#: ../../include/widgets.php:175 +#, php-format +msgid "You have %1$.0f of %2$.0f allowed connections." msgstr "" -#: ../../include/taxonomy.php:314 -msgid "have" +#: ../../include/widgets.php:181 +msgid "Add New Connection" msgstr "" -#: ../../include/taxonomy.php:314 -msgid "has" +#: ../../include/widgets.php:182 +msgid "Enter channel address" msgstr "" -#: ../../include/taxonomy.php:315 -msgid "want" +#: ../../include/widgets.php:183 +msgid "Examples: bob@example.com, https://example.com/barbara" msgstr "" -#: ../../include/taxonomy.php:315 -msgid "wants" +#: ../../include/widgets.php:199 +msgid "Notes" msgstr "" -#: ../../include/taxonomy.php:316 -msgid "likes" +#: ../../include/widgets.php:273 +msgid "Remove term" msgstr "" -#: ../../include/taxonomy.php:317 -msgid "dislikes" +#: ../../include/widgets.php:313 ../../include/widgets.php:432 +#: ../../include/contact_widgets.php:56 ../../include/contact_widgets.php:94 +msgid "Everything" msgstr "" -#: ../../include/contact_widgets.php:11 -#, php-format -msgid "%d invitation available" -msgid_plural "%d invitations available" -msgstr[0] "" -msgstr[1] "" - -#: ../../include/contact_widgets.php:19 -msgid "Find Channels" +#: ../../include/widgets.php:354 +msgid "Archives" msgstr "" -#: ../../include/contact_widgets.php:20 -msgid "Enter name or interest" +#: ../../include/widgets.php:516 +msgid "Refresh" msgstr "" -#: ../../include/contact_widgets.php:21 -msgid "Connect/Follow" +#: ../../include/widgets.php:556 +msgid "Account settings" msgstr "" -#: ../../include/contact_widgets.php:22 -msgid "Examples: Robert Morgenstein, Fishing" +#: ../../include/widgets.php:562 +msgid "Channel settings" msgstr "" -#: ../../include/contact_widgets.php:26 -msgid "Random Profile" +#: ../../include/widgets.php:571 +msgid "Additional features" msgstr "" -#: ../../include/contact_widgets.php:27 -msgid "Invite Friends" +#: ../../include/widgets.php:578 +msgid "Feature/Addon settings" msgstr "" -#: ../../include/contact_widgets.php:29 -msgid "Advanced example: name=fred and country=iceland" +#: ../../include/widgets.php:584 +msgid "Display settings" msgstr "" -#: ../../include/contact_widgets.php:56 ../../include/contact_widgets.php:94 -#: ../../include/widgets.php:313 ../../include/widgets.php:432 -msgid "Everything" +#: ../../include/widgets.php:591 +msgid "Manage locations" msgstr "" -#: ../../include/contact_widgets.php:122 -#, php-format -msgid "%d connection in common" -msgid_plural "%d connections in common" -msgstr[0] "" -msgstr[1] "" - -#: ../../include/contact_widgets.php:127 -msgid "show more" +#: ../../include/widgets.php:600 +msgid "Export channel" msgstr "" -#: ../../include/dir_fns.php:141 -msgid "Directory Options" +#: ../../include/widgets.php:607 +msgid "Connected apps" msgstr "" -#: ../../include/dir_fns.php:143 -msgid "Safe Mode" +#: ../../include/widgets.php:631 +msgid "Premium Channel Settings" msgstr "" -#: ../../include/dir_fns.php:144 -msgid "Public Forums Only" +#: ../../include/widgets.php:660 +msgid "Private Mail Menu" msgstr "" -#: ../../include/dir_fns.php:145 -msgid "This Website Only" +#: ../../include/widgets.php:662 +msgid "Combined View" msgstr "" -#: ../../include/message.php:20 -msgid "No recipient provided." +#: ../../include/widgets.php:694 ../../include/widgets.php:706 +msgid "Conversations" msgstr "" -#: ../../include/message.php:25 -msgid "[no subject]" +#: ../../include/widgets.php:698 +msgid "Received Messages" msgstr "" -#: ../../include/message.php:45 -msgid "Unable to determine sender." +#: ../../include/widgets.php:702 +msgid "Sent Messages" msgstr "" -#: ../../include/message.php:222 -msgid "Stored post could not be verified." +#: ../../include/widgets.php:716 +msgid "No messages." msgstr "" -#: ../../include/items.php:897 ../../include/items.php:942 -msgid "(Unknown)" +#: ../../include/widgets.php:734 +msgid "Delete conversation" msgstr "" -#: ../../include/items.php:1141 -msgid "Visible to anybody on the internet." +#: ../../include/widgets.php:760 +msgid "Events Tools" msgstr "" -#: ../../include/items.php:1143 -msgid "Visible to you only." +#: ../../include/widgets.php:761 +msgid "Export Calendar" msgstr "" -#: ../../include/items.php:1145 -msgid "Visible to anybody in this network." +#: ../../include/widgets.php:762 +msgid "Import Calendar" msgstr "" -#: ../../include/items.php:1147 -msgid "Visible to anybody authenticated." +#: ../../include/widgets.php:854 +msgid "Overview" msgstr "" -#: ../../include/items.php:1149 -#, php-format -msgid "Visible to anybody on %s." +#: ../../include/widgets.php:861 +msgid "Chat Members" msgstr "" -#: ../../include/items.php:1151 -msgid "Visible to all connections." +#: ../../include/widgets.php:883 +msgid "Wiki List" msgstr "" -#: ../../include/items.php:1153 -msgid "Visible to approved connections." +#: ../../include/widgets.php:921 +msgid "Wiki Pages" msgstr "" -#: ../../include/items.php:1155 -msgid "Visible to specific connections." +#: ../../include/widgets.php:956 +msgid "Bookmarked Chatrooms" msgstr "" -#: ../../include/items.php:3918 -msgid "Privacy group is empty." +#: ../../include/widgets.php:979 +msgid "Suggested Chatrooms" msgstr "" -#: ../../include/items.php:3925 -#, php-format -msgid "Privacy group: %s" +#: ../../include/widgets.php:1125 ../../include/widgets.php:1237 +msgid "photo/image" msgstr "" -#: ../../include/items.php:3937 -msgid "Connection not found." +#: ../../include/widgets.php:1180 +msgid "Click to show more" msgstr "" -#: ../../include/items.php:4290 -msgid "profile photo" +#: ../../include/widgets.php:1331 +msgid "Rating Tools" msgstr "" -#: ../../include/oembed.php:336 -msgid "Embedded content" +#: ../../include/widgets.php:1335 ../../include/widgets.php:1337 +msgid "Rate Me" msgstr "" -#: ../../include/oembed.php:345 -msgid "Embedding disabled" +#: ../../include/widgets.php:1340 +msgid "View Ratings" msgstr "" -#: ../../include/permissions.php:26 -msgid "Can view my normal stream and posts" +#: ../../include/widgets.php:1424 +msgid "Forums" msgstr "" -#: ../../include/permissions.php:30 -msgid "Can view my webpages" +#: ../../include/widgets.php:1453 +msgid "Tasks" msgstr "" -#: ../../include/permissions.php:34 -msgid "Can post on my channel page (\"wall\")" +#: ../../include/widgets.php:1462 +msgid "Documentation" msgstr "" -#: ../../include/permissions.php:37 -msgid "Can like/dislike stuff" +#: ../../include/widgets.php:1464 +msgid "Project/Site Information" msgstr "" -#: ../../include/permissions.php:37 -msgid "Profiles and things other than posts/comments" +#: ../../include/widgets.php:1465 +msgid "For Members" msgstr "" -#: ../../include/permissions.php:39 -msgid "Can forward to all my channel contacts via post @mentions" +#: ../../include/widgets.php:1466 +msgid "For Administrators" msgstr "" -#: ../../include/permissions.php:39 -msgid "Advanced - useful for creating group forum channels" +#: ../../include/widgets.php:1467 +msgid "For Developers" msgstr "" -#: ../../include/permissions.php:40 -msgid "Can chat with me (when available)" +#: ../../include/widgets.php:1491 ../../include/widgets.php:1529 +msgid "Member registrations waiting for confirmation" msgstr "" -#: ../../include/permissions.php:41 -msgid "Can write to my file storage and photos" +#: ../../include/widgets.php:1497 +msgid "Inspect queue" msgstr "" -#: ../../include/permissions.php:42 -msgid "Can edit my webpages" +#: ../../include/widgets.php:1499 +msgid "DB updates" msgstr "" -#: ../../include/permissions.php:44 -msgid "Somewhat advanced - very useful in open communities" +#: ../../include/widgets.php:1525 +msgid "Plugin Features" msgstr "" -#: ../../include/permissions.php:46 -msgid "Can administer my channel resources" -msgstr "" +#: ../../include/contact_widgets.php:11 +#, php-format +msgid "%d invitation available" +msgid_plural "%d invitations available" +msgstr[0] "" +msgstr[1] "" -#: ../../include/permissions.php:46 -msgid "Extremely advanced. Leave this alone unless you know what you are doing" +#: ../../include/contact_widgets.php:19 +msgid "Find Channels" msgstr "" -#: ../../include/security.php:109 -msgid "guest:" +#: ../../include/contact_widgets.php:20 +msgid "Enter name or interest" msgstr "" -#: ../../include/security.php:427 -msgid "" -"The form security token was not correct. This probably happened because the " -"form has been opened for too long (>3 hours) before submitting it." +#: ../../include/contact_widgets.php:21 +msgid "Connect/Follow" msgstr "" -#: ../../include/widgets.php:103 -msgid "System" +#: ../../include/contact_widgets.php:22 +msgid "Examples: Robert Morgenstein, Fishing" msgstr "" -#: ../../include/widgets.php:106 -msgid "New App" +#: ../../include/contact_widgets.php:26 +msgid "Random Profile" msgstr "" -#: ../../include/widgets.php:154 -msgid "Suggestions" +#: ../../include/contact_widgets.php:27 +msgid "Invite Friends" msgstr "" -#: ../../include/widgets.php:155 -msgid "See more..." +#: ../../include/contact_widgets.php:29 +msgid "Advanced example: name=fred and country=iceland" msgstr "" -#: ../../include/widgets.php:175 +#: ../../include/contact_widgets.php:122 #, php-format -msgid "You have %1$.0f of %2$.0f allowed connections." -msgstr "" - -#: ../../include/widgets.php:181 -msgid "Add New Connection" -msgstr "" +msgid "%d connection in common" +msgid_plural "%d connections in common" +msgstr[0] "" +msgstr[1] "" -#: ../../include/widgets.php:182 -msgid "Enter channel address" +#: ../../include/contact_widgets.php:127 +msgid "show more" msgstr "" -#: ../../include/widgets.php:183 -msgid "Examples: bob@example.com, https://example.com/barbara" +#: ../../include/dir_fns.php:141 +msgid "Directory Options" msgstr "" -#: ../../include/widgets.php:199 -msgid "Notes" +#: ../../include/dir_fns.php:143 +msgid "Safe Mode" msgstr "" -#: ../../include/widgets.php:273 -msgid "Remove term" +#: ../../include/dir_fns.php:144 +msgid "Public Forums Only" msgstr "" -#: ../../include/widgets.php:354 -msgid "Archives" +#: ../../include/dir_fns.php:145 +msgid "This Website Only" msgstr "" -#: ../../include/widgets.php:516 -msgid "Refresh" +#: ../../include/message.php:20 +msgid "No recipient provided." msgstr "" -#: ../../include/widgets.php:556 -msgid "Account settings" +#: ../../include/message.php:25 +msgid "[no subject]" msgstr "" -#: ../../include/widgets.php:562 -msgid "Channel settings" +#: ../../include/message.php:45 +msgid "Unable to determine sender." msgstr "" -#: ../../include/widgets.php:571 -msgid "Additional features" +#: ../../include/message.php:222 +msgid "Stored post could not be verified." msgstr "" -#: ../../include/widgets.php:578 -msgid "Feature/Addon settings" +#: ../../include/channel.php:33 +msgid "Unable to obtain identity information from database" msgstr "" -#: ../../include/widgets.php:584 -msgid "Display settings" +#: ../../include/channel.php:67 +msgid "Empty name" msgstr "" -#: ../../include/widgets.php:591 -msgid "Manage locations" +#: ../../include/channel.php:70 +msgid "Name too long" msgstr "" -#: ../../include/widgets.php:600 -msgid "Export channel" +#: ../../include/channel.php:181 +msgid "No account identifier" msgstr "" -#: ../../include/widgets.php:607 -msgid "Connected apps" +#: ../../include/channel.php:193 +msgid "Nickname is required." msgstr "" -#: ../../include/widgets.php:631 -msgid "Premium Channel Settings" +#: ../../include/channel.php:207 +msgid "Reserved nickname. Please choose another." msgstr "" -#: ../../include/widgets.php:660 -msgid "Private Mail Menu" +#: ../../include/channel.php:212 +msgid "" +"Nickname has unsupported characters or is already being used on this site." msgstr "" -#: ../../include/widgets.php:662 -msgid "Combined View" +#: ../../include/channel.php:272 +msgid "Unable to retrieve created identity" msgstr "" -#: ../../include/widgets.php:694 ../../include/widgets.php:706 -msgid "Conversations" +#: ../../include/channel.php:341 +msgid "Default Profile" msgstr "" -#: ../../include/widgets.php:698 -msgid "Received Messages" +#: ../../include/channel.php:821 +msgid "Requested channel is not available." msgstr "" -#: ../../include/widgets.php:702 -msgid "Sent Messages" +#: ../../include/channel.php:968 +msgid "Create New Profile" msgstr "" -#: ../../include/widgets.php:716 -msgid "No messages." +#: ../../include/channel.php:988 +msgid "Visible to everybody" msgstr "" -#: ../../include/widgets.php:734 -msgid "Delete conversation" +#: ../../include/channel.php:1061 ../../include/channel.php:1173 +msgid "Gender:" msgstr "" -#: ../../include/widgets.php:760 -msgid "Events Tools" +#: ../../include/channel.php:1062 ../../include/channel.php:1217 +msgid "Status:" msgstr "" -#: ../../include/widgets.php:761 -msgid "Export Calendar" +#: ../../include/channel.php:1063 ../../include/channel.php:1228 +msgid "Homepage:" msgstr "" -#: ../../include/widgets.php:762 -msgid "Import Calendar" +#: ../../include/channel.php:1064 +msgid "Online Now" msgstr "" -#: ../../include/widgets.php:840 -msgid "Overview" +#: ../../include/channel.php:1178 +msgid "Like this channel" msgstr "" -#: ../../include/widgets.php:847 -msgid "Chat Members" +#: ../../include/channel.php:1202 +msgid "j F, Y" msgstr "" -#: ../../include/widgets.php:869 -msgid "Wiki List" +#: ../../include/channel.php:1203 +msgid "j F" msgstr "" -#: ../../include/widgets.php:907 -msgid "Wiki Pages" +#: ../../include/channel.php:1210 +msgid "Birthday:" msgstr "" -#: ../../include/widgets.php:942 -msgid "Bookmarked Chatrooms" +#: ../../include/channel.php:1223 +#, php-format +msgid "for %1$d %2$s" msgstr "" -#: ../../include/widgets.php:965 -msgid "Suggested Chatrooms" +#: ../../include/channel.php:1226 +msgid "Sexual Preference:" msgstr "" -#: ../../include/widgets.php:1111 ../../include/widgets.php:1223 -msgid "photo/image" +#: ../../include/channel.php:1232 +msgid "Tags:" msgstr "" -#: ../../include/widgets.php:1166 -msgid "Click to show more" +#: ../../include/channel.php:1234 +msgid "Political Views:" msgstr "" -#: ../../include/widgets.php:1317 -msgid "Rating Tools" +#: ../../include/channel.php:1236 +msgid "Religion:" msgstr "" -#: ../../include/widgets.php:1321 ../../include/widgets.php:1323 -msgid "Rate Me" +#: ../../include/channel.php:1240 +msgid "Hobbies/Interests:" msgstr "" -#: ../../include/widgets.php:1326 -msgid "View Ratings" +#: ../../include/channel.php:1242 +msgid "Likes:" msgstr "" -#: ../../include/widgets.php:1410 -msgid "Forums" +#: ../../include/channel.php:1244 +msgid "Dislikes:" msgstr "" -#: ../../include/widgets.php:1439 -msgid "Tasks" +#: ../../include/channel.php:1246 +msgid "Contact information and Social Networks:" msgstr "" -#: ../../include/widgets.php:1448 -msgid "Documentation" +#: ../../include/channel.php:1248 +msgid "My other channels:" msgstr "" -#: ../../include/widgets.php:1450 -msgid "Project/Site Information" +#: ../../include/channel.php:1250 +msgid "Musical interests:" msgstr "" -#: ../../include/widgets.php:1451 -msgid "For Members" +#: ../../include/channel.php:1252 +msgid "Books, literature:" msgstr "" -#: ../../include/widgets.php:1452 -msgid "For Administrators" +#: ../../include/channel.php:1254 +msgid "Television:" msgstr "" -#: ../../include/widgets.php:1453 -msgid "For Developers" +#: ../../include/channel.php:1256 +msgid "Film/dance/culture/entertainment:" msgstr "" -#: ../../include/widgets.php:1477 ../../include/widgets.php:1515 -msgid "Member registrations waiting for confirmation" +#: ../../include/channel.php:1258 +msgid "Love/Romance:" msgstr "" -#: ../../include/widgets.php:1483 -msgid "Inspect queue" +#: ../../include/channel.php:1260 +msgid "Work/employment:" msgstr "" -#: ../../include/widgets.php:1485 -msgid "DB updates" +#: ../../include/channel.php:1262 +msgid "School/education:" msgstr "" -#: ../../include/widgets.php:1511 -msgid "Plugin Features" +#: ../../include/channel.php:1283 +msgid "Like this thing" msgstr "" #: ../../view/theme/redbasic/php/config.php:82 diff --git a/view/de/htconfig.tpl b/view/de/htconfig.tpl index 2b71610b6..9d4333fb0 100644 --- a/view/de/htconfig.tpl +++ b/view/de/htconfig.tpl @@ -10,8 +10,6 @@ $db_pass = '{{$dbpass}}'; $db_data = '{{$dbdata}}'; $db_type = '{{$dbtype}}'; // an integer. 0 or unset for mysql, 1 for postgres -define( 'UNO', {{$uno}} ); - /* * Notice: Many of the following settings will be available in the admin panel * after a successful site install. Once they are set in the admin panel, they @@ -36,6 +34,12 @@ App::$config['system']['baseurl'] = '{{$siteurl}}'; App::$config['system']['sitename'] = "Hubzilla"; App::$config['system']['location_hash'] = '{{$site_id}}'; +// 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 + +App::$config['system']['server_role'] = '{{$server_role}}'; // These lines set additional security headers to be sent with all responses // You may wish to set transport_security_header to 0 if your server already sends diff --git a/view/en-au/htconfig.tpl b/view/en-au/htconfig.tpl index 896b35bb2..090bbf06f 100644 --- a/view/en-au/htconfig.tpl +++ b/view/en-au/htconfig.tpl @@ -10,8 +10,6 @@ $db_pass = '{{$dbpass}}'; $db_data = '{{$dbdata}}'; $db_type = '{{$dbtype}}'; // an integer. 0 or unset for mysql, 1 for postgres -define( 'UNO', {{$uno}} ); - /* * Notice: Many of the following settings will be available in the admin panel * after a successful site install. Once they are set in the admin panel, they @@ -36,6 +34,12 @@ App::$config['system']['baseurl'] = '{{$siteurl}}'; App::$config['system']['sitename'] = "Hubzilla"; App::$config['system']['location_hash'] = '{{$site_id}}'; +// 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 + +App::$config['system']['server_role'] = '{{$server_role}}'; // These lines set additional security headers to be sent with all responses // You may wish to set transport_security_header to 0 if your server already sends diff --git a/view/en-gb/htconfig.tpl b/view/en-gb/htconfig.tpl index 04eb404fc..515957b36 100644 --- a/view/en-gb/htconfig.tpl +++ b/view/en-gb/htconfig.tpl @@ -10,8 +10,6 @@ $db_pass = '{{$dbpass}}'; $db_data = '{{$dbdata}}'; $db_type = '{{$dbtype}}'; // an integer. 0 or unset for mysql, 1 for postgres -define( 'UNO', {{$uno}} ); - /* * Notice: Many of the following settings will be available in the admin panel * after a successful site install. Once they are set in the admin panel, they @@ -36,6 +34,14 @@ App::$config['system']['baseurl'] = '{{$siteurl}}'; App::$config['system']['sitename'] = "Hubzilla"; App::$config['system']['location_hash'] = '{{$site_id}}'; + +// 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 + +App::$config['system']['server_role'] = '{{$server_role}}'; + // These lines set additional security headers to be sent with all responses // You may wish to set transport_security_header to 0 if your server already sends // this header. content_security_policy may need to be disabled if you wish to diff --git a/view/en/htconfig.tpl b/view/en/htconfig.tpl index 47daf3f99..a270951b2 100644 --- a/view/en/htconfig.tpl +++ b/view/en/htconfig.tpl @@ -10,8 +10,6 @@ $db_pass = '{{$dbpass}}'; $db_data = '{{$dbdata}}'; $db_type = '{{$dbtype}}'; // an integer. 0 or unset for mysql, 1 for postgres -define( 'UNO', {{$uno}} ); - /* * Notice: Many of the following settings will be available in the admin panel * after a successful site install. Once they are set in the admin panel, they @@ -36,6 +34,14 @@ App::$config['system']['baseurl'] = '{{$siteurl}}'; App::$config['system']['sitename'] = "Hubzilla"; App::$config['system']['location_hash'] = '{{$site_id}}'; +// 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 + +App::$config['system']['server_role'] = '{{$server_role}}'; + + // These lines set additional security headers to be sent with all responses // You may wish to set transport_security_header to 0 if your server already sends // this header. content_security_policy may need to be disabled if you wish to diff --git a/view/fr/htconfig.tpl b/view/fr/htconfig.tpl index d49448ac2..fae8e3f98 100644 --- a/view/fr/htconfig.tpl +++ b/view/fr/htconfig.tpl @@ -12,8 +12,6 @@ $db_pass = '{{$dbpass}}'; $db_data = '{{$dbdata}}'; $db_type = '{{$dbtype}}'; // an integer. 0 or unset for mysql, 1 for postgres -define( 'UNO', {{$uno}} ); - /* * Note: Plusieurs de ces réglages seront disponibles via le panneau d'administration * après l'installation. Lorsque des modifications sont apportés à travers le panneau d'administration @@ -37,6 +35,14 @@ App::$config['system']['baseurl'] = '{{$siteurl}}'; App::$config['system']['sitename'] = "Hubzilla"; App::$config['system']['location_hash'] = '{{$site_id}}'; +// 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 + +App::$config['system']['server_role'] = '{{$server_role}}'; + + // These lines set additional security headers to be sent with all responses // You may wish to set transport_security_header to 0 if your server already sends diff --git a/view/it/htconfig.tpl b/view/it/htconfig.tpl index 802b31b49..ea3f5b5c2 100644 --- a/view/it/htconfig.tpl +++ b/view/it/htconfig.tpl @@ -10,8 +10,6 @@ $db_pass = '{{$dbpass}}'; $db_data = '{{$dbdata}}'; $db_type = '{{$dbtype}}'; // an integer. 0 or unset for mysql, 1 for postgres -define( 'UNO', {{$uno}} ); - /* * Notice: Many of the following settings will be available in the admin panel * after a successful site install. Once they are set in the admin panel, they @@ -36,6 +34,14 @@ App::$config['system']['baseurl'] = '{{$siteurl}}'; App::$config['system']['sitename'] = "Hubzilla"; App::$config['system']['location_hash'] = '{{$site_id}}'; +// 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 + +App::$config['system']['server_role'] = '{{$server_role}}'; + + // These lines set additional security headers to be sent with all responses // You may wish to set transport_security_header to 0 if your server already sends // this header. content_security_policy may need to be disabled if you wish to diff --git a/view/js/acl.js b/view/js/acl.js index 79699c589..b36fa97a1 100644 --- a/view/js/acl.js +++ b/view/js/acl.js @@ -1,15 +1,17 @@ -function ACL(backend_url, preset) { +function ACL(backend_url) { that = this; that.url = backend_url; that.kp_timer = null; - if (preset === undefined) preset = []; - that.allow_cid = (preset[0] || []); - that.allow_gid = (preset[1] || []); - that.deny_cid = (preset[2] || []); - that.deny_gid = (preset[3] || []); + that.self = []; + + that.allow_cid = []; + that.allow_gid = []; + that.deny_cid = []; + that.deny_gid = []; + that.group_uids = []; that.info = $("#acl-info"); @@ -21,11 +23,8 @@ function ACL(backend_url, preset) { that.showlimited = $("#acl-showlimited"); that.acl_select = $("#acl-select"); - that.preset = preset; - that.self = []; - // set the initial ACL lists in case the enclosing form gets submitted before the ajax loader completes. - that.on_submit(); + //that.on_submit(); /*events*/ @@ -47,6 +46,10 @@ function ACL(backend_url, preset) { } }); + $(document).on('focus', '.acl-form', that.get_form_data); + $(document).on('click', '.acl-form', that.get_form_data); + $(document).on('click', '.acl-form-trigger', that.get_form_data); + $(document).on('click','.acl-button-show',that.on_button_show); $(document).on('click','.acl-button-hide',that.on_button_hide); @@ -54,29 +57,44 @@ function ACL(backend_url, preset) { /* startup! */ that.get(0,15000); - that.on_submit(); + //that.on_submit(); }); } -// no longer called only on submit - call to update whenever a change occurs to the acl list. +ACL.prototype.get_form_data = function(event) { + + form_id = $(this).data('form_id'); + that.form_id = $('#' + form_id); + + that.allow_cid = (that.form_id.data('allow_cid') || []); + that.allow_gid = (that.form_id.data('allow_gid') || []); + that.deny_cid = (that.form_id.data('deny_cid') || []); + that.deny_gid = (that.form_id.data('deny_gid') || []); + + that.update_view(); + that.on_submit(); + +} + +// no longer called only on submit - call to update whenever a change occurs to the acl list. ACL.prototype.on_submit = function() { - aclfields = $("#acl-fields").html(""); + + $('.acl-field').remove(); + $(that.allow_gid).each(function(i,v) { - aclfields.append("<input type='hidden' name='group_allow[]' value='"+v+"'>"); + that.form_id.append("<input class='acl-field' type='hidden' name='group_allow[]' value='"+v+"'>"); }); $(that.allow_cid).each(function(i,v) { - aclfields.append("<input type='hidden' name='contact_allow[]' value='"+v+"'>"); + that.form_id.append("<input class='acl-field' type='hidden' name='contact_allow[]' value='"+v+"'>"); }); $(that.deny_gid).each(function(i,v) { - aclfields.append("<input type='hidden' name='group_deny[]' value='"+v+"'>"); + that.form_id.append("<input class='acl-field' type='hidden' name='group_deny[]' value='"+v+"'>"); }); $(that.deny_cid).each(function(i,v) { - aclfields.append("<input type='hidden' name='contact_deny[]' value='"+v+"'>"); + that.form_id.append("<input class='acl-field' type='hidden' name='contact_deny[]' value='"+v+"'>"); }); - //areYouSure jquery plugin: recheck the form here - $('form').trigger('checkform.areYouSure'); }; ACL.prototype.search = function() { @@ -101,6 +119,7 @@ ACL.prototype.on_onlyme = function(event) { that.deny_cid = []; that.deny_gid = []; + that.update_view(event.target.value); that.on_submit(); @@ -126,14 +145,14 @@ ACL.prototype.on_showlimited = function(event) { // preventDefault() isn't called here as we want state changes from update_view() to be applied to the radiobutton event.stopPropagation(); - if(that.preset[0].length === 0 && that.preset[1].length === 0 && that.preset[2].length === 0 && that.preset[3].length === 0) { - that.preset[0] = [that.self[0]]; + if(that.allow_cid.length === 0 && that.allow_gid.length === 0 && that.deny_cid.length === 0 && that.deny_gid.length === 0) { + that.allow_cid = [that.self[0]]; } - that.allow_cid = (that.preset[0] || []); - that.allow_gid = (that.preset[1] || []); - that.deny_cid = (that.preset[2] || []); - that.deny_gid = (that.preset[3] || []); + that.allow_cid = (that.allow_cid || []); + that.allow_gid = (that.allow_gid || []); + that.deny_cid = (that.deny_cid || []); + that.deny_gid = (that.deny_gid || []); that.update_view(event.target.value); that.on_submit(); @@ -239,13 +258,19 @@ ACL.prototype.set_deny = function(itemid) { that.update_view(); }; -ACL.prototype.update_select = function(preset) { - that.showall.prop('selected', preset === 'public'); - that.onlyme.prop('selected', preset === 'onlyme'); - that.showlimited.prop('selected', preset === 'limited'); +ACL.prototype.update_select = function(set) { + that.showall.prop('selected', set === 'public'); + that.onlyme.prop('selected', set === 'onlyme'); + that.showlimited.prop('selected', set === 'limited'); }; ACL.prototype.update_view = function(value) { + if(that.form_id) { + that.form_id.data('allow_cid', that.allow_cid); + that.form_id.data('allow_gid', that.allow_gid); + that.form_id.data('deny_cid', that.deny_cid); + that.form_id.data('deny_gid', that.deny_gid); + } if (that.allow_gid.length === 0 && that.allow_cid.length === 0 && that.deny_gid.length === 0 && that.deny_cid.length === 0) { that.list.hide(); //hide acl-list @@ -259,8 +284,8 @@ ACL.prototype.update_view = function(value) { } // if value != 'onlyme' we should fall through this one - else if (that.allow_gid.length === 0 && that.allow_cid.length === 1 && that.allow_cid[0] === that.self[0] && that.deny_gid.length === 0 && that.deny_cid.length === 0 && value === 'onlyme') { - that.list.hide(); //hide acl-list if + else if (that.allow_gid.length === 0 && that.allow_cid.length === 1 && that.allow_cid[0] === that.self[0] && that.deny_gid.length === 0 && that.deny_cid.length === 0 && value !== 'limited') { + that.list.hide(); //hide acl-list that.info.hide(); //show acl-info that.update_select('onlyme'); @@ -363,5 +388,5 @@ ACL.prototype.populate = function(data) { $(el).attr('src', $(el).data("src")); $(el).removeAttr("data-src"); }); - that.update_view(); + //that.update_view(); }; diff --git a/view/js/main.js b/view/js/main.js index a3fade0ea..21157bdfe 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -1015,8 +1015,6 @@ function filestorage(event, nick, id) { $('#cloud-index-' + last_filestorage_id).removeClass('cloud-index-active'); $('#perms-panel-' + last_filestorage_id).hide().html(''); $('#file-edit-' + id).spin('tiny'); - // What for do we need this here? - delete acl; $.get('filestorage/' + nick + '/' + id + '/edit', function(data) { $('#cloud-index-' + id).addClass('cloud-index-active'); $('#perms-panel-' + id).html(data).show(); diff --git a/view/js/mod_cloud.js b/view/js/mod_cloud.js index e56ec2a81..8b8a3ba3f 100644 --- a/view/js/mod_cloud.js +++ b/view/js/mod_cloud.js @@ -100,13 +100,13 @@ function prepareHtml(f, i) { } function formatSizeUnits(bytes){ - if (bytes>=1000000000) {bytes=(bytes/1000000000).toFixed(2)+' GB';} - else if (bytes>=1000000) {bytes=(bytes/1000000).toFixed(2)+' MB';} - else if (bytes>=1000) {bytes=(bytes/1000).toFixed(2)+' KB';} - else if (bytes>1) {bytes=bytes+' bytes';} - else if (bytes==1) {bytes=bytes+' byte';} - else {bytes='0 byte';} - return bytes; + if (bytes>=1000000000) {bytes=(bytes/1000000000).toFixed(2)+' GB';} + else if (bytes>=1000000) {bytes=(bytes/1000000).toFixed(2)+' MB';} + else if (bytes>=1000) {bytes=(bytes/1000).toFixed(2)+' KB';} + else if (bytes>1) {bytes=bytes+' bytes';} + else if (bytes==1) {bytes=bytes+' byte';} + else {bytes='0 byte';} + return bytes; } // this is basically a js port of include/text.php getIconFromType() function @@ -202,7 +202,7 @@ function UploadFile(file, idx) { }); // POST to the entire cloud path - xhr.open('post', window.location.pathname, true); + xhr.open('post', 'file_upload', true); var formfields = $("#ajax-upload-files").serializeArray(); @@ -210,7 +210,7 @@ function UploadFile(file, idx) { $.each(formfields, function(i, field) { data.append(field.name, field.value); }); - data.append('file', file); + data.append('userfile', file); xhr.send(data); } diff --git a/view/js/mod_filestorage.js b/view/js/mod_filestorage.js index c0620c928..4f58af9d5 100644 --- a/view/js/mod_filestorage.js +++ b/view/js/mod_filestorage.js @@ -1,17 +1,4 @@ /** * JavaScript used by mod/filestorage */ -$(document).ready(function() { - $('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() { - var selstr; - $('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() { - selstr = $(this).text(); - $('#jot-perms-icon').removeClass('fa-unlock').addClass('fa-lock'); - $('#jot-public').hide(); - }); - if(selstr === null) { - $('#jot-perms-icon').removeClass('fa-lock').addClass('fa-unlock'); - $('#jot-public').show(); - } - }).trigger('change'); -});
\ No newline at end of file + diff --git a/view/nb-no/htconfig.tpl b/view/nb-no/htconfig.tpl index 802b31b49..ea3f5b5c2 100644 --- a/view/nb-no/htconfig.tpl +++ b/view/nb-no/htconfig.tpl @@ -10,8 +10,6 @@ $db_pass = '{{$dbpass}}'; $db_data = '{{$dbdata}}'; $db_type = '{{$dbtype}}'; // an integer. 0 or unset for mysql, 1 for postgres -define( 'UNO', {{$uno}} ); - /* * Notice: Many of the following settings will be available in the admin panel * after a successful site install. Once they are set in the admin panel, they @@ -36,6 +34,14 @@ App::$config['system']['baseurl'] = '{{$siteurl}}'; App::$config['system']['sitename'] = "Hubzilla"; App::$config['system']['location_hash'] = '{{$site_id}}'; +// 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 + +App::$config['system']['server_role'] = '{{$server_role}}'; + + // These lines set additional security headers to be sent with all responses // You may wish to set transport_security_header to 0 if your server already sends // this header. content_security_policy may need to be disabled if you wish to diff --git a/view/pt-br/htconfig.tpl b/view/pt-br/htconfig.tpl index 802b31b49..ea3f5b5c2 100644 --- a/view/pt-br/htconfig.tpl +++ b/view/pt-br/htconfig.tpl @@ -10,8 +10,6 @@ $db_pass = '{{$dbpass}}'; $db_data = '{{$dbdata}}'; $db_type = '{{$dbtype}}'; // an integer. 0 or unset for mysql, 1 for postgres -define( 'UNO', {{$uno}} ); - /* * Notice: Many of the following settings will be available in the admin panel * after a successful site install. Once they are set in the admin panel, they @@ -36,6 +34,14 @@ App::$config['system']['baseurl'] = '{{$siteurl}}'; App::$config['system']['sitename'] = "Hubzilla"; App::$config['system']['location_hash'] = '{{$site_id}}'; +// 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 + +App::$config['system']['server_role'] = '{{$server_role}}'; + + // These lines set additional security headers to be sent with all responses // You may wish to set transport_security_header to 0 if your server already sends // this header. content_security_policy may need to be disabled if you wish to diff --git a/view/ru/htconfig.tpl b/view/ru/htconfig.tpl index 5456d12c1..00da08c91 100644 --- a/view/ru/htconfig.tpl +++ b/view/ru/htconfig.tpl @@ -10,8 +10,6 @@ $db_pass = '{{$dbpass}}'; $db_data = '{{$dbdata}}'; $db_type = '{{$dbtype}}'; // an integer. 0 or unset for mysql, 1 for postgres -define( 'UNO', {{$uno}} ); - /* * Notice: Many of the following settings will be available in the admin panel * after a successful site install. Once they are set in the admin panel, they @@ -36,6 +34,13 @@ App::$config['system']['baseurl'] = '{{$siteurl}}'; App::$config['system']['sitename'] = "Hubzilla"; App::$config['system']['location_hash'] = '{{$site_id}}'; +// 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 + +App::$config['system']['server_role'] = '{{$server_role}}'; + // Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED. // Be certain to create your own personal account before setting // REGISTER_CLOSED. 'register_text' (if set) will be displayed prominently on diff --git a/view/sv/htconfig.tpl b/view/sv/htconfig.tpl index 5456d12c1..00da08c91 100644 --- a/view/sv/htconfig.tpl +++ b/view/sv/htconfig.tpl @@ -10,8 +10,6 @@ $db_pass = '{{$dbpass}}'; $db_data = '{{$dbdata}}'; $db_type = '{{$dbtype}}'; // an integer. 0 or unset for mysql, 1 for postgres -define( 'UNO', {{$uno}} ); - /* * Notice: Many of the following settings will be available in the admin panel * after a successful site install. Once they are set in the admin panel, they @@ -36,6 +34,13 @@ App::$config['system']['baseurl'] = '{{$siteurl}}'; App::$config['system']['sitename'] = "Hubzilla"; App::$config['system']['location_hash'] = '{{$site_id}}'; +// 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 + +App::$config['system']['server_role'] = '{{$server_role}}'; + // Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED. // Be certain to create your own personal account before setting // REGISTER_CLOSED. 'register_text' (if set) will be displayed prominently on diff --git a/view/tpl/acl_selector.tpl b/view/tpl/acl_selector.tpl index 60fae0a29..ddeb25a39 100755 --- a/view/tpl/acl_selector.tpl +++ b/view/tpl/acl_selector.tpl @@ -1,3 +1,4 @@ +<form> <div class="modal" id="aclModal"> <div class="modal-dialog"> <div class="modal-content"> @@ -59,14 +60,13 @@ </div><!-- /.modal-content --> </div><!-- /.modal-dialog --> </div><!-- /.modal --> - +</form> <script> $('[data-toggle="popover"]').popover(); // Init the popover, if present if(typeof acl=="undefined"){ acl = new ACL( - baseurl+"/acl", - [ {{$allowcid}},{{$allowgid}},{{$denycid}},{{$denygid}} ] + baseurl+"/acl" ); } </script> diff --git a/view/tpl/attach_edit.tpl b/view/tpl/attach_edit.tpl index 965fb4819..1d58004e5 100644 --- a/view/tpl/attach_edit.tpl +++ b/view/tpl/attach_edit.tpl @@ -1,4 +1,4 @@ -<form action="filestorage/{{$channelnick}}/{{$file.id}}/edit" method="post" > +<form id="attach_edit_form_{{$file.id}}" action="filestorage/{{$channelnick}}/{{$file.id}}/edit" method="post" class="acl-form" data-form_id="attach_edit_form_{{$file.id}}" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'> <input type="hidden" name="channelnick" value="{{$channelnick}}" /> <input type="hidden" name="filehash" value="{{$file.hash}}" /> <input type="hidden" name="uid" value="{{$uid}}" /> @@ -16,15 +16,13 @@ </button> </div> <div id="attach-edit-perms" class="btn-group pull-right"> - <button id="dbtn-acl" class="btn btn-default btn-xs" data-toggle="modal" data-target="#aclModal" title="{{$permset}}" onclick="return false;"> + <button id="dbtn-acl" class="btn btn-default btn-xs" data-toggle="modal" data-target="#aclModal" title="{{$permset}}" type="button"> <i id="jot-perms-icon" class="fa fa-{{$lockstate}} jot-icons"></i> </button> <button id="dbtn-submit" class="btn btn-primary btn-xs" type="submit" name="submit"> {{$submit}} </button> </div> - {{$aclselect}} - <div id="link-code" class="form-group"> <label for="">{{$cpldesc}}</label> <input type="text" class="form-control" id="linkpasteinput" name="cutpasteextlink" value="{{$cloudpath}}" onclick="this.select();"/> diff --git a/view/tpl/chatroom_new.tpl b/view/tpl/chatroom_new.tpl index a40313934..1b7e0501a 100644 --- a/view/tpl/chatroom_new.tpl +++ b/view/tpl/chatroom_new.tpl @@ -1,12 +1,12 @@ <div id="chatroom-new" class="section-content-tools-wrapper"> - <form action="chat" method="post" > + <form id="chatroom-new-form" action="chat" method="post" class="acl-form" data-form_id="chatroom-new-form" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'> {{include file="field_input.tpl" field=$name}} {{include file="field_input.tpl" field=$chat_expire}} - {{$acl}} <div class="btn-group pull-right"> <button id="dbtn-acl" class="btn btn-default" data-toggle="modal" data-target="#aclModal" title="{{$permissions}}" onclick="return false;" ><i id="jot-perms-icon" class="fa fa-{{$lockstate}}"></i></button> - <button id="dbtn-submit" class="btn btn-primary" type="submit" name="submit" value="{{$submit}}">{{$submit}}</button> + <button id="dbtn-submit" class="acl-submit btn btn-primary" type="submit" name="submit" value="{{$submit}}" data-formid="chatroom-new-form">{{$submit}}</button> </div> <div class="clear"></div> </form> </div> +{{$acl}} diff --git a/view/tpl/chatrooms.tpl b/view/tpl/chatrooms.tpl index 04ebbcae4..64f6e8d0f 100644 --- a/view/tpl/chatrooms.tpl +++ b/view/tpl/chatrooms.tpl @@ -1,7 +1,7 @@ <div class="generic-content-wrapper"> <div class="section-title-wrapper"> {{if $is_owner}} - <button type="button" class="btn btn-success btn-xs pull-right" onclick="openClose('chatroom-new');"><i class="fa fa-plus-circle"></i> {{$newroom}}</button> + <button type="button" class="btn btn-success btn-xs pull-right acl-form-trigger" onclick="openClose('chatroom-new');" data-form_id="chatroom-new-form"><i class="fa fa-plus-circle"></i> {{$newroom}}</button> {{/if}} <h2>{{$header}}</h2> </div> diff --git a/view/tpl/cloud_actionspanel.tpl b/view/tpl/cloud_actionspanel.tpl index eaa613dc4..d27b3f42d 100644 --- a/view/tpl/cloud_actionspanel.tpl +++ b/view/tpl/cloud_actionspanel.tpl @@ -1,20 +1,31 @@ <div id="files-mkdir-tools" class="section-content-tools-wrapper"> - <label for="files-mkdir">{{$folder_header}}</label> - <form method="post" action=""> - <input type="hidden" name="sabreAction" value="mkcol"> - <input id="files-mkdir" type="text" name="name" class="form-control form-group"> - <button class="btn btn-primary btn-sm pull-right" type="submit" value="{{$folder_submit}}">{{$folder_submit}}</button> - </form> - <div class="clear"></div> + <label for="files-mkdir">{{$folder_header}}</label> + <form method="post" action=""> + <input type="hidden" name="sabreAction" value="mkcol"> + <input id="files-mkdir" type="text" name="name" class="form-control form-group"> + <button class="btn btn-primary btn-sm pull-right" type="submit" value="{{$folder_submit}}">{{$folder_submit}}</button> + </form> + <div class="clear"></div> </div> <div id="files-upload-tools" class="section-content-tools-wrapper"> - {{if $quota.limit || $quota.used}}<div class="{{if $quota.warning}}section-content-danger-wrapper{{else}}section-content-info-wrapper{{/if}}">{{if $quota.warning}}<strong>{{$quota.warning}} </strong>{{/if}}{{$quota.desc}}</div>{{/if}} - <form id="ajax-upload-files" method="post" action="" enctype="multipart/form-data"> - <input type="hidden" name="sabreAction" value="put"> - <label for="files-upload">{{$upload_header}}</label> - <div class="clear"></div> - <input class="form-group pull-left" id="files-upload" type="file" name="file"> - <button id="upload-submit" class="btn btn-primary btn-sm pull-right" type="submit" value="{{$upload_submit}}">{{$upload_submit}}</button> - </form> - <div class="clear"></div> + {{if $quota.limit || $quota.used}}<div class="{{if $quota.warning}}section-content-danger-wrapper{{else}}section-content-info-wrapper{{/if}}">{{if $quota.warning}}<strong>{{$quota.warning}} </strong>{{/if}}{{$quota.desc}}</div>{{/if}} + <form id="ajax-upload-files" method="post" action="file_upload" enctype="multipart/form-data" class="acl-form" data-form_id="ajax-upload-files" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'> + <input type="hidden" name="directory" value="{{$path}}" /> + <input type="hidden" name="channick" value="{{$channick}}" /> + <input type="hidden" name="return_url" value="{{$return_url}}" /> + <label for="files-upload">{{$upload_header}}</label> + <input class="form-group pull-left" id="files-upload" type="file" name="userfile"> + <div class="pull-right btn-group"> + <div class="btn-group"> + {{if $lockstate}} + <button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;"> + <i id="jot-perms-icon" class="fa fa-{{$lockstate}}"></i> + </button> + {{/if}} + <button id="upload-submit" class="btn btn-primary btn-sm pull-right" type="submit" name="submit" value="{{$upload_submit}}">{{$upload_submit}}</button> + </div> + </div> + </form> + <div class="clear"></div> </div> +{{$aclselect}} diff --git a/view/tpl/comment_item.tpl b/view/tpl/comment_item.tpl index 1d8bd671d..74917d089 100755 --- a/view/tpl/comment_item.tpl +++ b/view/tpl/comment_item.tpl @@ -10,7 +10,7 @@ <input type="hidden" name="return" value="{{$return_path}}" /> <input type="hidden" name="jsreload" value="{{$jsreload}}" /> <input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" /> - <textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpenUI(this,{{$id}});" onBlur="commentCloseUI(this,{{$id}});" >{{$comment}}</textarea> + <textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpenUI(this,{{$id}});" onBlur="commentCloseUI(this,{{$id}});" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >{{$comment}}</textarea> {{if $qcomment}} <select id="qcomment-select-{{$id}}" name="qcomment-{{$id}}" class="qcomment" onchange="qCommentInsert(this,{{$id}});" > <option value=""></option> diff --git a/view/tpl/diaspora_vcard.tpl b/view/tpl/diaspora_vcard.tpl index 3812823da..017eb555c 100644 --- a/view/tpl/diaspora_vcard.tpl +++ b/view/tpl/diaspora_vcard.tpl @@ -8,7 +8,7 @@ <dl class='entity_nickname'> <dt>Nickname</dt> <dd> - <a class="nickname p-nickname">{{$diaspora.nickname}}</a> + <span class="nickname p-nickname">{{$diaspora.nickname}}</span> </dd> </dl> <dl class='entity_full_name'> @@ -33,25 +33,25 @@ <dl class="entity_url"> <dt>URL</dt> <dd> - <a href="{{$diaspora.podloc}}/" id="pod_location" >{{$diaspora.podloc}}/</a> + <a href="{{$diaspora.podloc}}/" id="pod_location" class="url" rel="me" >{{$diaspora.podloc}}/</a> </dd> </dl> <dl class="entity_photo"> <dt>Photo</dt> <dd> - <img class="photo u-photo avatar" height="300" width="300" src="{{$diaspora.photo300}}"> + <img class="photo u-photo avatar" height="300" width="300" src="{{$diaspora.photo300}}" /> </dd> </dl> <dl class="entity_photo_medium"> <dt>Photo</dt> <dd> - <img class="photo u-photo avatar" height="100" width="100" src="{{$diaspora.photo100}}"> + <img class="photo u-photo avatar" height="100" width="100" src="{{$diaspora.photo100}}" /> </dd> </dl> <dl class="entity_photo_small"> <dt>Photo</dt> <dd> - <img class="photo u-photo avatar" height="50" width="50" src="{{$diaspora.photo50}}"> + <img class="photo u-photo avatar" height="50" width="50" src="{{$diaspora.photo50}}" /> </dd> </dl> <dl class="entity_searchable"> @@ -60,4 +60,10 @@ <span class="searchable">{{$diaspora.searchable}}</span> </dd> </dl> + <dl class="entity_key"> + <dt>Key</dt> + <dd> + <pre class="key">{{$diaspora.pubkey}}</pre> + </dd> + </dl> </div> diff --git a/view/tpl/event_form.tpl b/view/tpl/event_form.tpl index fbeec9aa3..a2bb1f112 100755 --- a/view/tpl/event_form.tpl +++ b/view/tpl/event_form.tpl @@ -1,4 +1,4 @@ -<form id="event-edit-form" action="{{$post}}" method="post" > +<form id="event-edit-form" action="{{$post}}" method="post" class="acl-form" data-form_id="event-edit-form" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'> <input type="hidden" name="event_id" value="{{$eid}}" /> <input type="hidden" name="event_hash" value="{{$event_hash}}" /> @@ -107,7 +107,6 @@ {{if ! $eid}} {{include file="field_checkbox.tpl" field=$share}} - {{$acl}} {{/if}} <div class="clear"></div> @@ -116,8 +115,12 @@ <div class="btn-group pull-right"> <button id="event-edit-preview-btn" class="btn btn-default" type="button" title="{{$preview}}" onclick="doEventPreview();"><i class="fa fa-eye" ></i></button> {{if ! $eid}} - <button id="dbtn-acl" class="btn btn-default" type="button" data-toggle="modal" data-target="#aclModal" title="{{$permissions}}"><i id="jot-perms-icon" class="fa"></i></button> + <button id="dbtn-acl" class="btn btn-default" type="button" data-toggle="modal" data-target="#aclModal" title="{{$perms_label}}"><i id="jot-perms-icon" class="fa"></i></button> {{/if}} <button id="event-submit" class="btn btn-primary" type="submit" name="submit">{{$submit}}</button> </div> </form> + +{{if ! $eid}} + {{$acl}} +{{/if}} diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl index c0d524764..9de049b58 100755 --- a/view/tpl/jot-header.tpl +++ b/view/tpl/jot-header.tpl @@ -268,17 +268,32 @@ function enableOnUser(){ function linkdrop(event) { var reply = event.dataTransfer.getData("text/uri-list"); - event.target.textContent = reply; event.preventDefault(); + var editwin = '#' + event.target.id; + var commentwin = false; + if(editwin) { + commentwin = ((editwin.indexOf('comment') >= 0) ? true : false); + if(commentwin) { + var commentid = editwin.substring(editwin.lastIndexOf('-') + 1); + commentOpen(document.getElementById(event.target.id),commentid); + } + } + if(reply && reply.length) { reply = bin2hex(reply); $('#profile-rotator').spin('tiny'); $.get('{{$baseurl}}/linkinfo?f=&binurl=' + reply, function(data) { - if (!editor) $("#profile-jot-text").val(""); - initEditor(function(){ + if(commentwin) { + $(editwin).val( $(editwin).val() + data ); + $('#profile-rotator').spin(false); + } + else { + if (!editor) $("#profile-jot-text").val(""); + initEditor(function(){ addeditortext(data); $('#profile-rotator').spin(false); - }); + }); + } }); } } @@ -489,6 +504,7 @@ function enableOnUser(){ // cancel event and hover styling DragDropUploadFileHover(e); + // fetch FileList object var files = e.target.files || e.originalEvent.dataTransfer.files; // process all File objects diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index 490349a04..692cf129d 100755 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -1,4 +1,4 @@ -<form id="profile-jot-form" action="{{$action}}" method="post"> +<form id="profile-jot-form" action="{{$action}}" method="post" class="acl-form" data-form_id="profile-jot-form" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'> {{$mimeselect}} {{$layoutselect}} {{if $id_select}} @@ -23,7 +23,6 @@ <input type="hidden" name="webpage" value="{{$webpage}}" /> <input type="hidden" name="preview" id="jot-preview" value="0" /> <input type="hidden" id="jot-consensus" name="consensus" value="{{if $consensus}}{{$consensus}}{{else}}0{{/if}}" /> - {{if $showacl}}{{$acl}}{{/if}} {{if $webpage}} <div id="jot-pagetitle-wrap" class="jothidden"> @@ -39,7 +38,7 @@ </div> {{/if}} <div id="jot-text-wrap"> - <textarea class="profile-jot-text" id="profile-jot-text" name="body" tabindex=2 placeholder="{{$share}}">{{$content}}</textarea> + <textarea class="profile-jot-text" id="profile-jot-text" name="body" tabindex=2 placeholder="{{$share}}" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >{{$content}}</textarea> </div> {{if $attachment}} <div id="jot-attachment-wrap"> @@ -166,11 +165,11 @@ </button> {{/if}} {{if $showacl}} - <button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" title="{{$permset}}" onclick="return false;"> + <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"> <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="btn btn-primary btn-sm" type="submit" tabindex=3 name="button-submit" >{{$share}}</button> + <button id="dbtn-submit" class="acl-submit btn btn-primary btn-sm" type="submit" tabindex=3 name="button-submit">{{$share}}</button> </div> <div id="profile-jot-perms-end"></div> <div id="profile-jot-plugin-wrapper"> @@ -184,6 +183,8 @@ <div id="jot-preview-content" style="display:none;"></div> +{{if $showacl}}{{$acl}}{{/if}} + {{if $feature_expire}} <!-- Modal for item expiry--> <div class="modal" id="expiryModal" tabindex="-1" role="dialog" aria-labelledby="expiryModalLabel" aria-hidden="true"> diff --git a/view/tpl/mitemedit.tpl b/view/tpl/mitemedit.tpl index 865c587ec..a06203244 100644 --- a/view/tpl/mitemedit.tpl +++ b/view/tpl/mitemedit.tpl @@ -5,7 +5,7 @@ </div> {{/if}} <div id="menu-element-creator" class="section-content-tools-wrapper" style="display: {{$display}};"> - <form id="mitemedit" action="mitem/{{$menu_id}}{{if $mitem_id}}/{{$mitem_id}}{{/if}}{{if $sys}}?f=&sys=1{{/if}}" method="post" > + <form id="mitemedit" action="mitem/{{$menu_id}}{{if $mitem_id}}/{{$mitem_id}}{{/if}}{{if $sys}}?f=&sys=1{{/if}}" method="post" class="acl-form" data-form_id="mitemedit" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'> <input type="hidden" name="menu_id" value="{{$menu_id}}" /> {{if $mitem_id}} <input type="hidden" name="mitem_id" value="{{$mitem_id}}" /> @@ -32,10 +32,10 @@ {{/if}} <button class="btn btn-primary btn-sm" type="submit" name="submit" value="{{$submit}}">{{$submit}}</button> </div> - {{$aclselect}} </div> <div class="clear"></div> </form> + {{$aclselect}} </div> {{if $header}} </div> diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl index 76259a8be..ec827d990 100755 --- a/view/tpl/photo_view.tpl +++ b/view/tpl/photo_view.tpl @@ -23,7 +23,7 @@ {{/if}} {{if $edit}} <li class="nav-item"> - <a class="nav-link" href="#" title="" onclick="openClose('photo-edit'); return false;"><i class="fa fa-pencil"></i> {{$edit.edit}}</a> + <a class="nav-link acl-form-trigger" href="#" title="" onclick="openClose('photo-edit'); return false;" data-form_id="photo_edit_form"><i class="fa fa-pencil"></i> {{$edit.edit}}</a> </li> {{/if}} </ul> @@ -53,7 +53,7 @@ {{$map}} </div> <div id="photo-edit" class="section-content-tools-wrapper"> - <form action="photos/{{$edit.nickname}}/{{$edit.resource_id}}" method="post" id="photo_edit_form"> + <form action="photos/{{$edit.nickname}}/{{$edit.resource_id}}" method="post" id="photo_edit_form" class="acl-form" data-form_id="photo_edit_form" data-allow_cid='{{$edit.allow_cid}}' data-allow_gid='{{$edit.allow_gid}}' data-deny_cid='{{$edit.deny_cid}}' data-deny_gid='{{$edit.deny_gid}}'> <input type="hidden" name="item_id" value="{{$edit.item_id}}" /> {{* album renaming is not supported atm. <div class="form-group"> @@ -88,8 +88,6 @@ </div> {{/if}} - {{$edit.aclselect}} - <div class="form-group pull-left"> <button class="btn btn-danger btn-sm" id="photo-edit-delete-button" type="submit" name="delete" value="{{$edit.delete}}" onclick="return confirmDelete();" />{{$edit.delete}}</button> </div> @@ -102,6 +100,7 @@ <button id="dbtn-submit" class="btn btn-primary btn-sm" type="submit" name="submit" >{{$edit.submit}}</button> </div> </form> + {{$edit.aclselect}} <div id="photo-edit-end" class="clear"></div> </div> <div id="photo-view-wrapper"> diff --git a/view/tpl/photos_recent.tpl b/view/tpl/photos_recent.tpl index 139f27a23..4cb1bc306 100755 --- a/view/tpl/photos_recent.tpl +++ b/view/tpl/photos_recent.tpl @@ -2,7 +2,7 @@ <div class="section-title-wrapper"> <div class="pull-right"> {{if $can_post}} - <button class="btn btn-xs btn-success" title="{{$usage}}" onclick="openClose('photo-upload-form');"><i class="fa fa-arrow-circle-o-up"></i> {{$upload.0}}</button> + <button class="btn btn-xs btn-success acl-form-trigger" title="{{$usage}}" onclick="openClose('photo-upload-form');" data-form_id="photos-upload-form"><i class="fa fa-arrow-circle-o-up"></i> {{$upload.0}}</button> {{/if}} <button id="fullscreen-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen();"><i class="fa fa-expand"></i></button> <button id="inline-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen(false);"><i class="fa fa-compress"></i></button> diff --git a/view/tpl/photos_upload.tpl b/view/tpl/photos_upload.tpl index 6b98a8ac4..90cd0e84a 100755 --- a/view/tpl/photos_upload.tpl +++ b/view/tpl/photos_upload.tpl @@ -1,6 +1,6 @@ <div id="photo-upload-form"> <div class="section-content-tools-wrapper"> - <form action="photos/{{$nickname}}" enctype="multipart/form-data" method="post" name="photos-upload-form" id="photos-upload-form"> + <form action="photos/{{$nickname}}" enctype="multipart/form-data" method="post" name="photos-upload-form" id="photos-upload-form" class="acl-form" data-form_id="photos-upload-form" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'> <input type="hidden" id="photos-upload-source" name="source" value="photos" /> <div class="form-group"> @@ -14,9 +14,6 @@ {{/foreach}} </datalist> </div> - - {{$aclselect}} - {{if $default}} <div class="form-group"> <input id="photos-upload-choose" type="file" name="userfile" /> @@ -59,5 +56,6 @@ {{/if}} </form> </div> + {{$aclselect}} <div id="photos-upload-end" class="clear"></div> </div> diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl index 8157196ac..0ec44e9ff 100755 --- a/view/tpl/settings.tpl +++ b/view/tpl/settings.tpl @@ -5,7 +5,7 @@ <div class="clear"></div> </div> {{$nickname_block}} - <form action="settings" id="settings-form" method="post" autocomplete="off" > + <form action="settings" id="settings-form" method="post" autocomplete="off" class="acl-form" data-form_id="settings-form" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'> <input type='hidden' name='form_security_token' value='{{$form_security_token}}' /> <div class="panel-group" id="settings" role="tablist" aria-multiselectable="true"> <div class="panel"> @@ -72,7 +72,6 @@ {{/if}} <div id="settings-default-perms" class="form-group" > <button type="button" class="btn btn-default" data-toggle="modal" data-target="#aclModal"><i id="jot-perms-icon" class="fa"></i> {{$permissions}}</button> - {{$aclselect}} </div> {{$group_select}} {{include file="field_checkbox.tpl" field=$hide_presence}} @@ -174,4 +173,5 @@ </div> </div> </form> + {{$aclselect}} </div> diff --git a/view/tpl/thing_edit.tpl b/view/tpl/thing_edit.tpl index 356693782..b23584fe1 100644 --- a/view/tpl/thing_edit.tpl +++ b/view/tpl/thing_edit.tpl @@ -1,5 +1,5 @@ <h2>{{$thing_hdr}}</h2> -<form action="thing" method="post" > +<form id="thing-edit-form" action="thing" method="post" class="acl-form" data-form_id="thing-edit-form" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'> <input type="hidden" name="term_hash" value="{{$thing_hash}}" /> {{if $multiprof }} @@ -29,8 +29,6 @@ <div class="thing-end"></div> -{{$aclselect}} - {{if $lockstate}} <button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;"> <i id="jot-perms-icon" class="fa fa-{{$lockstate}}"></i> @@ -40,3 +38,4 @@ <input type="submit" class="thing-submit" name="submit" value="{{$submit}}" /> </form> +{{$aclselect}} diff --git a/view/tpl/thing_input.tpl b/view/tpl/thing_input.tpl index 75497e878..3e178925c 100644 --- a/view/tpl/thing_input.tpl +++ b/view/tpl/thing_input.tpl @@ -1,5 +1,5 @@ <h2>{{$thing_hdr}}</h2> -<form action="thing" method="post" > +<form id="thing-new-form" action="thing" method="post" class="acl-form" data-form_id="thing-new-form" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'> {{if $multiprof }} <div class="thing-profile-label">{{$profile_lbl}}</div> @@ -29,8 +29,6 @@ <div class="thing-end"></div> -{{$aclselect}} - {{if $lockstate}} <button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;"> <i id="jot-perms-icon" class="fa fa-{{$lockstate}}"></i> @@ -40,3 +38,4 @@ <input type="submit" class="thing-submit" name="submit" value="{{$submit}}" /> </form> +{{$aclselect}} diff --git a/view/tpl/webpagelist.tpl b/view/tpl/webpagelist.tpl index 524460408..4dec7518f 100644 --- a/view/tpl/webpagelist.tpl +++ b/view/tpl/webpagelist.tpl @@ -2,7 +2,7 @@ <div class="section-title-wrapper"> {{if $editor}} <div class="pull-right"> - <button id="webpage-create-btn" class="btn btn-xs btn-success" onclick="openClose('webpage-editor');"><i class="fa fa-pencil-square-o"></i> {{$create}}</button> + <button id="webpage-create-btn" class="btn btn-xs btn-success acl-form-trigger" onclick="openClose('webpage-editor');" data-form_id="profile-jot-form"><i class="fa fa-pencil-square-o"></i> {{$create}}</button> </div> {{/if}} <h2>{{$listtitle}}</h2> diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl index d9a4f8be3..c05b33a61 100644 --- a/view/tpl/wiki.tpl +++ b/view/tpl/wiki.tpl @@ -15,7 +15,7 @@ <div class="section-title-wrapper"> <div class="pull-right"> {{if $showNewWikiButton}} - <button class="btn btn-primary btn-xs" onclick="$('#new-page-form-wrapper').hide(); openClose('new-wiki-form-wrapper');">New Wiki</button> + <button class="btn btn-primary btn-xs acl-form-trigger" onclick="$('#new-page-form-wrapper').hide(); openClose('new-wiki-form-wrapper');" data-form_id="new-wiki-form">New Wiki</button> {{/if}} {{if $showNewPageButton}} <button class="btn btn-success btn-xs" onclick="$('#new-wiki-form-wrapper').hide(); openClose('new-page-form-wrapper');">New Page</button> @@ -29,7 +29,7 @@ <div class="clear"></div> </div> <div id="new-wiki-form-wrapper" class="section-content-tools-wrapper" style="display:none;"> - <form id="new-wiki-form" action="wiki/{{$channel}}/create/wiki" method="post" > + <form id="new-wiki-form" action="wiki/{{$channel}}/create/wiki" method="post" class="acl-form" data-form_id="new-wiki-form" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'> <div class="clear"></div> {{include file="field_input.tpl" field=$wikiName}} @@ -45,17 +45,17 @@ </div> <div class="btn-group pull-right"> - <div id="profile-jot-submit-right" class="btn-group" style="margin-right: 20px;"> + <div id="profile-jot-submit-right" class="btn-group"> <button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" title="Permission settings" onclick="return false;"> - <i id="jot-perms-icon" class="fa fa-{{$lockstate}} jot-icons">{{$bang}}</i> + <i id="jot-perms-icon" class="fa fa-{{$lockstate}} jot-icons"></i>{{$bang}} </button> + <button id="new-wiki-submit" class="btn btn-primary" type="submit" name="submit" >Create Wiki</button> </div> - <button id="new-wiki-submit" class="btn btn-primary" type="submit" name="submit" >Create Wiki</button> </div> - <div>{{$acl}}</div> </form> - <div class="clear"></div> - <hr> + {{$acl}} + <div class="clear"></div> + <hr> </div> <div id="new-page-form-wrapper" class="section-content-tools-wrapper" style="display:none;"> |