From 5ed4ed2246233d7e5c0a1136824a94e864420911 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Sun, 23 Jul 2017 19:54:32 -0700 Subject: [PATCH 001/441] suppress fopen errors from dav --- Zotlabs/Storage/File.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Zotlabs/Storage/File.php b/Zotlabs/Storage/File.php index 1475241ab..7a102134f 100644 --- a/Zotlabs/Storage/File.php +++ b/Zotlabs/Storage/File.php @@ -265,7 +265,7 @@ class File extends DAV\Node implements DAV\IFile { $f = 'store/' . $this->auth->owner_nick . '/' . (($this->os_path) ? $this->os_path . '/' : '') . $x; else $f = $x; - return fopen($f, 'rb'); + return @fopen($f, 'rb'); } return dbunescbin($r[0]['content']); } From 6a7fa6bf5414a89c27f4f7d8da1ad8bb33d7c5a1 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Mon, 24 Jul 2017 20:23:00 -0700 Subject: [PATCH 002/441] provide a keychange operation to rebase an identity on a new keypair --- Zotlabs/Daemon/Notifier.php | 25 +++- Zotlabs/Zot/IHandler.php | 2 + Zotlabs/Zot/Receiver.php | 4 + Zotlabs/Zot/ZotHandler.php | 4 + include/channel.php | 99 ++++++++++++++++ include/xchan.php | 229 ++++++++++++++++++++++++++++++++++++ include/zot.php | 44 +++++++ 7 files changed, 405 insertions(+), 2 deletions(-) diff --git a/Zotlabs/Daemon/Notifier.php b/Zotlabs/Daemon/Notifier.php index 20dd96ddd..f64e6748c 100644 --- a/Zotlabs/Daemon/Notifier.php +++ b/Zotlabs/Daemon/Notifier.php @@ -67,6 +67,7 @@ require_once('include/bbcode.php'); * location channel_id * request channel_id xchan_hash message_id * rating xlink_id + * keychange channel_id * */ @@ -144,6 +145,20 @@ class Notifier { $packet_type = 'request'; $normal_mode = false; } + elseif($cmd === 'keychange') { + $channel = channelx_by_n($item_id); + $r = q("select abook_xchan from abook where abook_channel = %d", + intval($item_id) + ); + if($r) { + foreach($r as $rr) { + $recipients[] = $rr['abook_xchan']; + } + } + $private = false; + $packet_type = 'keychange'; + $normal_mode = false; + } elseif($cmd == 'permission_update' || $cmd == 'permission_create') { // Get the (single) recipient $r = q("select * from abook left join xchan on abook_xchan = xchan_hash where abook_id = %d and abook_self = 0", @@ -570,12 +585,17 @@ class Notifier { } - $hash = random_string(); + $hash = random_string(); $packet = null; + $pmsg = ''; if($packet_type === 'refresh' || $packet_type === 'purge') { $packet = zot_build_packet($channel,$packet_type,(($packet_recips) ? $packet_recips : null)); } + if($packet_type === 'keychange') { + $packet = zot_build_packet($channel,$packet_type,(($packet_recips) ? $packet_recips : null)); + $pmsg = get_pconfig($channel['channel_id'],'system','keychange'); + } elseif($packet_type === 'request') { $env = (($hub_env && $hub_env[$hub['hubloc_host'] . $hub['hubloc_sitekey']]) ? $hub_env[$hub['hubloc_host'] . $hub['hubloc_sitekey']] : ''); $packet = zot_build_packet($channel,$packet_type,$env,$hub['hubloc_sitekey'],$hub['site_crypto'], @@ -589,7 +609,8 @@ class Notifier { 'account_id' => $channel['channel_account_id'], 'channel_id' => $channel['channel_id'], 'posturl' => $hub['hubloc_callback'], - 'notify' => $packet + 'notify' => $packet, + 'msg' => (($pmsg) ? json_encode($pmsg) : '') )); } else { diff --git a/Zotlabs/Zot/IHandler.php b/Zotlabs/Zot/IHandler.php index eeca1555c..dd82f5be6 100644 --- a/Zotlabs/Zot/IHandler.php +++ b/Zotlabs/Zot/IHandler.php @@ -12,6 +12,8 @@ interface IHandler { function Request($data); + function Rekey($sender,$data); + function AuthCheck($data,$encrypted); function Purge($sender,$recipients); diff --git a/Zotlabs/Zot/Receiver.php b/Zotlabs/Zot/Receiver.php index 0050a2559..c521c9d64 100644 --- a/Zotlabs/Zot/Receiver.php +++ b/Zotlabs/Zot/Receiver.php @@ -120,6 +120,10 @@ class Receiver { $this->handler->Notify($this->data); break; + case 'rekey': + $this->handler->Rekey($this->sender, $this->data); + break; + default: $this->response['message'] = 'Not implemented'; json_return_and_die($this->response); diff --git a/Zotlabs/Zot/ZotHandler.php b/Zotlabs/Zot/ZotHandler.php index aab336545..ab8815b3d 100644 --- a/Zotlabs/Zot/ZotHandler.php +++ b/Zotlabs/Zot/ZotHandler.php @@ -20,6 +20,10 @@ class ZotHandler implements IHandler { zot_reply_message_request($data); } + function Rekey($sender,$data) { + zot_rekey_request($sender,$data); + } + function AuthCheck($data,$encrypted) { zot_reply_auth_check($data,$encrypted); } diff --git a/include/channel.php b/include/channel.php index 49da57fd6..23ceb1414 100644 --- a/include/channel.php +++ b/include/channel.php @@ -454,6 +454,105 @@ function create_identity($arr) { return $ret; } + +function change_channel_keys($channel) { + + $ret = array('success' => false); + + $stored = []; + + $key = new_keypair(4096); + + $sig = base64url_encode(rsa_sign($channel['channel_guid'],$key['prvkey'])); + $hash = make_xchan_hash($channel['channel_guid'],$sig); + + $stored['old_guid'] = $channel['channel_guid']; + $stored['old_guid_sig'] = $channel['channel_guid_sig']; + $stored['old_key'] = $channel['channel_pubkey']; + $stored['old_hash'] = $channel['channel_hash']; + + $stored['new_key'] = $key['pubkey']; + $stored['new_sig'] = base64url_encode(rsa_sign($key['pubkey'],$channel['channel_prvkey'])); + + // Save this info for the notifier to collect + + set_pconfig($channel['channel_id'],'system','keychange',$stored); + + $r = q("update channel set channel_prvkey = '%s', channel_pubkey = '%s', channel_guid_sig = '%s', channel_hash = '%s' where channel_id = %d", + dbesc($key['prvkey']), + dbesc($key['pubkey']), + dbesc($sig), + dbesc($hash), + intval($channel['channel_id']) + ); + if(! $r) { + return $ret; + } + $r = q("select * from channel where channel_id = %d", + intval($channel['channel_id']) + ); + + if(! $r) { + $ret['message'] = t('Unable to retrieve modified identity'); + return $ret; + } + + $modified = $r[0]; + + $h = q("select * from hubloc where hubloc_hash = '%s' and hubloc_url = '%s' ", + dbesc($stored['old_hash']), + dbesc(z_root()) + ); + + if($h) { + foreach($h as $hv) { + $hv['hubloc_guid_sig'] = $sig; + $hv['hubloc_hash'] = $hash; + $hv['hubloc_url_sig'] = base64url_encode(rsa_sign(z_root(),$modifed['channel_prvkey'])); + hubloc_store_lowlevel($hv); + } + } + + $x = q("select * from xchan where xchan_hash = '%s' ", + dbesc($stored['old_hash']) + ); + + $check = q("select * from xchan where xchan_hash = '%s'", + dbesc($hash) + ); + + if(($x) && (! $check)) { + $oldxchan = $x[0]; + foreach($x as $xv) { + $xv['xchan_guid_sig'] = $sig; + $xv['xchan_hash'] = $hash; + $xv['xchan_pubkey'] = $key['pubkey']; + xchan_store_lowlevel($xv); + $newxchan = $xv; + } + } + + $a = q("select * from abook where abook_xchan = '%s' and abook_self = 1", + dbesc($stored['old_hash']) + ); + + if($a) { + q("update abook set abook_xchan = '%s' where abook_id = %d", + dbesc($hash), + intval($a[0]['abook_id']) + ); + } + + xchan_change_key($oldxchan,$newxchan,$stored); + + Zotlabs\Daemon\Master::Summon(array('Notifier', 'keychange', $channel['channel_id'])); + + $ret['success'] = true; + return $ret; +} + + + /** * @brief Set default channel to be used on login. * diff --git a/include/xchan.php b/include/xchan.php index 12eb674fa..dba0b8b88 100644 --- a/include/xchan.php +++ b/include/xchan.php @@ -137,3 +137,232 @@ function xchan_fetch($arr) { } +function xchan_change_key($oldx,$newx,$data) { + + $r = q("update abook set abook_xchan = '%s' where abook_xchan = '%s'", + dbsec($newx['xchan_hash']), + dbesc($oldx['xchan_hash']) + ); + + $r = q("update abconfig set xchan = '%s' where xchan = '%s'", + dbsec($newx['xchan_hash']), + dbesc($oldx['xchan_hash']) + ); + + $r = q("update group_member set xchan = '%s' where xchan = '%s'", + dbsec($newx['xchan_hash']), + dbesc($oldx['xchan_hash']) + ); + + $r = q("update chat set chat_xchan = '%s' where chat_xchan = '%s'", + dbsec($newx['xchan_hash']), + dbesc($oldx['xchan_hash']) + ); + + $r = q("update chatpresence set cp_xchan = '%s' where cp_xchan = '%s'", + dbsec($newx['xchan_hash']), + dbesc($oldx['xchan_hash']) + ); + + $r = q("update event set event_xchan = '%s' where event_xchan = '%s'", + dbsec($newx['xchan_hash']), + dbesc($oldx['xchan_hash']) + ); + + $r = q("update item set owner_xchan = '%s' where owner_xchan = '%s'", + dbsec($newx['xchan_hash']), + dbesc($oldx['xchan_hash']) + ); + + $r = q("update item set author_xchan = '%s' where author_xchan = '%s'", + dbsec($newx['xchan_hash']), + dbesc($oldx['xchan_hash']) + ); + + $r = q("update item set source_xchan = '%s' where source_xchan = '%s'", + dbsec($newx['xchan_hash']), + dbesc($oldx['xchan_hash']) + ); + + $r = q("update mail set from_xchan = '%s' where from_xchan = '%s'", + dbsec($newx['xchan_hash']), + dbesc($oldx['xchan_hash']) + ); + + $r = q("update mail set to_xchan = '%s' where to_xchan = '%s'", + dbsec($newx['xchan_hash']), + dbesc($oldx['xchan_hash']) + ); + + $r = q("update shares set share_xchan = '%s' where share_xchan = '%s'", + dbsec($newx['xchan_hash']), + dbesc($oldx['xchan_hash']) + ); + + $r = q("update source set src_channel_xchan = '%s' where src_channel_xchan = '%s'", + dbsec($newx['xchan_hash']), + dbesc($oldx['xchan_hash']) + ); + + $r = q("update source set src_xchan = '%s' where src_xchan = '%s'", + dbsec($newx['xchan_hash']), + dbesc($oldx['xchan_hash']) + ); + + $r = q("update xchat set xchat_xchan = '%s' where xchat_xchan = '%s'", + dbsec($newx['xchan_hash']), + dbesc($oldx['xchan_hash']) + ); + + $r = q("update xconfig set xchan = '%s' where xchan = '%s'", + dbsec($newx['xchan_hash']), + dbesc($oldx['xchan_hash']) + ); + + $r = q("update xign set xchan = '%s' where xchan = '%s'", + dbsec($newx['xchan_hash']), + dbesc($oldx['xchan_hash']) + ); + + $r = q("update xlink set xlink_xchan = '%s' where xlink_xchan = '%s'", + dbsec($newx['xchan_hash']), + dbesc($oldx['xchan_hash']) + ); + + $r = q("update xprof set xprof_hash = '%s' where xprof_hash = '%s'", + dbsec($newx['xchan_hash']), + dbesc($oldx['xchan_hash']) + ); + + $r = q("update xtag set xtag_hash = '%s' where xtag_hash = '%s'", + dbsec($newx['xchan_hash']), + dbesc($oldx['xchan_hash']) + ); + + $r = q("select channel_id, channel_allow_cid, channel_deny_cid from channel where (channel_allow_cid like '%s' or channel_deny_cid like '%s') ", + dbesc($oldx['xchan_hash']), + dbesc($oldx['xchan_hash']) + ); + + if($r) { + foreach($r as $rv) { + $z = q("update channel set channel_allow_cid = '%s', channel_deny_cid = '%s' where channel_id = %d", + dbesc(str_replace('<' . $oldx['xchan_hash'] . '>', '<' . $newx['xchan_hash'] . '>', $rv['channel_allow_cid'])), + dbesc(str_replace('<' . $oldx['xchan_hash'] . '>', '<' . $newx['xchan_hash'] . '>', $rv['channel_deny_cid'])), + intval($rv['channel_id']) + ); + } + } + + $r = q("select id, allow_cid, deny_cid from attach where (allow_cid like '%s' or deny_cid like '%s') ", + dbesc($oldx['xchan_hash']), + dbesc($oldx['xchan_hash']) + ); + + if($r) { + foreach($r as $rv) { + $z = q("update attach set allow_cid = '%s', deny_cid = '%s' where id = %d", + dbesc(str_replace('<' . $oldx['xchan_hash'] . '>', '<' . $newx['xchan_hash'] . '>', $rv['allow_cid'])), + dbesc(str_replace('<' . $oldx['xchan_hash'] . '>', '<' . $newx['xchan_hash'] . '>', $rv['deny_cid'])), + intval($rv['id']) + ); + } + } + + $r = q("select cr_id, allow_cid, deny_cid from chatroom where (allow_cid like '%s' or deny_cid like '%s') ", + dbesc($oldx['xchan_hash']), + dbesc($oldx['xchan_hash']) + ); + + if($r) { + foreach($r as $rv) { + $z = q("update chatroom set allow_cid = '%s', deny_cid = '%s' where cr_id = %d", + dbesc(str_replace('<' . $oldx['xchan_hash'] . '>', '<' . $newx['xchan_hash'] . '>', $rv['allow_cid'])), + dbesc(str_replace('<' . $oldx['xchan_hash'] . '>', '<' . $newx['xchan_hash'] . '>', $rv['deny_cid'])), + intval($rv['cr_id']) + ); + } + } + + + $r = q("select id, allow_cid, deny_cid from event where (allow_cid like '%s' or deny_cid like '%s') ", + dbesc($oldx['xchan_hash']), + dbesc($oldx['xchan_hash']) + ); + + if($r) { + foreach($r as $rv) { + $z = q("update event set allow_cid = '%s', deny_cid = '%s' where id = %d", + dbesc(str_replace('<' . $oldx['xchan_hash'] . '>', '<' . $newx['xchan_hash'] . '>', $rv['allow_cid'])), + dbesc(str_replace('<' . $oldx['xchan_hash'] . '>', '<' . $newx['xchan_hash'] . '>', $rv['deny_cid'])), + intval($rv['id']) + ); + } + } + + + $r = q("select id, allow_cid, deny_cid from item where (allow_cid like '%s' or deny_cid like '%s') ", + dbesc($oldx['xchan_hash']), + dbesc($oldx['xchan_hash']) + ); + + if($r) { + foreach($r as $rv) { + $z = q("update item set allow_cid = '%s', deny_cid = '%s' where id = %d", + dbesc(str_replace('<' . $oldx['xchan_hash'] . '>', '<' . $newx['xchan_hash'] . '>', $rv['allow_cid'])), + dbesc(str_replace('<' . $oldx['xchan_hash'] . '>', '<' . $newx['xchan_hash'] . '>', $rv['deny_cid'])), + intval($rv['id']) + ); + } + } + + + $r = q("select mitem_id, allow_cid, deny_cid from menu_item where (allow_cid like '%s' or deny_cid like '%s') ", + dbesc($oldx['xchan_hash']), + dbesc($oldx['xchan_hash']) + ); + + if($r) { + foreach($r as $rv) { + $z = q("update menu_item set allow_cid = '%s', deny_cid = '%s' where mitem_id = %d", + dbesc(str_replace('<' . $oldx['xchan_hash'] . '>', '<' . $newx['xchan_hash'] . '>', $rv['allow_cid'])), + dbesc(str_replace('<' . $oldx['xchan_hash'] . '>', '<' . $newx['xchan_hash'] . '>', $rv['deny_cid'])), + intval($rv['mitem_id']) + ); + } + } + + + + $r = q("select obj_id, allow_cid, deny_cid from obj where (allow_cid like '%s' or deny_cid like '%s') ", + dbesc($oldx['xchan_hash']), + dbesc($oldx['xchan_hash']) + ); + + if($r) { + foreach($r as $rv) { + $z = q("update obj set allow_cid = '%s', deny_cid = '%s' where obj_id = %d", + dbesc(str_replace('<' . $oldx['xchan_hash'] . '>', '<' . $newx['xchan_hash'] . '>', $rv['allow_cid'])), + dbesc(str_replace('<' . $oldx['xchan_hash'] . '>', '<' . $newx['xchan_hash'] . '>', $rv['deny_cid'])), + intval($rv['obj_id']) + ); + } + } + + $r = q("select id, allow_cid, deny_cid from photo where (allow_cid like '%s' or deny_cid like '%s') ", + dbesc($oldx['xchan_hash']), + dbesc($oldx['xchan_hash']) + ); + + if($r) { + foreach($r as $rv) { + $z = q("update photo set allow_cid = '%s', deny_cid = '%s' where id = %d", + dbesc(str_replace('<' . $oldx['xchan_hash'] . '>', '<' . $newx['xchan_hash'] . '>', $rv['allow_cid'])), + dbesc(str_replace('<' . $oldx['xchan_hash'] . '>', '<' . $newx['xchan_hash'] . '>', $rv['deny_cid'])), + intval($rv['id']) + ); + } + } + + +} \ No newline at end of file diff --git a/include/zot.php b/include/zot.php index 8bbc4a969..220292994 100644 --- a/include/zot.php +++ b/include/zot.php @@ -3757,6 +3757,50 @@ function zot_reply_message_request($data) { json_return_and_die($ret); } +function zot_rekey_request($sender,$data) { + + $ret = array('success' => false); + + // newsig is newkey signed with oldkey + + // The original xchan will remain. In Zot/Receiver we will have imported the new xchan and hubloc to verify + // the packet authenticity. What we will do now is verify that the keychange operation was signed by the + // oldkey, and if so change all the abook, abconfig, group, and permission elements which reference the + // old xchan_hash. + + if((! $data['oldkey']) && (! $data['oldsig']) && (! $data['newkey']) && (! $data['newsig'])) + json_return_and_die($ret); + + $oldhash = make_xchan_hash($data['old_guid'],$data['old_guid_sig']); + + $r = q("select * from xchan where xchan_hash = '%s' limit 1", + dbesc($oldhash) + ); + + if(! $r) { + json_return_and_die($ret); + } + + $xchan = $r[0]; + + if(! rsa_verify($data['newkey'],base64url_decode($data['newsig']),$xchan['xchan_pubkey'])) { + json_return_and_die($ret); + } + + $newhash = make_xchan_hash($sender['guid'],$sender['guid_sig']); + + $r = q("select * from xchan where xchan_hash = '%s' limit 1", + dbesc($newhash) + ); + + $newxchan = $r[0]; + + xchan_change_key($xchan,$newxchan,$data); + + $ret['success'] = true; + json_return_and_die($ret); +} + function zotinfo($arr) { From ddecbf052eabe92f61091bcd2541190b1037e466 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Mon, 24 Jul 2017 22:45:50 -0700 Subject: [PATCH 003/441] new field names did not get saved --- include/zot.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/zot.php b/include/zot.php index 220292994..33cf1d40d 100644 --- a/include/zot.php +++ b/include/zot.php @@ -3768,7 +3768,7 @@ function zot_rekey_request($sender,$data) { // oldkey, and if so change all the abook, abconfig, group, and permission elements which reference the // old xchan_hash. - if((! $data['oldkey']) && (! $data['oldsig']) && (! $data['newkey']) && (! $data['newsig'])) + if((! $data['old_key']) && (! $data['new_key']) && (! $data['new_sig'])) json_return_and_die($ret); $oldhash = make_xchan_hash($data['old_guid'],$data['old_guid_sig']); @@ -3783,7 +3783,7 @@ function zot_rekey_request($sender,$data) { $xchan = $r[0]; - if(! rsa_verify($data['newkey'],base64url_decode($data['newsig']),$xchan['xchan_pubkey'])) { + if(! rsa_verify($data['new_key'],base64url_decode($data['new_sig']),$xchan['xchan_pubkey'])) { json_return_and_die($ret); } From c24cfbc62af111f18576cfde8e4e920e66c57ff5 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Tue, 25 Jul 2017 15:59:58 -0700 Subject: [PATCH 004/441] make signing methods variable and signable --- boot.php | 2 +- include/crypto.php | 10 ++++++++++ include/zot.php | 3 ++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/boot.php b/boot.php index 061c14554..f5fe4b185 100755 --- a/boot.php +++ b/boot.php @@ -50,7 +50,7 @@ require_once('include/attach.php'); define ( 'PLATFORM_NAME', 'hubzilla' ); define ( 'STD_VERSION', '2.5.9' ); -define ( 'ZOT_REVISION', '1.2' ); +define ( 'ZOT_REVISION', '1.3' ); define ( 'DB_UPDATE_VERSION', 1192 ); diff --git a/include/crypto.php b/include/crypto.php index 2c5545e9b..6ac3fd732 100644 --- a/include/crypto.php +++ b/include/crypto.php @@ -185,6 +185,16 @@ function crypto_methods() { } +function signing_methods() { + + + $r = [ 'sha256' ]; + call_hooks('signing_methods',$r); + return $r; + +} + + function aes_encapsulate($data,$pubkey) { if(! $pubkey) logger('aes_encapsulate: no key. data: ' . $data); diff --git a/include/zot.php b/include/zot.php index 33cf1d40d..f9682237e 100644 --- a/include/zot.php +++ b/include/zot.php @@ -122,7 +122,8 @@ function zot_build_packet($channel, $type = 'notify', $recipients = null, $remot ], 'callback' => '/post', 'version' => ZOT_REVISION, - 'encryption' => crypto_methods() + 'encryption' => crypto_methods(), + 'signing' => signing_methods() ]; if ($recipients) { From 029cf6395dc1da503ebda7718cae30a8c19de691 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Tue, 25 Jul 2017 17:58:46 -0700 Subject: [PATCH 005/441] sync key changes to clones --- include/channel.php | 3 ++ include/zot.php | 114 +++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 111 insertions(+), 6 deletions(-) diff --git a/include/channel.php b/include/channel.php index 23ceb1414..f6252f094 100644 --- a/include/channel.php +++ b/include/channel.php @@ -488,6 +488,7 @@ function change_channel_keys($channel) { if(! $r) { return $ret; } + $r = q("select * from channel where channel_id = %d", intval($channel['channel_id']) ); @@ -532,6 +533,8 @@ function change_channel_keys($channel) { } } + build_sync_packet($channel['channel_id'], [ 'keychange' => $stored ]); + $a = q("select * from abook where abook_xchan = '%s' and abook_self = 1", dbesc($stored['old_hash']) ); diff --git a/include/zot.php b/include/zot.php index f9682237e..a86948ef9 100644 --- a/include/zot.php +++ b/include/zot.php @@ -2949,6 +2949,11 @@ function build_sync_packet($uid = 0, $packet = null, $groups_changed = false) { if($packet) logger('packet: ' . print_r($packet, true),LOGGER_DATA, LOG_DEBUG); + $keychange = (($packet && array_key_exists('keychange',$packet)) ? true : false); + if($keychange) { + logger('keychange sync'); + } + if(! $uid) $uid = local_channel(); @@ -2962,6 +2967,7 @@ function build_sync_packet($uid = 0, $packet = null, $groups_changed = false) { return; $channel = $r[0]; + unset($channel['channel_password']); unset($channel['channel_salt']); @@ -2972,12 +2978,11 @@ function build_sync_packet($uid = 0, $packet = null, $groups_changed = false) { } } - if(intval($channel['channel_removed'])) return; $h = q("select hubloc.*, site.site_crypto from hubloc left join site on site_url = hubloc_url where hubloc_hash = '%s' and hubloc_deleted = 0", - dbesc($channel['channel_hash']) + dbesc(($keychange) ? $packet['keychange']['old_hash'] : $channel['channel_hash']) ); if(! $h) @@ -3032,7 +3037,15 @@ function build_sync_packet($uid = 0, $packet = null, $groups_changed = false) { // don't pass these elements, they should not be synchronised - $disallowed = array('channel_id','channel_account_id','channel_primary','channel_prvkey','channel_address','channel_deleted','channel_removed','channel_system'); + + $disallowed = [ + 'channel_id','channel_account_id','channel_primary','channel_address', + 'channel_deleted','channel_removed','channel_system' + ]; + + if(! $keychange) { + $disallowed[] = 'channel_prvkey'; + } if(in_array($k,$disallowed)) continue; @@ -3092,17 +3105,18 @@ function build_sync_packet($uid = 0, $packet = null, $groups_changed = false) { function process_channel_sync_delivery($sender, $arr, $deliveries) { - require_once('include/import.php'); /** @FIXME this will sync red structures (channel, pconfig and abook). Eventually we need to make this application agnostic. */ - $result = array(); + $result = []; + + $keychange = ((array_key_exists('keychange',$arr)) ? true : false); foreach ($deliveries as $d) { $r = q("select * from channel where channel_hash = '%s' limit 1", - dbesc($d['hash']) + dbesc(($keychange) ? $arr['keychange']['old_hash'] : $d['hash']) ); if (! $r) { @@ -3121,6 +3135,94 @@ function process_channel_sync_delivery($sender, $arr, $deliveries) { continue; } + if($keychange) { + // verify the keychange operation + if(! rsa_verify($arr['channel']['channel_pubkey'],base64url_decode($arr['keychange']['new_sig']),$channel['channel_prvkey'])) { + logger('sync keychange: verification failed'); + continue; + } + + $sig = base64url_encode(rsa_sign($channel['channel_guid'],$arr['channel']['channel_prvkey'])); + $hash = make_xchan_hash($channel['channel_guid'],$sig); + + + $r = q("update channel set channel_prvkey = '%s', channel_pubkey = '%s', channel_guid_sig = '%s', + channel_hash = '%s' where channel_id = %d", + dbesc($arr['channel']['channel_prvkey']), + dbesc($arr['channel']['channel_pubkey']), + dbesc($sig), + dbesc($hash), + intval($channel['channel_id']) + ); + if(! $r) { + logger('keychange sync: channel update failed'); + continue; + } + + $r = q("select * from channel where channel_id = %d", + intval($channel['channel_id']) + ); + + if(! $r) { + logger('keychange sync: channel retrieve failed'); + continue; + } + + $channel = $r[0]; + + $h = q("select * from hubloc where hubloc_hash = '%s' and hubloc_url = '%s' ", + dbesc($arr['keychange']['old_hash']), + dbesc(z_root()) + ); + + if($h) { + foreach($h as $hv) { + $hv['hubloc_guid_sig'] = $sig; + $hv['hubloc_hash'] = $hash; + $hv['hubloc_url_sig'] = base64url_encode(rsa_sign(z_root(),$channel['channel_prvkey'])); + hubloc_store_lowlevel($hv); + } + } + + $x = q("select * from xchan where xchan_hash = '%s' ", + dbesc($arr['keychange']['old_hash']) + ); + + $check = q("select * from xchan where xchan_hash = '%s'", + dbesc($hash) + ); + + if(($x) && (! $check)) { + $oldxchan = $x[0]; + foreach($x as $xv) { + $xv['xchan_guid_sig'] = $sig; + $xv['xchan_hash'] = $hash; + $xv['xchan_pubkey'] = $channel['channel_pubkey']; + xchan_store_lowlevel($xv); + $newxchan = $xv; + } + } + + $a = q("select * from abook where abook_xchan = '%s' and abook_self = 1", + dbesc($arr['keychange']['old_hash']) + ); + + if($a) { + q("update abook set abook_xchan = '%s' where abook_id = %d", + dbesc($hash), + intval($a[0]['abook_id']) + ); + } + + xchan_change_key($oldxchan,$newxchan,$arr['keychange']); + + // keychange operations can end up in a confused state if you try and sync anything else + // besides the channel keys, so ignore any other packets. + + continue; + } + + if(array_key_exists('config',$arr) && is_array($arr['config']) && count($arr['config'])) { foreach($arr['config'] as $cat => $k) { foreach($arr['config'][$cat] as $k => $v) From eec2871680ae97810de4bdc20bb3decf2d919019 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Tue, 25 Jul 2017 20:52:29 -0700 Subject: [PATCH 006/441] consolidate duplicated code --- include/xchan.php | 291 +++++++++++----------------------------------- 1 file changed, 71 insertions(+), 220 deletions(-) diff --git a/include/xchan.php b/include/xchan.php index dba0b8b88..8c9c09c72 100644 --- a/include/xchan.php +++ b/include/xchan.php @@ -137,232 +137,83 @@ function xchan_fetch($arr) { } +function xchan_keychange_table($table,$column,$oldxchan,$newxchan) { + $r = q("update $table set $column = '%s' where $column = '%s'", + dbesc($newxchan['xchan_hash']), + dbesc($oldxchan['xchan_hash']) + ); + return $r; +} + +function xchan_keychange_acl($table,$column,$oldxchan,$newxchan) { + + $allow = (($table === 'channel') ? 'channel_allow_cid' : 'allow_cid'); + $deny = (($table === 'channel') ? 'channel_deny_cid' : 'deny_cid'); + + + $r = q("select $column, $allow, $deny from $table where ($allow like '%s' or $deny like '%s') ", + dbesc('<' . $oldxchan['xchan_hash'] . '>'), + dbesc('<' . $oldxchan['xchan_hash'] . '>') + ); + + if($r) { + foreach($r as $rv) { + $z = q("update $table set $allow = '%s', $deny = '%s' where $column = %d", + dbesc(str_replace('<' . $oldxchan['xchan_hash'] . '>', '<' . $newxchan['xchan_hash'] . '>', + $rv[$allow])), + dbesc(str_replace('<' . $oldxchan['xchan_hash'] . '>', '<' . $newxchan['xchan_hash'] . '>', + $rv[$deny])), + intval($rv[$column]) + ); + } + } + return $z; +} + + function xchan_change_key($oldx,$newx,$data) { - $r = q("update abook set abook_xchan = '%s' where abook_xchan = '%s'", - dbsec($newx['xchan_hash']), - dbesc($oldx['xchan_hash']) - ); + $tables = [ + 'abook' => 'abook_xchan', + 'abconfig' => 'xchan', + 'group_member' => 'xchan', + 'chat' => 'chat_xchan', + 'chatpresence' => 'cp_xchan', + 'event' => 'event_xchan', + 'item' => 'owner_xchan', + 'item' => 'author_xchan', + 'item' => 'source_xchan', + 'mail' => 'from_xchan', + 'mail' => 'to_xchan', + 'shares' => 'share_xchan', + 'source' => 'src_channel_xchan', + 'source' => 'src_xchan', + 'xchat' => 'xchat_xchan', + 'xconfig' => 'xchan', + 'xign' => 'xchan', + 'xlink' => 'xlink_xchan', + 'xprof' => 'xprof_hash', + 'xtag' => 'xtag_hash' + ]; + - $r = q("update abconfig set xchan = '%s' where xchan = '%s'", - dbsec($newx['xchan_hash']), - dbesc($oldx['xchan_hash']) - ); + $acls = [ + 'channel' => 'channel_id', + 'attach' => 'id', + 'chatroom' => 'cr_id', + 'event' => 'id', + 'item' => 'id', + 'menu_item' => 'mitem_id', + 'obj' => 'obj_id', + 'photo' => 'id' + ]; - $r = q("update group_member set xchan = '%s' where xchan = '%s'", - dbsec($newx['xchan_hash']), - dbesc($oldx['xchan_hash']) - ); - $r = q("update chat set chat_xchan = '%s' where chat_xchan = '%s'", - dbsec($newx['xchan_hash']), - dbesc($oldx['xchan_hash']) - ); - - $r = q("update chatpresence set cp_xchan = '%s' where cp_xchan = '%s'", - dbsec($newx['xchan_hash']), - dbesc($oldx['xchan_hash']) - ); - - $r = q("update event set event_xchan = '%s' where event_xchan = '%s'", - dbsec($newx['xchan_hash']), - dbesc($oldx['xchan_hash']) - ); - - $r = q("update item set owner_xchan = '%s' where owner_xchan = '%s'", - dbsec($newx['xchan_hash']), - dbesc($oldx['xchan_hash']) - ); - - $r = q("update item set author_xchan = '%s' where author_xchan = '%s'", - dbsec($newx['xchan_hash']), - dbesc($oldx['xchan_hash']) - ); - - $r = q("update item set source_xchan = '%s' where source_xchan = '%s'", - dbsec($newx['xchan_hash']), - dbesc($oldx['xchan_hash']) - ); - - $r = q("update mail set from_xchan = '%s' where from_xchan = '%s'", - dbsec($newx['xchan_hash']), - dbesc($oldx['xchan_hash']) - ); - - $r = q("update mail set to_xchan = '%s' where to_xchan = '%s'", - dbsec($newx['xchan_hash']), - dbesc($oldx['xchan_hash']) - ); - - $r = q("update shares set share_xchan = '%s' where share_xchan = '%s'", - dbsec($newx['xchan_hash']), - dbesc($oldx['xchan_hash']) - ); - - $r = q("update source set src_channel_xchan = '%s' where src_channel_xchan = '%s'", - dbsec($newx['xchan_hash']), - dbesc($oldx['xchan_hash']) - ); - - $r = q("update source set src_xchan = '%s' where src_xchan = '%s'", - dbsec($newx['xchan_hash']), - dbesc($oldx['xchan_hash']) - ); - - $r = q("update xchat set xchat_xchan = '%s' where xchat_xchan = '%s'", - dbsec($newx['xchan_hash']), - dbesc($oldx['xchan_hash']) - ); - - $r = q("update xconfig set xchan = '%s' where xchan = '%s'", - dbsec($newx['xchan_hash']), - dbesc($oldx['xchan_hash']) - ); - - $r = q("update xign set xchan = '%s' where xchan = '%s'", - dbsec($newx['xchan_hash']), - dbesc($oldx['xchan_hash']) - ); - - $r = q("update xlink set xlink_xchan = '%s' where xlink_xchan = '%s'", - dbsec($newx['xchan_hash']), - dbesc($oldx['xchan_hash']) - ); - - $r = q("update xprof set xprof_hash = '%s' where xprof_hash = '%s'", - dbsec($newx['xchan_hash']), - dbesc($oldx['xchan_hash']) - ); - - $r = q("update xtag set xtag_hash = '%s' where xtag_hash = '%s'", - dbsec($newx['xchan_hash']), - dbesc($oldx['xchan_hash']) - ); - - $r = q("select channel_id, channel_allow_cid, channel_deny_cid from channel where (channel_allow_cid like '%s' or channel_deny_cid like '%s') ", - dbesc($oldx['xchan_hash']), - dbesc($oldx['xchan_hash']) - ); - - if($r) { - foreach($r as $rv) { - $z = q("update channel set channel_allow_cid = '%s', channel_deny_cid = '%s' where channel_id = %d", - dbesc(str_replace('<' . $oldx['xchan_hash'] . '>', '<' . $newx['xchan_hash'] . '>', $rv['channel_allow_cid'])), - dbesc(str_replace('<' . $oldx['xchan_hash'] . '>', '<' . $newx['xchan_hash'] . '>', $rv['channel_deny_cid'])), - intval($rv['channel_id']) - ); - } + foreach($tables as $k => $v) { + xchan_keychange_table($k,$v,$oldx,$newx); } - $r = q("select id, allow_cid, deny_cid from attach where (allow_cid like '%s' or deny_cid like '%s') ", - dbesc($oldx['xchan_hash']), - dbesc($oldx['xchan_hash']) - ); - - if($r) { - foreach($r as $rv) { - $z = q("update attach set allow_cid = '%s', deny_cid = '%s' where id = %d", - dbesc(str_replace('<' . $oldx['xchan_hash'] . '>', '<' . $newx['xchan_hash'] . '>', $rv['allow_cid'])), - dbesc(str_replace('<' . $oldx['xchan_hash'] . '>', '<' . $newx['xchan_hash'] . '>', $rv['deny_cid'])), - intval($rv['id']) - ); - } + foreach($acls as $k => $v) { + xchan_keychange_acl($k,$v,$oldx,$newx); } - - $r = q("select cr_id, allow_cid, deny_cid from chatroom where (allow_cid like '%s' or deny_cid like '%s') ", - dbesc($oldx['xchan_hash']), - dbesc($oldx['xchan_hash']) - ); - - if($r) { - foreach($r as $rv) { - $z = q("update chatroom set allow_cid = '%s', deny_cid = '%s' where cr_id = %d", - dbesc(str_replace('<' . $oldx['xchan_hash'] . '>', '<' . $newx['xchan_hash'] . '>', $rv['allow_cid'])), - dbesc(str_replace('<' . $oldx['xchan_hash'] . '>', '<' . $newx['xchan_hash'] . '>', $rv['deny_cid'])), - intval($rv['cr_id']) - ); - } - } - - - $r = q("select id, allow_cid, deny_cid from event where (allow_cid like '%s' or deny_cid like '%s') ", - dbesc($oldx['xchan_hash']), - dbesc($oldx['xchan_hash']) - ); - - if($r) { - foreach($r as $rv) { - $z = q("update event set allow_cid = '%s', deny_cid = '%s' where id = %d", - dbesc(str_replace('<' . $oldx['xchan_hash'] . '>', '<' . $newx['xchan_hash'] . '>', $rv['allow_cid'])), - dbesc(str_replace('<' . $oldx['xchan_hash'] . '>', '<' . $newx['xchan_hash'] . '>', $rv['deny_cid'])), - intval($rv['id']) - ); - } - } - - - $r = q("select id, allow_cid, deny_cid from item where (allow_cid like '%s' or deny_cid like '%s') ", - dbesc($oldx['xchan_hash']), - dbesc($oldx['xchan_hash']) - ); - - if($r) { - foreach($r as $rv) { - $z = q("update item set allow_cid = '%s', deny_cid = '%s' where id = %d", - dbesc(str_replace('<' . $oldx['xchan_hash'] . '>', '<' . $newx['xchan_hash'] . '>', $rv['allow_cid'])), - dbesc(str_replace('<' . $oldx['xchan_hash'] . '>', '<' . $newx['xchan_hash'] . '>', $rv['deny_cid'])), - intval($rv['id']) - ); - } - } - - - $r = q("select mitem_id, allow_cid, deny_cid from menu_item where (allow_cid like '%s' or deny_cid like '%s') ", - dbesc($oldx['xchan_hash']), - dbesc($oldx['xchan_hash']) - ); - - if($r) { - foreach($r as $rv) { - $z = q("update menu_item set allow_cid = '%s', deny_cid = '%s' where mitem_id = %d", - dbesc(str_replace('<' . $oldx['xchan_hash'] . '>', '<' . $newx['xchan_hash'] . '>', $rv['allow_cid'])), - dbesc(str_replace('<' . $oldx['xchan_hash'] . '>', '<' . $newx['xchan_hash'] . '>', $rv['deny_cid'])), - intval($rv['mitem_id']) - ); - } - } - - - - $r = q("select obj_id, allow_cid, deny_cid from obj where (allow_cid like '%s' or deny_cid like '%s') ", - dbesc($oldx['xchan_hash']), - dbesc($oldx['xchan_hash']) - ); - - if($r) { - foreach($r as $rv) { - $z = q("update obj set allow_cid = '%s', deny_cid = '%s' where obj_id = %d", - dbesc(str_replace('<' . $oldx['xchan_hash'] . '>', '<' . $newx['xchan_hash'] . '>', $rv['allow_cid'])), - dbesc(str_replace('<' . $oldx['xchan_hash'] . '>', '<' . $newx['xchan_hash'] . '>', $rv['deny_cid'])), - intval($rv['obj_id']) - ); - } - } - - $r = q("select id, allow_cid, deny_cid from photo where (allow_cid like '%s' or deny_cid like '%s') ", - dbesc($oldx['xchan_hash']), - dbesc($oldx['xchan_hash']) - ); - - if($r) { - foreach($r as $rv) { - $z = q("update photo set allow_cid = '%s', deny_cid = '%s' where id = %d", - dbesc(str_replace('<' . $oldx['xchan_hash'] . '>', '<' . $newx['xchan_hash'] . '>', $rv['allow_cid'])), - dbesc(str_replace('<' . $oldx['xchan_hash'] . '>', '<' . $newx['xchan_hash'] . '>', $rv['deny_cid'])), - intval($rv['id']) - ); - } - } - - } \ No newline at end of file From 7d82b5f28d3fe10792098d8ecc4c60e224b8bd3d Mon Sep 17 00:00:00 2001 From: zotlabs Date: Tue, 25 Jul 2017 22:17:31 -0700 Subject: [PATCH 007/441] start to implement the code needed for verifying variable signature algorithms --- include/zot.php | 46 +++++++++++++++++++++++++++++++--------------- 1 file changed, 31 insertions(+), 15 deletions(-) diff --git a/include/zot.php b/include/zot.php index a86948ef9..976b4290e 100644 --- a/include/zot.php +++ b/include/zot.php @@ -111,13 +111,15 @@ function zot_get_hublocs($hash) { */ function zot_build_packet($channel, $type = 'notify', $recipients = null, $remote_key = null, $methods = '', $secret = null, $extra = null) { + $sig_method = get_config('system','signature_algorithm','sha256'); + $data = [ 'type' => $type, 'sender' => [ 'guid' => $channel['channel_guid'], - 'guid_sig' => base64url_encode(rsa_sign($channel['channel_guid'],$channel['channel_prvkey'])), + 'guid_sig' => base64url_encode(rsa_sign($channel['channel_guid'],$channel['channel_prvkey'],$sig_method)), 'url' => z_root(), - 'url_sig' => base64url_encode(rsa_sign(z_root(),$channel['channel_prvkey'])), + 'url_sig' => base64url_encode(rsa_sign(z_root(),$channel['channel_prvkey'],$sig_method)), 'sitekey' => get_config('system','pubkey') ], 'callback' => '/post', @@ -135,7 +137,7 @@ function zot_build_packet($channel, $type = 'notify', $recipients = null, $remot if ($secret) { $data['secret'] = $secret; - $data['secret_sig'] = base64url_encode(rsa_sign($secret,$channel['channel_prvkey'])); + $data['secret_sig'] = base64url_encode(rsa_sign($secret,$channel['channel_prvkey'],$sig_method)); } if ($extra) { @@ -576,6 +578,8 @@ function zot_register_hub($arr) { if($arr['url'] && $arr['url_sig'] && $arr['guid'] && $arr['guid_sig']) { + $sig_methods = ((array_key_exists('signing',$arr) && is_array($arr['signing'])) ? $arr['signing'] : [ 'sha256' ]); + $guid_hash = make_xchan_hash($arr['guid'],$arr['guid_sig']); $url = $arr['url'] . '/.well-known/zot-info/?f=&guid_hash=' . $guid_hash; @@ -595,17 +599,18 @@ function zot_register_hub($arr) { * our current communication. */ - if((rsa_verify($arr['guid'],base64url_decode($arr['guid_sig']),$record['key'])) - && (rsa_verify($arr['url'],base64url_decode($arr['url_sig']),$record['key'])) + foreach($sig_methods as $method) { + if((rsa_verify($arr['guid'],base64url_decode($arr['guid_sig']),$record['key'],$method)) + && (rsa_verify($arr['url'],base64url_decode($arr['url_sig']),$record['key'],$method)) && ($arr['guid'] === $record['guid']) && ($arr['guid_sig'] === $record['guid_sig'])) { - - $c = import_xchan($record); - if($c['success']) - $result['success'] = true; - } - else { - logger('zot_register_hub: failure to verify returned packet.'); + $c = import_xchan($record); + if($c['success']) + $result['success'] = true; + } + else { + logger('zot_register_hub: failure to verify returned packet using ' . $method); + } } } } @@ -658,8 +663,19 @@ function import_xchan($arr,$ud_flags = UPDATE_FLAGS_UPDATED, $ud_arr = null) { $import_photos = false; - if(! rsa_verify($arr['guid'],base64url_decode($arr['guid_sig']),$arr['key'])) { - logger('import_xchan: Unable to verify channel signature for ' . $arr['address']); + $sig_methods = ((array_key_exists('signing',$arr) && is_array($arr['signing'])) ? $arr['signing'] : [ 'sha256' ]); + $verified = false; + + foreach($sig_methods as $method) { + if(! rsa_verify($arr['guid'],base64url_decode($arr['guid_sig']),$arr['key'],$method)) { + logger('import_xchan: Unable to verify channel signature for ' . $arr['address'] . ' using ' . $method); + continue; + } + else { + $verified = true; + } + } + if(! $verified) { $ret['message'] = t('Unable to verify channel signature'); return $ret; } @@ -918,7 +934,7 @@ function import_xchan($arr,$ud_flags = UPDATE_FLAGS_UPDATED, $ud_arr = null) { } elseif(! $ud_flags) { // nothing changed but we still need to update the updates record - q("update updates set ud_flags = ( ud_flags | %d ) where ud_addr = '%s' and not (ud_flags & %d)>0 ", + q("update updates set ud_flags = ( ud_flags | %d ) where ud_addr = '%s' and not (ud_flags & %d) > 0 ", intval(UPDATE_FLAGS_UPDATED), dbesc($address), intval(UPDATE_FLAGS_UPDATED) From 7d891a54e7a47dc7471774a3e51e0e4da7e2e3d9 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Wed, 26 Jul 2017 16:22:20 -0700 Subject: [PATCH 008/441] improve the formatting of shares when converting from bbcode to markdown --- include/markdown.php | 69 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/include/markdown.php b/include/markdown.php index 5d3c4c7df..ccd108c1b 100644 --- a/include/markdown.php +++ b/include/markdown.php @@ -84,6 +84,72 @@ function markdown_to_bb($s, $use_zrl = false, $options = []) { +function bb_to_markdown_share($match) { + + $matches = array(); + $attributes = $match[1]; + + $author = ""; + preg_match("/author='(.*?)'/ism", $attributes, $matches); + if ($matches[1] != "") + $author = urldecode($matches[1]); + + $link = ""; + preg_match("/link='(.*?)'/ism", $attributes, $matches); + if ($matches[1] != "") + $link = $matches[1]; + + $avatar = ""; + preg_match("/avatar='(.*?)'/ism", $attributes, $matches); + if ($matches[1] != "") + $avatar = $matches[1]; + + $profile = ""; + preg_match("/profile='(.*?)'/ism", $attributes, $matches); + if ($matches[1] != "") + $profile = $matches[1]; + + $posted = ""; + preg_match("/posted='(.*?)'/ism", $attributes, $matches); + if ($matches[1] != "") + $posted = $matches[1]; + + // message_id is never used, do we still need it? + $message_id = ""; + preg_match("/message_id='(.*?)'/ism", $attributes, $matches); + if ($matches[1] != "") + $message_id = $matches[1]; + + if(! $message_id) { + preg_match("/guid='(.*?)'/ism", $attributes, $matches); + if ($matches[1] != "") + $message_id = $matches[1]; + } + + + $reldate = datetime_convert('UTC', date_default_timezone_get(), $posted, 'r'); + + $headline = ''; + + if ($avatar != "") + $headline .= '[url=' . zid($profile) . '][img]' . $avatar . '[/img][/url]'; + + // Bob Smith wrote the following post 2 hours ago + + $fmt = sprintf( t('%1$s wrote the following %2$s %3$s'), + '[url=' . zid($profile) . ']' . $author . '[/url]', + '[url=' . zid($link) . ']' . t('post') . '[/url]', + $reldate + ); + + $headline .= $fmt . "\n\n"; + + $text = $headline . trim($match[2]); + + return $text; +} + + function bb_to_markdown($Text) { @@ -100,9 +166,12 @@ function bb_to_markdown($Text) { // Converting images with size parameters to simple images. Markdown doesn't know it. $Text = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", '[img]$3[/img]', $Text); + $Text = preg_replace_callback("/\[share(.*?)\](.*?)\[\/share\]/ism", 'bb_to_markdown_share', $Text); + call_hooks('bb_to_markdown_bb',$Text); + // Convert it to HTML - don't try oembed $Text = bbcode($Text, $preserve_nl, false); From 769f697ae32b9c8a2ac30d7e9e349c1f54975219 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Wed, 26 Jul 2017 16:36:09 -0700 Subject: [PATCH 009/441] more work on signature algorithm choice --- include/zot.php | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/include/zot.php b/include/zot.php index 976b4290e..75c37836d 100644 --- a/include/zot.php +++ b/include/zot.php @@ -31,9 +31,9 @@ require_once('include/perm_upgrade.php'); * @param string $channel_nick a unique nickname of controlling entity * @returns string */ + function zot_new_uid($channel_nick) { $rawstr = z_root() . '/' . $channel_nick . '.' . mt_rand(); - return(base64url_encode(hash('whirlpool', $rawstr, true), true)); } @@ -49,6 +49,7 @@ function zot_new_uid($channel_nick) { * @param string $guid * @param string $guid_sig */ + function make_xchan_hash($guid, $guid_sig) { return base64url_encode(hash('whirlpool', $guid . $guid_sig, true)); } @@ -62,17 +63,17 @@ function make_xchan_hash($guid, $guid_sig) { * @param string $hash - xchan_hash * @returns array of hubloc (hub location structures) * * \b hubloc_id int - * * \b hubloc_guid char(255) + * * \b hubloc_guid char(191) * * \b hubloc_guid_sig text - * * \b hubloc_hash char(255) - * * \b hubloc_addr char(255) + * * \b hubloc_hash char(191) + * * \b hubloc_addr char(191) * * \b hubloc_flags int * * \b hubloc_status int - * * \b hubloc_url char(255) + * * \b hubloc_url char(191) * * \b hubloc_url_sig text - * * \b hubloc_host char(255) - * * \b hubloc_callback char(255) - * * \b hubloc_connect char(255) + * * \b hubloc_host char(191) + * * \b hubloc_callback char(191) + * * \b hubloc_connect char(191) * * \b hubloc_sitekey text * * \b hubloc_updated datetime * * \b hubloc_connected datetime @@ -97,7 +98,7 @@ function zot_get_hublocs($hash) { * @param array $channel * sender channel structure * @param string $type - * packet type: one of 'ping', 'pickup', 'purge', 'refresh', 'force_refresh', 'notify', 'auth_check' + * packet type: one of 'ping', 'pickup', 'purge', 'refresh', 'keychange', 'force_refresh', 'notify', 'auth_check' * @param array $recipients * envelope information, array ( 'guid' => string, 'guid_sig' => string ); empty for public posts * @param string $remote_key @@ -532,7 +533,7 @@ function zot_gethub($arr, $multiple = false) { } $limit = (($multiple) ? '' : ' limit 1 '); - $sitekey = ((array_key_exists('sitekey',$arr) && $arr['sitekey']) ? " and hubloc_sitekey = '" . protect_sprintf($arr['sitekey']) . "' " : ''); + $sitekey = ((array_key_exists('sitekey',$arr) && $arr['sitekey']) ? " and hubloc_sitekey = '" . dbesc(protect_sprintf($arr['sitekey'])) . "' " : ''); $r = q("select hubloc.*, site.site_crypto from hubloc left join site on hubloc_url = site_url where hubloc_guid = '%s' and hubloc_guid_sig = '%s' @@ -3925,6 +3926,8 @@ function zotinfo($arr) { $ret = array('success' => false); + $sig_method = get_config('system','signature_algorithm','sha256'); + $zhash = ((x($arr,'guid_hash')) ? $arr['guid_hash'] : ''); $zguid = ((x($arr,'guid')) ? $arr['guid'] : ''); $zguid_sig = ((x($arr,'guid_sig')) ? $arr['guid_sig'] : ''); @@ -4088,7 +4091,7 @@ function zotinfo($arr) { // Communication details if($token) - $ret['signed_token'] = base64url_encode(rsa_sign('token.' . $token,$e['channel_prvkey'])); + $ret['signed_token'] = base64url_encode(rsa_sign('token.' . $token,$e['channel_prvkey'],$sig_method)); $ret['guid'] = $e['xchan_guid']; @@ -4157,7 +4160,7 @@ function zotinfo($arr) { $ret['site'] = array(); $ret['site']['url'] = z_root(); - $ret['site']['url_sig'] = base64url_encode(rsa_sign(z_root(),$e['channel_prvkey'])); + $ret['site']['url_sig'] = base64url_encode(rsa_sign(z_root(),$e['channel_prvkey'],$sig_method)); $ret['site']['zot_auth'] = z_root() . '/magic'; $dirmode = get_config('system','directory_mode'); @@ -4175,6 +4178,7 @@ function zotinfo($arr) { $ret['site']['encryption'] = crypto_methods(); + $ret['site']['signing'] = signing_methods(); // hide detailed site information if you're off the grid From 9132b9c02661586a54823517c331fb718a9cbd17 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Wed, 26 Jul 2017 16:39:13 -0700 Subject: [PATCH 010/441] remove activitypub components from core --- include/feedutils.php | 182 ------------------------------------------ 1 file changed, 182 deletions(-) diff --git a/include/feedutils.php b/include/feedutils.php index 4f68fdeef..e660574ed 100644 --- a/include/feedutils.php +++ b/include/feedutils.php @@ -1868,185 +1868,3 @@ function atom_entry($item, $type, $author, $owner, $comment = false, $cid = 0, $ return $x['entry']; } -/** - * @brief - * - * @param array $items - * @return array - */ -function gen_asld($items) { - $ret = array(); - if(! $items) - return $ret; - - foreach($items as $item) { - $ret[] = i2asld($item); - } - - return $ret; -} - -/** - * @brief - * - * @param array $i - * @return array - */ -function i2asld($i) { - - if(! $i) - return array(); - - $ret = array(); - - $ret['@context'] = array( 'https://www.w3.org/ns/activitystreams', 'zot' => 'http://purl.org/zot/protocol'); - - if($i['verb']) { - if(strpos(dirname($i['verb'],'activitystrea.ms/schema/1.0'))) { - $ret['type'] = ucfirst(basename($i['verb'])); - } - elseif(strpos(dirname($i['verb'],'purl.org/zot'))) { - $ret['type'] = 'zot:' . ucfirst(basename($i['verb'])); - } - } - $ret['id'] = $i['plink']; - - $ret['published'] = datetime_convert('UTC','UTC',$i['created'],ATOM_TIME); - - // we need to pass the parent into this -// if($i['id'] != $i['parent'] && $i['obj_type'] === ACTIVITY_OBJ_NOTE) { -// $ret['inReplyTo'] = asencode_note -// } - - if($i['obj_type'] === ACTIVITY_OBJ_NOTE) - $ret['object'] = asencode_note($i); - - $ret['actor'] = asencode_person($i['author']); - - return $ret; -} - -function asencode_note($i) { - - $ret = array(); - - $ret['@type'] = 'Note'; - $ret['id'] = $i['plink']; - if($i['title']) - $ret['title'] = bbcode($i['title']); - - $ret['content'] = bbcode($i['body']); - $ret['zot:owner'] = asencode_person($i['owner']); - $ret['published'] = datetime_convert('UTC','UTC',$i['created'],ATOM_TIME); - if($i['created'] !== $i['edited']) - $ret['updated'] = datetime_convert('UTC','UTC',$i['edited'],ATOM_TIME); - - return $ret; -} - - -function asencode_person($p) { - $ret = []; - $ret['type'] = 'Person'; - $ret['id'] = $p['xchan_url']; - $ret['name'] = $p['xchan_name']; - $ret['icon'] = [ - [ - 'type' => 'Image', - 'mediaType' => $p['xchan_photo_mimetype'], - 'url' => $p['xchan_photo_l'], - 'height' => 300, - 'width' => 300, - ], - [ - 'type' => 'Image', - 'mediaType' => $p['xchan_photo_mimetype'], - 'url' => $p['xchan_photo_m'], - 'height' => 80, - 'width' => 80, - ], - [ - 'type' => 'Image', - 'mediaType' => $p['xchan_photo_mimetype'], - 'url' => $p['xchan_photo_l'], - 'height' => 48, - 'width' => 48, - ] - ]; - $ret['url'] = [ - 'type' => 'Link', - 'mediaType' => 'text/html', - 'href' => $p['xchan_url'] - ]; - - if(array_key_exists('channel_id',$p)) { - $ret['inbox'] = z_root() . '/inbox/' . $p['channel_address']; - $ret['outbox'] = z_root() . '/outbox/' . $p['channel_address']; - $ret['me:magic_keys'] = [ - [ - 'value' => salmon_key($p['channel_pubkey']), - 'key_id' => base64url_encode(hash('sha256',salmon_key($p['channel_pubkey'])),true) - ] - ]; - - - } - else { - $collections = get_xconfig($p['xchan_hash'],'activitystreams','collections',[]); - if($collections) { - $ret = array_merge($ret,$collections); - } - } - - return $ret; -} - - -function activity_mapper($verb) { - - $acts = [ - 'http://activitystrea.ms/schema/1.0/post' => 'Create', - 'http://activitystrea.ms/schema/1.0/update' => 'Update', - 'http://activitystrea.ms/schema/1.0/like' => 'Like', - 'http://activitystrea.ms/schema/1.0/favorite' => 'Like', - 'http://purl.org/zot/activity/dislike' => 'Dislike', - 'http://activitystrea.ms/schema/1.0/tag' => 'Add', - 'http://activitystrea.ms/schema/1.0/follow' => 'Follow', - 'http://activitystrea.ms/schema/1.0/unfollow' => 'Unfollow', - ]; - - - if(array_key_exists($acts[$verb])) { - return $acts[$verb]; - } - return false; -} - - -function activity_obj_mapper($obj,$reverse = false) { - - $objs = [ - 'http://activitystrea.ms/schema/1.0/note' => 'Note', - 'http://activitystrea.ms/schema/1.0/comment' => 'Note', - 'http://activitystrea.ms/schema/1.0/person' => 'Person', - 'http://purl.org/zot/activity/profile' => 'Profile', - 'http://activitystrea.ms/schema/1.0/photo' => 'Image', - 'http://activitystrea.ms/schema/1.0/profile-photo' => 'Icon', - 'http://activitystrea.ms/schema/1.0/event' => 'Event', - 'http://activitystrea.ms/schema/1.0/wiki' => 'Document', - 'http://purl.org/zot/activity/location' => 'Place', - 'http://purl.org/zot/activity/chessgame' => 'Game', - 'http://purl.org/zot/activity/tagterm' => 'zot:Tag', - 'http://purl.org/zot/activity/thing' => 'zot:Thing', - 'http://purl.org/zot/activity/file' => 'zot:File', - 'http://purl.org/zot/activity/poke' => 'zot:Action', - 'http://purl.org/zot/activity/react' => 'zot:Reaction', - 'http://purl.org/zot/activity/mood' => 'zot:Mood', - - ]; - - if(array_key_exists($objs[$verb])) { - return $objs[$verb]; - } - return false; -} From dbbae4bac81d18f814c18ac8d0ea51667e00703f Mon Sep 17 00:00:00 2001 From: zotlabs Date: Wed, 26 Jul 2017 17:38:34 -0700 Subject: [PATCH 011/441] issue with OStatus comments being propagated downstream --- include/feedutils.php | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/include/feedutils.php b/include/feedutils.php index e660574ed..eb24f9032 100644 --- a/include/feedutils.php +++ b/include/feedutils.php @@ -999,6 +999,7 @@ function consume_feed($xml, $importer, &$contact, $pass = 0) { foreach($items as $item) { $is_reply = false; + $send_downstream = false; $parent_link = ''; logger('processing ' . $item->get_id(), LOGGER_DEBUG); @@ -1200,6 +1201,15 @@ function consume_feed($xml, $importer, &$contact, $pass = 0) { $status = 202; continue; } + + // The salmon endpoint sets this to indicate that we should send comments from + // interactive feeds (such as OStatus) downstream to our followers + // We do not want to set it for non-interactive feeds or conversations we do not own + + if(array_key_exists('send_downstream',$importer) && intval($importer['send_downstream']) + && ($parent_item['owner_xchan'] == $importer['channel_hash'])) { + $send_downstream = true; + } } else { if((! perm_is_allowed($importer['channel_id'],$contact['xchan_hash'],'send_stream')) && (! $importer['system'])) { @@ -1229,6 +1239,11 @@ function consume_feed($xml, $importer, &$contact, $pass = 0) { $xx = item_store($datarray); $r = $xx['item_id']; + + if($send_downstream) { + \Zotlabs\Daemon\Master::Summon(array('Notifier', 'comment', $r)); + } + continue; } else { From 41a6300d3ce205fae4f4210815ef0b6a04d22406 Mon Sep 17 00:00:00 2001 From: git-marijus Date: Thu, 27 Jul 2017 20:47:07 +0200 Subject: [PATCH 012/441] remove borders from navbar toggler --- view/tpl/nav.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index c0b34bbe8..b9abf4d48 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -68,7 +68,7 @@ {{/if}} - From 179478a9401c059e16588654d878e6a7813904cb Mon Sep 17 00:00:00 2001 From: git-marijus Date: Thu, 27 Jul 2017 21:51:59 +0200 Subject: [PATCH 013/441] default to static updates if not local channel --- Zotlabs/Module/Display.php | 2 +- Zotlabs/Module/Pubstream.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Zotlabs/Module/Display.php b/Zotlabs/Module/Display.php index df3cb1e2b..81c72adb3 100644 --- a/Zotlabs/Module/Display.php +++ b/Zotlabs/Module/Display.php @@ -140,7 +140,7 @@ class Display extends \Zotlabs\Web\Controller { if((! $update) && (! $load)) { - $static = ((local_channel()) ? channel_manual_conv_update(local_channel()) : 0); + $static = ((local_channel()) ? channel_manual_conv_update(local_channel()) : 1); $o .= '
' . "\r\n"; $o .= " +
diff --git a/view/tpl/photos_recent.tpl b/view/tpl/photos_recent.tpl index 8fe631ca6..c6a9067c1 100755 --- a/view/tpl/photos_recent.tpl +++ b/view/tpl/photos_recent.tpl @@ -19,5 +19,8 @@
- +
From 297057d2bdc227a8729e136a290f81012248d033 Mon Sep 17 00:00:00 2001 From: git-marijus Date: Sun, 30 Jul 2017 17:49:35 +0200 Subject: [PATCH 026/441] do not include ACTIVITY_OBJ_FILE obj_type in the ping/something query --- Zotlabs/Module/Ping.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Zotlabs/Module/Ping.php b/Zotlabs/Module/Ping.php index bf926075c..190208727 100644 --- a/Zotlabs/Module/Ping.php +++ b/Zotlabs/Module/Ping.php @@ -291,9 +291,12 @@ class Ping extends \Zotlabs\Web\Controller { $r = q("SELECT * FROM item WHERE item_unseen = 1 and uid = %d $item_normal - and author_xchan != '%s' ORDER BY created DESC limit 300", + AND author_xchan != '%s' + AND obj_type != '%s' + ORDER BY created DESC limit 300", intval(local_channel()), - dbesc($ob_hash) + dbesc($ob_hash), + dbesc(ACTIVITY_OBJ_FILE) ); if($r) { From ead80481b967d529956694c7d8125e92fccee8c1 Mon Sep 17 00:00:00 2001 From: git-marijus Date: Sun, 30 Jul 2017 18:01:01 +0200 Subject: [PATCH 027/441] another syntax error --- Zotlabs/Module/Network.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Zotlabs/Module/Network.php b/Zotlabs/Module/Network.php index d689efd14..597ba084b 100644 --- a/Zotlabs/Module/Network.php +++ b/Zotlabs/Module/Network.php @@ -534,7 +534,7 @@ class Network extends \Zotlabs\Web\Controller { if($parents_str) { $update_unseen = " AND ( id IN ( " . dbesc($parents_str) . " )"; - $update_unseen .= " AND obj_type != " . dbesc(ACTIVITY_OBJ_FILE) . ""; + $update_unseen .= " AND obj_type != '" . dbesc(ACTIVITY_OBJ_FILE) . "'"; $update_unseen .= " OR ( parent IN ( " . dbesc($parents_str) . " ) AND verb in ( '" . dbesc(ACTIVITY_LIKE) . "','" . dbesc(ACTIVITY_DISLIKE) . "' ))) "; } } From 4a071b9a1cac32ed331a9a4e76d8a6c9aa312bef Mon Sep 17 00:00:00 2001 From: git-marijus Date: Sun, 30 Jul 2017 19:21:02 +0200 Subject: [PATCH 028/441] ltrim $display_path in attach_store() to be consistent with attach_mkdir() and go to created folder after successfully creating one --- Zotlabs/Module/File_upload.php | 2 ++ include/attach.php | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Zotlabs/Module/File_upload.php b/Zotlabs/Module/File_upload.php index f036d3f43..bce81ad7a 100644 --- a/Zotlabs/Module/File_upload.php +++ b/Zotlabs/Module/File_upload.php @@ -35,6 +35,8 @@ class File_upload extends \Zotlabs\Web\Controller { if($_REQUEST['filename']) { $r = attach_mkdir($channel, get_observer_hash(), $_REQUEST); + if($r['success']) + goaway(z_root() . '/cloud/' . $channel['channel_address'] . '/' . $r['data']['display_path']); } else { $r = attach_store($channel, get_observer_hash(), '', $_REQUEST); diff --git a/include/attach.php b/include/attach.php index 4d20f094c..8de4983fa 100644 --- a/include/attach.php +++ b/include/attach.php @@ -708,7 +708,7 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) { $os_relpath = ltrim($os_relpath,'/'); $os_path = $os_relpath; - $display_path = $pathname . '/' . $filename; + $display_path = ltrim($pathname . '/' . $filename,'/'); if($src) @file_put_contents($os_basepath . $os_relpath,@file_get_contents($src)); @@ -886,7 +886,7 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) { } if($notify) { - $cloudPath = z_root() . '/cloud/' . $channel['channel_address'] . $r['0']['display_path']; + $cloudPath = z_root() . '/cloud/' . $channel['channel_address'] . '/' . $r['0']['display_path']; $object = get_file_activity_object($channel['channel_id'], $r['0']['hash'], $cloudPath); file_activity($channel['channel_id'], $object, $r['0']['allow_cid'], $r['0']['allow_gid'], $r['0']['deny_cid'], $r['0']['deny_gid'], 'post', $notify); } From 35c05a318016e3269e4bc677a36b515833fab66e Mon Sep 17 00:00:00 2001 From: git-marijus Date: Sun, 30 Jul 2017 19:46:52 +0200 Subject: [PATCH 029/441] fix a bug where if multiple channels uploaded the same file to the same folder, the uploaded file would end up with an incremental number added to the filename for each upload even if the file did not exist yet in the channels folder --- include/attach.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/include/attach.php b/include/attach.php index 8de4983fa..785969a32 100644 --- a/include/attach.php +++ b/include/attach.php @@ -611,7 +611,8 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) { // A freshly uploaded file. Check for duplicate and resolve with the channel's overwrite settings. - $r = q("select filename, id, hash, filesize from attach where filename = '%s' and folder = '%s' ", + $r = q("select filename, id, hash, filesize from attach where uid = %d and filename = '%s' and folder = '%s' ", + intval($channel_id), dbesc($filename), dbesc($folder_hash) ); @@ -633,7 +634,8 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) { $ext = $def_extension; } - $r = q("select filename from attach where ( filename = '%s' OR filename like '%s' ) and folder = '%s' ", + $r = q("select filename from attach where uid = %d and ( filename = '%s' OR filename like '%s' ) and folder = '%s' ", + intval($channel_id), dbesc($basename . $ext), dbesc($basename . '(%)' . $ext), dbesc($folder_hash) From 40effa441743fcbb8d62591421611a3193e352d4 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Sun, 30 Jul 2017 13:52:16 -0700 Subject: [PATCH 030/441] add options flag to bb_to_markdown so we can distinguish between diaspora use and other use and therefore filter and adjust content selectively --- include/markdown.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/include/markdown.php b/include/markdown.php index ccd108c1b..530af57a0 100644 --- a/include/markdown.php +++ b/include/markdown.php @@ -151,7 +151,7 @@ function bb_to_markdown_share($match) { -function bb_to_markdown($Text) { +function bb_to_markdown($Text, $options = []) { /* * Transform #tags, strip off the [url] and replace spaces with underscore @@ -168,9 +168,11 @@ function bb_to_markdown($Text) { $Text = preg_replace_callback("/\[share(.*?)\](.*?)\[\/share\]/ism", 'bb_to_markdown_share', $Text); + $x = [ 'bbcode' => $Text, 'options' => $options ]; - call_hooks('bb_to_markdown_bb',$Text); + call_hooks('bb_to_markdown_bb',$x); + $Text = $x['bbcode']; // Convert it to HTML - don't try oembed $Text = bbcode($Text, $preserve_nl, false); From 964a02d68456912e08e76ec2bbfa1074e624cae7 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Sun, 30 Jul 2017 16:15:34 -0700 Subject: [PATCH 031/441] provide a better "is_commentable" default for OStatus conversations that were fetched on the fly --- include/feedutils.php | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/include/feedutils.php b/include/feedutils.php index eb24f9032..e3f899a1e 100644 --- a/include/feedutils.php +++ b/include/feedutils.php @@ -1028,6 +1028,11 @@ function consume_feed($xml, $importer, &$contact, $pass = 0) { if(! $datarray['mid']) continue; + // This probably isn't an appropriate default but we're about to change it + // if it's wrong. + + $datarray['comment_policy'] = 'authenticated'; + // A Mastodon privacy tag has been found. We cannot send private comments // through the OStatus protocol, so block commenting. @@ -1256,6 +1261,11 @@ function consume_feed($xml, $importer, &$contact, $pass = 0) { if(! $datarray['mid']) continue; + // This probably isn't an appropriate default but we're about to change it + // if it's wrong. + + $datarray['comment_policy'] = 'authenticated'; + // A Mastodon privacy tag has been found. We cannot send private comments // through the OStatus protocol, so block commenting. @@ -1270,6 +1280,7 @@ function consume_feed($xml, $importer, &$contact, $pass = 0) { } + // if we have everything but a photo, provide the default profile photo if($author['author_name'] && $author['author_link'] && (! $author['author_photo'])) @@ -1493,7 +1504,7 @@ function process_salmon_feed($xml, $importer) { // reset policies which are restricted by default for RSS connections // This item is likely coming from GNU-social via salmon and allows public interaction $datarray['public_policy'] = ''; - $datarray['comment_policy'] = ''; + $datarray['comment_policy'] = 'authenticated'; $ret['item'] = $datarray; } From b4efe8ad8d91c70bf869259e6764e7e4a079563b Mon Sep 17 00:00:00 2001 From: git-marijus Date: Mon, 31 Jul 2017 02:24:49 +0200 Subject: [PATCH 032/441] implement system configs as app requirement and add the pubstream app --- Zotlabs/Lib/Apps.php | 14 ++++++++++---- app/pubstream.apd | 6 ++++++ 2 files changed, 16 insertions(+), 4 deletions(-) create mode 100644 app/pubstream.apd diff --git a/Zotlabs/Lib/Apps.php b/Zotlabs/Lib/Apps.php index 68587df49..7287bdd52 100644 --- a/Zotlabs/Lib/Apps.php +++ b/Zotlabs/Lib/Apps.php @@ -169,6 +169,7 @@ class Apps { $requires = explode(',',$ret['requires']); foreach($requires as $require) { $require = trim(strtolower($require)); + $toggle = (($require[0] == '!') ? 0 : 1); switch($require) { case 'nologin': if(local_channel()) @@ -191,10 +192,12 @@ class Apps { unset($ret); break; default: - if(! (local_channel() && feature_enabled(local_channel(),$require))) + $unset = ((local_channel() && feature_enabled(local_channel(),$require)) ? false : true); + $unset = ((get_config('system', ltrim($require, '!')) == $toggle) ? false : true); + + if($unset) unset($ret); break; - } } } @@ -307,6 +310,7 @@ class Apps { $requires = explode(',',$v); foreach($requires as $require) { $require = trim(strtolower($require)); + $toggle = (($require[0] == '!') ? 0 : 1); switch($require) { case 'nologin': if(local_channel()) @@ -330,10 +334,12 @@ class Apps { return ''; break; default: - if(! (local_channel() && feature_enabled(local_channel(),$require))) + $unset = ((local_channel() && feature_enabled(local_channel(),$require)) ? false : true); + $unset = ((get_config('system', ltrim($require, '!')) == $toggle) ? false : true); + + if($unset) return ''; break; - } } } diff --git a/app/pubstream.apd b/app/pubstream.apd new file mode 100644 index 000000000..065be24bc --- /dev/null +++ b/app/pubstream.apd @@ -0,0 +1,6 @@ +version: 1 +url: $baseurl/pubstream +requires: !disable_discover_tab +name: Public Stream +photo: icon:globe +categories: Social From 988371be0b2df3f917da67f39814e21f96f9f957 Mon Sep 17 00:00:00 2001 From: git-marijus Date: Mon, 31 Jul 2017 02:35:46 +0200 Subject: [PATCH 033/441] disable file notifications on initial upload for now - it can behave funky when uploading multiple small files at once --- include/attach.php | 6 +++--- view/tpl/cloud_actionspanel.tpl | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/attach.php b/include/attach.php index 785969a32..75235d7e1 100644 --- a/include/attach.php +++ b/include/attach.php @@ -888,9 +888,9 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) { } if($notify) { - $cloudPath = z_root() . '/cloud/' . $channel['channel_address'] . '/' . $r['0']['display_path']; - $object = get_file_activity_object($channel['channel_id'], $r['0']['hash'], $cloudPath); - file_activity($channel['channel_id'], $object, $r['0']['allow_cid'], $r['0']['allow_gid'], $r['0']['deny_cid'], $r['0']['deny_gid'], 'post', $notify); + //$cloudPath = z_root() . '/cloud/' . $channel['channel_address'] . '/' . $r['0']['display_path']; + //$object = get_file_activity_object($channel['channel_id'], $r['0']['hash'], $cloudPath); + //file_activity($channel['channel_id'], $object, $r['0']['allow_cid'], $r['0']['allow_gid'], $r['0']['deny_cid'], $r['0']['deny_gid'], 'post', $notify); } return $ret; diff --git a/view/tpl/cloud_actionspanel.tpl b/view/tpl/cloud_actionspanel.tpl index fc3e7f82f..baee48da3 100644 --- a/view/tpl/cloud_actionspanel.tpl +++ b/view/tpl/cloud_actionspanel.tpl @@ -26,7 +26,7 @@ - {{include file="field_checkbox.tpl" field=$notify}} + {{**include file="field_checkbox.tpl" field=$notify**}}
{{if $lockstate}} From 8f3a99ad1f87973d0788596371f311e0e4fa1ee3 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Sun, 30 Jul 2017 19:04:17 -0700 Subject: [PATCH 034/441] ensure we can work around the $is_http var in include/follow - this is left over from when the only non-webfinger connections we could make were RSS/Atom feeds. --- include/follow.php | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/include/follow.php b/include/follow.php index 2c2f5e209..9e2fd6a9c 100644 --- a/include/follow.php +++ b/include/follow.php @@ -182,6 +182,11 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false) $hash = get_observer_hash(); $default_group = $channel['channel_default_group']; + if($hash == $xchan_hash) { + $result['message'] = t('Cannot connect to yourself.'); + return $result; + } + if($xchan['xchan_network'] === 'rss') { // check service class feed limits @@ -196,28 +201,22 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false) $result['message'] = upgrade_message(); return $result; } - } - - if($hash == $xchan_hash) { - $result['message'] = t('Cannot connect to yourself.'); - return $result; - } - - $r = q("select abook_id, abook_xchan, abook_pending, abook_instance from abook - where abook_xchan = '%s' and abook_channel = %d limit 1", - dbesc($xchan_hash), - intval($uid) - ); - - if($is_http) { // Always set these "remote" permissions for feeds since we cannot interact with them // to negotiate a suitable permission response set_abconfig($uid,$xchan_hash,'their_perms','view_stream',1); set_abconfig($uid,$xchan_hash,'their_perms','republish',1); + } + + $r = q("select abook_id, abook_xchan, abook_pending, abook_instance from abook + where abook_xchan = '%s' and abook_channel = %d limit 1", + dbesc($xchan_hash), + intval($uid) + ); + if($r) { $abook_instance = $r[0]['abook_instance']; @@ -250,7 +249,7 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false) 'abook_channel' => intval($uid), 'abook_closeness' => intval($closeness), 'abook_xchan' => $xchan_hash, - 'abook_feed' => intval(($is_http) ? 1 : 0), + 'abook_feed' => intval(($xchan['xchan_network'] === 'rss') ? 1 : 0), 'abook_created' => datetime_convert(), 'abook_updated' => datetime_convert(), 'abook_instance' => (($singleton) ? z_root() : '') From e3c8e4f4833b485469616c753cc660e8a55bef29 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Sun, 30 Jul 2017 21:55:28 -0700 Subject: [PATCH 035/441] modify connection edit display for channels with no address/webbie --- Zotlabs/Module/Connedit.php | 3 ++- boot.php | 1 + include/network.php | 27 ++++++++++++++------------- view/tpl/abook_edit.tpl | 2 +- 4 files changed, 18 insertions(+), 15 deletions(-) diff --git a/Zotlabs/Module/Connedit.php b/Zotlabs/Module/Connedit.php index d301c2d45..0f18b432d 100644 --- a/Zotlabs/Module/Connedit.php +++ b/Zotlabs/Module/Connedit.php @@ -841,7 +841,7 @@ class Connedit extends \Zotlabs\Web\Controller { } } else - $locstr = t('none'); + $locstr = $contact['xchan_url']; $clone_warn = ''; $clonable = (in_array($contact['xchan_network'],['zot','rss']) ? true : false); @@ -866,6 +866,7 @@ class Connedit extends \Zotlabs\Web\Controller { '$permcat_new' => t('Add permission role'), '$permcat_enable' => feature_enabled(local_channel(),'permcats'), '$addr' => $contact['xchan_addr'], + '$primeurl' => $contact['xchan_url'], '$section' => $section, '$sections' => $sections, '$vcard' => $vcard, diff --git a/boot.php b/boot.php index 69b4db269..965a11a6e 100755 --- a/boot.php +++ b/boot.php @@ -256,6 +256,7 @@ define ( 'NETWORK_OSTATUS', 'stat'); // status.net, identi.ca, GNU-s define ( 'NETWORK_GNUSOCIAL', 'gnusoc'); // status.net, identi.ca, GNU-social, other OStatus implementations define ( 'NETWORK_FEED', 'rss'); // RSS/Atom feeds with no known "post/notify" protocol define ( 'NETWORK_DIASPORA', 'diaspora'); // Diaspora +define ( 'NETWORK_ACTIVITYPUB' 'activitypub'); define ( 'NETWORK_MAIL', 'mail'); // IMAP/POP define ( 'NETWORK_MAIL2', 'mai2'); // extended IMAP/POP define ( 'NETWORK_FACEBOOK', 'face'); // Facebook API diff --git a/include/network.php b/include/network.php index fe9a9aa2b..fa49e5765 100644 --- a/include/network.php +++ b/include/network.php @@ -1142,7 +1142,7 @@ function discover_by_webbie($webbie) { $network = null; - $webbie = strtolower($webbie); +// $webbie = strtolower($webbie); $x = webfinger_rfc7033($webbie,true); if($x && array_key_exists('links',$x) && $x['links']) { @@ -1688,18 +1688,19 @@ function get_repository_version($branch = 'master') { function network_to_name($s) { $nets = array( - NETWORK_DFRN => t('Friendica'), - NETWORK_FRND => t('Friendica'), - NETWORK_OSTATUS => t('OStatus'), - NETWORK_GNUSOCIAL => t('GNU-Social'), - NETWORK_FEED => t('RSS/Atom'), - NETWORK_MAIL => t('Email'), - NETWORK_DIASPORA => t('Diaspora'), - NETWORK_FACEBOOK => t('Facebook'), - NETWORK_ZOT => t('Zot'), - NETWORK_LINKEDIN => t('LinkedIn'), - NETWORK_XMPP => t('XMPP/IM'), - NETWORK_MYSPACE => t('MySpace'), + NETWORK_DFRN => t('Friendica'), + NETWORK_FRND => t('Friendica'), + NETWORK_OSTATUS => t('OStatus'), + NETWORK_GNUSOCIAL => t('GNU-Social'), + NETWORK_FEED => t('RSS/Atom'), + NETWORK_ACTIVITYPUB => t('ActivityPub'), + NETWORK_MAIL => t('Email'), + NETWORK_DIASPORA => t('Diaspora'), + NETWORK_FACEBOOK => t('Facebook'), + NETWORK_ZOT => t('Zot'), + NETWORK_LINKEDIN => t('LinkedIn'), + NETWORK_XMPP => t('XMPP/IM'), + NETWORK_MYSPACE => t('MySpace'), ); call_hooks('network_to_name', $nets); diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl index 146030494..13b94a560 100755 --- a/view/tpl/abook_edit.tpl +++ b/view/tpl/abook_edit.tpl @@ -52,7 +52,7 @@ {{/foreach}}
- {{$addr_text}} '{{$addr}}' + {{$addr_text}} '{{if $addr}}{{$addr}}{{else}}{{$primeurl}}{{/if}}'
{{if $locstr}}
From 445fa6825a20876441d07c28f7b7bbd2c8fd064c Mon Sep 17 00:00:00 2001 From: zotlabs Date: Sun, 30 Jul 2017 21:56:39 -0700 Subject: [PATCH 036/441] typo --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot.php b/boot.php index 965a11a6e..20ba72fae 100755 --- a/boot.php +++ b/boot.php @@ -256,7 +256,7 @@ define ( 'NETWORK_OSTATUS', 'stat'); // status.net, identi.ca, GNU-s define ( 'NETWORK_GNUSOCIAL', 'gnusoc'); // status.net, identi.ca, GNU-social, other OStatus implementations define ( 'NETWORK_FEED', 'rss'); // RSS/Atom feeds with no known "post/notify" protocol define ( 'NETWORK_DIASPORA', 'diaspora'); // Diaspora -define ( 'NETWORK_ACTIVITYPUB' 'activitypub'); +define ( 'NETWORK_ACTIVITYPUB', 'activitypub'); define ( 'NETWORK_MAIL', 'mail'); // IMAP/POP define ( 'NETWORK_MAIL2', 'mai2'); // extended IMAP/POP define ( 'NETWORK_FACEBOOK', 'face'); // Facebook API From 79a806f328e27269d13f26deb0acee7ad8560f7a Mon Sep 17 00:00:00 2001 From: git-marijus Date: Mon, 31 Jul 2017 16:49:56 +0200 Subject: [PATCH 037/441] db update to add index for item.obj_type --- boot.php | 2 +- install/schema_mysql.sql | 1 + install/schema_postgres.sql | 1 + install/update.php | 18 +++++++++++++++--- 4 files changed, 18 insertions(+), 4 deletions(-) diff --git a/boot.php b/boot.php index 69b4db269..5b8c3006d 100755 --- a/boot.php +++ b/boot.php @@ -52,7 +52,7 @@ define ( 'PLATFORM_NAME', 'hubzilla' ); define ( 'STD_VERSION', '2.7.0' ); define ( 'ZOT_REVISION', '1.3' ); -define ( 'DB_UPDATE_VERSION', 1192 ); +define ( 'DB_UPDATE_VERSION', 1193 ); define ( 'PROJECT_BASE', __DIR__ ); diff --git a/install/schema_mysql.sql b/install/schema_mysql.sql index 4430e9f10..9e2e401b5 100644 --- a/install/schema_mysql.sql +++ b/install/schema_mysql.sql @@ -660,6 +660,7 @@ CREATE TABLE IF NOT EXISTS `item` ( KEY `item_flags` (`item_flags`), KEY `commented` (`commented`), KEY `verb` (`verb`), + KEY `obj_type` (`obj_type`), KEY `item_private` (`item_private`), KEY `llink` (`llink`), KEY `expires` (`expires`), diff --git a/install/schema_postgres.sql b/install/schema_postgres.sql index f3cead9b7..0bc783692 100644 --- a/install/schema_postgres.sql +++ b/install/schema_postgres.sql @@ -631,6 +631,7 @@ create index "item_restrict" on item ("item_restrict"); create index "item_flags" on item ("item_flags"); create index "item_commented" on item ("commented"); create index "item_verb" on item ("verb"); +create index "item_obj_type" on item ("obj_type"); create index "item_private" on item ("item_private"); create index "item_llink" on item ("llink"); create index "item_expires" on item ("expires"); diff --git a/install/update.php b/install/update.php index ac560f4db..8798a3d69 100644 --- a/install/update.php +++ b/install/update.php @@ -1,6 +1,6 @@ Date: Mon, 31 Jul 2017 16:59:43 +0200 Subject: [PATCH 038/441] improve file_activity() a little --- Zotlabs/Module/Filestorage.php | 10 +--------- Zotlabs/Module/Sharedwithme.php | 5 +++++ include/attach.php | 23 +++-------------------- 3 files changed, 9 insertions(+), 29 deletions(-) diff --git a/Zotlabs/Module/Filestorage.php b/Zotlabs/Module/Filestorage.php index 0b83dea34..55713027a 100644 --- a/Zotlabs/Module/Filestorage.php +++ b/Zotlabs/Module/Filestorage.php @@ -5,14 +5,6 @@ namespace Zotlabs\Module; * */ -require_once('include/attach.php'); - - -/** - * - * @param object &$a - */ - class Filestorage extends \Zotlabs\Web\Controller { function post() { @@ -36,7 +28,7 @@ class Filestorage extends \Zotlabs\Web\Controller { $channel = \App::get_channel(); $acl = new \Zotlabs\Access\AccessList($channel); - $acl->set_from_array($_REQUEST); + $acl->set_from_array($_POST); $x = $acl->get(); $url = get_cloud_url($channel_id, $channel['channel_address'], $resource); diff --git a/Zotlabs/Module/Sharedwithme.php b/Zotlabs/Module/Sharedwithme.php index 5d6d0f7da..2c97e9726 100644 --- a/Zotlabs/Module/Sharedwithme.php +++ b/Zotlabs/Module/Sharedwithme.php @@ -4,6 +4,11 @@ require_once('include/conversation.php'); require_once('include/text.php'); +/** + * @file Zotlabs/Module/Sharedwithme.php + * + */ + class Sharedwithme extends \Zotlabs\Web\Controller { function get() { diff --git a/include/attach.php b/include/attach.php index 75235d7e1..d19de2ea3 100644 --- a/include/attach.php +++ b/include/attach.php @@ -1684,17 +1684,9 @@ function file_activity($channel_id, $object, $allow_cid, $allow_gid, $deny_cid, $arr['obj'] = $u_jsonobject; $arr['body'] = ''; - $post = item_store($arr); - $item_id = $post['item_id']; - if($item_id) { - Zotlabs\Daemon\Master::Summon(array('Notifier','activity',$item_id)); - } - - call_hooks('post_local_end', $arr); + post_activity_item($arr); $update = false; - - //notice( t('File activity updated') . EOL); } //don't create new activity if notify was not enabled @@ -1719,16 +1711,7 @@ function file_activity($channel_id, $object, $allow_cid, $allow_gid, $deny_cid, $arr['obj'] = (($update) ? $u_jsonobject : $jsonobject); $arr['body'] = ''; - $post = item_store($arr); - $item_id = $post['item_id']; - - if($item_id) { - Zotlabs\Daemon\Master::Summon(array('Notifier','activity',$item_id)); - } - - call_hooks('post_local_end', $arr); - - //(($verb === 'post') ? notice( t('File activity posted') . EOL) : notice( t('File activity dropped') . EOL)); + post_activity_item($arr); return; } @@ -1894,7 +1877,7 @@ function recursive_activity_recipients($arr_allow_cid, $arr_allow_gid, $arr_deny //if none is allowed restrict to self if(($r_arr_allow_gid === false) && ($r_arr_allow_cid === false)) { - $ret['allow_cid'] = $poster['xchan_hash']; + $ret['allow_cid'] = [$poster['xchan_hash']]; } else { $ret['allow_gid'] = $r_arr_allow_gid; $ret['allow_cid'] = $r_arr_allow_cid; From 376b05bcc9bbe6848c5693cd53201c0e8c8415ee Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Tue, 1 Aug 2017 00:56:59 +0200 Subject: [PATCH 039/441] less badge more icon --- view/css/bootstrap-red.css | 1 + 1 file changed, 1 insertion(+) diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css index 2133a2461..d7638714b 100644 --- a/view/css/bootstrap-red.css +++ b/view/css/bootstrap-red.css @@ -5,6 +5,7 @@ nav .badge { position: absolute; font-size: 0.75rem; + line-height: 0.75; } @media screen and (min-width: 767px) { From 1f2482f6abf5986ebf4b9ee292ba229a4a3b6797 Mon Sep 17 00:00:00 2001 From: git-marijus Date: Tue, 1 Aug 2017 03:38:41 +0200 Subject: [PATCH 040/441] correct the logic for configs in app requirement --- Zotlabs/Lib/Apps.php | 31 +++++++++++++++++++++++++------ app/pubstream.apd | 2 +- 2 files changed, 26 insertions(+), 7 deletions(-) diff --git a/Zotlabs/Lib/Apps.php b/Zotlabs/Lib/Apps.php index 7287bdd52..1fb841008 100644 --- a/Zotlabs/Lib/Apps.php +++ b/Zotlabs/Lib/Apps.php @@ -169,7 +169,15 @@ class Apps { $requires = explode(',',$ret['requires']); foreach($requires as $require) { $require = trim(strtolower($require)); + $config = false; + + if(substr($require, 0, 7) == 'config:') { + $config = true; + $require = ltrim($require, 'config:'); + } + $toggle = (($require[0] == '!') ? 0 : 1); + switch($require) { case 'nologin': if(local_channel()) @@ -192,9 +200,10 @@ class Apps { unset($ret); break; default: - $unset = ((local_channel() && feature_enabled(local_channel(),$require)) ? false : true); - $unset = ((get_config('system', ltrim($require, '!')) == $toggle) ? false : true); - + if($config) + $unset = ((get_config('system', ltrim($require, '!')) == $toggle) ? false : true); + else + $unset = ((local_channel() && feature_enabled(local_channel(),$require)) ? false : true); if($unset) unset($ret); break; @@ -308,9 +317,18 @@ class Apps { if($k === 'requires') { $requires = explode(',',$v); + foreach($requires as $require) { $require = trim(strtolower($require)); + $config = false; + + if(substr($require, 0, 7) == 'config:') { + $config = true; + $require = ltrim($require, 'config:'); + } + $toggle = (($require[0] == '!') ? 0 : 1); + switch($require) { case 'nologin': if(local_channel()) @@ -334,9 +352,10 @@ class Apps { return ''; break; default: - $unset = ((local_channel() && feature_enabled(local_channel(),$require)) ? false : true); - $unset = ((get_config('system', ltrim($require, '!')) == $toggle) ? false : true); - + if($config) + $unset = ((get_config('system', ltrim($require, '!')) == $toggle) ? false : true); + else + $unset = ((local_channel() && feature_enabled(local_channel(),$require)) ? false : true); if($unset) return ''; break; diff --git a/app/pubstream.apd b/app/pubstream.apd index 065be24bc..874e0a6cc 100644 --- a/app/pubstream.apd +++ b/app/pubstream.apd @@ -1,6 +1,6 @@ version: 1 url: $baseurl/pubstream -requires: !disable_discover_tab +requires: config:!disable_discover_tab name: Public Stream photo: icon:globe categories: Social From 46d8cf3f947b7b7c805a2ea964e8ca6bed73df9f Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Tue, 1 Aug 2017 12:32:50 +0200 Subject: [PATCH 041/441] strings --- util/hmessages.po | 19475 ++++++++++++++++++++++---------------------- 1 file changed, 9693 insertions(+), 9782 deletions(-) diff --git a/util/hmessages.po b/util/hmessages.po index 8cb0a2dec..5115cf7c3 100644 --- a/util/hmessages.po +++ b/util/hmessages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 2.5.8\n" +"Project-Id-Version: 2.7.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-07-05 21:45-0700\n" +"POT-Creation-Date: 2017-08-01 12:13+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,79 +17,6 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../../Zotlabs/Access/PermissionRoles.php:248 -msgid "Social Networking" -msgstr "" - -#: ../../Zotlabs/Access/PermissionRoles.php:249 -msgid "Social - Mostly Public" -msgstr "" - -#: ../../Zotlabs/Access/PermissionRoles.php:250 -msgid "Social - Restricted" -msgstr "" - -#: ../../Zotlabs/Access/PermissionRoles.php:251 -msgid "Social - Private" -msgstr "" - -#: ../../Zotlabs/Access/PermissionRoles.php:254 -msgid "Community Forum" -msgstr "" - -#: ../../Zotlabs/Access/PermissionRoles.php:255 -msgid "Forum - Mostly Public" -msgstr "" - -#: ../../Zotlabs/Access/PermissionRoles.php:256 -msgid "Forum - Restricted" -msgstr "" - -#: ../../Zotlabs/Access/PermissionRoles.php:257 -msgid "Forum - Private" -msgstr "" - -#: ../../Zotlabs/Access/PermissionRoles.php:260 -msgid "Feed Republish" -msgstr "" - -#: ../../Zotlabs/Access/PermissionRoles.php:261 -msgid "Feed - Mostly Public" -msgstr "" - -#: ../../Zotlabs/Access/PermissionRoles.php:262 -msgid "Feed - Restricted" -msgstr "" - -#: ../../Zotlabs/Access/PermissionRoles.php:265 -msgid "Special Purpose" -msgstr "" - -#: ../../Zotlabs/Access/PermissionRoles.php:266 -msgid "Special - Celebrity/Soapbox" -msgstr "" - -#: ../../Zotlabs/Access/PermissionRoles.php:267 -msgid "Special - Group Repository" -msgstr "" - -#: ../../Zotlabs/Access/PermissionRoles.php:270 -#: ../../Zotlabs/Module/Register.php:213 ../../Zotlabs/Module/Profiles.php:798 -#: ../../Zotlabs/Module/Connedit.php:931 -#: ../../Zotlabs/Module/New_channel.php:132 -#: ../../Zotlabs/Module/Settings/Channel.php:463 -#: ../../Zotlabs/Module/Cdav.php:1121 ../../include/connections.php:681 -#: ../../include/connections.php:688 ../../include/selectors.php:49 -#: ../../include/selectors.php:66 ../../include/selectors.php:104 -#: ../../include/selectors.php:140 ../../include/event.php:1297 -#: ../../include/event.php:1304 -msgid "Other" -msgstr "" - -#: ../../Zotlabs/Access/PermissionRoles.php:271 -msgid "Custom/Expert Mode" -msgstr "" - #: ../../Zotlabs/Access/Permissions.php:53 msgid "Can view my channel stream and posts" msgstr "" @@ -162,1263 +89,1950 @@ msgstr "" msgid "Can administer my channel" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:107 ../../Zotlabs/Storage/Browser.php:238 -msgid "parent" +#: ../../Zotlabs/Access/PermissionRoles.php:248 +msgid "Social Networking" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:131 ../../include/text.php:2692 -msgid "Collection" +#: ../../Zotlabs/Access/PermissionRoles.php:249 +msgid "Social - Mostly Public" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:134 -msgid "Principal" +#: ../../Zotlabs/Access/PermissionRoles.php:250 +msgid "Social - Restricted" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:137 -msgid "Addressbook" +#: ../../Zotlabs/Access/PermissionRoles.php:251 +msgid "Social - Private" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:140 -msgid "Calendar" +#: ../../Zotlabs/Access/PermissionRoles.php:254 +msgid "Community Forum" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:143 -msgid "Schedule Inbox" +#: ../../Zotlabs/Access/PermissionRoles.php:255 +msgid "Forum - Mostly Public" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:146 -msgid "Schedule Outbox" +#: ../../Zotlabs/Access/PermissionRoles.php:256 +msgid "Forum - Restricted" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:164 ../../Zotlabs/Module/Photos.php:757 -#: ../../Zotlabs/Module/Photos.php:1213 -#: ../../Zotlabs/Module/Embedphotos.php:146 ../../Zotlabs/Module/Cdav.php:727 -#: ../../Zotlabs/Module/Cdav.php:728 ../../Zotlabs/Module/Cdav.php:735 -#: ../../Zotlabs/Lib/Apps.php:696 ../../Zotlabs/Lib/Apps.php:774 -#: ../../Zotlabs/Widget/Album.php:84 ../../Zotlabs/Widget/Portfolio.php:86 -#: ../../include/conversation.php:1107 -msgid "Unknown" +#: ../../Zotlabs/Access/PermissionRoles.php:257 +msgid "Forum - Private" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:225 ../../Zotlabs/Module/Fbrowser.php:85 -#: ../../Zotlabs/Lib/Apps.php:225 ../../include/nav.php:390 -#: ../../include/conversation.php:1788 -msgid "Files" +#: ../../Zotlabs/Access/PermissionRoles.php:260 +msgid "Feed Republish" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:226 -msgid "Total" +#: ../../Zotlabs/Access/PermissionRoles.php:261 +msgid "Feed - Mostly Public" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:228 -msgid "Shared" +#: ../../Zotlabs/Access/PermissionRoles.php:262 +msgid "Feed - Restricted" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:229 ../../Zotlabs/Storage/Browser.php:333 -#: ../../Zotlabs/Module/Profiles.php:801 ../../Zotlabs/Module/Layouts.php:185 -#: ../../Zotlabs/Module/Menu.php:118 ../../Zotlabs/Module/Connedit.php:934 -#: ../../Zotlabs/Module/New_channel.php:147 -#: ../../Zotlabs/Module/Webpages.php:237 ../../Zotlabs/Module/Blocks.php:159 -#: ../../Zotlabs/Module/Cdav.php:1124 ../../Zotlabs/Widget/Cdav.php:127 -#: ../../Zotlabs/Widget/Cdav.php:164 -msgid "Create" +#: ../../Zotlabs/Access/PermissionRoles.php:265 +msgid "Special Purpose" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:230 ../../Zotlabs/Storage/Browser.php:335 -#: ../../Zotlabs/Module/Cover_photo.php:361 -#: ../../Zotlabs/Module/Profile_photo.php:423 -#: ../../Zotlabs/Module/Photos.php:784 ../../Zotlabs/Module/Photos.php:1321 -#: ../../Zotlabs/Module/Embedphotos.php:158 ../../Zotlabs/Widget/Album.php:97 -#: ../../Zotlabs/Widget/Cdav.php:132 ../../Zotlabs/Widget/Cdav.php:168 -#: ../../Zotlabs/Widget/Portfolio.php:99 -msgid "Upload" +#: ../../Zotlabs/Access/PermissionRoles.php:266 +msgid "Special - Celebrity/Soapbox" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:234 ../../Zotlabs/Module/Wiki.php:172 -#: ../../Zotlabs/Module/Admin/Channels.php:159 -#: ../../Zotlabs/Module/Connedit.php:919 -#: ../../Zotlabs/Module/Sharedwithme.php:100 -#: ../../Zotlabs/Module/Settings/Oauth.php:89 -#: ../../Zotlabs/Module/Settings/Oauth.php:115 -#: ../../Zotlabs/Module/Chat.php:249 ../../Zotlabs/Module/Cdav.php:1109 -#: ../../Zotlabs/Lib/NativeWikiPage.php:539 -#: ../../Zotlabs/Widget/Wiki_page_history.php:22 -#: ../../extend/addon/addon/rendezvous/rendezvous.php:172 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:158 -msgid "Name" +#: ../../Zotlabs/Access/PermissionRoles.php:267 +msgid "Special - Group Repository" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:235 ../../Zotlabs/Module/Wiki.php:173 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:159 -msgid "Type" +#: ../../Zotlabs/Access/PermissionRoles.php:270 +#: ../../Zotlabs/Module/Cdav.php:1123 ../../Zotlabs/Module/New_channel.php:132 +#: ../../Zotlabs/Module/Settings/Channel.php:467 +#: ../../Zotlabs/Module/Connedit.php:932 ../../Zotlabs/Module/Profiles.php:798 +#: ../../Zotlabs/Module/Register.php:213 ../../include/selectors.php:49 +#: ../../include/selectors.php:66 ../../include/selectors.php:104 +#: ../../include/selectors.php:140 ../../include/event.php:1297 +#: ../../include/event.php:1304 ../../include/connections.php:681 +#: ../../include/connections.php:688 +msgid "Other" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:236 -#: ../../Zotlabs/Module/Sharedwithme.php:102 ../../include/text.php:1386 -msgid "Size" +#: ../../Zotlabs/Access/PermissionRoles.php:271 +msgid "Custom/Expert Mode" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:237 -#: ../../Zotlabs/Module/Sharedwithme.php:103 -msgid "Last Modified" +#: ../../Zotlabs/Module/Blocks.php:33 ../../Zotlabs/Module/Editlayout.php:31 +#: ../../Zotlabs/Module/Connect.php:17 ../../Zotlabs/Module/Achievements.php:15 +#: ../../Zotlabs/Module/Hcard.php:12 ../../Zotlabs/Module/Editblock.php:31 +#: ../../Zotlabs/Module/Profile.php:20 ../../Zotlabs/Module/Layouts.php:31 +#: ../../Zotlabs/Module/Editwebpage.php:32 ../../Zotlabs/Module/Webpages.php:33 +#: ../../Zotlabs/Module/Filestorage.php:51 ../../include/channel.php:1062 +msgid "Requested profile is not available." msgstr "" -#: ../../Zotlabs/Storage/Browser.php:239 ../../Zotlabs/Module/Layouts.php:193 -#: ../../Zotlabs/Module/Wiki.php:165 ../../Zotlabs/Module/Wiki.php:298 -#: ../../Zotlabs/Module/Connections.php:261 -#: ../../Zotlabs/Module/Connections.php:298 -#: ../../Zotlabs/Module/Connections.php:318 -#: ../../Zotlabs/Module/Admin/Profs.php:154 -#: ../../Zotlabs/Module/Editlayout.php:114 -#: ../../Zotlabs/Module/Editwebpage.php:142 ../../Zotlabs/Module/Menu.php:112 -#: ../../Zotlabs/Module/Editblock.php:114 ../../Zotlabs/Module/Editpost.php:85 -#: ../../Zotlabs/Module/Webpages.php:238 ../../Zotlabs/Module/Blocks.php:160 -#: ../../Zotlabs/Module/Settings/Oauth.php:149 -#: ../../Zotlabs/Module/Thing.php:260 ../../Zotlabs/Lib/ThreadItem.php:107 -#: ../../Zotlabs/Lib/Apps.php:368 ../../Zotlabs/Widget/Cdav.php:125 -#: ../../Zotlabs/Widget/Cdav.php:161 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:151 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:252 -#: ../../include/menu.php:113 ../../include/channel.php:1059 -#: ../../include/channel.php:1063 -msgid "Edit" -msgstr "" - -#: ../../Zotlabs/Storage/Browser.php:240 ../../Zotlabs/Module/Profiles.php:803 -#: ../../Zotlabs/Module/Connections.php:269 -#: ../../Zotlabs/Module/Admin/Profs.php:155 -#: ../../Zotlabs/Module/Admin/Accounts.php:173 -#: ../../Zotlabs/Module/Admin/Channels.php:149 -#: ../../Zotlabs/Module/Editlayout.php:138 -#: ../../Zotlabs/Module/Editwebpage.php:167 -#: ../../Zotlabs/Module/Connedit.php:650 ../../Zotlabs/Module/Connedit.php:936 -#: ../../Zotlabs/Module/Group.php:177 ../../Zotlabs/Module/Editblock.php:139 -#: ../../Zotlabs/Module/Webpages.php:240 ../../Zotlabs/Module/Blocks.php:162 -#: ../../Zotlabs/Module/Settings/Oauth.php:150 -#: ../../Zotlabs/Module/Thing.php:261 ../../Zotlabs/Module/Photos.php:1143 -#: ../../Zotlabs/Module/Cdav.php:837 ../../Zotlabs/Module/Cdav.php:1126 -#: ../../Zotlabs/Lib/ThreadItem.php:127 ../../Zotlabs/Lib/Apps.php:369 -#: ../../include/conversation.php:649 ../../include/conversation.php:686 -msgid "Delete" -msgstr "" - -#: ../../Zotlabs/Storage/Browser.php:302 -#, php-format -msgid "You are using %1$s of your available file storage." -msgstr "" - -#: ../../Zotlabs/Storage/Browser.php:307 -#, php-format -msgid "You are using %1$s of %2$s available file storage. (%3$s%)" -msgstr "" - -#: ../../Zotlabs/Storage/Browser.php:318 -msgid "WARNING:" -msgstr "" - -#: ../../Zotlabs/Storage/Browser.php:328 -msgid "" -"Please use DAV to upload large (video, audio) files.
See Cloud Desktop " -"Clients" -msgstr "" - -#: ../../Zotlabs/Storage/Browser.php:332 -msgid "Create new folder" -msgstr "" - -#: ../../Zotlabs/Storage/Browser.php:334 -msgid "Upload file" -msgstr "" - -#: ../../Zotlabs/Storage/Browser.php:348 -msgid "Drop files here to immediately upload" -msgstr "" - -#: ../../Zotlabs/Web/Router.php:146 ../../Zotlabs/Module/Block.php:77 -#: ../../Zotlabs/Module/Page.php:128 ../../Zotlabs/Module/Display.php:122 -#: ../../Zotlabs/Lib/NativeWikiPage.php:500 ../../include/help.php:68 -msgid "Page not found." -msgstr "" - -#: ../../Zotlabs/Web/WebServer.php:130 ../../Zotlabs/Module/Group.php:72 -#: ../../Zotlabs/Module/Dreport.php:10 ../../Zotlabs/Module/Dreport.php:68 -#: ../../Zotlabs/Module/Import_items.php:120 ../../Zotlabs/Module/Like.php:283 -#: ../../Zotlabs/Module/Subthread.php:62 ../../Zotlabs/Module/Profperm.php:28 -#: ../../extend/addon/addon/frphotos/frphotos.php:81 -#: ../../extend/addon/addon/redfiles/redfiles.php:109 -#: ../../extend/addon/addon/redphotos/redphotos.php:119 -#: ../../include/items.php:340 -msgid "Permission denied" -msgstr "" - -#: ../../Zotlabs/Web/WebServer.php:131 -#: ../../Zotlabs/Module/Achievements.php:34 -#: ../../Zotlabs/Module/Register.php:77 ../../Zotlabs/Module/Message.php:18 -#: ../../Zotlabs/Module/Profiles.php:198 ../../Zotlabs/Module/Profiles.php:635 +#: ../../Zotlabs/Module/Blocks.php:73 ../../Zotlabs/Module/Blocks.php:80 +#: ../../Zotlabs/Module/Invite.php:17 ../../Zotlabs/Module/Invite.php:94 +#: ../../Zotlabs/Module/Editlayout.php:67 +#: ../../Zotlabs/Module/Editlayout.php:90 ../../Zotlabs/Module/Channel.php:115 +#: ../../Zotlabs/Module/Channel.php:245 ../../Zotlabs/Module/Channel.php:285 +#: ../../Zotlabs/Module/Settings.php:59 ../../Zotlabs/Module/Locs.php:87 +#: ../../Zotlabs/Module/Mitem.php:115 ../../Zotlabs/Module/Events.php:271 +#: ../../Zotlabs/Module/Appman.php:82 ../../Zotlabs/Module/Regmod.php:21 +#: ../../Zotlabs/Module/New_channel.php:77 +#: ../../Zotlabs/Module/New_channel.php:104 +#: ../../Zotlabs/Module/Sharedwithme.php:16 ../../Zotlabs/Module/Setup.php:209 +#: ../../Zotlabs/Module/Moderate.php:13 +#: ../../Zotlabs/Module/Achievements.php:34 ../../Zotlabs/Module/Thing.php:274 +#: ../../Zotlabs/Module/Thing.php:294 ../../Zotlabs/Module/Thing.php:335 +#: ../../Zotlabs/Module/Api.php:24 ../../Zotlabs/Module/Editblock.php:67 +#: ../../Zotlabs/Module/Profile.php:85 ../../Zotlabs/Module/Profile.php:102 +#: ../../Zotlabs/Module/Mood.php:116 ../../Zotlabs/Module/Connections.php:29 +#: ../../Zotlabs/Module/Viewsrc.php:19 ../../Zotlabs/Module/Bookmarks.php:64 +#: ../../Zotlabs/Module/Photos.php:69 ../../Zotlabs/Module/Wiki.php:50 +#: ../../Zotlabs/Module/Wiki.php:235 ../../Zotlabs/Module/Wiki.php:341 +#: ../../Zotlabs/Module/Pdledit.php:29 ../../Zotlabs/Module/Poke.php:149 +#: ../../Zotlabs/Module/Profile_photo.php:280 +#: ../../Zotlabs/Module/Profile_photo.php:293 #: ../../Zotlabs/Module/Authtest.php:16 ../../Zotlabs/Module/Item.php:223 #: ../../Zotlabs/Module/Item.php:240 ../../Zotlabs/Module/Item.php:250 -#: ../../Zotlabs/Module/Item.php:1071 ../../Zotlabs/Module/Layouts.php:71 +#: ../../Zotlabs/Module/Item.php:1076 ../../Zotlabs/Module/Page.php:34 +#: ../../Zotlabs/Module/Page.php:125 ../../Zotlabs/Module/Connedit.php:385 +#: ../../Zotlabs/Module/Chat.php:100 ../../Zotlabs/Module/Chat.php:105 +#: ../../Zotlabs/Module/Menu.php:78 ../../Zotlabs/Module/Layouts.php:71 #: ../../Zotlabs/Module/Layouts.php:78 ../../Zotlabs/Module/Layouts.php:89 -#: ../../Zotlabs/Module/Wiki.php:50 ../../Zotlabs/Module/Wiki.php:233 -#: ../../Zotlabs/Module/Wiki.php:339 ../../Zotlabs/Module/Block.php:24 -#: ../../Zotlabs/Module/Block.php:74 ../../Zotlabs/Module/Connections.php:29 -#: ../../Zotlabs/Module/Cover_photo.php:281 -#: ../../Zotlabs/Module/Cover_photo.php:294 -#: ../../Zotlabs/Module/Editlayout.php:67 -#: ../../Zotlabs/Module/Editlayout.php:90 +#: ../../Zotlabs/Module/Group.php:13 ../../Zotlabs/Module/Profiles.php:198 +#: ../../Zotlabs/Module/Profiles.php:635 #: ../../Zotlabs/Module/Editwebpage.php:68 #: ../../Zotlabs/Module/Editwebpage.php:89 #: ../../Zotlabs/Module/Editwebpage.php:107 -#: ../../Zotlabs/Module/Editwebpage.php:121 -#: ../../Zotlabs/Module/Network.php:15 ../../Zotlabs/Module/Menu.php:78 -#: ../../Zotlabs/Module/Locs.php:87 ../../Zotlabs/Module/Connedit.php:385 -#: ../../Zotlabs/Module/Filestorage.php:23 -#: ../../Zotlabs/Module/Filestorage.php:78 -#: ../../Zotlabs/Module/Filestorage.php:93 -#: ../../Zotlabs/Module/Filestorage.php:120 ../../Zotlabs/Module/Setup.php:206 -#: ../../Zotlabs/Module/Settings.php:59 ../../Zotlabs/Module/Group.php:13 -#: ../../Zotlabs/Module/Mail.php:146 ../../Zotlabs/Module/Editblock.php:67 -#: ../../Zotlabs/Module/Mitem.php:115 ../../Zotlabs/Module/Moderate.php:13 -#: ../../Zotlabs/Module/Editpost.php:17 ../../Zotlabs/Module/Api.php:24 -#: ../../Zotlabs/Module/Page.php:34 ../../Zotlabs/Module/Page.php:125 -#: ../../Zotlabs/Module/New_channel.php:77 -#: ../../Zotlabs/Module/New_channel.php:104 -#: ../../Zotlabs/Module/Profile.php:83 ../../Zotlabs/Module/Profile.php:100 -#: ../../Zotlabs/Module/Notifications.php:11 -#: ../../Zotlabs/Module/Webpages.php:116 ../../Zotlabs/Module/Invite.php:17 -#: ../../Zotlabs/Module/Invite.php:94 ../../Zotlabs/Module/Like.php:181 -#: ../../Zotlabs/Module/Mood.php:116 ../../Zotlabs/Module/Blocks.php:73 -#: ../../Zotlabs/Module/Blocks.php:80 ../../Zotlabs/Module/Rate.php:113 -#: ../../Zotlabs/Module/Profile_photo.php:280 -#: ../../Zotlabs/Module/Profile_photo.php:293 -#: ../../Zotlabs/Module/Appman.php:82 ../../Zotlabs/Module/Common.php:39 -#: ../../Zotlabs/Module/Manage.php:10 ../../Zotlabs/Module/Regmod.php:21 -#: ../../Zotlabs/Module/Pdledit.php:29 ../../Zotlabs/Module/Events.php:271 -#: ../../Zotlabs/Module/Viewsrc.php:19 -#: ../../Zotlabs/Module/Service_limits.php:11 -#: ../../Zotlabs/Module/Bookmarks.php:61 -#: ../../Zotlabs/Module/Sharedwithme.php:11 -#: ../../Zotlabs/Module/Sources.php:74 ../../Zotlabs/Module/Poke.php:149 -#: ../../Zotlabs/Module/Suggest.php:28 ../../Zotlabs/Module/Thing.php:274 -#: ../../Zotlabs/Module/Thing.php:294 ../../Zotlabs/Module/Thing.php:335 +#: ../../Zotlabs/Module/Editwebpage.php:121 ../../Zotlabs/Module/Manage.php:10 +#: ../../Zotlabs/Module/Webpages.php:118 ../../Zotlabs/Module/Block.php:24 +#: ../../Zotlabs/Module/Block.php:74 ../../Zotlabs/Module/Editpost.php:17 +#: ../../Zotlabs/Module/Sources.php:74 ../../Zotlabs/Module/Like.php:181 +#: ../../Zotlabs/Module/Suggest.php:28 ../../Zotlabs/Module/Message.php:18 +#: ../../Zotlabs/Module/Mail.php:146 ../../Zotlabs/Module/Register.php:77 +#: ../../Zotlabs/Module/Cover_photo.php:281 +#: ../../Zotlabs/Module/Cover_photo.php:294 ../../Zotlabs/Module/Network.php:15 +#: ../../Zotlabs/Module/Filestorage.php:15 +#: ../../Zotlabs/Module/Filestorage.php:70 +#: ../../Zotlabs/Module/Filestorage.php:85 +#: ../../Zotlabs/Module/Filestorage.php:112 ../../Zotlabs/Module/Common.php:39 #: ../../Zotlabs/Module/Viewconnections.php:28 #: ../../Zotlabs/Module/Viewconnections.php:33 -#: ../../Zotlabs/Module/Photos.php:69 ../../Zotlabs/Module/Chat.php:98 -#: ../../Zotlabs/Module/Chat.php:103 ../../Zotlabs/Module/Channel.php:115 -#: ../../Zotlabs/Module/Channel.php:245 ../../Zotlabs/Module/Channel.php:285 -#: ../../Zotlabs/Lib/Chatroom.php:137 -#: ../../extend/addon/addon/keepout/keepout.php:36 -#: ../../extend/addon/addon/pumpio/pumpio.php:40 -#: ../../extend/addon/addon/openid/Mod_Id.php:53 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:196 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:292 +#: ../../Zotlabs/Module/Service_limits.php:11 ../../Zotlabs/Module/Rate.php:113 +#: ../../Zotlabs/Module/Notifications.php:11 ../../Zotlabs/Lib/Chatroom.php:137 +#: ../../Zotlabs/Web/WebServer.php:131 ../../addon/keepout/keepout.php:36 +#: ../../addon/openid/Mod_Id.php:53 ../../addon/gitwiki/Mod_Gitwiki.php:196 +#: ../../addon/gitwiki/Mod_Gitwiki.php:292 ../../addon/pumpio/pumpio.php:40 #: ../../include/attach.php:144 ../../include/attach.php:191 #: ../../include/attach.php:255 ../../include/attach.php:269 #: ../../include/attach.php:276 ../../include/attach.php:344 #: ../../include/attach.php:358 ../../include/attach.php:365 -#: ../../include/attach.php:442 ../../include/attach.php:909 -#: ../../include/attach.php:983 ../../include/attach.php:1148 +#: ../../include/attach.php:443 ../../include/attach.php:918 +#: ../../include/attach.php:992 ../../include/attach.php:1157 #: ../../include/items.php:3440 ../../include/photos.php:28 msgid "Permission denied." msgstr "" -#: ../../Zotlabs/Zot/Auth.php:138 -msgid "" -"Remote authentication blocked. You are logged into this site locally. Please " -"logout and retry." +#: ../../Zotlabs/Module/Blocks.php:97 ../../Zotlabs/Module/Blocks.php:155 +#: ../../Zotlabs/Module/Editblock.php:113 +msgid "Block Name" msgstr "" -#: ../../Zotlabs/Zot/Auth.php:250 -#: ../../extend/addon/addon/openid/Mod_Openid.php:76 -#: ../../extend/addon/addon/openid/Mod_Openid.php:178 +#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2280 +msgid "Blocks" +msgstr "" + +#: ../../Zotlabs/Module/Blocks.php:156 +msgid "Block Title" +msgstr "" + +#: ../../Zotlabs/Module/Blocks.php:157 ../../Zotlabs/Module/Menu.php:114 +#: ../../Zotlabs/Module/Layouts.php:191 ../../Zotlabs/Module/Webpages.php:251 +msgid "Created" +msgstr "" + +#: ../../Zotlabs/Module/Blocks.php:158 ../../Zotlabs/Module/Menu.php:115 +#: ../../Zotlabs/Module/Layouts.php:192 ../../Zotlabs/Module/Webpages.php:252 +msgid "Edited" +msgstr "" + +#: ../../Zotlabs/Module/Blocks.php:159 ../../Zotlabs/Module/Cdav.php:1126 +#: ../../Zotlabs/Module/New_channel.php:147 +#: ../../Zotlabs/Module/Connedit.php:935 ../../Zotlabs/Module/Menu.php:118 +#: ../../Zotlabs/Module/Layouts.php:185 ../../Zotlabs/Module/Profiles.php:801 +#: ../../Zotlabs/Module/Webpages.php:239 ../../Zotlabs/Storage/Browser.php:229 +#: ../../Zotlabs/Storage/Browser.php:335 ../../Zotlabs/Widget/Cdav.php:127 +#: ../../Zotlabs/Widget/Cdav.php:164 +msgid "Create" +msgstr "" + +#: ../../Zotlabs/Module/Blocks.php:160 ../../Zotlabs/Module/Editlayout.php:114 +#: ../../Zotlabs/Module/Admin/Profs.php:154 +#: ../../Zotlabs/Module/Settings/Oauth.php:149 +#: ../../Zotlabs/Module/Thing.php:260 ../../Zotlabs/Module/Editblock.php:114 +#: ../../Zotlabs/Module/Connections.php:260 +#: ../../Zotlabs/Module/Connections.php:297 +#: ../../Zotlabs/Module/Connections.php:317 ../../Zotlabs/Module/Wiki.php:167 +#: ../../Zotlabs/Module/Wiki.php:300 ../../Zotlabs/Module/Menu.php:112 +#: ../../Zotlabs/Module/Layouts.php:193 +#: ../../Zotlabs/Module/Editwebpage.php:142 +#: ../../Zotlabs/Module/Webpages.php:240 ../../Zotlabs/Module/Editpost.php:85 +#: ../../Zotlabs/Lib/Apps.php:393 ../../Zotlabs/Lib/ThreadItem.php:107 +#: ../../Zotlabs/Storage/Browser.php:239 ../../Zotlabs/Widget/Cdav.php:125 +#: ../../Zotlabs/Widget/Cdav.php:161 ../../addon/gitwiki/Mod_Gitwiki.php:151 +#: ../../addon/gitwiki/Mod_Gitwiki.php:252 ../../include/channel.php:1161 +#: ../../include/channel.php:1165 ../../include/menu.php:113 +msgid "Edit" +msgstr "" + +#: ../../Zotlabs/Module/Blocks.php:161 ../../Zotlabs/Module/Photos.php:1044 +#: ../../Zotlabs/Module/Layouts.php:194 ../../Zotlabs/Module/Webpages.php:241 +#: ../../Zotlabs/Widget/Cdav.php:123 ../../include/conversation.php:1308 +msgid "Share" +msgstr "" + +#: ../../Zotlabs/Module/Blocks.php:162 ../../Zotlabs/Module/Editlayout.php:138 +#: ../../Zotlabs/Module/Cdav.php:838 ../../Zotlabs/Module/Cdav.php:1128 +#: ../../Zotlabs/Module/Admin/Accounts.php:173 +#: ../../Zotlabs/Module/Admin/Channels.php:149 +#: ../../Zotlabs/Module/Admin/Profs.php:155 +#: ../../Zotlabs/Module/Settings/Oauth.php:150 +#: ../../Zotlabs/Module/Thing.php:261 ../../Zotlabs/Module/Editblock.php:139 +#: ../../Zotlabs/Module/Connections.php:268 +#: ../../Zotlabs/Module/Photos.php:1145 ../../Zotlabs/Module/Connedit.php:650 +#: ../../Zotlabs/Module/Connedit.php:937 ../../Zotlabs/Module/Group.php:179 +#: ../../Zotlabs/Module/Profiles.php:803 +#: ../../Zotlabs/Module/Editwebpage.php:167 +#: ../../Zotlabs/Module/Webpages.php:242 ../../Zotlabs/Lib/Apps.php:394 +#: ../../Zotlabs/Lib/ThreadItem.php:127 ../../Zotlabs/Storage/Browser.php:240 +#: ../../include/conversation.php:649 ../../include/conversation.php:686 +msgid "Delete" +msgstr "" + +#: ../../Zotlabs/Module/Blocks.php:166 ../../Zotlabs/Module/Events.php:694 +#: ../../Zotlabs/Module/Wiki.php:169 ../../Zotlabs/Module/Layouts.php:198 +#: ../../Zotlabs/Module/Webpages.php:246 ../../Zotlabs/Module/Pubsites.php:59 +#: ../../addon/gitwiki/Mod_Gitwiki.php:153 +msgid "View" +msgstr "" + +#: ../../Zotlabs/Module/Invite.php:29 +msgid "Total invitation limit exceeded." +msgstr "" + +#: ../../Zotlabs/Module/Invite.php:53 #, php-format -msgid "Welcome %s. Remote authentication successful." +msgid "%s : Not a valid email address." msgstr "" -#: ../../Zotlabs/Module/Achievements.php:15 -#: ../../Zotlabs/Module/Layouts.php:31 ../../Zotlabs/Module/Connect.php:17 -#: ../../Zotlabs/Module/Editlayout.php:31 -#: ../../Zotlabs/Module/Editwebpage.php:32 -#: ../../Zotlabs/Module/Filestorage.php:59 ../../Zotlabs/Module/Hcard.php:12 -#: ../../Zotlabs/Module/Editblock.php:31 ../../Zotlabs/Module/Profile.php:20 -#: ../../Zotlabs/Module/Webpages.php:33 ../../Zotlabs/Module/Blocks.php:33 -#: ../../include/channel.php:960 -msgid "Requested profile is not available." +#: ../../Zotlabs/Module/Invite.php:67 +msgid "Please join us on $Projectname" msgstr "" -#: ../../Zotlabs/Module/Achievements.php:38 -msgid "Some blurb about what to do when you're new here" +#: ../../Zotlabs/Module/Invite.php:77 +msgid "Invitation limit exceeded. Please contact your site administrator." msgstr "" -#: ../../Zotlabs/Module/Register.php:49 -msgid "Maximum daily site registrations exceeded. Please try again tomorrow." -msgstr "" - -#: ../../Zotlabs/Module/Register.php:55 -msgid "" -"Please indicate acceptance of the Terms of Service. Registration failed." -msgstr "" - -#: ../../Zotlabs/Module/Register.php:89 -msgid "Passwords do not match." -msgstr "" - -#: ../../Zotlabs/Module/Register.php:131 -msgid "" -"Registration successful. Please check your email for validation instructions." -msgstr "" - -#: ../../Zotlabs/Module/Register.php:137 -msgid "Your registration is pending approval by the site owner." -msgstr "" - -#: ../../Zotlabs/Module/Register.php:140 -msgid "Your registration can not be processed." -msgstr "" - -#: ../../Zotlabs/Module/Register.php:184 -msgid "Registration on this hub is disabled." -msgstr "" - -#: ../../Zotlabs/Module/Register.php:193 -msgid "Registration on this hub is by approval only." -msgstr "" - -#: ../../Zotlabs/Module/Register.php:194 -msgid "Register at another affiliated hub." -msgstr "" - -#: ../../Zotlabs/Module/Register.php:204 -msgid "" -"This site has exceeded the number of allowed daily account registrations. " -"Please try again tomorrow." -msgstr "" - -#: ../../Zotlabs/Module/Register.php:221 ../../Zotlabs/Module/Siteinfo.php:27 -msgid "Terms of Service" -msgstr "" - -#: ../../Zotlabs/Module/Register.php:227 +#: ../../Zotlabs/Module/Invite.php:82 #, php-format -msgid "I accept the %s for this website" +msgid "%s : Message delivery failed." msgstr "" -#: ../../Zotlabs/Module/Register.php:229 +#: ../../Zotlabs/Module/Invite.php:86 #, php-format -msgid "I am over 13 years of age and accept the %s for this website" +msgid "%d message sent." +msgid_plural "%d messages sent." +msgstr[0] "" +msgstr[1] "" + +#: ../../Zotlabs/Module/Invite.php:98 ../../Zotlabs/Lib/Apps.php:254 +msgid "Invite" msgstr "" -#: ../../Zotlabs/Module/Register.php:233 -msgid "Your email address" +#: ../../Zotlabs/Module/Invite.php:107 +msgid "You have no more invitations available" msgstr "" -#: ../../Zotlabs/Module/Register.php:234 -msgid "Choose a password" +#: ../../Zotlabs/Module/Invite.php:138 +msgid "Send invitations" msgstr "" -#: ../../Zotlabs/Module/Register.php:235 -msgid "Please re-enter your password" +#: ../../Zotlabs/Module/Invite.php:139 +msgid "Enter email addresses, one per line:" msgstr "" -#: ../../Zotlabs/Module/Register.php:236 -msgid "Please enter your invitation code" +#: ../../Zotlabs/Module/Invite.php:140 ../../Zotlabs/Module/Mail.php:285 +msgid "Your message:" +msgstr "" + +#: ../../Zotlabs/Module/Invite.php:141 +msgid "Please join my community on $Projectname." +msgstr "" + +#: ../../Zotlabs/Module/Invite.php:143 +msgid "You will need to supply this invitation code:" +msgstr "" + +#: ../../Zotlabs/Module/Invite.php:144 +msgid "1. Register at any $Projectname location (they are all inter-connected)" +msgstr "" + +#: ../../Zotlabs/Module/Invite.php:146 +msgid "2. Enter my $Projectname network address into the site searchbar." +msgstr "" + +#: ../../Zotlabs/Module/Invite.php:147 +msgid "or visit" +msgstr "" + +#: ../../Zotlabs/Module/Invite.php:149 +msgid "3. Click [Connect]" +msgstr "" + +#: ../../Zotlabs/Module/Invite.php:151 ../../Zotlabs/Module/Locs.php:121 +#: ../../Zotlabs/Module/Mitem.php:243 ../../Zotlabs/Module/Events.php:493 +#: ../../Zotlabs/Module/Appman.php:148 +#: ../../Zotlabs/Module/Import_items.php:129 ../../Zotlabs/Module/Setup.php:308 +#: ../../Zotlabs/Module/Setup.php:349 ../../Zotlabs/Module/Connect.php:98 +#: ../../Zotlabs/Module/Admin/Features.php:66 +#: ../../Zotlabs/Module/Admin/Plugins.php:438 +#: ../../Zotlabs/Module/Admin/Accounts.php:166 +#: ../../Zotlabs/Module/Admin/Logs.php:84 +#: ../../Zotlabs/Module/Admin/Channels.php:147 +#: ../../Zotlabs/Module/Admin/Themes.php:158 +#: ../../Zotlabs/Module/Admin/Site.php:271 +#: ../../Zotlabs/Module/Admin/Profs.php:157 +#: ../../Zotlabs/Module/Admin/Account_edit.php:74 +#: ../../Zotlabs/Module/Admin/Security.php:104 +#: ../../Zotlabs/Module/Settings/Permcats.php:110 +#: ../../Zotlabs/Module/Settings/Channel.php:480 +#: ../../Zotlabs/Module/Settings/Features.php:47 +#: ../../Zotlabs/Module/Settings/Tokens.php:168 +#: ../../Zotlabs/Module/Settings/Account.php:118 +#: ../../Zotlabs/Module/Settings/Featured.php:52 +#: ../../Zotlabs/Module/Settings/Display.php:203 +#: ../../Zotlabs/Module/Settings/Oauth.php:87 +#: ../../Zotlabs/Module/Thing.php:320 ../../Zotlabs/Module/Thing.php:370 +#: ../../Zotlabs/Module/Import.php:518 ../../Zotlabs/Module/Cal.php:343 +#: ../../Zotlabs/Module/Mood.php:139 ../../Zotlabs/Module/Photos.php:659 +#: ../../Zotlabs/Module/Photos.php:1024 ../../Zotlabs/Module/Photos.php:1064 +#: ../../Zotlabs/Module/Photos.php:1182 ../../Zotlabs/Module/Wiki.php:171 +#: ../../Zotlabs/Module/Pdledit.php:74 ../../Zotlabs/Module/Poke.php:200 +#: ../../Zotlabs/Module/Connedit.php:900 ../../Zotlabs/Module/Chat.php:196 +#: ../../Zotlabs/Module/Chat.php:242 ../../Zotlabs/Module/Pconfig.php:107 +#: ../../Zotlabs/Module/Group.php:87 ../../Zotlabs/Module/Profiles.php:726 +#: ../../Zotlabs/Module/Sources.php:114 ../../Zotlabs/Module/Sources.php:149 +#: ../../Zotlabs/Module/Xchan.php:15 ../../Zotlabs/Module/Mail.php:431 +#: ../../Zotlabs/Module/Filestorage.php:155 ../../Zotlabs/Module/Rate.php:166 +#: ../../Zotlabs/Lib/ThreadItem.php:730 ../../Zotlabs/Widget/Eventstools.php:16 +#: ../../view/theme/redbasic/php/config.php:95 +#: ../../addon/skeleton/skeleton.php:65 ../../addon/gnusoc/gnusoc.php:226 +#: ../../addon/planets/planets.php:153 +#: ../../addon/openclipatar/openclipatar.php:53 +#: ../../addon/wppost/wppost.php:113 ../../addon/nsfw/nsfw.php:92 +#: ../../addon/ijpost/ijpost.php:89 ../../addon/dwpost/dwpost.php:89 +#: ../../addon/mailhost/mailhost.php:40 +#: ../../addon/likebanner/likebanner.php:57 +#: ../../addon/redphotos/redphotos.php:136 ../../addon/irc/irc.php:53 +#: ../../addon/ljpost/ljpost.php:86 ../../addon/startpage/startpage.php:113 +#: ../../addon/diaspora/diaspora.php:759 +#: ../../addon/gitwiki/Mod_Gitwiki.php:155 +#: ../../addon/rainbowtag/rainbowtag.php:85 ../../addon/visage/visage.php:170 +#: ../../addon/nsabait/nsabait.php:161 ../../addon/mailtest/mailtest.php:100 +#: ../../addon/openstreetmap/openstreetmap.php:168 +#: ../../addon/rtof/rtof.php:101 ../../addon/jappixmini/jappixmini.php:371 +#: ../../addon/superblock/superblock.php:120 ../../addon/nofed/nofed.php:80 +#: ../../addon/redred/redred.php:119 ../../addon/logrot/logrot.php:35 +#: ../../addon/frphotos/frphotos.php:96 ../../addon/chords/Mod_Chords.php:60 +#: ../../addon/libertree/libertree.php:85 +#: ../../addon/flattrwidget/flattrwidget.php:124 +#: ../../addon/statusnet/statusnet.php:322 +#: ../../addon/statusnet/statusnet.php:380 +#: ../../addon/statusnet/statusnet.php:432 +#: ../../addon/statusnet/statusnet.php:899 ../../addon/twitter/twitter.php:217 +#: ../../addon/twitter/twitter.php:259 +#: ../../addon/smileybutton/smileybutton.php:219 ../../addon/piwik/piwik.php:95 +#: ../../addon/pageheader/pageheader.php:48 +#: ../../addon/authchoose/authchoose.php:71 ../../addon/xmpp/xmpp.php:69 +#: ../../addon/pumpio/pumpio.php:237 ../../addon/redfiles/redfiles.php:124 +#: ../../addon/hubwall/hubwall.php:95 ../../include/js_strings.php:22 +msgid "Submit" +msgstr "" + +#: ../../Zotlabs/Module/Editlayout.php:79 ../../Zotlabs/Module/Editblock.php:79 +#: ../../Zotlabs/Module/Editblock.php:95 +#: ../../Zotlabs/Module/Editwebpage.php:80 ../../Zotlabs/Module/Editpost.php:24 +msgid "Item not found" +msgstr "" + +#: ../../Zotlabs/Module/Editlayout.php:128 ../../Zotlabs/Module/Layouts.php:129 +#: ../../Zotlabs/Module/Layouts.php:189 +msgid "Layout Name" +msgstr "" + +#: ../../Zotlabs/Module/Editlayout.php:129 ../../Zotlabs/Module/Layouts.php:132 +msgid "Layout Description (Optional)" +msgstr "" + +#: ../../Zotlabs/Module/Editlayout.php:137 +msgid "Edit Layout" +msgstr "" + +#: ../../Zotlabs/Module/Profperm.php:28 ../../Zotlabs/Module/Subthread.php:62 +#: ../../Zotlabs/Module/Import_items.php:120 ../../Zotlabs/Module/Group.php:74 +#: ../../Zotlabs/Module/Dreport.php:10 ../../Zotlabs/Module/Dreport.php:68 +#: ../../Zotlabs/Module/Like.php:283 ../../Zotlabs/Web/WebServer.php:130 +#: ../../addon/redphotos/redphotos.php:119 ../../addon/frphotos/frphotos.php:81 +#: ../../addon/redfiles/redfiles.php:109 ../../include/items.php:340 +msgid "Permission denied" +msgstr "" + +#: ../../Zotlabs/Module/Profperm.php:34 ../../Zotlabs/Module/Profperm.php:63 +msgid "Invalid profile identifier." +msgstr "" + +#: ../../Zotlabs/Module/Profperm.php:111 +msgid "Profile Visibility Editor" +msgstr "" + +#: ../../Zotlabs/Module/Profperm.php:113 ../../include/channel.php:1485 +msgid "Profile" +msgstr "" + +#: ../../Zotlabs/Module/Profperm.php:115 +msgid "Click on a contact to add or remove." +msgstr "" + +#: ../../Zotlabs/Module/Profperm.php:124 +msgid "Visible To" +msgstr "" + +#: ../../Zotlabs/Module/Profperm.php:140 +#: ../../Zotlabs/Module/Connections.php:140 +msgid "All Connections" +msgstr "" + +#: ../../Zotlabs/Module/Cdav.php:726 +msgid "INVALID EVENT DISMISSED!" +msgstr "" + +#: ../../Zotlabs/Module/Cdav.php:727 +msgid "Summary: " +msgstr "" + +#: ../../Zotlabs/Module/Cdav.php:727 ../../Zotlabs/Module/Cdav.php:728 +#: ../../Zotlabs/Module/Cdav.php:735 ../../Zotlabs/Module/Embedphotos.php:146 +#: ../../Zotlabs/Module/Photos.php:759 ../../Zotlabs/Module/Photos.php:1215 +#: ../../Zotlabs/Lib/Apps.php:721 ../../Zotlabs/Lib/Apps.php:799 +#: ../../Zotlabs/Storage/Browser.php:164 ../../Zotlabs/Widget/Portfolio.php:86 +#: ../../Zotlabs/Widget/Album.php:84 ../../include/conversation.php:1107 +msgid "Unknown" +msgstr "" + +#: ../../Zotlabs/Module/Cdav.php:728 +msgid "Date: " +msgstr "" + +#: ../../Zotlabs/Module/Cdav.php:729 ../../Zotlabs/Module/Cdav.php:736 +msgid "Reason: " +msgstr "" + +#: ../../Zotlabs/Module/Cdav.php:734 +msgid "INVALID CARD DISMISSED!" +msgstr "" + +#: ../../Zotlabs/Module/Cdav.php:735 +msgid "Name: " +msgstr "" + +#: ../../Zotlabs/Module/Cdav.php:768 +msgid "CalDAV" +msgstr "" + +#: ../../Zotlabs/Module/Cdav.php:809 ../../Zotlabs/Module/Events.php:460 +msgid "Event title" +msgstr "" + +#: ../../Zotlabs/Module/Cdav.php:810 ../../Zotlabs/Module/Events.php:466 +msgid "Start date and time" +msgstr "" + +#: ../../Zotlabs/Module/Cdav.php:810 ../../Zotlabs/Module/Cdav.php:811 +msgid "Example: YYYY-MM-DD HH:mm" +msgstr "" + +#: ../../Zotlabs/Module/Cdav.php:811 +msgid "End date and time" +msgstr "" + +#: ../../Zotlabs/Module/Cdav.php:812 ../../Zotlabs/Module/Events.php:473 +#: ../../Zotlabs/Module/Appman.php:138 ../../Zotlabs/Module/Rbmark.php:101 +#: ../../addon/rendezvous/rendezvous.php:173 +msgid "Description" +msgstr "" + +#: ../../Zotlabs/Module/Cdav.php:813 ../../Zotlabs/Module/Locs.php:117 +#: ../../Zotlabs/Module/Events.php:475 ../../Zotlabs/Module/Profiles.php:509 +#: ../../Zotlabs/Module/Profiles.php:737 ../../Zotlabs/Module/Pubsites.php:51 +#: ../../include/js_strings.php:25 +msgid "Location" +msgstr "" + +#: ../../Zotlabs/Module/Cdav.php:820 ../../Zotlabs/Module/Events.php:689 +#: ../../Zotlabs/Module/Events.php:698 ../../Zotlabs/Module/Cal.php:337 +#: ../../Zotlabs/Module/Cal.php:344 ../../Zotlabs/Module/Photos.php:913 +msgid "Previous" +msgstr "" + +#: ../../Zotlabs/Module/Cdav.php:821 ../../Zotlabs/Module/Events.php:690 +#: ../../Zotlabs/Module/Events.php:699 ../../Zotlabs/Module/Setup.php:263 +#: ../../Zotlabs/Module/Cal.php:338 ../../Zotlabs/Module/Cal.php:345 +#: ../../Zotlabs/Module/Photos.php:922 +msgid "Next" +msgstr "" + +#: ../../Zotlabs/Module/Cdav.php:822 ../../Zotlabs/Module/Events.php:700 +#: ../../Zotlabs/Module/Cal.php:346 +msgid "Today" +msgstr "" + +#: ../../Zotlabs/Module/Cdav.php:823 ../../Zotlabs/Module/Events.php:695 +msgid "Month" +msgstr "" + +#: ../../Zotlabs/Module/Cdav.php:824 ../../Zotlabs/Module/Events.php:696 +msgid "Week" +msgstr "" + +#: ../../Zotlabs/Module/Cdav.php:825 ../../Zotlabs/Module/Events.php:697 +msgid "Day" +msgstr "" + +#: ../../Zotlabs/Module/Cdav.php:826 +msgid "List month" +msgstr "" + +#: ../../Zotlabs/Module/Cdav.php:827 +msgid "List week" +msgstr "" + +#: ../../Zotlabs/Module/Cdav.php:828 +msgid "List day" +msgstr "" + +#: ../../Zotlabs/Module/Cdav.php:835 +msgid "More" +msgstr "" + +#: ../../Zotlabs/Module/Cdav.php:836 +msgid "Less" +msgstr "" + +#: ../../Zotlabs/Module/Cdav.php:837 +msgid "Select calendar" +msgstr "" + +#: ../../Zotlabs/Module/Cdav.php:839 +msgid "Delete all" +msgstr "" + +#: ../../Zotlabs/Module/Cdav.php:840 ../../Zotlabs/Module/Cdav.php:1129 +#: ../../Zotlabs/Module/Admin/Plugins.php:423 +#: ../../Zotlabs/Module/Settings/Oauth.php:88 +#: ../../Zotlabs/Module/Settings/Oauth.php:114 +#: ../../Zotlabs/Module/Wiki.php:290 ../../Zotlabs/Module/Wiki.php:316 +#: ../../Zotlabs/Module/Connedit.php:938 ../../Zotlabs/Module/Fbrowser.php:66 +#: ../../Zotlabs/Module/Fbrowser.php:88 ../../Zotlabs/Module/Profiles.php:804 +#: ../../Zotlabs/Module/Filer.php:55 ../../Zotlabs/Module/Tagrm.php:15 +#: ../../Zotlabs/Module/Tagrm.php:138 ../../addon/js_upload/js_upload.php:46 +#: ../../addon/gitwiki/Mod_Gitwiki.php:244 +#: ../../addon/gitwiki/Mod_Gitwiki.php:267 ../../include/conversation.php:1324 +#: ../../include/conversation.php:1373 +msgid "Cancel" +msgstr "" + +#: ../../Zotlabs/Module/Cdav.php:841 +msgid "Sorry! Editing of recurrent events is not yet implemented." +msgstr "" + +#: ../../Zotlabs/Module/Cdav.php:969 +msgid "CardDAV" +msgstr "" + +#: ../../Zotlabs/Module/Cdav.php:1111 ../../Zotlabs/Module/Sharedwithme.php:105 +#: ../../Zotlabs/Module/Admin/Channels.php:159 +#: ../../Zotlabs/Module/Settings/Oauth.php:89 +#: ../../Zotlabs/Module/Settings/Oauth.php:115 +#: ../../Zotlabs/Module/Wiki.php:174 ../../Zotlabs/Module/Connedit.php:920 +#: ../../Zotlabs/Module/Chat.php:251 ../../Zotlabs/Lib/NativeWikiPage.php:539 +#: ../../Zotlabs/Storage/Browser.php:234 +#: ../../Zotlabs/Widget/Wiki_page_history.php:22 +#: ../../addon/rendezvous/rendezvous.php:172 +#: ../../addon/gitwiki/Mod_Gitwiki.php:158 +msgid "Name" +msgstr "" + +#: ../../Zotlabs/Module/Cdav.php:1112 ../../Zotlabs/Module/Connedit.php:921 +msgid "Organisation" +msgstr "" + +#: ../../Zotlabs/Module/Cdav.php:1113 ../../Zotlabs/Module/Connedit.php:922 +msgid "Title" +msgstr "" + +#: ../../Zotlabs/Module/Cdav.php:1114 ../../Zotlabs/Module/Connedit.php:923 +#: ../../Zotlabs/Module/Profiles.php:789 +msgid "Phone" +msgstr "" + +#: ../../Zotlabs/Module/Cdav.php:1115 +#: ../../Zotlabs/Module/Admin/Accounts.php:169 +#: ../../Zotlabs/Module/Admin/Accounts.php:181 +#: ../../Zotlabs/Module/Connedit.php:924 ../../Zotlabs/Module/Profiles.php:790 +#: ../../addon/openid/MysqlProvider.php:56 +#: ../../addon/openid/MysqlProvider.php:57 ../../addon/rtof/rtof.php:93 +#: ../../addon/redred/redred.php:107 ../../include/network.php:1697 +msgid "Email" +msgstr "" + +#: ../../Zotlabs/Module/Cdav.php:1116 ../../Zotlabs/Module/Connedit.php:925 +#: ../../Zotlabs/Module/Profiles.php:791 +msgid "Instant messenger" +msgstr "" + +#: ../../Zotlabs/Module/Cdav.php:1117 ../../Zotlabs/Module/Connedit.php:926 +#: ../../Zotlabs/Module/Profiles.php:792 +msgid "Website" +msgstr "" + +#: ../../Zotlabs/Module/Cdav.php:1118 ../../Zotlabs/Module/Locs.php:118 +#: ../../Zotlabs/Module/Admin/Channels.php:160 +#: ../../Zotlabs/Module/Connedit.php:927 ../../Zotlabs/Module/Profiles.php:502 +#: ../../Zotlabs/Module/Profiles.php:793 +msgid "Address" +msgstr "" + +#: ../../Zotlabs/Module/Cdav.php:1119 ../../Zotlabs/Module/Connedit.php:928 +#: ../../Zotlabs/Module/Profiles.php:794 +msgid "Note" +msgstr "" + +#: ../../Zotlabs/Module/Cdav.php:1120 ../../Zotlabs/Module/Connedit.php:929 +#: ../../Zotlabs/Module/Profiles.php:795 ../../include/event.php:1290 +#: ../../include/connections.php:674 +msgid "Mobile" +msgstr "" + +#: ../../Zotlabs/Module/Cdav.php:1121 ../../Zotlabs/Module/Connedit.php:930 +#: ../../Zotlabs/Module/Profiles.php:796 ../../include/event.php:1291 +#: ../../include/connections.php:675 +msgid "Home" +msgstr "" + +#: ../../Zotlabs/Module/Cdav.php:1122 ../../Zotlabs/Module/Connedit.php:931 +#: ../../Zotlabs/Module/Profiles.php:797 ../../include/event.php:1294 +#: ../../include/connections.php:678 +msgid "Work" +msgstr "" + +#: ../../Zotlabs/Module/Cdav.php:1124 ../../Zotlabs/Module/Connedit.php:933 +#: ../../Zotlabs/Module/Profiles.php:799 +#: ../../addon/jappixmini/jappixmini.php:368 +msgid "Add Contact" +msgstr "" + +#: ../../Zotlabs/Module/Cdav.php:1125 ../../Zotlabs/Module/Connedit.php:934 +#: ../../Zotlabs/Module/Profiles.php:800 +msgid "Add Field" +msgstr "" + +#: ../../Zotlabs/Module/Cdav.php:1127 +#: ../../Zotlabs/Module/Admin/Plugins.php:453 +#: ../../Zotlabs/Module/Settings/Oauth.php:42 +#: ../../Zotlabs/Module/Settings/Oauth.php:113 +#: ../../Zotlabs/Module/Connedit.php:936 ../../Zotlabs/Module/Profiles.php:802 +#: ../../Zotlabs/Lib/Apps.php:384 +msgid "Update" +msgstr "" + +#: ../../Zotlabs/Module/Cdav.php:1130 ../../Zotlabs/Module/Connedit.php:939 +msgid "P.O. Box" +msgstr "" + +#: ../../Zotlabs/Module/Cdav.php:1131 ../../Zotlabs/Module/Connedit.php:940 +msgid "Additional" +msgstr "" + +#: ../../Zotlabs/Module/Cdav.php:1132 ../../Zotlabs/Module/Connedit.php:941 +msgid "Street" +msgstr "" + +#: ../../Zotlabs/Module/Cdav.php:1133 ../../Zotlabs/Module/Connedit.php:942 +msgid "Locality" +msgstr "" + +#: ../../Zotlabs/Module/Cdav.php:1134 ../../Zotlabs/Module/Connedit.php:943 +msgid "Region" +msgstr "" + +#: ../../Zotlabs/Module/Cdav.php:1135 ../../Zotlabs/Module/Connedit.php:944 +msgid "ZIP Code" +msgstr "" + +#: ../../Zotlabs/Module/Cdav.php:1136 ../../Zotlabs/Module/Connedit.php:945 +#: ../../Zotlabs/Module/Profiles.php:760 +msgid "Country" +msgstr "" + +#: ../../Zotlabs/Module/Cdav.php:1183 +msgid "Default Calendar" +msgstr "" + +#: ../../Zotlabs/Module/Cdav.php:1193 +msgid "Default Addressbook" +msgstr "" + +#: ../../Zotlabs/Module/Regdir.php:49 ../../Zotlabs/Module/Dirsearch.php:25 +msgid "This site is not a directory server" +msgstr "" + +#: ../../Zotlabs/Module/Channel.php:32 ../../Zotlabs/Module/Chat.php:25 +#: ../../addon/gitwiki/Mod_Gitwiki.php:28 ../../addon/chess/chess.php:403 +msgid "You must be logged in to see this page." +msgstr "" + +#: ../../Zotlabs/Module/Channel.php:47 ../../Zotlabs/Module/Hcard.php:37 +#: ../../Zotlabs/Module/Profile.php:45 +msgid "Posts and comments" +msgstr "" + +#: ../../Zotlabs/Module/Channel.php:54 ../../Zotlabs/Module/Hcard.php:44 +#: ../../Zotlabs/Module/Profile.php:52 +msgid "Only posts" +msgstr "" + +#: ../../Zotlabs/Module/Channel.php:97 ../../Zotlabs/Lib/Apps.php:240 +#: ../../include/nav.php:175 +msgid "Channel Home" +msgstr "" + +#: ../../Zotlabs/Module/Channel.php:112 +msgid "Insufficient permissions. Request redirected to profile page." +msgstr "" + +#: ../../Zotlabs/Module/Lang.php:8 ../../Zotlabs/Lib/Apps.php:256 +#: ../../addon/openid/MysqlProvider.php:69 +msgid "Language" +msgstr "" + +#: ../../Zotlabs/Module/Uexport.php:57 ../../Zotlabs/Module/Uexport.php:58 +msgid "Export Channel" +msgstr "" + +#: ../../Zotlabs/Module/Uexport.php:59 +msgid "" +"Export your basic channel information to a file. This acts as a backup of " +"your connections, permissions, profile and basic data, which can be used to " +"import your data to a new server hub, but does not contain your content." +msgstr "" + +#: ../../Zotlabs/Module/Uexport.php:60 +msgid "Export Content" +msgstr "" + +#: ../../Zotlabs/Module/Uexport.php:61 +msgid "" +"Export your channel information and recent content to a JSON backup that can " +"be restored or imported to another server hub. This backs up all of your " +"connections, permissions, profile data and several months of posts. This " +"file may be VERY large. Please be patient - it may take several minutes for " +"this download to begin." +msgstr "" + +#: ../../Zotlabs/Module/Uexport.php:63 +msgid "Export your posts from a given year." +msgstr "" + +#: ../../Zotlabs/Module/Uexport.php:65 +msgid "" +"You may also export your posts and conversations for a particular year or " +"month. Adjust the date in your browser location bar to select other dates. " +"If the export fails (possibly due to memory exhaustion on your server hub), " +"please try again selecting a more limited date range." +msgstr "" + +#: ../../Zotlabs/Module/Uexport.php:66 +#, php-format +msgid "" +"To select all posts for a given year, such as this year, visit %2$s" +msgstr "" + +#: ../../Zotlabs/Module/Uexport.php:67 +#, php-format +msgid "" +"To select all posts for a given month, such as January of this year, visit " +"%2$s" +msgstr "" + +#: ../../Zotlabs/Module/Uexport.php:68 +#, php-format +msgid "" +"These content files may be imported or restored by visiting " +"%2$s on any site containing your channel. For best results please import " +"or restore these in date order (oldest first)." +msgstr "" + +#: ../../Zotlabs/Module/Search.php:17 ../../Zotlabs/Module/Photos.php:490 +#: ../../Zotlabs/Module/Ratings.php:83 ../../Zotlabs/Module/Directory.php:63 +#: ../../Zotlabs/Module/Display.php:22 +#: ../../Zotlabs/Module/Viewconnections.php:23 +msgid "Public access denied." +msgstr "" + +#: ../../Zotlabs/Module/Search.php:25 ../../Zotlabs/Module/Search.php:44 +#: ../../Zotlabs/Module/Connections.php:313 ../../Zotlabs/Lib/Apps.php:250 +#: ../../Zotlabs/Widget/Sitesearch.php:31 ../../include/text.php:1021 +#: ../../include/text.php:1033 ../../include/acl_selectors.php:213 +#: ../../include/nav.php:160 +msgid "Search" +msgstr "" + +#: ../../Zotlabs/Module/Search.php:225 +#, php-format +msgid "Items tagged with: %s" +msgstr "" + +#: ../../Zotlabs/Module/Search.php:227 +#, php-format +msgid "Search results for: %s" +msgstr "" + +#: ../../Zotlabs/Module/Locs.php:25 ../../Zotlabs/Module/Locs.php:54 +msgid "Location not found." +msgstr "" + +#: ../../Zotlabs/Module/Locs.php:62 +msgid "Location lookup failed." +msgstr "" + +#: ../../Zotlabs/Module/Locs.php:66 +msgid "" +"Please select another location to become primary before removing the primary " +"location." +msgstr "" + +#: ../../Zotlabs/Module/Locs.php:95 +msgid "Syncing locations" +msgstr "" + +#: ../../Zotlabs/Module/Locs.php:105 +msgid "No locations found." +msgstr "" + +#: ../../Zotlabs/Module/Locs.php:116 +msgid "Manage Channel Locations" +msgstr "" + +#: ../../Zotlabs/Module/Locs.php:119 ../../Zotlabs/Module/Admin.php:111 +msgid "Primary" +msgstr "" + +#: ../../Zotlabs/Module/Locs.php:120 ../../Zotlabs/Module/Menu.php:113 +msgid "Drop" +msgstr "" + +#: ../../Zotlabs/Module/Locs.php:122 +msgid "Sync Now" +msgstr "" + +#: ../../Zotlabs/Module/Locs.php:123 +msgid "Please wait several minutes between consecutive operations." +msgstr "" + +#: ../../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/Apporder.php:34 +msgid "Change Order of Navigation Apps" +msgstr "" + +#: ../../Zotlabs/Module/Apporder.php:35 +msgid "Use arrows to move the corresponding app up or down in the display list" +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 "" + +#: ../../Zotlabs/Module/Mitem.php:76 +msgid "Unable to update menu element." +msgstr "" + +#: ../../Zotlabs/Module/Mitem.php:92 +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:230 +msgid "Menu Item Permissions" +msgstr "" + +#: ../../Zotlabs/Module/Mitem.php:154 ../../Zotlabs/Module/Mitem.php:231 +#: ../../Zotlabs/Module/Settings/Channel.php:513 +msgid "(click to open/close)" +msgstr "" + +#: ../../Zotlabs/Module/Mitem.php:160 ../../Zotlabs/Module/Mitem.php:176 +msgid "Link Name" +msgstr "" + +#: ../../Zotlabs/Module/Mitem.php:161 ../../Zotlabs/Module/Mitem.php:239 +msgid "Link or Submenu Target" +msgstr "" + +#: ../../Zotlabs/Module/Mitem.php:161 +msgid "Enter URL of the link or select a menu name to create a submenu" +msgstr "" + +#: ../../Zotlabs/Module/Mitem.php:162 ../../Zotlabs/Module/Mitem.php:240 +msgid "Use magic-auth if available" +msgstr "" + +#: ../../Zotlabs/Module/Mitem.php:162 ../../Zotlabs/Module/Mitem.php:163 +#: ../../Zotlabs/Module/Mitem.php:240 ../../Zotlabs/Module/Mitem.php:241 +#: ../../Zotlabs/Module/Events.php:470 ../../Zotlabs/Module/Events.php:471 +#: ../../Zotlabs/Module/Removeme.php:63 ../../Zotlabs/Module/Admin/Site.php:235 +#: ../../Zotlabs/Module/Settings/Channel.php:298 +#: ../../Zotlabs/Module/Settings/Display.php:103 +#: ../../Zotlabs/Module/Api.php:97 ../../Zotlabs/Module/Photos.php:644 +#: ../../Zotlabs/Module/Wiki.php:182 ../../Zotlabs/Module/Connedit.php:392 +#: ../../Zotlabs/Module/Connedit.php:775 ../../Zotlabs/Module/Menu.php:100 +#: ../../Zotlabs/Module/Menu.php:157 ../../Zotlabs/Module/Profiles.php:681 +#: ../../Zotlabs/Module/Filestorage.php:150 +#: ../../Zotlabs/Module/Filestorage.php:158 +#: ../../Zotlabs/Storage/Browser.php:351 ../../boot.php:1605 +#: ../../view/theme/redbasic/php/config.php:100 +#: ../../view/theme/redbasic/php/config.php:115 +#: ../../addon/planets/planets.php:149 ../../addon/wppost/wppost.php:82 +#: ../../addon/wppost/wppost.php:105 ../../addon/wppost/wppost.php:109 +#: ../../addon/nsfw/nsfw.php:84 ../../addon/ijpost/ijpost.php:73 +#: ../../addon/ijpost/ijpost.php:85 ../../addon/dwpost/dwpost.php:73 +#: ../../addon/dwpost/dwpost.php:85 ../../addon/ljpost/ljpost.php:70 +#: ../../addon/ljpost/ljpost.php:82 ../../addon/gitwiki/Mod_Gitwiki.php:166 +#: ../../addon/rainbowtag/rainbowtag.php:81 ../../addon/visage/visage.php:166 +#: ../../addon/nsabait/nsabait.php:157 ../../addon/rtof/rtof.php:81 +#: ../../addon/rtof/rtof.php:85 ../../addon/jappixmini/jappixmini.php:309 +#: ../../addon/jappixmini/jappixmini.php:313 +#: ../../addon/jappixmini/jappixmini.php:343 +#: ../../addon/jappixmini/jappixmini.php:351 +#: ../../addon/jappixmini/jappixmini.php:355 +#: ../../addon/jappixmini/jappixmini.php:359 ../../addon/nofed/nofed.php:72 +#: ../../addon/nofed/nofed.php:76 ../../addon/redred/redred.php:95 +#: ../../addon/redred/redred.php:99 ../../addon/libertree/libertree.php:69 +#: ../../addon/libertree/libertree.php:81 +#: ../../addon/flattrwidget/flattrwidget.php:120 +#: ../../addon/statusnet/statusnet.php:389 +#: ../../addon/statusnet/statusnet.php:411 +#: ../../addon/statusnet/statusnet.php:415 +#: ../../addon/statusnet/statusnet.php:424 ../../addon/twitter/twitter.php:242 +#: ../../addon/twitter/twitter.php:246 ../../addon/twitter/twitter.php:255 +#: ../../addon/smileybutton/smileybutton.php:211 +#: ../../addon/smileybutton/smileybutton.php:215 +#: ../../addon/authchoose/authchoose.php:67 ../../addon/xmpp/xmpp.php:53 +#: ../../addon/pumpio/pumpio.php:219 ../../addon/pumpio/pumpio.php:223 +#: ../../addon/pumpio/pumpio.php:227 ../../addon/pumpio/pumpio.php:231 +#: ../../include/dir_fns.php:143 ../../include/dir_fns.php:144 +#: ../../include/dir_fns.php:145 +msgid "No" +msgstr "" + +#: ../../Zotlabs/Module/Mitem.php:162 ../../Zotlabs/Module/Mitem.php:163 +#: ../../Zotlabs/Module/Mitem.php:240 ../../Zotlabs/Module/Mitem.php:241 +#: ../../Zotlabs/Module/Events.php:470 ../../Zotlabs/Module/Events.php:471 +#: ../../Zotlabs/Module/Removeme.php:63 ../../Zotlabs/Module/Admin/Site.php:237 +#: ../../Zotlabs/Module/Settings/Channel.php:298 +#: ../../Zotlabs/Module/Settings/Display.php:103 +#: ../../Zotlabs/Module/Api.php:96 ../../Zotlabs/Module/Photos.php:644 +#: ../../Zotlabs/Module/Wiki.php:182 ../../Zotlabs/Module/Connedit.php:392 +#: ../../Zotlabs/Module/Menu.php:100 ../../Zotlabs/Module/Menu.php:157 +#: ../../Zotlabs/Module/Profiles.php:681 +#: ../../Zotlabs/Module/Filestorage.php:150 +#: ../../Zotlabs/Module/Filestorage.php:158 +#: ../../Zotlabs/Storage/Browser.php:351 ../../boot.php:1605 +#: ../../view/theme/redbasic/php/config.php:100 +#: ../../view/theme/redbasic/php/config.php:115 +#: ../../addon/planets/planets.php:149 ../../addon/wppost/wppost.php:82 +#: ../../addon/wppost/wppost.php:105 ../../addon/wppost/wppost.php:109 +#: ../../addon/nsfw/nsfw.php:84 ../../addon/ijpost/ijpost.php:73 +#: ../../addon/ijpost/ijpost.php:85 ../../addon/dwpost/dwpost.php:73 +#: ../../addon/dwpost/dwpost.php:85 ../../addon/ljpost/ljpost.php:70 +#: ../../addon/ljpost/ljpost.php:82 ../../addon/gitwiki/Mod_Gitwiki.php:166 +#: ../../addon/rainbowtag/rainbowtag.php:81 ../../addon/visage/visage.php:166 +#: ../../addon/nsabait/nsabait.php:157 ../../addon/rtof/rtof.php:81 +#: ../../addon/rtof/rtof.php:85 ../../addon/jappixmini/jappixmini.php:309 +#: ../../addon/jappixmini/jappixmini.php:313 +#: ../../addon/jappixmini/jappixmini.php:343 +#: ../../addon/jappixmini/jappixmini.php:351 +#: ../../addon/jappixmini/jappixmini.php:355 +#: ../../addon/jappixmini/jappixmini.php:359 ../../addon/nofed/nofed.php:72 +#: ../../addon/nofed/nofed.php:76 ../../addon/redred/redred.php:95 +#: ../../addon/redred/redred.php:99 ../../addon/libertree/libertree.php:69 +#: ../../addon/libertree/libertree.php:81 +#: ../../addon/flattrwidget/flattrwidget.php:120 +#: ../../addon/statusnet/statusnet.php:389 +#: ../../addon/statusnet/statusnet.php:411 +#: ../../addon/statusnet/statusnet.php:415 +#: ../../addon/statusnet/statusnet.php:424 ../../addon/twitter/twitter.php:242 +#: ../../addon/twitter/twitter.php:246 ../../addon/twitter/twitter.php:255 +#: ../../addon/smileybutton/smileybutton.php:211 +#: ../../addon/smileybutton/smileybutton.php:215 +#: ../../addon/authchoose/authchoose.php:67 ../../addon/xmpp/xmpp.php:53 +#: ../../addon/pumpio/pumpio.php:219 ../../addon/pumpio/pumpio.php:223 +#: ../../addon/pumpio/pumpio.php:227 ../../addon/pumpio/pumpio.php:231 +#: ../../include/dir_fns.php:143 ../../include/dir_fns.php:144 +#: ../../include/dir_fns.php:145 +msgid "Yes" +msgstr "" + +#: ../../Zotlabs/Module/Mitem.php:163 ../../Zotlabs/Module/Mitem.php:241 +msgid "Open link in new window" +msgstr "" + +#: ../../Zotlabs/Module/Mitem.php:164 ../../Zotlabs/Module/Mitem.php:242 +msgid "Order in list" +msgstr "" + +#: ../../Zotlabs/Module/Mitem.php:164 ../../Zotlabs/Module/Mitem.php:242 +msgid "Higher numbers will sink to bottom of listing" +msgstr "" + +#: ../../Zotlabs/Module/Mitem.php:165 +msgid "Submit and finish" +msgstr "" + +#: ../../Zotlabs/Module/Mitem.php:166 +msgid "Submit and continue" +msgstr "" + +#: ../../Zotlabs/Module/Mitem.php:174 +msgid "Menu:" +msgstr "" + +#: ../../Zotlabs/Module/Mitem.php:177 +msgid "Link Target" +msgstr "" + +#: ../../Zotlabs/Module/Mitem.php:180 +msgid "Edit menu" +msgstr "" + +#: ../../Zotlabs/Module/Mitem.php:183 +msgid "Edit element" +msgstr "" + +#: ../../Zotlabs/Module/Mitem.php:184 +msgid "Drop element" +msgstr "" + +#: ../../Zotlabs/Module/Mitem.php:185 +msgid "New element" +msgstr "" + +#: ../../Zotlabs/Module/Mitem.php:186 +msgid "Edit this menu container" +msgstr "" + +#: ../../Zotlabs/Module/Mitem.php:187 +msgid "Add menu element" +msgstr "" + +#: ../../Zotlabs/Module/Mitem.php:188 +msgid "Delete this menu item" +msgstr "" + +#: ../../Zotlabs/Module/Mitem.php:189 +msgid "Edit this menu item" +msgstr "" + +#: ../../Zotlabs/Module/Mitem.php:206 +msgid "Menu item not found." +msgstr "" + +#: ../../Zotlabs/Module/Mitem.php:219 +msgid "Menu item deleted." +msgstr "" + +#: ../../Zotlabs/Module/Mitem.php:221 +msgid "Menu item could not be deleted." +msgstr "" + +#: ../../Zotlabs/Module/Mitem.php:228 +msgid "Edit Menu Element" +msgstr "" + +#: ../../Zotlabs/Module/Mitem.php:238 +msgid "Link text" +msgstr "" + +#: ../../Zotlabs/Module/Events.php:25 +msgid "Calendar entries imported." +msgstr "" + +#: ../../Zotlabs/Module/Events.php:27 +msgid "No calendar entries found." +msgstr "" + +#: ../../Zotlabs/Module/Events.php:110 +msgid "Event can not end before it has started." +msgstr "" + +#: ../../Zotlabs/Module/Events.php:112 ../../Zotlabs/Module/Events.php:121 +#: ../../Zotlabs/Module/Events.php:143 +msgid "Unable to generate preview." +msgstr "" + +#: ../../Zotlabs/Module/Events.php:119 +msgid "Event title and start time are required." +msgstr "" + +#: ../../Zotlabs/Module/Events.php:141 ../../Zotlabs/Module/Events.php:265 +msgid "Event not found." +msgstr "" + +#: ../../Zotlabs/Module/Events.php:260 ../../Zotlabs/Module/Tagger.php:51 +#: ../../Zotlabs/Module/Like.php:372 ../../include/conversation.php:119 +#: ../../include/text.php:1933 ../../include/event.php:1145 +msgid "event" +msgstr "" + +#: ../../Zotlabs/Module/Events.php:275 ../../Zotlabs/Lib/Apps.php:243 +#: ../../include/conversation.php:1799 ../../include/conversation.php:1802 +#: ../../include/nav.php:195 ../../include/nav.php:397 +#: ../../include/nav.php:400 +msgid "Events" +msgstr "" + +#: ../../Zotlabs/Module/Events.php:460 +msgid "Edit event title" +msgstr "" + +#: ../../Zotlabs/Module/Events.php:460 ../../Zotlabs/Module/Events.php:465 +#: ../../Zotlabs/Module/Appman.php:136 ../../Zotlabs/Module/Appman.php:137 +#: ../../Zotlabs/Module/Profiles.php:748 ../../Zotlabs/Module/Profiles.php:752 +#: ../../include/datetime.php:259 +msgid "Required" +msgstr "" + +#: ../../Zotlabs/Module/Events.php:462 +msgid "Categories (comma-separated list)" +msgstr "" + +#: ../../Zotlabs/Module/Events.php:463 +msgid "Edit Category" +msgstr "" + +#: ../../Zotlabs/Module/Events.php:463 +msgid "Category" +msgstr "" + +#: ../../Zotlabs/Module/Events.php:466 +msgid "Edit start date and time" +msgstr "" + +#: ../../Zotlabs/Module/Events.php:467 ../../Zotlabs/Module/Events.php:470 +msgid "Finish date and time are not known or not relevant" +msgstr "" + +#: ../../Zotlabs/Module/Events.php:469 +msgid "Edit finish date and time" +msgstr "" + +#: ../../Zotlabs/Module/Events.php:469 +msgid "Finish date and time" +msgstr "" + +#: ../../Zotlabs/Module/Events.php:471 ../../Zotlabs/Module/Events.php:472 +msgid "Adjust for viewer timezone" +msgstr "" + +#: ../../Zotlabs/Module/Events.php:471 +msgid "" +"Important for events that happen in a particular place. Not practical for " +"global holidays." +msgstr "" + +#: ../../Zotlabs/Module/Events.php:473 +msgid "Edit Description" +msgstr "" + +#: ../../Zotlabs/Module/Events.php:475 +msgid "Edit Location" +msgstr "" + +#: ../../Zotlabs/Module/Events.php:478 ../../Zotlabs/Module/Photos.php:1065 +#: ../../Zotlabs/Module/Webpages.php:247 ../../Zotlabs/Lib/ThreadItem.php:739 +#: ../../include/conversation.php:1277 +msgid "Preview" +msgstr "" + +#: ../../Zotlabs/Module/Events.php:479 ../../include/conversation.php:1340 +msgid "Permission settings" +msgstr "" + +#: ../../Zotlabs/Module/Events.php:489 +msgid "Timezone:" +msgstr "" + +#: ../../Zotlabs/Module/Events.php:494 +msgid "Advanced Options" +msgstr "" + +#: ../../Zotlabs/Module/Events.php:605 ../../Zotlabs/Module/Cal.php:264 +msgid "l, F j" +msgstr "" + +#: ../../Zotlabs/Module/Events.php:633 +msgid "Edit event" +msgstr "" + +#: ../../Zotlabs/Module/Events.php:635 +msgid "Delete event" +msgstr "" + +#: ../../Zotlabs/Module/Events.php:660 ../../Zotlabs/Module/Cal.php:313 +#: ../../include/text.php:1752 +msgid "Link to Source" +msgstr "" + +#: ../../Zotlabs/Module/Events.php:669 +msgid "calendar" +msgstr "" + +#: ../../Zotlabs/Module/Events.php:688 ../../Zotlabs/Module/Cal.php:336 +msgid "Edit Event" +msgstr "" + +#: ../../Zotlabs/Module/Events.php:688 ../../Zotlabs/Module/Cal.php:336 +msgid "Create Event" +msgstr "" + +#: ../../Zotlabs/Module/Events.php:691 ../../Zotlabs/Module/Cal.php:339 +#: ../../include/channel.php:1488 +msgid "Export" +msgstr "" + +#: ../../Zotlabs/Module/Events.php:731 +msgid "Event removed" +msgstr "" + +#: ../../Zotlabs/Module/Events.php:734 +msgid "Failed to remove event" +msgstr "" + +#: ../../Zotlabs/Module/Appman.php:38 ../../Zotlabs/Module/Appman.php:55 +msgid "App installed." +msgstr "" + +#: ../../Zotlabs/Module/Appman.php:48 +msgid "Malformed app." +msgstr "" + +#: ../../Zotlabs/Module/Appman.php:125 +msgid "Embed code" +msgstr "" + +#: ../../Zotlabs/Module/Appman.php:131 +msgid "Edit App" +msgstr "" + +#: ../../Zotlabs/Module/Appman.php:131 +msgid "Create App" +msgstr "" + +#: ../../Zotlabs/Module/Appman.php:136 +msgid "Name of app" +msgstr "" + +#: ../../Zotlabs/Module/Appman.php:137 +msgid "Location (URL) of app" +msgstr "" + +#: ../../Zotlabs/Module/Appman.php:139 +msgid "Photo icon URL" +msgstr "" + +#: ../../Zotlabs/Module/Appman.php:139 +msgid "80 x 80 pixels - optional" +msgstr "" + +#: ../../Zotlabs/Module/Appman.php:140 +msgid "Categories (optional, comma separated list)" +msgstr "" + +#: ../../Zotlabs/Module/Appman.php:141 +msgid "Version ID" +msgstr "" + +#: ../../Zotlabs/Module/Appman.php:142 +msgid "Price of app" +msgstr "" + +#: ../../Zotlabs/Module/Appman.php:143 +msgid "Location (URL) to purchase app" +msgstr "" + +#: ../../Zotlabs/Module/Regmod.php:15 +msgid "Please login." +msgstr "" + +#: ../../Zotlabs/Module/Magic.php:71 +msgid "Hub not found." +msgstr "" + +#: ../../Zotlabs/Module/Subthread.php:87 ../../Zotlabs/Module/Tagger.php:47 +#: ../../Zotlabs/Module/Like.php:370 +#: ../../addon/redphotos/redphotohelper.php:71 +#: ../../addon/diaspora/Receiver.php:1370 ../../include/conversation.php:116 +#: ../../include/text.php:1930 +msgid "photo" +msgstr "" + +#: ../../Zotlabs/Module/Subthread.php:87 ../../Zotlabs/Module/Like.php:370 +#: ../../addon/diaspora/Receiver.php:1370 ../../include/conversation.php:144 +#: ../../include/text.php:1936 +msgid "status" +msgstr "" + +#: ../../Zotlabs/Module/Subthread.php:118 +#, php-format +msgid "%1$s is following %2$s's %3$s" +msgstr "" + +#: ../../Zotlabs/Module/Subthread.php:120 +#, php-format +msgid "%1$s stopped following %2$s's %3$s" +msgstr "" + +#: ../../Zotlabs/Module/Import_items.php:48 ../../Zotlabs/Module/Import.php:64 +msgid "Nothing to import." +msgstr "" + +#: ../../Zotlabs/Module/Import_items.php:72 ../../Zotlabs/Module/Import.php:79 +#: ../../Zotlabs/Module/Import.php:95 +msgid "Unable to download data from old server" +msgstr "" + +#: ../../Zotlabs/Module/Import_items.php:77 ../../Zotlabs/Module/Import.php:102 +msgid "Imported file is empty." +msgstr "" + +#: ../../Zotlabs/Module/Import_items.php:93 ../../Zotlabs/Module/Import.php:121 +#, php-format +msgid "Warning: Database versions differ by %1$d updates." +msgstr "" + +#: ../../Zotlabs/Module/Import_items.php:108 +msgid "Import completed" +msgstr "" + +#: ../../Zotlabs/Module/Import_items.php:125 +msgid "Import Items" +msgstr "" + +#: ../../Zotlabs/Module/Import_items.php:126 +msgid "Use this form to import existing posts and content from an export file." +msgstr "" + +#: ../../Zotlabs/Module/Import_items.php:127 +#: ../../Zotlabs/Module/Import.php:505 +msgid "File to Upload" +msgstr "" + +#: ../../Zotlabs/Module/New_channel.php:121 ../../Zotlabs/Module/Manage.php:138 +#, php-format +msgid "You have created %1$.0f of %2$.0f allowed channels." msgstr "" -#: ../../Zotlabs/Module/Register.php:237 #: ../../Zotlabs/Module/New_channel.php:134 +#: ../../Zotlabs/Module/Register.php:237 msgid "Name or caption" msgstr "" -#: ../../Zotlabs/Module/Register.php:237 #: ../../Zotlabs/Module/New_channel.php:134 +#: ../../Zotlabs/Module/Register.php:237 msgid "" "Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation " "Group\"" msgstr "" -#: ../../Zotlabs/Module/Register.php:239 #: ../../Zotlabs/Module/New_channel.php:136 +#: ../../Zotlabs/Module/Register.php:239 msgid "Choose a short nickname" msgstr "" -#: ../../Zotlabs/Module/Register.php:239 #: ../../Zotlabs/Module/New_channel.php:136 +#: ../../Zotlabs/Module/Register.php:239 #, php-format msgid "" "Your nickname will be used to create an easy to remember channel address e." "g. nickname%s" msgstr "" -#: ../../Zotlabs/Module/Register.php:240 #: ../../Zotlabs/Module/New_channel.php:137 +#: ../../Zotlabs/Module/Register.php:240 msgid "Channel role and privacy" msgstr "" -#: ../../Zotlabs/Module/Register.php:240 #: ../../Zotlabs/Module/New_channel.php:137 +#: ../../Zotlabs/Module/Register.php:240 msgid "Select a channel role with your privacy requirements." msgstr "" -#: ../../Zotlabs/Module/Register.php:240 #: ../../Zotlabs/Module/New_channel.php:137 +#: ../../Zotlabs/Module/Register.php:240 msgid "Read more about roles" msgstr "" -#: ../../Zotlabs/Module/Register.php:241 -msgid "no" +#: ../../Zotlabs/Module/New_channel.php:140 +msgid "Create Channel" msgstr "" -#: ../../Zotlabs/Module/Register.php:241 -msgid "yes" -msgstr "" - -#: ../../Zotlabs/Module/Register.php:251 -#: ../../Zotlabs/Module/Admin/Site.php:272 -msgid "Registration" -msgstr "" - -#: ../../Zotlabs/Module/Register.php:256 -msgid "Membership on this site is by invitation only." -msgstr "" - -#: ../../Zotlabs/Module/Register.php:268 ../../include/nav.php:147 -#: ../../boot.php:1572 -msgid "Register" -msgstr "" - -#: ../../Zotlabs/Module/Register.php:269 +#: ../../Zotlabs/Module/New_channel.php:141 msgid "" -"This site may require email verification after submitting this form. If you " -"are returned to a login page, please check your email for instructions." +"A channel is your identity on this network. It can represent a person, a " +"blog, or a forum to name a few. Channels can make connections with other " +"channels to share information with highly detailed permissions." msgstr "" -#: ../../Zotlabs/Module/Probe.php:28 ../../Zotlabs/Module/Probe.php:32 -#, php-format -msgid "Fetching URL returns error: %1$s" +#: ../../Zotlabs/Module/New_channel.php:142 +msgid "" +"or import an existing channel from another location." msgstr "" -#: ../../Zotlabs/Module/Directory.php:63 ../../Zotlabs/Module/Ratings.php:83 -#: ../../Zotlabs/Module/Search.php:17 ../../Zotlabs/Module/Display.php:22 -#: ../../Zotlabs/Module/Viewconnections.php:23 -#: ../../Zotlabs/Module/Photos.php:490 -msgid "Public access denied." +#: ../../Zotlabs/Module/Removeme.php:35 +msgid "" +"Channel removals are not allowed within 48 hours of changing the account " +"password." msgstr "" -#: ../../Zotlabs/Module/Directory.php:245 -#, php-format -msgid "%d rating" -msgid_plural "%d ratings" -msgstr[0] "" -msgstr[1] "" - -#: ../../Zotlabs/Module/Directory.php:256 -msgid "Gender: " +#: ../../Zotlabs/Module/Removeme.php:60 +msgid "Remove This Channel" msgstr "" -#: ../../Zotlabs/Module/Directory.php:258 -msgid "Status: " +#: ../../Zotlabs/Module/Removeme.php:61 +#: ../../Zotlabs/Module/Removeaccount.php:58 +msgid "WARNING: " msgstr "" -#: ../../Zotlabs/Module/Directory.php:260 -msgid "Homepage: " +#: ../../Zotlabs/Module/Removeme.php:61 +msgid "This channel will be completely removed from the network. " msgstr "" -#: ../../Zotlabs/Module/Directory.php:309 ../../include/channel.php:1314 -msgid "Age:" +#: ../../Zotlabs/Module/Removeme.php:61 +#: ../../Zotlabs/Module/Removeaccount.php:58 +msgid "This action is permanent and can not be undone!" msgstr "" -#: ../../Zotlabs/Module/Directory.php:314 ../../include/event.php:52 -#: ../../include/event.php:84 ../../include/channel.php:1149 -msgid "Location:" +#: ../../Zotlabs/Module/Removeme.php:62 +#: ../../Zotlabs/Module/Removeaccount.php:59 +msgid "Please enter your password for verification:" msgstr "" -#: ../../Zotlabs/Module/Directory.php:320 -msgid "Description:" -msgstr "" - -#: ../../Zotlabs/Module/Directory.php:325 ../../include/channel.php:1330 -msgid "Hometown:" -msgstr "" - -#: ../../Zotlabs/Module/Directory.php:327 ../../include/channel.php:1338 -msgid "About:" -msgstr "" - -#: ../../Zotlabs/Module/Directory.php:328 ../../Zotlabs/Module/Suggest.php:54 -#: ../../Zotlabs/Widget/Follow.php:32 ../../Zotlabs/Widget/Suggestions.php:44 -#: ../../include/connections.php:111 ../../include/conversation.php:999 -#: ../../include/channel.php:1134 -msgid "Connect" -msgstr "" - -#: ../../Zotlabs/Module/Directory.php:329 -msgid "Public Forum:" -msgstr "" - -#: ../../Zotlabs/Module/Directory.php:332 -msgid "Keywords: " -msgstr "" - -#: ../../Zotlabs/Module/Directory.php:335 -msgid "Don't suggest" -msgstr "" - -#: ../../Zotlabs/Module/Directory.php:337 -msgid "Common connections:" -msgstr "" - -#: ../../Zotlabs/Module/Directory.php:386 -msgid "Global Directory" -msgstr "" - -#: ../../Zotlabs/Module/Directory.php:386 -msgid "Local Directory" -msgstr "" - -#: ../../Zotlabs/Module/Directory.php:391 -#: ../../Zotlabs/Module/Directory.php:396 -#: ../../Zotlabs/Module/Connections.php:317 -#: ../../include/contact_widgets.php:23 -msgid "Find" -msgstr "" - -#: ../../Zotlabs/Module/Directory.php:392 -msgid "Finding:" -msgstr "" - -#: ../../Zotlabs/Module/Directory.php:395 ../../Zotlabs/Module/Suggest.php:62 -#: ../../include/contact_widgets.php:24 -msgid "Channel Suggestions" -msgstr "" - -#: ../../Zotlabs/Module/Directory.php:397 -msgid "next page" -msgstr "" - -#: ../../Zotlabs/Module/Directory.php:397 -msgid "previous page" -msgstr "" - -#: ../../Zotlabs/Module/Directory.php:398 -msgid "Sort options" -msgstr "" - -#: ../../Zotlabs/Module/Directory.php:399 -msgid "Alphabetic" -msgstr "" - -#: ../../Zotlabs/Module/Directory.php:400 -msgid "Reverse Alphabetic" -msgstr "" - -#: ../../Zotlabs/Module/Directory.php:401 -msgid "Newest to Oldest" -msgstr "" - -#: ../../Zotlabs/Module/Directory.php:402 -msgid "Oldest to Newest" -msgstr "" - -#: ../../Zotlabs/Module/Directory.php:419 -msgid "No entries (some entries may be hidden)." -msgstr "" - -#: ../../Zotlabs/Module/Profiles.php:24 ../../Zotlabs/Module/Profiles.php:184 -#: ../../Zotlabs/Module/Profiles.php:241 ../../Zotlabs/Module/Profiles.php:659 -msgid "Profile not found." -msgstr "" - -#: ../../Zotlabs/Module/Profiles.php:44 -msgid "Profile deleted." -msgstr "" - -#: ../../Zotlabs/Module/Profiles.php:68 ../../Zotlabs/Module/Profiles.php:105 -msgid "Profile-" -msgstr "" - -#: ../../Zotlabs/Module/Profiles.php:90 ../../Zotlabs/Module/Profiles.php:127 -msgid "New profile created." -msgstr "" - -#: ../../Zotlabs/Module/Profiles.php:111 -msgid "Profile unavailable to clone." -msgstr "" - -#: ../../Zotlabs/Module/Profiles.php:146 -msgid "Profile unavailable to export." -msgstr "" - -#: ../../Zotlabs/Module/Profiles.php:252 -msgid "Profile Name is required." -msgstr "" - -#: ../../Zotlabs/Module/Profiles.php:459 -msgid "Marital Status" -msgstr "" - -#: ../../Zotlabs/Module/Profiles.php:463 -msgid "Romantic Partner" -msgstr "" - -#: ../../Zotlabs/Module/Profiles.php:467 ../../Zotlabs/Module/Profiles.php:775 -msgid "Likes" -msgstr "" - -#: ../../Zotlabs/Module/Profiles.php:471 ../../Zotlabs/Module/Profiles.php:776 -msgid "Dislikes" -msgstr "" - -#: ../../Zotlabs/Module/Profiles.php:475 ../../Zotlabs/Module/Profiles.php:783 -msgid "Work/Employment" -msgstr "" - -#: ../../Zotlabs/Module/Profiles.php:478 -msgid "Religion" -msgstr "" - -#: ../../Zotlabs/Module/Profiles.php:482 -msgid "Political Views" -msgstr "" - -#: ../../Zotlabs/Module/Profiles.php:486 -#: ../../extend/addon/addon/openid/MysqlProvider.php:74 -msgid "Gender" -msgstr "" - -#: ../../Zotlabs/Module/Profiles.php:490 -msgid "Sexual Preference" -msgstr "" - -#: ../../Zotlabs/Module/Profiles.php:494 -msgid "Homepage" -msgstr "" - -#: ../../Zotlabs/Module/Profiles.php:498 -msgid "Interests" -msgstr "" - -#: ../../Zotlabs/Module/Profiles.php:502 ../../Zotlabs/Module/Profiles.php:793 -#: ../../Zotlabs/Module/Admin/Channels.php:160 -#: ../../Zotlabs/Module/Locs.php:118 ../../Zotlabs/Module/Connedit.php:926 -#: ../../Zotlabs/Module/Cdav.php:1116 -msgid "Address" -msgstr "" - -#: ../../Zotlabs/Module/Profiles.php:509 ../../Zotlabs/Module/Profiles.php:737 -#: ../../Zotlabs/Module/Locs.php:117 ../../Zotlabs/Module/Pubsites.php:51 -#: ../../Zotlabs/Module/Events.php:475 ../../Zotlabs/Module/Cdav.php:812 -#: ../../include/js_strings.php:25 -msgid "Location" -msgstr "" - -#: ../../Zotlabs/Module/Profiles.php:594 -msgid "Profile updated." -msgstr "" - -#: ../../Zotlabs/Module/Profiles.php:678 -msgid "Hide your connections list from viewers of this profile" -msgstr "" - -#: ../../Zotlabs/Module/Profiles.php:681 ../../Zotlabs/Module/Wiki.php:180 -#: ../../Zotlabs/Module/Admin/Site.php:235 ../../Zotlabs/Module/Menu.php:100 -#: ../../Zotlabs/Module/Menu.php:157 ../../Zotlabs/Module/Connedit.php:392 -#: ../../Zotlabs/Module/Connedit.php:775 -#: ../../Zotlabs/Module/Filestorage.php:160 -#: ../../Zotlabs/Module/Filestorage.php:168 ../../Zotlabs/Module/Mitem.php:162 -#: ../../Zotlabs/Module/Mitem.php:163 ../../Zotlabs/Module/Mitem.php:240 -#: ../../Zotlabs/Module/Mitem.php:241 ../../Zotlabs/Module/Api.php:97 -#: ../../Zotlabs/Module/Events.php:470 ../../Zotlabs/Module/Events.php:471 #: ../../Zotlabs/Module/Removeme.php:63 -#: ../../Zotlabs/Module/Settings/Channel.php:294 -#: ../../Zotlabs/Module/Settings/Display.php:103 -#: ../../Zotlabs/Module/Photos.php:642 -#: ../../extend/addon/addon/dwpost/dwpost.php:73 -#: ../../extend/addon/addon/dwpost/dwpost.php:85 -#: ../../extend/addon/addon/flattrwidget/flattrwidget.php:120 -#: ../../extend/addon/addon/ijpost/ijpost.php:73 -#: ../../extend/addon/addon/ijpost/ijpost.php:85 -#: ../../extend/addon/addon/jappixmini/jappixmini.php:309 -#: ../../extend/addon/addon/jappixmini/jappixmini.php:313 -#: ../../extend/addon/addon/jappixmini/jappixmini.php:343 -#: ../../extend/addon/addon/jappixmini/jappixmini.php:351 -#: ../../extend/addon/addon/jappixmini/jappixmini.php:355 -#: ../../extend/addon/addon/jappixmini/jappixmini.php:359 -#: ../../extend/addon/addon/libertree/libertree.php:69 -#: ../../extend/addon/addon/libertree/libertree.php:81 -#: ../../extend/addon/addon/ljpost/ljpost.php:70 -#: ../../extend/addon/addon/ljpost/ljpost.php:82 -#: ../../extend/addon/addon/nofed/nofed.php:72 -#: ../../extend/addon/addon/nofed/nofed.php:76 -#: ../../extend/addon/addon/nsabait/nsabait.php:157 -#: ../../extend/addon/addon/nsfw/nsfw.php:84 -#: ../../extend/addon/addon/planets/planets.php:149 -#: ../../extend/addon/addon/pumpio/pumpio.php:219 -#: ../../extend/addon/addon/pumpio/pumpio.php:223 -#: ../../extend/addon/addon/pumpio/pumpio.php:227 -#: ../../extend/addon/addon/pumpio/pumpio.php:231 -#: ../../extend/addon/addon/rainbowtag/rainbowtag.php:81 -#: ../../extend/addon/addon/redred/redred.php:95 -#: ../../extend/addon/addon/redred/redred.php:99 -#: ../../extend/addon/addon/rtof/rtof.php:81 -#: ../../extend/addon/addon/rtof/rtof.php:85 -#: ../../extend/addon/addon/smileybutton/smileybutton.php:211 -#: ../../extend/addon/addon/smileybutton/smileybutton.php:215 -#: ../../extend/addon/addon/statusnet/statusnet.php:389 -#: ../../extend/addon/addon/statusnet/statusnet.php:411 -#: ../../extend/addon/addon/statusnet/statusnet.php:415 -#: ../../extend/addon/addon/statusnet/statusnet.php:424 -#: ../../extend/addon/addon/twitter/twitter.php:242 -#: ../../extend/addon/addon/twitter/twitter.php:246 -#: ../../extend/addon/addon/twitter/twitter.php:255 -#: ../../extend/addon/addon/visage/visage.php:166 -#: ../../extend/addon/addon/wppost/wppost.php:82 -#: ../../extend/addon/addon/wppost/wppost.php:105 -#: ../../extend/addon/addon/wppost/wppost.php:109 -#: ../../extend/addon/addon/xmpp/xmpp.php:53 -#: ../../extend/addon/addon/authchoose/authchoose.php:67 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:166 -#: ../../include/dir_fns.php:143 ../../include/dir_fns.php:144 -#: ../../include/dir_fns.php:145 ../../view/theme/redbasic/php/config.php:100 -#: ../../view/theme/redbasic/php/config.php:115 ../../boot.php:1595 -msgid "No" +msgid "Remove this channel and all its clones from the network" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:681 ../../Zotlabs/Module/Wiki.php:180 -#: ../../Zotlabs/Module/Admin/Site.php:237 ../../Zotlabs/Module/Menu.php:100 -#: ../../Zotlabs/Module/Menu.php:157 ../../Zotlabs/Module/Connedit.php:392 -#: ../../Zotlabs/Module/Filestorage.php:160 -#: ../../Zotlabs/Module/Filestorage.php:168 ../../Zotlabs/Module/Mitem.php:162 -#: ../../Zotlabs/Module/Mitem.php:163 ../../Zotlabs/Module/Mitem.php:240 -#: ../../Zotlabs/Module/Mitem.php:241 ../../Zotlabs/Module/Api.php:96 -#: ../../Zotlabs/Module/Events.php:470 ../../Zotlabs/Module/Events.php:471 #: ../../Zotlabs/Module/Removeme.php:63 -#: ../../Zotlabs/Module/Settings/Channel.php:294 -#: ../../Zotlabs/Module/Settings/Display.php:103 -#: ../../Zotlabs/Module/Photos.php:642 -#: ../../extend/addon/addon/dwpost/dwpost.php:73 -#: ../../extend/addon/addon/dwpost/dwpost.php:85 -#: ../../extend/addon/addon/flattrwidget/flattrwidget.php:120 -#: ../../extend/addon/addon/ijpost/ijpost.php:73 -#: ../../extend/addon/addon/ijpost/ijpost.php:85 -#: ../../extend/addon/addon/jappixmini/jappixmini.php:309 -#: ../../extend/addon/addon/jappixmini/jappixmini.php:313 -#: ../../extend/addon/addon/jappixmini/jappixmini.php:343 -#: ../../extend/addon/addon/jappixmini/jappixmini.php:351 -#: ../../extend/addon/addon/jappixmini/jappixmini.php:355 -#: ../../extend/addon/addon/jappixmini/jappixmini.php:359 -#: ../../extend/addon/addon/libertree/libertree.php:69 -#: ../../extend/addon/addon/libertree/libertree.php:81 -#: ../../extend/addon/addon/ljpost/ljpost.php:70 -#: ../../extend/addon/addon/ljpost/ljpost.php:82 -#: ../../extend/addon/addon/nofed/nofed.php:72 -#: ../../extend/addon/addon/nofed/nofed.php:76 -#: ../../extend/addon/addon/nsabait/nsabait.php:157 -#: ../../extend/addon/addon/nsfw/nsfw.php:84 -#: ../../extend/addon/addon/planets/planets.php:149 -#: ../../extend/addon/addon/pumpio/pumpio.php:219 -#: ../../extend/addon/addon/pumpio/pumpio.php:223 -#: ../../extend/addon/addon/pumpio/pumpio.php:227 -#: ../../extend/addon/addon/pumpio/pumpio.php:231 -#: ../../extend/addon/addon/rainbowtag/rainbowtag.php:81 -#: ../../extend/addon/addon/redred/redred.php:95 -#: ../../extend/addon/addon/redred/redred.php:99 -#: ../../extend/addon/addon/rtof/rtof.php:81 -#: ../../extend/addon/addon/rtof/rtof.php:85 -#: ../../extend/addon/addon/smileybutton/smileybutton.php:211 -#: ../../extend/addon/addon/smileybutton/smileybutton.php:215 -#: ../../extend/addon/addon/statusnet/statusnet.php:389 -#: ../../extend/addon/addon/statusnet/statusnet.php:411 -#: ../../extend/addon/addon/statusnet/statusnet.php:415 -#: ../../extend/addon/addon/statusnet/statusnet.php:424 -#: ../../extend/addon/addon/twitter/twitter.php:242 -#: ../../extend/addon/addon/twitter/twitter.php:246 -#: ../../extend/addon/addon/twitter/twitter.php:255 -#: ../../extend/addon/addon/visage/visage.php:166 -#: ../../extend/addon/addon/wppost/wppost.php:82 -#: ../../extend/addon/addon/wppost/wppost.php:105 -#: ../../extend/addon/addon/wppost/wppost.php:109 -#: ../../extend/addon/addon/xmpp/xmpp.php:53 -#: ../../extend/addon/addon/authchoose/authchoose.php:67 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:166 -#: ../../include/dir_fns.php:143 ../../include/dir_fns.php:144 -#: ../../include/dir_fns.php:145 ../../view/theme/redbasic/php/config.php:100 -#: ../../view/theme/redbasic/php/config.php:115 ../../boot.php:1595 -msgid "Yes" -msgstr "" - -#: ../../Zotlabs/Module/Profiles.php:725 -msgid "Edit Profile Details" -msgstr "" - -#: ../../Zotlabs/Module/Profiles.php:726 ../../Zotlabs/Module/Connect.php:98 -#: ../../Zotlabs/Module/Wiki.php:169 -#: ../../Zotlabs/Module/Admin/Features.php:66 -#: ../../Zotlabs/Module/Admin/Logs.php:84 -#: ../../Zotlabs/Module/Admin/Profs.php:157 -#: ../../Zotlabs/Module/Admin/Security.php:104 -#: ../../Zotlabs/Module/Admin/Account_edit.php:74 -#: ../../Zotlabs/Module/Admin/Accounts.php:166 -#: ../../Zotlabs/Module/Admin/Channels.php:147 -#: ../../Zotlabs/Module/Admin/Plugins.php:438 -#: ../../Zotlabs/Module/Admin/Themes.php:158 -#: ../../Zotlabs/Module/Admin/Site.php:271 ../../Zotlabs/Module/Locs.php:121 -#: ../../Zotlabs/Module/Connedit.php:899 -#: ../../Zotlabs/Module/Filestorage.php:165 ../../Zotlabs/Module/Setup.php:303 -#: ../../Zotlabs/Module/Setup.php:344 ../../Zotlabs/Module/Group.php:85 -#: ../../Zotlabs/Module/Import_items.php:129 ../../Zotlabs/Module/Mail.php:431 -#: ../../Zotlabs/Module/Mitem.php:243 ../../Zotlabs/Module/Invite.php:149 -#: ../../Zotlabs/Module/Pconfig.php:107 ../../Zotlabs/Module/Mood.php:139 -#: ../../Zotlabs/Module/Cal.php:343 ../../Zotlabs/Module/Rate.php:166 -#: ../../Zotlabs/Module/Appman.php:148 ../../Zotlabs/Module/Pdledit.php:74 -#: ../../Zotlabs/Module/Import.php:518 ../../Zotlabs/Module/Events.php:493 -#: ../../Zotlabs/Module/Sources.php:114 ../../Zotlabs/Module/Sources.php:149 -#: ../../Zotlabs/Module/Poke.php:198 -#: ../../Zotlabs/Module/Settings/Features.php:47 -#: ../../Zotlabs/Module/Settings/Oauth.php:87 -#: ../../Zotlabs/Module/Settings/Account.php:118 -#: ../../Zotlabs/Module/Settings/Channel.php:476 -#: ../../Zotlabs/Module/Settings/Featured.php:50 -#: ../../Zotlabs/Module/Settings/Display.php:203 -#: ../../Zotlabs/Module/Settings/Tokens.php:168 -#: ../../Zotlabs/Module/Settings/Permcats.php:110 -#: ../../Zotlabs/Module/Thing.php:320 ../../Zotlabs/Module/Thing.php:370 -#: ../../Zotlabs/Module/Photos.php:657 ../../Zotlabs/Module/Photos.php:1022 -#: ../../Zotlabs/Module/Photos.php:1062 ../../Zotlabs/Module/Photos.php:1180 -#: ../../Zotlabs/Module/Chat.php:194 ../../Zotlabs/Module/Chat.php:240 -#: ../../Zotlabs/Module/Xchan.php:15 ../../Zotlabs/Lib/ThreadItem.php:730 -#: ../../Zotlabs/Widget/Eventstools.php:16 -#: ../../extend/addon/addon/chords/Mod_Chords.php:60 -#: ../../extend/addon/addon/dwpost/dwpost.php:89 -#: ../../extend/addon/addon/flattrwidget/flattrwidget.php:124 -#: ../../extend/addon/addon/frphotos/frphotos.php:96 -#: ../../extend/addon/addon/hubwall/hubwall.php:95 -#: ../../extend/addon/addon/ijpost/ijpost.php:89 -#: ../../extend/addon/addon/irc/irc.php:53 -#: ../../extend/addon/addon/jappixmini/jappixmini.php:371 -#: ../../extend/addon/addon/libertree/libertree.php:85 -#: ../../extend/addon/addon/ljpost/ljpost.php:86 -#: ../../extend/addon/addon/logrot/logrot.php:35 -#: ../../extend/addon/addon/mailhost/mailhost.php:40 -#: ../../extend/addon/addon/nofed/nofed.php:80 -#: ../../extend/addon/addon/nsabait/nsabait.php:161 -#: ../../extend/addon/addon/nsfw/nsfw.php:92 -#: ../../extend/addon/addon/openclipatar/openclipatar.php:53 -#: ../../extend/addon/addon/openstreetmap/openstreetmap.php:168 -#: ../../extend/addon/addon/pageheader/pageheader.php:48 -#: ../../extend/addon/addon/piwik/piwik.php:95 -#: ../../extend/addon/addon/planets/planets.php:153 -#: ../../extend/addon/addon/pumpio/pumpio.php:237 -#: ../../extend/addon/addon/rainbowtag/rainbowtag.php:85 -#: ../../extend/addon/addon/redfiles/redfiles.php:124 -#: ../../extend/addon/addon/redphotos/redphotos.php:136 -#: ../../extend/addon/addon/redred/redred.php:119 -#: ../../extend/addon/addon/rtof/rtof.php:101 -#: ../../extend/addon/addon/skeleton/skeleton.php:65 -#: ../../extend/addon/addon/smileybutton/smileybutton.php:219 -#: ../../extend/addon/addon/startpage/startpage.php:113 -#: ../../extend/addon/addon/statusnet/statusnet.php:322 -#: ../../extend/addon/addon/statusnet/statusnet.php:380 -#: ../../extend/addon/addon/statusnet/statusnet.php:432 -#: ../../extend/addon/addon/statusnet/statusnet.php:899 -#: ../../extend/addon/addon/superblock/superblock.php:120 -#: ../../extend/addon/addon/twitter/twitter.php:217 -#: ../../extend/addon/addon/twitter/twitter.php:259 -#: ../../extend/addon/addon/visage/visage.php:170 -#: ../../extend/addon/addon/wppost/wppost.php:113 -#: ../../extend/addon/addon/xmpp/xmpp.php:69 -#: ../../extend/addon/addon/likebanner/likebanner.php:57 -#: ../../extend/addon/addon/authchoose/authchoose.php:71 -#: ../../extend/addon/addon/mailtest/mailtest.php:100 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:155 -#: ../../extend/addon/addon/diaspora/diaspora.php:749 -#: ../../extend/addon/addon/gnusoc/gnusoc.php:226 -#: ../../include/js_strings.php:22 ../../view/theme/redbasic/php/config.php:95 -msgid "Submit" +msgid "" +"By default only the instance of the channel located on this hub will be " +"removed from the network" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:727 -msgid "View this profile" +#: ../../Zotlabs/Module/Removeme.php:64 +#: ../../Zotlabs/Module/Settings/Channel.php:580 +msgid "Remove Channel" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:728 ../../Zotlabs/Module/Profiles.php:827 -#: ../../include/channel.php:1081 -msgid "Edit visibility" +#: ../../Zotlabs/Module/Sharedwithme.php:104 +msgid "Files: shared with me" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:729 -msgid "Profile Tools" +#: ../../Zotlabs/Module/Sharedwithme.php:106 +msgid "NEW" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:730 -msgid "Change cover photo" +#: ../../Zotlabs/Module/Sharedwithme.php:107 +#: ../../Zotlabs/Storage/Browser.php:236 ../../include/text.php:1386 +msgid "Size" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:731 ../../include/channel.php:1052 -msgid "Change profile photo" +#: ../../Zotlabs/Module/Sharedwithme.php:108 +#: ../../Zotlabs/Storage/Browser.php:237 +msgid "Last Modified" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:732 -msgid "Create a new profile using these settings" +#: ../../Zotlabs/Module/Sharedwithme.php:109 +msgid "Remove all files" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:733 -msgid "Clone this profile" +#: ../../Zotlabs/Module/Sharedwithme.php:110 +msgid "Remove this file" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:734 -msgid "Delete this profile" +#: ../../Zotlabs/Module/Setup.php:170 +msgid "$Projectname Server - Setup" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:735 -msgid "Add profile things" +#: ../../Zotlabs/Module/Setup.php:174 +msgid "Could not connect to database." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:736 ../../include/conversation.php:1654 -msgid "Personal" +#: ../../Zotlabs/Module/Setup.php:178 +msgid "" +"Could not connect to specified site URL. Possible SSL certificate or DNS " +"issue." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:738 -msgid "Relation" +#: ../../Zotlabs/Module/Setup.php:185 +msgid "Could not create table." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:739 ../../include/datetime.php:55 -msgid "Miscellaneous" +#: ../../Zotlabs/Module/Setup.php:191 +msgid "Your site database has been installed." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:741 -msgid "Import profile from file" +#: ../../Zotlabs/Module/Setup.php:197 +msgid "" +"You may need to import the file \"install/schema_xxx.sql\" manually using a " +"database client." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:742 -msgid "Export profile to file" +#: ../../Zotlabs/Module/Setup.php:198 ../../Zotlabs/Module/Setup.php:262 +#: ../../Zotlabs/Module/Setup.php:745 +msgid "Please see the file \"install/INSTALL.txt\"." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:743 -msgid "Your gender" +#: ../../Zotlabs/Module/Setup.php:259 +msgid "System check" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:744 -msgid "Marital status" +#: ../../Zotlabs/Module/Setup.php:264 +msgid "Check again" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:745 -msgid "Sexual preference" +#: ../../Zotlabs/Module/Setup.php:286 +msgid "Database connection" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:748 -msgid "Profile name" +#: ../../Zotlabs/Module/Setup.php:287 +msgid "" +"In order to install $Projectname we need to know how to connect to your " +"database." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:748 ../../Zotlabs/Module/Profiles.php:752 -#: ../../Zotlabs/Module/Appman.php:136 ../../Zotlabs/Module/Appman.php:137 -#: ../../Zotlabs/Module/Events.php:460 ../../Zotlabs/Module/Events.php:465 -#: ../../include/datetime.php:259 -msgid "Required" +#: ../../Zotlabs/Module/Setup.php:288 +msgid "" +"Please contact your hosting provider or site administrator if you have " +"questions about these settings." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:750 -msgid "This is your default profile." +#: ../../Zotlabs/Module/Setup.php:289 +msgid "" +"The database you specify below should already exist. If it does not, please " +"create it before continuing." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:752 -msgid "Your full name" +#: ../../Zotlabs/Module/Setup.php:293 +msgid "Database Server Name" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:753 -msgid "Title/Description" +#: ../../Zotlabs/Module/Setup.php:293 +msgid "Default is 127.0.0.1" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:756 -msgid "Street address" +#: ../../Zotlabs/Module/Setup.php:294 +msgid "Database Port" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:757 -msgid "Locality/City" +#: ../../Zotlabs/Module/Setup.php:294 +msgid "Communication port number - use 0 for default" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:758 -msgid "Region/State" +#: ../../Zotlabs/Module/Setup.php:295 +msgid "Database Login Name" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:759 -msgid "Postal/Zip code" +#: ../../Zotlabs/Module/Setup.php:296 +msgid "Database Login Password" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:760 ../../Zotlabs/Module/Connedit.php:944 -#: ../../Zotlabs/Module/Cdav.php:1134 -msgid "Country" +#: ../../Zotlabs/Module/Setup.php:297 +msgid "Database Name" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:765 -msgid "Who (if applicable)" +#: ../../Zotlabs/Module/Setup.php:298 +msgid "Database Type" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:765 -msgid "Examples: cathy123, Cathy Williams, cathy@example.com" +#: ../../Zotlabs/Module/Setup.php:300 ../../Zotlabs/Module/Setup.php:341 +msgid "Site administrator email address" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:766 -msgid "Since (date)" +#: ../../Zotlabs/Module/Setup.php:300 ../../Zotlabs/Module/Setup.php:341 +msgid "" +"Your account email address must match this in order to use the web admin " +"panel." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:769 -msgid "Tell us about yourself" +#: ../../Zotlabs/Module/Setup.php:301 ../../Zotlabs/Module/Setup.php:343 +msgid "Website URL" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:770 -#: ../../extend/addon/addon/openid/MysqlProvider.php:68 -msgid "Homepage URL" +#: ../../Zotlabs/Module/Setup.php:301 ../../Zotlabs/Module/Setup.php:343 +msgid "Please use SSL (https) URL if available." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:771 -msgid "Hometown" +#: ../../Zotlabs/Module/Setup.php:302 ../../Zotlabs/Module/Setup.php:345 +msgid "Please select a default timezone for your website" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:772 -msgid "Political views" +#: ../../Zotlabs/Module/Setup.php:330 +msgid "Site settings" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:773 -msgid "Religious views" +#: ../../Zotlabs/Module/Setup.php:384 +msgid "PHP version 5.5 or greater is required." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:774 -msgid "Keywords used in directory listings" +#: ../../Zotlabs/Module/Setup.php:385 +msgid "PHP version" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:774 -msgid "Example: fishing photography software" +#: ../../Zotlabs/Module/Setup.php:401 +msgid "Could not find a command line version of PHP in the web server PATH." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:777 -msgid "Musical interests" +#: ../../Zotlabs/Module/Setup.php:402 +msgid "" +"If you don't have a command line version of PHP installed on server, you " +"will not be able to run background polling via cron." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:778 -msgid "Books, literature" +#: ../../Zotlabs/Module/Setup.php:406 +msgid "PHP executable path" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:779 -msgid "Television" +#: ../../Zotlabs/Module/Setup.php:406 +msgid "" +"Enter full path to php executable. You can leave this blank to continue the " +"installation." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:780 -msgid "Film/Dance/Culture/Entertainment" +#: ../../Zotlabs/Module/Setup.php:411 +msgid "Command line PHP" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:781 -msgid "Hobbies/Interests" +#: ../../Zotlabs/Module/Setup.php:421 +msgid "" +"Unable to check command line PHP, as shell_exec() is disabled. This is " +"required." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:782 -msgid "Love/Romance" +#: ../../Zotlabs/Module/Setup.php:424 +msgid "" +"The command line version of PHP on your system does not have " +"\"register_argc_argv\" enabled." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:784 -msgid "School/Education" +#: ../../Zotlabs/Module/Setup.php:425 +msgid "This is required for message delivery to work." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:785 -msgid "Contact information and social networks" +#: ../../Zotlabs/Module/Setup.php:428 +msgid "PHP register_argc_argv" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:786 -msgid "My other channels" -msgstr "" - -#: ../../Zotlabs/Module/Profiles.php:788 -msgid "Communications" -msgstr "" - -#: ../../Zotlabs/Module/Profiles.php:789 ../../Zotlabs/Module/Connedit.php:922 -#: ../../Zotlabs/Module/Cdav.php:1112 -msgid "Phone" -msgstr "" - -#: ../../Zotlabs/Module/Profiles.php:790 -#: ../../Zotlabs/Module/Admin/Accounts.php:169 -#: ../../Zotlabs/Module/Admin/Accounts.php:181 -#: ../../Zotlabs/Module/Connedit.php:923 ../../Zotlabs/Module/Cdav.php:1113 -#: ../../extend/addon/addon/redred/redred.php:107 -#: ../../extend/addon/addon/rtof/rtof.php:93 -#: ../../extend/addon/addon/openid/MysqlProvider.php:56 -#: ../../extend/addon/addon/openid/MysqlProvider.php:57 -#: ../../include/network.php:1696 -msgid "Email" -msgstr "" - -#: ../../Zotlabs/Module/Profiles.php:791 ../../Zotlabs/Module/Connedit.php:924 -#: ../../Zotlabs/Module/Cdav.php:1114 -msgid "Instant messenger" -msgstr "" - -#: ../../Zotlabs/Module/Profiles.php:792 ../../Zotlabs/Module/Connedit.php:925 -#: ../../Zotlabs/Module/Cdav.php:1115 -msgid "Website" -msgstr "" - -#: ../../Zotlabs/Module/Profiles.php:794 ../../Zotlabs/Module/Connedit.php:927 -#: ../../Zotlabs/Module/Cdav.php:1117 -msgid "Note" -msgstr "" - -#: ../../Zotlabs/Module/Profiles.php:795 ../../Zotlabs/Module/Connedit.php:928 -#: ../../Zotlabs/Module/Cdav.php:1118 ../../include/connections.php:674 -#: ../../include/event.php:1290 -msgid "Mobile" -msgstr "" - -#: ../../Zotlabs/Module/Profiles.php:796 ../../Zotlabs/Module/Connedit.php:929 -#: ../../Zotlabs/Module/Cdav.php:1119 ../../include/connections.php:675 -#: ../../include/event.php:1291 -msgid "Home" -msgstr "" - -#: ../../Zotlabs/Module/Profiles.php:797 ../../Zotlabs/Module/Connedit.php:930 -#: ../../Zotlabs/Module/Cdav.php:1120 ../../include/connections.php:678 -#: ../../include/event.php:1294 -msgid "Work" -msgstr "" - -#: ../../Zotlabs/Module/Profiles.php:799 ../../Zotlabs/Module/Connedit.php:932 -#: ../../Zotlabs/Module/Cdav.php:1122 -#: ../../extend/addon/addon/jappixmini/jappixmini.php:368 -msgid "Add Contact" -msgstr "" - -#: ../../Zotlabs/Module/Profiles.php:800 ../../Zotlabs/Module/Connedit.php:933 -#: ../../Zotlabs/Module/Cdav.php:1123 -msgid "Add Field" -msgstr "" - -#: ../../Zotlabs/Module/Profiles.php:802 -#: ../../Zotlabs/Module/Admin/Plugins.php:453 -#: ../../Zotlabs/Module/Connedit.php:935 -#: ../../Zotlabs/Module/Settings/Oauth.php:42 -#: ../../Zotlabs/Module/Settings/Oauth.php:113 -#: ../../Zotlabs/Module/Cdav.php:1125 ../../Zotlabs/Lib/Apps.php:359 -msgid "Update" -msgstr "" - -#: ../../Zotlabs/Module/Profiles.php:804 ../../Zotlabs/Module/Wiki.php:288 -#: ../../Zotlabs/Module/Wiki.php:314 -#: ../../Zotlabs/Module/Admin/Plugins.php:423 -#: ../../Zotlabs/Module/Filer.php:55 ../../Zotlabs/Module/Connedit.php:937 -#: ../../Zotlabs/Module/Fbrowser.php:66 ../../Zotlabs/Module/Fbrowser.php:88 -#: ../../Zotlabs/Module/Settings/Oauth.php:88 -#: ../../Zotlabs/Module/Settings/Oauth.php:114 -#: ../../Zotlabs/Module/Tagrm.php:15 ../../Zotlabs/Module/Tagrm.php:138 -#: ../../Zotlabs/Module/Cdav.php:839 ../../Zotlabs/Module/Cdav.php:1127 -#: ../../extend/addon/addon/js_upload/js_upload.php:46 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:244 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:267 -#: ../../include/conversation.php:1324 ../../include/conversation.php:1373 -msgid "Cancel" -msgstr "" - -#: ../../Zotlabs/Module/Profiles.php:823 ../../include/channel.php:1077 -msgid "Profile Image" -msgstr "" - -#: ../../Zotlabs/Module/Profiles.php:833 ../../include/nav.php:107 -#: ../../include/channel.php:1059 -msgid "Edit Profiles" -msgstr "" - -#: ../../Zotlabs/Module/Profiles.php:834 ../../Zotlabs/Module/Wiki.php:168 -#: ../../Zotlabs/Module/Manage.php:143 ../../Zotlabs/Module/Chat.php:254 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:154 -msgid "Create New" -msgstr "" - -#: ../../Zotlabs/Module/Item.php:185 -msgid "Unable to locate original post." -msgstr "" - -#: ../../Zotlabs/Module/Item.php:470 -msgid "Empty post discarded." -msgstr "" - -#: ../../Zotlabs/Module/Item.php:844 -msgid "Duplicate post suppressed." -msgstr "" - -#: ../../Zotlabs/Module/Item.php:984 -msgid "System error. Post not saved." -msgstr "" - -#: ../../Zotlabs/Module/Item.php:1020 -msgid "Your comment is awaiting approval." -msgstr "" - -#: ../../Zotlabs/Module/Item.php:1118 -msgid "Unable to obtain post information from database." -msgstr "" - -#: ../../Zotlabs/Module/Item.php:1125 +#: ../../Zotlabs/Module/Setup.php:446 #, php-format -msgid "You have reached your limit of %1$.0f top level posts." +msgid "" +"Your max allowed total upload size is set to %s. Maximum size of one file to " +"upload is set to %s. You are allowed to upload up to %d files at once." msgstr "" -#: ../../Zotlabs/Module/Item.php:1132 +#: ../../Zotlabs/Module/Setup.php:451 +msgid "You can adjust these settings in the server php.ini file." +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:453 +msgid "PHP upload limits" +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:476 +msgid "" +"Error: the \"openssl_pkey_new\" function on this system is not able to " +"generate encryption keys" +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:477 +msgid "" +"If running under Windows, please see \"http://www.php.net/manual/en/openssl." +"installation.php\"." +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:480 +msgid "Generate encryption keys" +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:497 +msgid "libCurl PHP module" +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:498 +msgid "GD graphics PHP module" +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:499 +msgid "OpenSSL PHP module" +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:500 +msgid "PDO database PHP module" +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:501 +msgid "mb_string PHP module" +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:502 +msgid "xml PHP module" +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:503 +msgid "zip PHP module" +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:507 ../../Zotlabs/Module/Setup.php:509 +msgid "Apache mod_rewrite module" +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:507 +msgid "" +"Error: Apache webserver mod-rewrite module is required but not installed." +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:513 ../../Zotlabs/Module/Setup.php:516 +msgid "exec" +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:513 +msgid "" +"Error: exec is required but is either not installed or has been disabled in " +"php.ini" +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:519 ../../Zotlabs/Module/Setup.php:522 +msgid "shell_exec" +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:519 +msgid "" +"Error: shell_exec is required but is either not installed or has been " +"disabled in php.ini" +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:527 +msgid "Error: libCURL PHP module required but not installed." +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:531 +msgid "" +"Error: GD graphics PHP module with JPEG support required but not installed." +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:535 +msgid "Error: openssl PHP module required but not installed." +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:539 +msgid "Error: PDO database PHP module required but not installed." +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:543 +msgid "Error: mb_string PHP module required but not installed." +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:547 +msgid "Error: xml PHP module required for DAV but not installed." +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:551 +msgid "Error: zip PHP module required but not installed." +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:569 +msgid "" +"The web installer needs to be able to create a file called \".htconfig.php\" " +"in the top folder of your web server and it is unable to do so." +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:570 +msgid "" +"This is most often a permission setting, as the web server may not be able " +"to write files in your folder - even if you can." +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:571 +msgid "" +"At the end of this procedure, we will give you a text to save in a file " +"named .htconfig.php in your Red top folder." +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:572 +msgid "" +"You can alternatively skip this procedure and perform a manual installation. " +"Please see the file \"install/INSTALL.txt\" for instructions." +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:575 +msgid ".htconfig.php is writable" +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:589 +msgid "" +"This software uses the Smarty3 template engine to render its web views. " +"Smarty3 compiles templates to PHP to speed up rendering." +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:590 #, php-format -msgid "You have reached your limit of %1$.0f webpages." +msgid "" +"In order to store these compiled templates, the web server needs to have " +"write access to the directory %s under the top level web folder." msgstr "" -#: ../../Zotlabs/Module/Layouts.php:129 ../../Zotlabs/Module/Layouts.php:189 -#: ../../Zotlabs/Module/Editlayout.php:128 -msgid "Layout Name" +#: ../../Zotlabs/Module/Setup.php:591 ../../Zotlabs/Module/Setup.php:612 +msgid "" +"Please ensure that the user that your web server runs as (e.g. www-data) has " +"write access to this folder." msgstr "" -#: ../../Zotlabs/Module/Layouts.php:132 -#: ../../Zotlabs/Module/Editlayout.php:129 -msgid "Layout Description (Optional)" +#: ../../Zotlabs/Module/Setup.php:592 +#, php-format +msgid "" +"Note: as a security measure, you should give the web server write access to " +"%s only--not the template files (.tpl) that it contains." msgstr "" -#: ../../Zotlabs/Module/Layouts.php:184 ../../include/text.php:2282 -msgid "Layouts" +#: ../../Zotlabs/Module/Setup.php:595 +#, php-format +msgid "%s is writable" msgstr "" -#: ../../Zotlabs/Module/Layouts.php:186 ../../Zotlabs/Lib/Apps.php:233 -#: ../../include/nav.php:159 ../../include/nav.php:255 -#: ../../include/help.php:55 ../../include/help.php:61 -msgid "Help" +#: ../../Zotlabs/Module/Setup.php:611 +msgid "" +"This software uses the store directory to save uploaded files. The web " +"server needs to have write access to the store directory under the top level " +"web folder" msgstr "" -#: ../../Zotlabs/Module/Layouts.php:186 -msgid "Comanche page description language help" +#: ../../Zotlabs/Module/Setup.php:615 +msgid "store is writable" msgstr "" -#: ../../Zotlabs/Module/Layouts.php:190 -msgid "Layout Description" +#: ../../Zotlabs/Module/Setup.php:647 +msgid "" +"SSL certificate cannot be validated. Fix certificate or disable https access " +"to this site." msgstr "" -#: ../../Zotlabs/Module/Layouts.php:191 ../../Zotlabs/Module/Menu.php:114 -#: ../../Zotlabs/Module/Webpages.php:249 ../../Zotlabs/Module/Blocks.php:157 -msgid "Created" +#: ../../Zotlabs/Module/Setup.php:648 +msgid "" +"If you have https access to your website or allow connections to TCP port " +"443 (the https: port), you MUST use a browser-valid certificate. You MUST " +"NOT use self-signed certificates!" msgstr "" -#: ../../Zotlabs/Module/Layouts.php:192 ../../Zotlabs/Module/Menu.php:115 -#: ../../Zotlabs/Module/Webpages.php:250 ../../Zotlabs/Module/Blocks.php:158 -msgid "Edited" +#: ../../Zotlabs/Module/Setup.php:649 +msgid "" +"This restriction is incorporated because public posts from you may for " +"example contain references to images on your own hub." msgstr "" -#: ../../Zotlabs/Module/Layouts.php:194 ../../Zotlabs/Module/Webpages.php:239 -#: ../../Zotlabs/Module/Blocks.php:161 ../../Zotlabs/Module/Photos.php:1042 -#: ../../Zotlabs/Widget/Cdav.php:123 ../../include/conversation.php:1308 -msgid "Share" +#: ../../Zotlabs/Module/Setup.php:650 +msgid "" +"If your certificate is not recognized, members of other sites (who may " +"themselves have valid certificates) will get a warning message on their own " +"site complaining about security issues." msgstr "" -#: ../../Zotlabs/Module/Layouts.php:195 -msgid "Download PDL file" +#: ../../Zotlabs/Module/Setup.php:651 +msgid "" +"This can cause usability issues elsewhere (not just on your own site) so we " +"must insist on this requirement." msgstr "" -#: ../../Zotlabs/Module/Layouts.php:198 ../../Zotlabs/Module/Wiki.php:167 -#: ../../Zotlabs/Module/Pubsites.php:59 ../../Zotlabs/Module/Webpages.php:244 -#: ../../Zotlabs/Module/Blocks.php:166 ../../Zotlabs/Module/Events.php:694 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:153 -msgid "View" +#: ../../Zotlabs/Module/Setup.php:652 +msgid "" +"Providers are available that issue free certificates which are browser-valid." +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:654 +msgid "" +"If you are confident that the certificate is valid and signed by a trusted " +"authority, check to see if you have failed to install an intermediate cert. " +"These are not normally required by browsers, but are required for server-to-" +"server communications." +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:656 +msgid "SSL certificate validation" +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:662 +msgid "" +"Url rewrite in .htaccess is not working. Check your server configuration." +"Test: " +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:665 +msgid "Url rewrite is working" +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:679 +msgid "" +"The database configuration file \".htconfig.php\" could not be written. " +"Please use the enclosed text to create a configuration file in your web " +"server root." +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:703 ../../addon/rendezvous/rendezvous.php:401 +msgid "Errors encountered creating database tables." +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:743 +msgid "

What next?

" +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:744 +msgid "" +"IMPORTANT: You will need to [manually] setup a scheduled task for the poller." msgstr "" #: ../../Zotlabs/Module/Connect.php:61 ../../Zotlabs/Module/Connect.php:109 @@ -1464,487 +2078,32 @@ msgstr "" msgid "Restricted or Premium Channel" msgstr "" -#: ../../Zotlabs/Module/Chanview.php:96 ../../Zotlabs/Module/Block.php:41 -#: ../../Zotlabs/Module/Page.php:75 ../../Zotlabs/Module/Cal.php:62 -#: ../../Zotlabs/Module/Wall_upload.php:31 -msgid "Channel not found." +#: ../../Zotlabs/Module/Admin/Queue.php:35 +msgid "Queue Statistics" msgstr "" -#: ../../Zotlabs/Module/Chanview.php:139 -msgid "toggle full screen mode" +#: ../../Zotlabs/Module/Admin/Queue.php:36 +msgid "Total Entries" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:30 -msgid "Profile Unavailable." +#: ../../Zotlabs/Module/Admin/Queue.php:37 +msgid "Priority" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:44 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:42 -msgid "Not found" +#: ../../Zotlabs/Module/Admin/Queue.php:38 +msgid "Destination URL" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:68 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:62 -msgid "Invalid channel" +#: ../../Zotlabs/Module/Admin/Queue.php:39 +msgid "Mark hub permanently offline" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:160 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:146 -#: ../../include/nav.php:452 ../../include/conversation.php:1851 -msgid "Wikis" +#: ../../Zotlabs/Module/Admin/Queue.php:40 +msgid "Empty queue for this hub" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:166 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:152 -msgid "Download" -msgstr "" - -#: ../../Zotlabs/Module/Wiki.php:170 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:156 -msgid "Wiki name" -msgstr "" - -#: ../../Zotlabs/Module/Wiki.php:171 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:157 -msgid "Content type" -msgstr "" - -#: ../../Zotlabs/Module/Wiki.php:180 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:166 -msgid "Create a status post for this wiki" -msgstr "" - -#: ../../Zotlabs/Module/Wiki.php:222 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:185 -msgid "Wiki not found" -msgstr "" - -#: ../../Zotlabs/Module/Wiki.php:246 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:210 -msgid "Rename page" -msgstr "" - -#: ../../Zotlabs/Module/Wiki.php:256 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:214 -msgid "Error retrieving page content" -msgstr "" - -#: ../../Zotlabs/Module/Wiki.php:262 -msgid "New page" -msgstr "" - -#: ../../Zotlabs/Module/Wiki.php:286 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:242 -msgid "Revision Comparison" -msgstr "" - -#: ../../Zotlabs/Module/Wiki.php:287 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:243 -msgid "Revert" -msgstr "" - -#: ../../Zotlabs/Module/Wiki.php:291 -msgid "Short description of your changes (optional)" -msgstr "" - -#: ../../Zotlabs/Module/Wiki.php:298 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:252 -msgid "Source" -msgstr "" - -#: ../../Zotlabs/Module/Wiki.php:307 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:260 -msgid "New page name" -msgstr "" - -#: ../../Zotlabs/Module/Wiki.php:312 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:265 -#: ../../include/conversation.php:1229 -msgid "Embed image from photo albums" -msgstr "" - -#: ../../Zotlabs/Module/Wiki.php:313 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:266 -#: ../../include/conversation.php:1323 -msgid "Embed an image from your albums" -msgstr "" - -#: ../../Zotlabs/Module/Wiki.php:315 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:268 -#: ../../include/conversation.php:1325 ../../include/conversation.php:1372 -msgid "OK" -msgstr "" - -#: ../../Zotlabs/Module/Wiki.php:316 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:269 -#: ../../include/conversation.php:1265 -msgid "Choose images to embed" -msgstr "" - -#: ../../Zotlabs/Module/Wiki.php:317 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:270 -#: ../../include/conversation.php:1266 -msgid "Choose an album" -msgstr "" - -#: ../../Zotlabs/Module/Wiki.php:318 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:271 -msgid "Choose a different album" -msgstr "" - -#: ../../Zotlabs/Module/Wiki.php:319 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:272 -#: ../../include/conversation.php:1268 -msgid "Error getting album list" -msgstr "" - -#: ../../Zotlabs/Module/Wiki.php:320 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:273 -#: ../../include/conversation.php:1269 -msgid "Error getting photo link" -msgstr "" - -#: ../../Zotlabs/Module/Wiki.php:321 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:274 -#: ../../include/conversation.php:1270 -msgid "Error getting album" -msgstr "" - -#: ../../Zotlabs/Module/Wiki.php:389 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:337 -msgid "Error creating wiki. Invalid name." -msgstr "" - -#: ../../Zotlabs/Module/Wiki.php:396 -msgid "A wiki with this name already exists." -msgstr "" - -#: ../../Zotlabs/Module/Wiki.php:409 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:348 -msgid "Wiki created, but error creating Home page." -msgstr "" - -#: ../../Zotlabs/Module/Wiki.php:416 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:353 -msgid "Error creating wiki" -msgstr "" - -#: ../../Zotlabs/Module/Wiki.php:428 -msgid "Wiki delete permission denied." -msgstr "" - -#: ../../Zotlabs/Module/Wiki.php:438 -msgid "Error deleting wiki" -msgstr "" - -#: ../../Zotlabs/Module/Wiki.php:464 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:400 -msgid "New page created" -msgstr "" - -#: ../../Zotlabs/Module/Wiki.php:585 -msgid "Cannot delete Home" -msgstr "" - -#: ../../Zotlabs/Module/Wiki.php:649 -msgid "Current Revision" -msgstr "" - -#: ../../Zotlabs/Module/Wiki.php:649 -msgid "Selected Revision" -msgstr "" - -#: ../../Zotlabs/Module/Wiki.php:699 -msgid "You must be authenticated." -msgstr "" - -#: ../../Zotlabs/Module/Block.php:29 ../../Zotlabs/Module/Page.php:39 -msgid "Invalid item." -msgstr "" - -#: ../../Zotlabs/Module/Ping.php:254 -msgid "sent you a private message" -msgstr "" - -#: ../../Zotlabs/Module/Ping.php:302 -msgid "added your channel" -msgstr "" - -#: ../../Zotlabs/Module/Ping.php:312 -msgid "g A l F d" -msgstr "" - -#: ../../Zotlabs/Module/Ping.php:330 -msgid "[today]" -msgstr "" - -#: ../../Zotlabs/Module/Ping.php:339 -msgid "posted an event" -msgstr "" - -#: ../../Zotlabs/Module/Connections.php:52 -#: ../../Zotlabs/Module/Connections.php:157 -#: ../../Zotlabs/Module/Connections.php:246 -msgid "Blocked" -msgstr "" - -#: ../../Zotlabs/Module/Connections.php:57 -#: ../../Zotlabs/Module/Connections.php:164 -#: ../../Zotlabs/Module/Connections.php:245 -msgid "Ignored" -msgstr "" - -#: ../../Zotlabs/Module/Connections.php:62 -#: ../../Zotlabs/Module/Connections.php:178 -#: ../../Zotlabs/Module/Connections.php:244 -msgid "Hidden" -msgstr "" - -#: ../../Zotlabs/Module/Connections.php:67 -#: ../../Zotlabs/Module/Connections.php:171 -msgid "Archived/Unreachable" -msgstr "" - -#: ../../Zotlabs/Module/Connections.php:72 -#: ../../Zotlabs/Module/Connections.php:82 ../../Zotlabs/Module/Menu.php:116 -#: ../../include/conversation.php:1663 -msgid "New" -msgstr "" - -#: ../../Zotlabs/Module/Connections.php:88 -#: ../../Zotlabs/Module/Connections.php:103 -#: ../../Zotlabs/Module/Connedit.php:709 ../../Zotlabs/Widget/Affinity.php:30 -msgid "All" -msgstr "" - -#: ../../Zotlabs/Module/Connections.php:134 -msgid "New Connections" -msgstr "" - -#: ../../Zotlabs/Module/Connections.php:137 -msgid "Show pending (new) connections" -msgstr "" - -#: ../../Zotlabs/Module/Connections.php:141 -#: ../../Zotlabs/Module/Profperm.php:140 -msgid "All Connections" -msgstr "" - -#: ../../Zotlabs/Module/Connections.php:144 -msgid "Show all connections" -msgstr "" - -#: ../../Zotlabs/Module/Connections.php:160 -msgid "Only show blocked connections" -msgstr "" - -#: ../../Zotlabs/Module/Connections.php:167 -msgid "Only show ignored connections" -msgstr "" - -#: ../../Zotlabs/Module/Connections.php:174 -msgid "Only show archived/unreachable connections" -msgstr "" - -#: ../../Zotlabs/Module/Connections.php:181 -msgid "Only show hidden connections" -msgstr "" - -#: ../../Zotlabs/Module/Connections.php:242 -msgid "Pending approval" -msgstr "" - -#: ../../Zotlabs/Module/Connections.php:243 -msgid "Archived" -msgstr "" - -#: ../../Zotlabs/Module/Connections.php:247 -msgid "Not connected at this location" -msgstr "" - -#: ../../Zotlabs/Module/Connections.php:259 -#, php-format -msgid "%1$s [%2$s]" -msgstr "" - -#: ../../Zotlabs/Module/Connections.php:260 -msgid "Edit connection" -msgstr "" - -#: ../../Zotlabs/Module/Connections.php:262 -msgid "Delete connection" -msgstr "" - -#: ../../Zotlabs/Module/Connections.php:271 -msgid "Channel address" -msgstr "" - -#: ../../Zotlabs/Module/Connections.php:273 -msgid "Network" -msgstr "" - -#: ../../Zotlabs/Module/Connections.php:276 -msgid "Call" -msgstr "" - -#: ../../Zotlabs/Module/Connections.php:278 -msgid "Status" -msgstr "" - -#: ../../Zotlabs/Module/Connections.php:280 -msgid "Connected" -msgstr "" - -#: ../../Zotlabs/Module/Connections.php:282 -msgid "Approve connection" -msgstr "" - -#: ../../Zotlabs/Module/Connections.php:283 -#: ../../Zotlabs/Module/Admin/Accounts.php:171 -#: ../../include/conversation.php:685 -msgid "Approve" -msgstr "" - -#: ../../Zotlabs/Module/Connections.php:284 -msgid "Ignore connection" -msgstr "" - -#: ../../Zotlabs/Module/Connections.php:285 -#: ../../Zotlabs/Module/Connedit.php:626 -msgid "Ignore" -msgstr "" - -#: ../../Zotlabs/Module/Connections.php:286 -msgid "Recent activity" -msgstr "" - -#: ../../Zotlabs/Module/Connections.php:310 ../../Zotlabs/Lib/Apps.php:217 -#: ../../include/text.php:951 ../../include/nav.php:183 -msgid "Connections" -msgstr "" - -#: ../../Zotlabs/Module/Connections.php:314 ../../Zotlabs/Module/Search.php:44 -#: ../../Zotlabs/Lib/Apps.php:238 ../../Zotlabs/Widget/Sitesearch.php:31 -#: ../../include/text.php:1021 ../../include/text.php:1033 -#: ../../include/nav.php:162 ../../include/acl_selectors.php:213 -msgid "Search" -msgstr "" - -#: ../../Zotlabs/Module/Connections.php:315 -msgid "Search your connections" -msgstr "" - -#: ../../Zotlabs/Module/Connections.php:316 -msgid "Connections search" -msgstr "" - -#: ../../Zotlabs/Module/Cover_photo.php:56 -#: ../../Zotlabs/Module/Profile_photo.php:61 -msgid "Image uploaded but image cropping failed." -msgstr "" - -#: ../../Zotlabs/Module/Cover_photo.php:136 -#: ../../Zotlabs/Module/Cover_photo.php:186 -msgid "Cover Photos" -msgstr "" - -#: ../../Zotlabs/Module/Cover_photo.php:159 -#: ../../Zotlabs/Module/Profile_photo.php:137 -msgid "Image resize failed." -msgstr "" - -#: ../../Zotlabs/Module/Cover_photo.php:173 -#: ../../Zotlabs/Module/Profile_photo.php:203 ../../include/photos.php:145 -msgid "Unable to process image" -msgstr "" - -#: ../../Zotlabs/Module/Cover_photo.php:197 -#: ../../Zotlabs/Module/Profile_photo.php:238 -msgid "Image upload failed." -msgstr "" - -#: ../../Zotlabs/Module/Cover_photo.php:214 -#: ../../Zotlabs/Module/Profile_photo.php:257 -msgid "Unable to process image." -msgstr "" - -#: ../../Zotlabs/Module/Cover_photo.php:237 ../../include/items.php:4273 -msgid "female" -msgstr "" - -#: ../../Zotlabs/Module/Cover_photo.php:238 ../../include/items.php:4274 -#, php-format -msgid "%1$s updated her %2$s" -msgstr "" - -#: ../../Zotlabs/Module/Cover_photo.php:239 ../../include/items.php:4275 -msgid "male" -msgstr "" - -#: ../../Zotlabs/Module/Cover_photo.php:240 ../../include/items.php:4276 -#, php-format -msgid "%1$s updated his %2$s" -msgstr "" - -#: ../../Zotlabs/Module/Cover_photo.php:242 ../../include/items.php:4278 -#, php-format -msgid "%1$s updated their %2$s" -msgstr "" - -#: ../../Zotlabs/Module/Cover_photo.php:244 ../../include/channel.php:1776 -msgid "cover photo" -msgstr "" - -#: ../../Zotlabs/Module/Cover_photo.php:307 -#: ../../Zotlabs/Module/Cover_photo.php:322 -#: ../../Zotlabs/Module/Profile_photo.php:318 -#: ../../Zotlabs/Module/Profile_photo.php:365 -msgid "Photo not available." -msgstr "" - -#: ../../Zotlabs/Module/Cover_photo.php:358 -#: ../../Zotlabs/Module/Profile_photo.php:420 -msgid "Upload File:" -msgstr "" - -#: ../../Zotlabs/Module/Cover_photo.php:359 -#: ../../Zotlabs/Module/Profile_photo.php:421 -msgid "Select a profile:" -msgstr "" - -#: ../../Zotlabs/Module/Cover_photo.php:360 -msgid "Upload Cover Photo" -msgstr "" - -#: ../../Zotlabs/Module/Cover_photo.php:365 -#: ../../Zotlabs/Module/Profile_photo.php:429 -#: ../../Zotlabs/Module/Settings/Channel.php:404 -msgid "or" -msgstr "" - -#: ../../Zotlabs/Module/Cover_photo.php:365 -#: ../../Zotlabs/Module/Profile_photo.php:429 -msgid "skip this step" -msgstr "" - -#: ../../Zotlabs/Module/Cover_photo.php:365 -#: ../../Zotlabs/Module/Profile_photo.php:429 -msgid "select a photo from your photo albums" -msgstr "" - -#: ../../Zotlabs/Module/Cover_photo.php:381 -#: ../../Zotlabs/Module/Profile_photo.php:448 -msgid "Crop Image" -msgstr "" - -#: ../../Zotlabs/Module/Cover_photo.php:382 -#: ../../Zotlabs/Module/Profile_photo.php:449 -msgid "Please adjust the image cropping for optimum viewing." -msgstr "" - -#: ../../Zotlabs/Module/Cover_photo.php:384 -#: ../../Zotlabs/Module/Profile_photo.php:451 -msgid "Done Editing" +#: ../../Zotlabs/Module/Admin/Queue.php:41 +msgid "Last known contact" msgstr "" #: ../../Zotlabs/Module/Admin/Features.php:55 @@ -1968,479 +2127,6 @@ msgstr "" msgid "Manage Additional Features" msgstr "" -#: ../../Zotlabs/Module/Admin/Logs.php:28 -msgid "Log settings updated." -msgstr "" - -#: ../../Zotlabs/Module/Admin/Logs.php:82 -#: ../../Zotlabs/Module/Admin/Security.php:86 -#: ../../Zotlabs/Module/Admin/Accounts.php:164 -#: ../../Zotlabs/Module/Admin/Channels.php:145 -#: ../../Zotlabs/Module/Admin/Plugins.php:341 -#: ../../Zotlabs/Module/Admin/Plugins.php:436 -#: ../../Zotlabs/Module/Admin/Themes.php:122 -#: ../../Zotlabs/Module/Admin/Themes.php:156 -#: ../../Zotlabs/Module/Admin/Site.php:269 ../../Zotlabs/Module/Admin.php:134 -msgid "Administration" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Logs.php:83 ../../Zotlabs/Widget/Admin.php:48 -#: ../../Zotlabs/Widget/Admin.php:58 -msgid "Logs" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Logs.php:85 -msgid "Clear" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Logs.php:91 -msgid "Debugging" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Logs.php:92 -msgid "Log file" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Logs.php:92 -msgid "" -"Must be writable by web server. Relative to your top-level webserver " -"directory." -msgstr "" - -#: ../../Zotlabs/Module/Admin/Logs.php:93 -msgid "Log level" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Profs.php:69 -msgid "New Profile Field" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Profs.php:70 -#: ../../Zotlabs/Module/Admin/Profs.php:90 -msgid "Field nickname" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Profs.php:70 -#: ../../Zotlabs/Module/Admin/Profs.php:90 -msgid "System name of field" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Profs.php:71 -#: ../../Zotlabs/Module/Admin/Profs.php:91 -msgid "Input type" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Profs.php:72 -#: ../../Zotlabs/Module/Admin/Profs.php:92 -msgid "Field Name" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Profs.php:72 -#: ../../Zotlabs/Module/Admin/Profs.php:92 -msgid "Label on profile pages" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Profs.php:73 -#: ../../Zotlabs/Module/Admin/Profs.php:93 -msgid "Help text" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Profs.php:73 -#: ../../Zotlabs/Module/Admin/Profs.php:93 -msgid "Additional info (optional)" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Profs.php:74 -#: ../../Zotlabs/Module/Admin/Profs.php:94 ../../Zotlabs/Module/Filer.php:53 -#: ../../Zotlabs/Module/Rbmark.php:32 ../../Zotlabs/Module/Rbmark.php:104 -#: ../../Zotlabs/Widget/Notes.php:18 ../../include/text.php:1022 -#: ../../include/text.php:1034 -msgid "Save" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Profs.php:83 -msgid "Field definition not found" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Profs.php:89 -msgid "Edit Profile Field" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Profs.php:147 ../../Zotlabs/Widget/Admin.php:30 -msgid "Profile Fields" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Profs.php:148 -msgid "Basic Profile Fields" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Profs.php:149 -msgid "Advanced Profile Fields" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Profs.php:149 -msgid "(In addition to basic fields)" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Profs.php:151 -msgid "All available fields" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Profs.php:152 -msgid "Custom Fields" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Profs.php:156 -msgid "Create Custom Field" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Security.php:77 -msgid "" -"By default, unfiltered HTML is allowed in embedded media. This is inherently " -"insecure." -msgstr "" - -#: ../../Zotlabs/Module/Admin/Security.php:80 -msgid "" -"The recommended setting is to only allow unfiltered HTML from the following " -"sites:" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Security.php:81 -msgid "" -"https://youtube.com/
https://www.youtube.com/
https://youtu.be/" -"
https://vimeo.com/
https://soundcloud.com/
" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Security.php:82 -msgid "" -"All other embedded content will be filtered, unless " -"embedded content from that site is explicitly blocked." -msgstr "" - -#: ../../Zotlabs/Module/Admin/Security.php:87 -#: ../../Zotlabs/Widget/Admin.php:25 -msgid "Security" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Security.php:89 -msgid "Block public" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Security.php:89 -msgid "" -"Check to block public access to all otherwise public personal pages on this " -"site unless you are currently authenticated." -msgstr "" - -#: ../../Zotlabs/Module/Admin/Security.php:90 -msgid "Set \"Transport Security\" HTTP header" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Security.php:91 -msgid "Set \"Content Security Policy\" HTTP header" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Security.php:92 -msgid "Allowed email domains" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Security.php:92 -msgid "" -"Comma separated list of domains which are allowed in email addresses for " -"registrations to this site. Wildcards are accepted. Empty to allow any " -"domains" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Security.php:93 -msgid "Not allowed email domains" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Security.php:93 -msgid "" -"Comma separated list of domains which are not allowed in email addresses for " -"registrations to this site. Wildcards are accepted. Empty to allow any " -"domains, unless allowed domains have been defined." -msgstr "" - -#: ../../Zotlabs/Module/Admin/Security.php:94 -msgid "Allow communications only from these sites" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Security.php:94 -msgid "" -"One site per line. Leave empty to allow communication from anywhere by " -"default" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Security.php:95 -msgid "Block communications from these sites" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Security.php:96 -msgid "Allow communications only from these channels" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Security.php:96 -msgid "" -"One channel (hash) per line. Leave empty to allow from any channel by default" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Security.php:97 -msgid "Block communications from these channels" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Security.php:98 -msgid "Only allow embeds from secure (SSL) websites and links." -msgstr "" - -#: ../../Zotlabs/Module/Admin/Security.php:99 -msgid "Allow unfiltered embedded HTML content only from these domains" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Security.php:99 -msgid "One site per line. By default embedded content is filtered." -msgstr "" - -#: ../../Zotlabs/Module/Admin/Security.php:100 -msgid "Block embedded HTML from these domains" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Account_edit.php:29 -#, php-format -msgid "Password changed for account %d." -msgstr "" - -#: ../../Zotlabs/Module/Admin/Account_edit.php:46 -msgid "Account settings updated." -msgstr "" - -#: ../../Zotlabs/Module/Admin/Account_edit.php:61 -msgid "Account not found." -msgstr "" - -#: ../../Zotlabs/Module/Admin/Account_edit.php:68 -msgid "Account Edit" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Account_edit.php:69 -msgid "New Password" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Account_edit.php:70 -msgid "New Password again" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Account_edit.php:71 -msgid "Technical skill level" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Account_edit.php:72 -msgid "Account language (for emails)" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Account_edit.php:73 -msgid "Service class" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Accounts.php:36 -#, php-format -msgid "%s account blocked/unblocked" -msgid_plural "%s account blocked/unblocked" -msgstr[0] "" -msgstr[1] "" - -#: ../../Zotlabs/Module/Admin/Accounts.php:43 -#, php-format -msgid "%s account deleted" -msgid_plural "%s accounts deleted" -msgstr[0] "" -msgstr[1] "" - -#: ../../Zotlabs/Module/Admin/Accounts.php:79 -msgid "Account not found" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Accounts.php:90 -#, php-format -msgid "Account '%s' deleted" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Accounts.php:98 -#, php-format -msgid "Account '%s' blocked" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Accounts.php:106 -#, php-format -msgid "Account '%s' unblocked" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Accounts.php:165 -#: ../../Zotlabs/Module/Admin/Accounts.php:178 -#: ../../Zotlabs/Module/Admin.php:94 ../../Zotlabs/Widget/Admin.php:23 -msgid "Accounts" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Accounts.php:167 -#: ../../Zotlabs/Module/Admin/Channels.php:148 -msgid "select all" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Accounts.php:168 -msgid "Registrations waiting for confirm" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Accounts.php:169 -msgid "Request date" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Accounts.php:170 -msgid "No registrations." -msgstr "" - -#: ../../Zotlabs/Module/Admin/Accounts.php:172 -msgid "Deny" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Accounts.php:174 -#: ../../Zotlabs/Module/Connedit.php:618 -msgid "Block" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Accounts.php:175 -#: ../../Zotlabs/Module/Connedit.php:618 -msgid "Unblock" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Accounts.php:180 -msgid "ID" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Accounts.php:182 ../../include/group.php:287 -msgid "All Channels" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Accounts.php:183 -msgid "Register date" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Accounts.php:184 -msgid "Last login" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Accounts.php:185 -msgid "Expires" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Accounts.php:186 -msgid "Service Class" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Accounts.php:188 -msgid "" -"Selected accounts will be deleted!\\n\\nEverything these accounts had posted " -"on this site will be permanently deleted!\\n\\nAre you sure?" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Accounts.php:189 -msgid "" -"The account {0} will be deleted!\\n\\nEverything this account has posted on " -"this site will be permanently deleted!\\n\\nAre you sure?" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Channels.php:31 -#, php-format -msgid "%s channel censored/uncensored" -msgid_plural "%s channels censored/uncensored" -msgstr[0] "" -msgstr[1] "" - -#: ../../Zotlabs/Module/Admin/Channels.php:40 -#, php-format -msgid "%s channel code allowed/disallowed" -msgid_plural "%s channels code allowed/disallowed" -msgstr[0] "" -msgstr[1] "" - -#: ../../Zotlabs/Module/Admin/Channels.php:46 -#, php-format -msgid "%s channel deleted" -msgid_plural "%s channels deleted" -msgstr[0] "" -msgstr[1] "" - -#: ../../Zotlabs/Module/Admin/Channels.php:65 -msgid "Channel not found" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Channels.php:75 -#, php-format -msgid "Channel '%s' deleted" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Channels.php:87 -#, php-format -msgid "Channel '%s' censored" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Channels.php:87 -#, php-format -msgid "Channel '%s' uncensored" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Channels.php:98 -#, php-format -msgid "Channel '%s' code allowed" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Channels.php:98 -#, php-format -msgid "Channel '%s' code disallowed" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Channels.php:146 -#: ../../Zotlabs/Module/Admin.php:108 ../../Zotlabs/Widget/Admin.php:24 -msgid "Channels" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Channels.php:150 -msgid "Censor" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Channels.php:151 -msgid "Uncensor" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Channels.php:152 -msgid "Allow Code" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Channels.php:153 -msgid "Disallow Code" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Channels.php:154 ../../include/nav.php:359 -#: ../../include/conversation.php:1757 -msgid "Channel" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Channels.php:158 -msgid "UID" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Channels.php:162 -msgid "" -"Selected channels will be deleted!\\n\\nEverything that was posted in these " -"channels on this site will be permanently deleted!\\n\\nAre you sure?" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Channels.php:163 -msgid "" -"The channel {0} will be deleted!\\n\\nEverything that was posted in this " -"channel on this site will be permanently deleted!\\n\\nAre you sure?" -msgstr "" - #: ../../Zotlabs/Module/Admin/Dbsync.php:19 msgid "Update has been marked successful" msgstr "" @@ -2481,39 +2167,11 @@ msgstr "" msgid "Attempt to execute this update step automatically" msgstr "" -#: ../../Zotlabs/Module/Admin/Queue.php:35 -msgid "Queue Statistics" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Queue.php:36 -msgid "Total Entries" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Queue.php:37 -msgid "Priority" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Queue.php:38 -msgid "Destination URL" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Queue.php:39 -msgid "Mark hub permanently offline" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Queue.php:40 -msgid "Empty queue for this hub" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Queue.php:41 -msgid "Last known contact" -msgstr "" - #: ../../Zotlabs/Module/Admin/Plugins.php:259 -#: ../../Zotlabs/Module/Admin/Themes.php:72 -#: ../../Zotlabs/Module/Filestorage.php:32 ../../Zotlabs/Module/Display.php:35 -#: ../../Zotlabs/Module/Viewsrc.php:25 ../../Zotlabs/Module/Admin.php:60 -#: ../../Zotlabs/Module/Thing.php:89 ../../include/items.php:3361 +#: ../../Zotlabs/Module/Admin/Themes.php:72 ../../Zotlabs/Module/Thing.php:89 +#: ../../Zotlabs/Module/Viewsrc.php:25 ../../Zotlabs/Module/Display.php:35 +#: ../../Zotlabs/Module/Filestorage.php:24 ../../Zotlabs/Module/Admin.php:62 +#: ../../include/items.php:3361 msgid "Item not found." msgstr "" @@ -2537,9 +2195,21 @@ msgstr "" msgid "Enable" msgstr "" +#: ../../Zotlabs/Module/Admin/Plugins.php:341 +#: ../../Zotlabs/Module/Admin/Plugins.php:436 +#: ../../Zotlabs/Module/Admin/Accounts.php:164 +#: ../../Zotlabs/Module/Admin/Logs.php:82 +#: ../../Zotlabs/Module/Admin/Channels.php:145 +#: ../../Zotlabs/Module/Admin/Themes.php:122 +#: ../../Zotlabs/Module/Admin/Themes.php:156 +#: ../../Zotlabs/Module/Admin/Site.php:269 +#: ../../Zotlabs/Module/Admin/Security.php:86 +#: ../../Zotlabs/Module/Admin.php:136 +msgid "Administration" +msgstr "" + #: ../../Zotlabs/Module/Admin/Plugins.php:342 -#: ../../Zotlabs/Module/Admin/Plugins.php:437 -#: ../../Zotlabs/Widget/Admin.php:27 +#: ../../Zotlabs/Module/Admin/Plugins.php:437 ../../Zotlabs/Widget/Admin.php:27 msgid "Plugins" msgstr "" @@ -2549,8 +2219,8 @@ msgid "Toggle" msgstr "" #: ../../Zotlabs/Module/Admin/Plugins.php:344 -#: ../../Zotlabs/Module/Admin/Themes.php:125 ../../Zotlabs/Lib/Apps.php:224 -#: ../../Zotlabs/Widget/Settings_menu.php:133 ../../include/nav.php:204 +#: ../../Zotlabs/Module/Admin/Themes.php:125 ../../Zotlabs/Lib/Apps.php:236 +#: ../../Zotlabs/Widget/Settings_menu.php:133 ../../include/nav.php:201 msgid "Settings" msgstr "" @@ -2613,7 +2283,7 @@ msgstr "" msgid "Install new repo" msgstr "" -#: ../../Zotlabs/Module/Admin/Plugins.php:422 ../../Zotlabs/Lib/Apps.php:359 +#: ../../Zotlabs/Module/Admin/Plugins.php:422 ../../Zotlabs/Lib/Apps.php:384 msgid "Install" msgstr "" @@ -2634,11 +2304,245 @@ msgid "Switch branch" msgstr "" #: ../../Zotlabs/Module/Admin/Plugins.php:455 -#: ../../Zotlabs/Module/Tagrm.php:137 ../../Zotlabs/Module/Photos.php:960 -#: ../../extend/addon/addon/superblock/superblock.php:116 +#: ../../Zotlabs/Module/Photos.php:962 ../../Zotlabs/Module/Tagrm.php:137 +#: ../../addon/superblock/superblock.php:116 msgid "Remove" msgstr "" +#: ../../Zotlabs/Module/Admin/Accounts.php:36 +#, php-format +msgid "%s account blocked/unblocked" +msgid_plural "%s account blocked/unblocked" +msgstr[0] "" +msgstr[1] "" + +#: ../../Zotlabs/Module/Admin/Accounts.php:43 +#, php-format +msgid "%s account deleted" +msgid_plural "%s accounts deleted" +msgstr[0] "" +msgstr[1] "" + +#: ../../Zotlabs/Module/Admin/Accounts.php:79 +msgid "Account not found" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Accounts.php:90 +#, php-format +msgid "Account '%s' deleted" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Accounts.php:98 +#, php-format +msgid "Account '%s' blocked" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Accounts.php:106 +#, php-format +msgid "Account '%s' unblocked" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Accounts.php:165 +#: ../../Zotlabs/Module/Admin/Accounts.php:178 +#: ../../Zotlabs/Module/Admin.php:96 ../../Zotlabs/Widget/Admin.php:23 +msgid "Accounts" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Accounts.php:167 +#: ../../Zotlabs/Module/Admin/Channels.php:148 +msgid "select all" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Accounts.php:168 +msgid "Registrations waiting for confirm" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Accounts.php:169 +msgid "Request date" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Accounts.php:170 +msgid "No registrations." +msgstr "" + +#: ../../Zotlabs/Module/Admin/Accounts.php:171 +#: ../../Zotlabs/Module/Connections.php:282 ../../include/conversation.php:685 +msgid "Approve" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Accounts.php:172 +msgid "Deny" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Accounts.php:174 +#: ../../Zotlabs/Module/Connedit.php:618 +msgid "Block" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Accounts.php:175 +#: ../../Zotlabs/Module/Connedit.php:618 +msgid "Unblock" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Accounts.php:180 +msgid "ID" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Accounts.php:182 ../../include/group.php:288 +msgid "All Channels" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Accounts.php:183 +msgid "Register date" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Accounts.php:184 +msgid "Last login" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Accounts.php:185 +msgid "Expires" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Accounts.php:186 +msgid "Service Class" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Accounts.php:188 +msgid "" +"Selected accounts will be deleted!\\n\\nEverything these accounts had posted " +"on this site will be permanently deleted!\\n\\nAre you sure?" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Accounts.php:189 +msgid "" +"The account {0} will be deleted!\\n\\nEverything this account has posted on " +"this site will be permanently deleted!\\n\\nAre you sure?" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Logs.php:28 +msgid "Log settings updated." +msgstr "" + +#: ../../Zotlabs/Module/Admin/Logs.php:83 ../../Zotlabs/Widget/Admin.php:48 +#: ../../Zotlabs/Widget/Admin.php:58 +msgid "Logs" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Logs.php:85 +msgid "Clear" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Logs.php:91 +msgid "Debugging" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Logs.php:92 +msgid "Log file" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Logs.php:92 +msgid "" +"Must be writable by web server. Relative to your top-level webserver " +"directory." +msgstr "" + +#: ../../Zotlabs/Module/Admin/Logs.php:93 +msgid "Log level" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Channels.php:31 +#, php-format +msgid "%s channel censored/uncensored" +msgid_plural "%s channels censored/uncensored" +msgstr[0] "" +msgstr[1] "" + +#: ../../Zotlabs/Module/Admin/Channels.php:40 +#, php-format +msgid "%s channel code allowed/disallowed" +msgid_plural "%s channels code allowed/disallowed" +msgstr[0] "" +msgstr[1] "" + +#: ../../Zotlabs/Module/Admin/Channels.php:46 +#, php-format +msgid "%s channel deleted" +msgid_plural "%s channels deleted" +msgstr[0] "" +msgstr[1] "" + +#: ../../Zotlabs/Module/Admin/Channels.php:65 +msgid "Channel not found" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Channels.php:75 +#, php-format +msgid "Channel '%s' deleted" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Channels.php:87 +#, php-format +msgid "Channel '%s' censored" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Channels.php:87 +#, php-format +msgid "Channel '%s' uncensored" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Channels.php:98 +#, php-format +msgid "Channel '%s' code allowed" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Channels.php:98 +#, php-format +msgid "Channel '%s' code disallowed" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Channels.php:146 +#: ../../Zotlabs/Module/Admin.php:110 ../../Zotlabs/Widget/Admin.php:24 +msgid "Channels" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Channels.php:150 +msgid "Censor" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Channels.php:151 +msgid "Uncensor" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Channels.php:152 +msgid "Allow Code" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Channels.php:153 +msgid "Disallow Code" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Channels.php:154 +#: ../../include/conversation.php:1757 ../../include/nav.php:355 +msgid "Channel" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Channels.php:158 +msgid "UID" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Channels.php:162 +msgid "" +"Selected channels will be deleted!\\n\\nEverything that was posted in these " +"channels on this site will be permanently deleted!\\n\\nAre you sure?" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Channels.php:163 +msgid "" +"The channel {0} will be deleted!\\n\\nEverything that was posted in this " +"channel on this site will be permanently deleted!\\n\\nAre you sure?" +msgstr "" + #: ../../Zotlabs/Module/Admin/Themes.php:26 msgid "Theme settings updated." msgstr "" @@ -2668,8 +2572,8 @@ msgstr "" msgid "Site settings updated." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:168 ../../include/text.php:2928 -#: ../../view/theme/redbasic/php/config.php:15 +#: ../../Zotlabs/Module/Admin/Site.php:168 +#: ../../view/theme/redbasic/php/config.php:15 ../../include/text.php:2928 msgid "Default" msgstr "" @@ -2740,6 +2644,11 @@ msgstr "" msgid "Site" msgstr "" +#: ../../Zotlabs/Module/Admin/Site.php:272 +#: ../../Zotlabs/Module/Register.php:251 +msgid "Registration" +msgstr "" + #: ../../Zotlabs/Module/Admin/Site.php:273 msgid "File upload" msgstr "" @@ -2748,13 +2657,12 @@ msgstr "" msgid "Policies" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:275 -#: ../../include/contact_widgets.php:16 +#: ../../Zotlabs/Module/Admin/Site.php:275 ../../include/contact_widgets.php:16 msgid "Advanced" msgstr "" #: ../../Zotlabs/Module/Admin/Site.php:279 -#: ../../extend/addon/addon/statusnet/statusnet.php:890 +#: ../../addon/statusnet/statusnet.php:890 msgid "Site name" msgstr "" @@ -2788,8 +2696,7 @@ msgid "" "BBCode can be used here" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:287 -#: ../../Zotlabs/Module/Siteinfo.php:23 +#: ../../Zotlabs/Module/Admin/Site.php:287 ../../Zotlabs/Module/Siteinfo.php:22 msgid "Site Information" msgstr "" @@ -3037,2050 +2944,235 @@ msgstr "" msgid "0 for no expiration of imported content" msgstr "" -#: ../../Zotlabs/Module/Filer.php:52 -msgid "Enter a folder name" +#: ../../Zotlabs/Module/Admin/Profs.php:69 +msgid "New Profile Field" msgstr "" -#: ../../Zotlabs/Module/Filer.php:52 -msgid "or select an existing folder (doubleclick)" +#: ../../Zotlabs/Module/Admin/Profs.php:70 +#: ../../Zotlabs/Module/Admin/Profs.php:90 +msgid "Field nickname" msgstr "" -#: ../../Zotlabs/Module/Filer.php:54 ../../Zotlabs/Lib/ThreadItem.php:137 -msgid "Save to Folder" +#: ../../Zotlabs/Module/Admin/Profs.php:70 +#: ../../Zotlabs/Module/Admin/Profs.php:90 +msgid "System name of field" msgstr "" -#: ../../Zotlabs/Module/Editlayout.php:79 -#: ../../Zotlabs/Module/Editwebpage.php:80 -#: ../../Zotlabs/Module/Editblock.php:79 ../../Zotlabs/Module/Editblock.php:95 -#: ../../Zotlabs/Module/Editpost.php:24 -msgid "Item not found" +#: ../../Zotlabs/Module/Admin/Profs.php:71 +#: ../../Zotlabs/Module/Admin/Profs.php:91 +msgid "Input type" msgstr "" -#: ../../Zotlabs/Module/Editlayout.php:137 -msgid "Edit Layout" +#: ../../Zotlabs/Module/Admin/Profs.php:72 +#: ../../Zotlabs/Module/Admin/Profs.php:92 +msgid "Field Name" msgstr "" -#: ../../Zotlabs/Module/Editwebpage.php:139 -msgid "Page link" +#: ../../Zotlabs/Module/Admin/Profs.php:72 +#: ../../Zotlabs/Module/Admin/Profs.php:92 +msgid "Label on profile pages" msgstr "" -#: ../../Zotlabs/Module/Editwebpage.php:143 ../../Zotlabs/Module/Mail.php:288 -#: ../../Zotlabs/Module/Mail.php:430 ../../Zotlabs/Module/Editblock.php:116 -#: ../../Zotlabs/Module/Chat.php:205 ../../include/conversation.php:1225 -msgid "Insert web link" +#: ../../Zotlabs/Module/Admin/Profs.php:73 +#: ../../Zotlabs/Module/Admin/Profs.php:93 +msgid "Help text" msgstr "" -#: ../../Zotlabs/Module/Editwebpage.php:166 -msgid "Edit Webpage" +#: ../../Zotlabs/Module/Admin/Profs.php:73 +#: ../../Zotlabs/Module/Admin/Profs.php:93 +msgid "Additional info (optional)" msgstr "" -#: ../../Zotlabs/Module/Chatsvc.php:131 -msgid "Away" +#: ../../Zotlabs/Module/Admin/Profs.php:74 +#: ../../Zotlabs/Module/Admin/Profs.php:94 ../../Zotlabs/Module/Rbmark.php:32 +#: ../../Zotlabs/Module/Rbmark.php:104 ../../Zotlabs/Module/Filer.php:53 +#: ../../Zotlabs/Widget/Notes.php:18 ../../include/text.php:1022 +#: ../../include/text.php:1034 +msgid "Save" msgstr "" -#: ../../Zotlabs/Module/Chatsvc.php:136 -msgid "Online" +#: ../../Zotlabs/Module/Admin/Profs.php:83 +msgid "Field definition not found" msgstr "" -#: ../../Zotlabs/Module/Dirsearch.php:25 ../../Zotlabs/Module/Regdir.php:49 -msgid "This site is not a directory server" +#: ../../Zotlabs/Module/Admin/Profs.php:89 +msgid "Edit Profile Field" msgstr "" -#: ../../Zotlabs/Module/Dirsearch.php:33 -msgid "This directory server requires an access token" +#: ../../Zotlabs/Module/Admin/Profs.php:147 ../../Zotlabs/Widget/Admin.php:30 +msgid "Profile Fields" msgstr "" -#: ../../Zotlabs/Module/Network.php:96 -msgid "No such group" +#: ../../Zotlabs/Module/Admin/Profs.php:148 +msgid "Basic Profile Fields" msgstr "" -#: ../../Zotlabs/Module/Network.php:136 -msgid "No such channel" +#: ../../Zotlabs/Module/Admin/Profs.php:149 +msgid "Advanced Profile Fields" msgstr "" -#: ../../Zotlabs/Module/Network.php:141 -msgid "forum" +#: ../../Zotlabs/Module/Admin/Profs.php:149 +msgid "(In addition to basic fields)" msgstr "" -#: ../../Zotlabs/Module/Network.php:153 -msgid "Search Results For:" +#: ../../Zotlabs/Module/Admin/Profs.php:151 +msgid "All available fields" msgstr "" -#: ../../Zotlabs/Module/Network.php:221 -msgid "Privacy group is empty" +#: ../../Zotlabs/Module/Admin/Profs.php:152 +msgid "Custom Fields" msgstr "" -#: ../../Zotlabs/Module/Network.php:230 -msgid "Privacy group: " +#: ../../Zotlabs/Module/Admin/Profs.php:156 +msgid "Create Custom Field" msgstr "" -#: ../../Zotlabs/Module/Network.php:256 -msgid "Invalid connection." -msgstr "" - -#: ../../Zotlabs/Module/Network.php:275 -#: ../../extend/addon/addon/redred/redred.php:65 -msgid "Invalid channel." -msgstr "" - -#: ../../Zotlabs/Module/Menu.php:49 -msgid "Unable to update menu." -msgstr "" - -#: ../../Zotlabs/Module/Menu.php:60 -msgid "Unable to create menu." -msgstr "" - -#: ../../Zotlabs/Module/Menu.php:98 ../../Zotlabs/Module/Menu.php:110 -msgid "Menu Name" -msgstr "" - -#: ../../Zotlabs/Module/Menu.php:98 -msgid "Unique name (not visible on webpage) - required" -msgstr "" - -#: ../../Zotlabs/Module/Menu.php:99 ../../Zotlabs/Module/Menu.php:111 -msgid "Menu Title" -msgstr "" - -#: ../../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:2281 -msgid "Menus" -msgstr "" - -#: ../../Zotlabs/Module/Menu.php:113 ../../Zotlabs/Module/Locs.php:120 -msgid "Drop" -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:144 ../../Zotlabs/Module/Mitem.php:28 -msgid "Menu not found." -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/Menu.php:166 ../../Zotlabs/Module/Mitem.php:120 -#: ../../Zotlabs/Module/Xchan.php:41 -msgid "Not found." -msgstr "" - -#: ../../Zotlabs/Module/Rpost.php:138 ../../Zotlabs/Module/Editpost.php:108 -msgid "Edit post" -msgstr "" - -#: ../../Zotlabs/Module/Locs.php:25 ../../Zotlabs/Module/Locs.php:54 -msgid "Location not found." -msgstr "" - -#: ../../Zotlabs/Module/Locs.php:62 -msgid "Location lookup failed." -msgstr "" - -#: ../../Zotlabs/Module/Locs.php:66 -msgid "" -"Please select another location to become primary before removing the primary " -"location." -msgstr "" - -#: ../../Zotlabs/Module/Locs.php:95 -msgid "Syncing locations" -msgstr "" - -#: ../../Zotlabs/Module/Locs.php:105 -msgid "No locations found." -msgstr "" - -#: ../../Zotlabs/Module/Locs.php:116 -msgid "Manage Channel Locations" -msgstr "" - -#: ../../Zotlabs/Module/Locs.php:119 ../../Zotlabs/Module/Admin.php:109 -msgid "Primary" -msgstr "" - -#: ../../Zotlabs/Module/Locs.php:122 -msgid "Sync Now" -msgstr "" - -#: ../../Zotlabs/Module/Locs.php:123 -msgid "Please wait several minutes between consecutive operations." -msgstr "" - -#: ../../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/Pubsites.php:24 ../../Zotlabs/Widget/Pubsites.php:12 -msgid "Public Hubs" -msgstr "" - -#: ../../Zotlabs/Module/Pubsites.php:27 -msgid "" -"The listed hubs allow public registration for the $Projectname network. All " -"hubs in the network are interlinked so membership on any of them conveys " -"membership in the network as a whole. Some hubs may require subscription or " -"provide tiered service plans. The hub itself may provide " -"additional details." -msgstr "" - -#: ../../Zotlabs/Module/Pubsites.php:33 -msgid "Hub URL" -msgstr "" - -#: ../../Zotlabs/Module/Pubsites.php:33 -msgid "Access Type" -msgstr "" - -#: ../../Zotlabs/Module/Pubsites.php:33 -msgid "Registration Policy" -msgstr "" - -#: ../../Zotlabs/Module/Pubsites.php:33 -msgid "Stats" -msgstr "" - -#: ../../Zotlabs/Module/Pubsites.php:33 -msgid "Software" -msgstr "" - -#: ../../Zotlabs/Module/Pubsites.php:35 ../../Zotlabs/Module/Ratings.php:97 -#: ../../include/conversation.php:1029 -msgid "Ratings" -msgstr "" - -#: ../../Zotlabs/Module/Pubsites.php:48 -msgid "Rate" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:79 -msgid "Could not access contact record." -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:109 -msgid "Could not locate selected profile." -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:246 -msgid "Connection updated." -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:248 -msgid "Failed to update connection record." -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:298 -msgid "is now connected to" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:423 -msgid "Could not access address book record." -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:471 -msgid "Refresh failed - channel is currently unavailable." -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:486 ../../Zotlabs/Module/Connedit.php:495 -#: ../../Zotlabs/Module/Connedit.php:504 ../../Zotlabs/Module/Connedit.php:513 -#: ../../Zotlabs/Module/Connedit.php:526 -msgid "Unable to set address book parameters." -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:550 -msgid "Connection has been removed." -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:590 ../../Zotlabs/Lib/Apps.php:229 -#: ../../extend/addon/addon/openclipatar/openclipatar.php:57 -#: ../../include/nav.php:104 ../../include/conversation.php:979 -msgid "View Profile" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:593 +#: ../../Zotlabs/Module/Admin/Account_edit.php:29 #, php-format -msgid "View %s's profile" +msgid "Password changed for account %d." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:597 -msgid "Refresh Permissions" +#: ../../Zotlabs/Module/Admin/Account_edit.php:46 +msgid "Account settings updated." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:600 -msgid "Fetch updated permissions" +#: ../../Zotlabs/Module/Admin/Account_edit.php:61 +msgid "Account not found." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:604 -msgid "Refresh Photo" +#: ../../Zotlabs/Module/Admin/Account_edit.php:68 +msgid "Account Edit" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:607 -msgid "Fetch updated photo" +#: ../../Zotlabs/Module/Admin/Account_edit.php:69 +msgid "New Password" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:611 -msgid "Recent Activity" +#: ../../Zotlabs/Module/Admin/Account_edit.php:70 +msgid "New Password again" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:614 -msgid "View recent posts and comments" +#: ../../Zotlabs/Module/Admin/Account_edit.php:71 +msgid "Technical skill level" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:621 -msgid "Block (or Unblock) all communications with this connection" +#: ../../Zotlabs/Module/Admin/Account_edit.php:72 +msgid "Account language (for emails)" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:622 -msgid "This connection is blocked!" +#: ../../Zotlabs/Module/Admin/Account_edit.php:73 +msgid "Service class" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:626 -msgid "Unignore" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:629 -msgid "Ignore (or Unignore) all inbound communications from this connection" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:630 -msgid "This connection is ignored!" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:634 -msgid "Unarchive" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:634 -msgid "Archive" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:637 +#: ../../Zotlabs/Module/Admin/Security.php:77 msgid "" -"Archive (or Unarchive) this connection - mark channel dead but keep content" +"By default, unfiltered HTML is allowed in embedded media. This is inherently " +"insecure." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:638 -msgid "This connection is archived!" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:642 -msgid "Unhide" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:642 -msgid "Hide" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:645 -msgid "Hide or Unhide this connection from your other connections" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:646 -msgid "This connection is hidden!" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:653 -msgid "Delete this connection" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:661 -msgid "Fetch Vcard" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:664 -msgid "Fetch electronic calling card for this connection" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:672 -#: ../../Zotlabs/Module/Filestorage.php:152 ../../Zotlabs/Module/Thing.php:313 -#: ../../Zotlabs/Module/Thing.php:363 ../../Zotlabs/Module/Photos.php:647 -#: ../../Zotlabs/Module/Photos.php:1011 ../../Zotlabs/Module/Chat.php:233 -#: ../../include/acl_selectors.php:218 -msgid "Permissions" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:675 -msgid "Open Individual Permissions section by default" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:698 -msgid "Affinity" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:701 -msgid "Open Set Affinity section by default" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:705 ../../Zotlabs/Widget/Affinity.php:26 -msgid "Me" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:706 ../../Zotlabs/Widget/Affinity.php:27 -msgid "Family" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:707 -#: ../../Zotlabs/Module/Settings/Channel.php:62 -#: ../../Zotlabs/Module/Settings/Channel.php:66 -#: ../../Zotlabs/Module/Settings/Channel.php:67 -#: ../../Zotlabs/Module/Settings/Channel.php:70 -#: ../../Zotlabs/Module/Settings/Channel.php:81 -#: ../../Zotlabs/Widget/Affinity.php:28 ../../include/selectors.php:123 -#: ../../include/channel.php:408 ../../include/channel.php:409 -#: ../../include/channel.php:416 -msgid "Friends" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:708 ../../Zotlabs/Widget/Affinity.php:29 -msgid "Acquaintances" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:735 -msgid "Filter" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:738 -msgid "Open Custom Filter section by default" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:775 -msgid "Approve this connection" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:775 -msgid "Accept connection to allow communication" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:780 -msgid "Set Affinity" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:783 -msgid "Set Profile" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:786 -msgid "Set Affinity & Profile" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:844 -msgid "none" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:851 -msgid "This connection is unreachable from this location." -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:852 -msgid "This connection may be unreachable from other channel locations." -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:854 -msgid "Location independence is not supported by their network." -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:860 +#: ../../Zotlabs/Module/Admin/Security.php:80 msgid "" -"This connection is unreachable from this location. Location independence is " -"not supported by their network." +"The recommended setting is to only allow unfiltered HTML from the following " +"sites:" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:863 -#: ../../Zotlabs/Widget/Settings_menu.php:109 -msgid "Connection Default Permissions" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:863 ../../include/items.php:3925 -#, php-format -msgid "Connection: %s" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:864 -msgid "Apply these permissions automatically" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:864 -msgid "Connection requests will be approved without your interaction" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:865 -msgid "Permission role" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:866 -msgid "Add permission role" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:872 -msgid "This connection's primary address is" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:873 -msgid "Available locations:" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:878 +#: ../../Zotlabs/Module/Admin/Security.php:81 msgid "" -"The permissions indicated on this page will be applied to all new " -"connections." +"https://youtube.com/
https://www.youtube.com/
https://youtu.be/" +"
https://vimeo.com/
https://soundcloud.com/
" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:879 -msgid "Connection Tools" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:881 -msgid "Slide to adjust your degree of friendship" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:882 ../../Zotlabs/Module/Rate.php:155 -#: ../../include/js_strings.php:20 -msgid "Rating" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:883 -msgid "Slide to adjust your rating" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:884 ../../Zotlabs/Module/Connedit.php:889 -msgid "Optionally explain your rating" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:886 -msgid "Custom Filter" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:887 -msgid "Only import posts with this text" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:887 ../../Zotlabs/Module/Connedit.php:888 +#: ../../Zotlabs/Module/Admin/Security.php:82 msgid "" -"words one per line or #tags or /patterns/ or lang=xx, leave blank to import " -"all posts" +"All other embedded content will be filtered, unless " +"embedded content from that site is explicitly blocked." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:888 -msgid "Do not import posts with this text" +#: ../../Zotlabs/Module/Admin/Security.php:87 ../../Zotlabs/Widget/Admin.php:25 +msgid "Security" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:890 -msgid "This information is public!" +#: ../../Zotlabs/Module/Admin/Security.php:89 +msgid "Block public" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:895 -msgid "Connection Pending Approval" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:898 -#: ../../Zotlabs/Module/Settings/Tokens.php:163 -#: ../../Zotlabs/Module/Settings/Permcats.php:105 -msgid "inherited" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:900 -#, php-format +#: ../../Zotlabs/Module/Admin/Security.php:89 msgid "" -"Please choose the profile you would like to display to %s when viewing your " -"profile securely." +"Check to block public access to all otherwise public personal pages on this " +"site unless you are currently authenticated." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:902 -#: ../../Zotlabs/Module/Settings/Tokens.php:160 -msgid "Their Settings" +#: ../../Zotlabs/Module/Admin/Security.php:90 +msgid "Set \"Transport Security\" HTTP header" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:903 -#: ../../Zotlabs/Module/Settings/Tokens.php:161 -#: ../../Zotlabs/Module/Settings/Permcats.php:103 -msgid "My Settings" +#: ../../Zotlabs/Module/Admin/Security.php:91 +msgid "Set \"Content Security Policy\" HTTP header" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:905 -#: ../../Zotlabs/Module/Settings/Tokens.php:166 -#: ../../Zotlabs/Module/Settings/Permcats.php:108 -msgid "Individual Permissions" +#: ../../Zotlabs/Module/Admin/Security.php:92 +msgid "Allowed email domains" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:906 -#: ../../Zotlabs/Module/Settings/Tokens.php:167 -#: ../../Zotlabs/Module/Settings/Permcats.php:109 +#: ../../Zotlabs/Module/Admin/Security.php:92 msgid "" -"Some permissions may be inherited from your channel's privacy settings, which have higher priority than " -"individual settings. You can not change those settings here." +"Comma separated list of domains which are allowed in email addresses for " +"registrations to this site. Wildcards are accepted. Empty to allow any " +"domains" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:907 +#: ../../Zotlabs/Module/Admin/Security.php:93 +msgid "Not allowed email domains" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Security.php:93 msgid "" -"Some permissions may be inherited from your channel's privacy settings, which have higher priority than " -"individual settings. You can change those settings here but they wont have " -"any impact unless the inherited setting changes." +"Comma separated list of domains which are not allowed in email addresses for " +"registrations to this site. Wildcards are accepted. Empty to allow any " +"domains, unless allowed domains have been defined." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:908 -msgid "Last update:" +#: ../../Zotlabs/Module/Admin/Security.php:94 +msgid "Allow communications only from these sites" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:917 -msgid "Details" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:920 ../../Zotlabs/Module/Cdav.php:1110 -msgid "Organisation" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:921 ../../Zotlabs/Module/Cdav.php:1111 -msgid "Title" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:938 ../../Zotlabs/Module/Cdav.php:1128 -msgid "P.O. Box" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:939 ../../Zotlabs/Module/Cdav.php:1129 -msgid "Additional" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:940 ../../Zotlabs/Module/Cdav.php:1130 -msgid "Street" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:941 ../../Zotlabs/Module/Cdav.php:1131 -msgid "Locality" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:942 ../../Zotlabs/Module/Cdav.php:1132 -msgid "Region" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:943 ../../Zotlabs/Module/Cdav.php:1133 -msgid "ZIP Code" -msgstr "" - -#: ../../Zotlabs/Module/Apps.php:45 ../../Zotlabs/Lib/Apps.php:212 -msgid "Apps" -msgstr "" - -#: ../../Zotlabs/Module/Apps.php:48 -msgid "Manage apps" -msgstr "" - -#: ../../Zotlabs/Module/Apps.php:49 -msgid "Create new app" -msgstr "" - -#: ../../Zotlabs/Module/Home.php:74 ../../Zotlabs/Module/Home.php:82 -#: ../../extend/addon/addon/opensearch/opensearch.php:42 -msgid "$Projectname" -msgstr "" - -#: ../../Zotlabs/Module/Home.php:92 -#, php-format -msgid "Welcome to %s" -msgstr "" - -#: ../../Zotlabs/Module/Filestorage.php:87 -msgid "Permission Denied." -msgstr "" - -#: ../../Zotlabs/Module/Filestorage.php:103 -msgid "File not found." -msgstr "" - -#: ../../Zotlabs/Module/Filestorage.php:146 -msgid "Edit file permissions" -msgstr "" - -#: ../../Zotlabs/Module/Filestorage.php:159 -msgid "Set/edit permissions" -msgstr "" - -#: ../../Zotlabs/Module/Filestorage.php:160 -msgid "Include all files and sub folders" -msgstr "" - -#: ../../Zotlabs/Module/Filestorage.php:161 -msgid "Return to file list" -msgstr "" - -#: ../../Zotlabs/Module/Filestorage.php:163 -msgid "Copy/paste this code to attach file to a post" -msgstr "" - -#: ../../Zotlabs/Module/Filestorage.php:164 -msgid "Copy/paste this URL to link file from a web page" -msgstr "" - -#: ../../Zotlabs/Module/Filestorage.php:166 -msgid "Share this file" -msgstr "" - -#: ../../Zotlabs/Module/Filestorage.php:167 -msgid "Show URL to this file" -msgstr "" - -#: ../../Zotlabs/Module/Filestorage.php:168 -msgid "Notify your contacts about this file" -msgstr "" - -#: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:230 -#: ../../include/nav.php:382 ../../include/conversation.php:1780 -msgid "Photos" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:170 -msgid "$Projectname Server - Setup" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:174 -msgid "Could not connect to database." -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:178 +#: ../../Zotlabs/Module/Admin/Security.php:94 msgid "" -"Could not connect to specified site URL. Possible SSL certificate or DNS " -"issue." +"One site per line. Leave empty to allow communication from anywhere by " +"default" msgstr "" -#: ../../Zotlabs/Module/Setup.php:185 -msgid "Could not create table." +#: ../../Zotlabs/Module/Admin/Security.php:95 +msgid "Block communications from these sites" msgstr "" -#: ../../Zotlabs/Module/Setup.php:190 -msgid "Your site database has been installed." +#: ../../Zotlabs/Module/Admin/Security.php:96 +msgid "Allow communications only from these channels" msgstr "" -#: ../../Zotlabs/Module/Setup.php:194 +#: ../../Zotlabs/Module/Admin/Security.php:96 msgid "" -"You may need to import the file \"install/schema_xxx.sql\" manually using a " -"database client." +"One channel (hash) per line. Leave empty to allow from any channel by default" msgstr "" -#: ../../Zotlabs/Module/Setup.php:195 ../../Zotlabs/Module/Setup.php:257 -#: ../../Zotlabs/Module/Setup.php:740 -msgid "Please see the file \"install/INSTALL.txt\"." +#: ../../Zotlabs/Module/Admin/Security.php:97 +msgid "Block communications from these channels" msgstr "" -#: ../../Zotlabs/Module/Setup.php:254 -msgid "System check" +#: ../../Zotlabs/Module/Admin/Security.php:98 +msgid "Only allow embeds from secure (SSL) websites and links." msgstr "" -#: ../../Zotlabs/Module/Setup.php:258 ../../Zotlabs/Module/Cal.php:338 -#: ../../Zotlabs/Module/Cal.php:345 ../../Zotlabs/Module/Events.php:690 -#: ../../Zotlabs/Module/Events.php:699 ../../Zotlabs/Module/Photos.php:920 -#: ../../Zotlabs/Module/Cdav.php:820 -msgid "Next" +#: ../../Zotlabs/Module/Admin/Security.php:99 +msgid "Allow unfiltered embedded HTML content only from these domains" msgstr "" -#: ../../Zotlabs/Module/Setup.php:259 -msgid "Check again" +#: ../../Zotlabs/Module/Admin/Security.php:99 +msgid "One site per line. By default embedded content is filtered." msgstr "" -#: ../../Zotlabs/Module/Setup.php:281 -msgid "Database connection" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:282 -msgid "" -"In order to install $Projectname we need to know how to connect to your " -"database." -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:283 -msgid "" -"Please contact your hosting provider or site administrator if you have " -"questions about these settings." -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:284 -msgid "" -"The database you specify below should already exist. If it does not, please " -"create it before continuing." -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:288 -msgid "Database Server Name" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:288 -msgid "Default is 127.0.0.1" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:289 -msgid "Database Port" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:289 -msgid "Communication port number - use 0 for default" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:290 -msgid "Database Login Name" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:291 -msgid "Database Login Password" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:292 -msgid "Database Name" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:293 -msgid "Database Type" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:295 ../../Zotlabs/Module/Setup.php:336 -msgid "Site administrator email address" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:295 ../../Zotlabs/Module/Setup.php:336 -msgid "" -"Your account email address must match this in order to use the web admin " -"panel." -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:296 ../../Zotlabs/Module/Setup.php:338 -msgid "Website URL" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:296 ../../Zotlabs/Module/Setup.php:338 -msgid "Please use SSL (https) URL if available." -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:297 ../../Zotlabs/Module/Setup.php:340 -msgid "Please select a default timezone for your website" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:325 -msgid "Site settings" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:379 -msgid "PHP version 5.5 or greater is required." -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:380 -msgid "PHP version" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:396 -msgid "Could not find a command line version of PHP in the web server PATH." -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:397 -msgid "" -"If you don't have a command line version of PHP installed on server, you " -"will not be able to run background polling via cron." -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:401 -msgid "PHP executable path" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:401 -msgid "" -"Enter full path to php executable. You can leave this blank to continue the " -"installation." -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:406 -msgid "Command line PHP" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:416 -msgid "" -"Unable to check command line PHP, as shell_exec() is disabled. This is " -"required." -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:419 -msgid "" -"The command line version of PHP on your system does not have " -"\"register_argc_argv\" enabled." -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:420 -msgid "This is required for message delivery to work." -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:423 -msgid "PHP register_argc_argv" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:441 -#, php-format -msgid "" -"Your max allowed total upload size is set to %s. Maximum size of one file to " -"upload is set to %s. You are allowed to upload up to %d files at once." -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:446 -msgid "You can adjust these settings in the server php.ini file." -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:448 -msgid "PHP upload limits" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:471 -msgid "" -"Error: the \"openssl_pkey_new\" function on this system is not able to " -"generate encryption keys" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:472 -msgid "" -"If running under Windows, please see \"http://www.php.net/manual/en/openssl." -"installation.php\"." -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:475 -msgid "Generate encryption keys" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:492 -msgid "libCurl PHP module" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:493 -msgid "GD graphics PHP module" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:494 -msgid "OpenSSL PHP module" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:495 -msgid "PDO database PHP module" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:496 -msgid "mb_string PHP module" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:497 -msgid "xml PHP module" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:498 -msgid "zip PHP module" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:502 ../../Zotlabs/Module/Setup.php:504 -msgid "Apache mod_rewrite module" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:502 -msgid "" -"Error: Apache webserver mod-rewrite module is required but not installed." -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:508 ../../Zotlabs/Module/Setup.php:511 -msgid "exec" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:508 -msgid "" -"Error: exec is required but is either not installed or has been disabled in " -"php.ini" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:514 ../../Zotlabs/Module/Setup.php:517 -msgid "shell_exec" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:514 -msgid "" -"Error: shell_exec is required but is either not installed or has been " -"disabled in php.ini" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:522 -msgid "Error: libCURL PHP module required but not installed." -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:526 -msgid "" -"Error: GD graphics PHP module with JPEG support required but not installed." -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:530 -msgid "Error: openssl PHP module required but not installed." -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:534 -msgid "Error: PDO database PHP module required but not installed." -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:538 -msgid "Error: mb_string PHP module required but not installed." -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:542 -msgid "Error: xml PHP module required for DAV but not installed." -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:546 -msgid "Error: zip PHP module required but not installed." -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:564 -msgid "" -"The web installer needs to be able to create a file called \".htconfig.php\" " -"in the top folder of your web server and it is unable to do so." -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:565 -msgid "" -"This is most often a permission setting, as the web server may not be able " -"to write files in your folder - even if you can." -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:566 -msgid "" -"At the end of this procedure, we will give you a text to save in a file " -"named .htconfig.php in your Red top folder." -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:567 -msgid "" -"You can alternatively skip this procedure and perform a manual installation. " -"Please see the file \"install/INSTALL.txt\" for instructions." -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:570 -msgid ".htconfig.php is writable" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:584 -msgid "" -"This software uses the Smarty3 template engine to render its web views. " -"Smarty3 compiles templates to PHP to speed up rendering." -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:585 -#, php-format -msgid "" -"In order to store these compiled templates, the web server needs to have " -"write access to the directory %s under the top level web folder." -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:586 ../../Zotlabs/Module/Setup.php:607 -msgid "" -"Please ensure that the user that your web server runs as (e.g. www-data) has " -"write access to this folder." -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:587 -#, php-format -msgid "" -"Note: as a security measure, you should give the web server write access to " -"%s only--not the template files (.tpl) that it contains." -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:590 -#, php-format -msgid "%s is writable" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:606 -msgid "" -"This software uses the store directory to save uploaded files. The web " -"server needs to have write access to the store directory under the top level " -"web folder" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:610 -msgid "store is writable" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:642 -msgid "" -"SSL certificate cannot be validated. Fix certificate or disable https access " -"to this site." -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:643 -msgid "" -"If you have https access to your website or allow connections to TCP port " -"443 (the https: port), you MUST use a browser-valid certificate. You MUST " -"NOT use self-signed certificates!" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:644 -msgid "" -"This restriction is incorporated because public posts from you may for " -"example contain references to images on your own hub." -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:645 -msgid "" -"If your certificate is not recognized, members of other sites (who may " -"themselves have valid certificates) will get a warning message on their own " -"site complaining about security issues." -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:646 -msgid "" -"This can cause usability issues elsewhere (not just on your own site) so we " -"must insist on this requirement." -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:647 -msgid "" -"Providers are available that issue free certificates which are browser-valid." -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:649 -msgid "" -"If you are confident that the certificate is valid and signed by a trusted " -"authority, check to see if you have failed to install an intermediate cert. " -"These are not normally required by browsers, but are required for server-to-" -"server communications." -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:651 -msgid "SSL certificate validation" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:657 -msgid "" -"Url rewrite in .htaccess is not working. Check your server configuration." -"Test: " -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:660 -msgid "Url rewrite is working" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:674 -msgid "" -"The database configuration file \".htconfig.php\" could not be written. " -"Please use the enclosed text to create a configuration file in your web " -"server root." -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:698 -#: ../../extend/addon/addon/rendezvous/rendezvous.php:401 -msgid "Errors encountered creating database tables." -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:738 -msgid "

What next

" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:739 -msgid "" -"IMPORTANT: You will need to [manually] setup a scheduled task for the poller." -msgstr "" - -#: ../../Zotlabs/Module/Acl.php:117 ../../Zotlabs/Module/Lockview.php:117 -#: ../../Zotlabs/Module/Lockview.php:153 ../../include/acl_selectors.php:183 -msgctxt "acl" -msgid "Profile" -msgstr "" - -#: ../../Zotlabs/Module/Acl.php:344 -msgid "network" -msgstr "" - -#: ../../Zotlabs/Module/Acl.php:354 -msgid "RSS" -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:3892 -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 ../../Zotlabs/Module/Help.php:81 -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/Dreport.php:45 -msgid "Invalid message" -msgstr "" - -#: ../../Zotlabs/Module/Dreport.php:78 -msgid "no results" -msgstr "" - -#: ../../Zotlabs/Module/Dreport.php:93 -msgid "channel sync processed" -msgstr "" - -#: ../../Zotlabs/Module/Dreport.php:97 -msgid "queued" -msgstr "" - -#: ../../Zotlabs/Module/Dreport.php:101 -msgid "posted" -msgstr "" - -#: ../../Zotlabs/Module/Dreport.php:105 -msgid "accepted for delivery" -msgstr "" - -#: ../../Zotlabs/Module/Dreport.php:109 -msgid "updated" -msgstr "" - -#: ../../Zotlabs/Module/Dreport.php:112 -msgid "update ignored" -msgstr "" - -#: ../../Zotlabs/Module/Dreport.php:115 -msgid "permission denied" -msgstr "" - -#: ../../Zotlabs/Module/Dreport.php:119 -msgid "recipient not found" -msgstr "" - -#: ../../Zotlabs/Module/Dreport.php:122 -msgid "mail recalled" -msgstr "" - -#: ../../Zotlabs/Module/Dreport.php:125 -msgid "duplicate mail received" -msgstr "" - -#: ../../Zotlabs/Module/Dreport.php:128 -msgid "mail delivered" -msgstr "" - -#: ../../Zotlabs/Module/Dreport.php:148 -#, php-format -msgid "Delivery report for %1$s" -msgstr "" - -#: ../../Zotlabs/Module/Dreport.php:151 -msgid "Options" -msgstr "" - -#: ../../Zotlabs/Module/Dreport.php:152 -msgid "Redeliver" -msgstr "" - -#: ../../Zotlabs/Module/Impel.php:41 ../../include/bbcode.php:263 -msgid "webpage" -msgstr "" - -#: ../../Zotlabs/Module/Impel.php:46 ../../include/bbcode.php:269 -msgid "block" -msgstr "" - -#: ../../Zotlabs/Module/Impel.php:51 ../../include/bbcode.php:266 -msgid "layout" -msgstr "" - -#: ../../Zotlabs/Module/Impel.php:58 ../../include/bbcode.php:272 -msgid "menu" -msgstr "" - -#: ../../Zotlabs/Module/Impel.php:181 -#, php-format -msgid "%s element installed" -msgstr "" - -#: ../../Zotlabs/Module/Impel.php:184 -#, php-format -msgid "%s element installation failed" -msgstr "" - -#: ../../Zotlabs/Module/Hcard.php:37 ../../Zotlabs/Module/Profile.php:43 -#: ../../Zotlabs/Module/Channel.php:47 -msgid "Posts and comments" -msgstr "" - -#: ../../Zotlabs/Module/Hcard.php:44 ../../Zotlabs/Module/Profile.php:50 -#: ../../Zotlabs/Module/Channel.php:54 -msgid "Only posts" -msgstr "" - -#: ../../Zotlabs/Module/Import_items.php:48 ../../Zotlabs/Module/Import.php:64 -msgid "Nothing to import." -msgstr "" - -#: ../../Zotlabs/Module/Import_items.php:72 ../../Zotlabs/Module/Import.php:79 -#: ../../Zotlabs/Module/Import.php:95 -msgid "Unable to download data from old server" -msgstr "" - -#: ../../Zotlabs/Module/Import_items.php:77 -#: ../../Zotlabs/Module/Import.php:102 -msgid "Imported file is empty." -msgstr "" - -#: ../../Zotlabs/Module/Import_items.php:93 -#: ../../Zotlabs/Module/Import.php:121 -#, php-format -msgid "Warning: Database versions differ by %1$d updates." -msgstr "" - -#: ../../Zotlabs/Module/Import_items.php:108 -msgid "Import completed" -msgstr "" - -#: ../../Zotlabs/Module/Import_items.php:125 -msgid "Import Items" -msgstr "" - -#: ../../Zotlabs/Module/Import_items.php:126 -msgid "Use this form to import existing posts and content from an export file." -msgstr "" - -#: ../../Zotlabs/Module/Import_items.php:127 -#: ../../Zotlabs/Module/Import.php:505 -msgid "File to Upload" -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:73 -msgid "Unable to lookup recipient." -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:80 -msgid "Unable to communicate with requested channel." -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:87 -msgid "Cannot verify requested channel." -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:105 -msgid "Selected channel has private message restrictions. Send failed." -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:160 -msgid "Messages" -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:173 -msgid "message" -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:214 -msgid "Message recalled." -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:227 -msgid "Conversation removed." -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:241 ../../Zotlabs/Module/Mail.php:362 -#: ../../Zotlabs/Module/Chat.php:203 ../../include/conversation.php:1260 -msgid "Please enter a link URL:" -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:242 ../../Zotlabs/Module/Mail.php:363 -msgid "Expires YYYY-MM-DD HH:MM" -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:270 -msgid "Requested channel is not in this network" -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:278 -msgid "Send Private Message" -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:279 ../../Zotlabs/Module/Mail.php:421 -msgid "To:" -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:282 ../../Zotlabs/Module/Mail.php:423 -msgid "Subject:" -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:285 ../../Zotlabs/Module/Invite.php:138 -msgid "Your message:" -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:287 ../../Zotlabs/Module/Mail.php:429 -#: ../../include/conversation.php:1320 -msgid "Attach file" -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:289 -msgid "Send" -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:292 ../../Zotlabs/Module/Mail.php:434 -#: ../../include/conversation.php:1365 -msgid "Set expiration date" -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:294 ../../Zotlabs/Module/Mail.php:436 -#: ../../Zotlabs/Module/Chat.php:204 ../../Zotlabs/Lib/ThreadItem.php:742 -#: ../../include/conversation.php:1370 -msgid "Encrypt text" -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:393 -msgid "Delete message" -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:394 -msgid "Delivery report" -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:395 -msgid "Recall message" -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:397 -msgid "Message has been recalled." -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:414 -msgid "Delete Conversation" -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:416 -msgid "" -"No secure communications available. You may be able to " -"respond from the sender's profile page." -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:420 -msgid "Send Reply" -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:425 -#, php-format -msgid "Your message for %s (%s):" -msgstr "" - -#: ../../Zotlabs/Module/Oexchange.php:27 -msgid "Unable to find your hub." -msgstr "" - -#: ../../Zotlabs/Module/Oexchange.php:41 -msgid "Post successful." -msgstr "" - -#: ../../Zotlabs/Module/Editblock.php:113 ../../Zotlabs/Module/Blocks.php:97 -#: ../../Zotlabs/Module/Blocks.php:155 -msgid "Block Name" -msgstr "" - -#: ../../Zotlabs/Module/Editblock.php:129 ../../include/conversation.php:1336 -msgid "Title (optional)" -msgstr "" - -#: ../../Zotlabs/Module/Editblock.php:138 -msgid "Edit Block" -msgstr "" - -#: ../../Zotlabs/Module/Magic.php:71 -msgid "Hub not found." -msgstr "" - -#: ../../Zotlabs/Module/Mitem.php:52 -msgid "Unable to create element." -msgstr "" - -#: ../../Zotlabs/Module/Mitem.php:76 -msgid "Unable to update menu element." -msgstr "" - -#: ../../Zotlabs/Module/Mitem.php:92 -msgid "Unable to add menu element." -msgstr "" - -#: ../../Zotlabs/Module/Mitem.php:153 ../../Zotlabs/Module/Mitem.php:230 -msgid "Menu Item Permissions" -msgstr "" - -#: ../../Zotlabs/Module/Mitem.php:154 ../../Zotlabs/Module/Mitem.php:231 -#: ../../Zotlabs/Module/Settings/Channel.php:509 -msgid "(click to open/close)" -msgstr "" - -#: ../../Zotlabs/Module/Mitem.php:160 ../../Zotlabs/Module/Mitem.php:176 -msgid "Link Name" -msgstr "" - -#: ../../Zotlabs/Module/Mitem.php:161 ../../Zotlabs/Module/Mitem.php:239 -msgid "Link or Submenu Target" -msgstr "" - -#: ../../Zotlabs/Module/Mitem.php:161 -msgid "Enter URL of the link or select a menu name to create a submenu" -msgstr "" - -#: ../../Zotlabs/Module/Mitem.php:162 ../../Zotlabs/Module/Mitem.php:240 -msgid "Use magic-auth if available" -msgstr "" - -#: ../../Zotlabs/Module/Mitem.php:163 ../../Zotlabs/Module/Mitem.php:241 -msgid "Open link in new window" -msgstr "" - -#: ../../Zotlabs/Module/Mitem.php:164 ../../Zotlabs/Module/Mitem.php:242 -msgid "Order in list" -msgstr "" - -#: ../../Zotlabs/Module/Mitem.php:164 ../../Zotlabs/Module/Mitem.php:242 -msgid "Higher numbers will sink to bottom of listing" -msgstr "" - -#: ../../Zotlabs/Module/Mitem.php:165 -msgid "Submit and finish" -msgstr "" - -#: ../../Zotlabs/Module/Mitem.php:166 -msgid "Submit and continue" -msgstr "" - -#: ../../Zotlabs/Module/Mitem.php:174 -msgid "Menu:" -msgstr "" - -#: ../../Zotlabs/Module/Mitem.php:177 -msgid "Link Target" -msgstr "" - -#: ../../Zotlabs/Module/Mitem.php:180 -msgid "Edit menu" -msgstr "" - -#: ../../Zotlabs/Module/Mitem.php:183 -msgid "Edit element" -msgstr "" - -#: ../../Zotlabs/Module/Mitem.php:184 -msgid "Drop element" -msgstr "" - -#: ../../Zotlabs/Module/Mitem.php:185 -msgid "New element" -msgstr "" - -#: ../../Zotlabs/Module/Mitem.php:186 -msgid "Edit this menu container" -msgstr "" - -#: ../../Zotlabs/Module/Mitem.php:187 -msgid "Add menu element" -msgstr "" - -#: ../../Zotlabs/Module/Mitem.php:188 -msgid "Delete this menu item" -msgstr "" - -#: ../../Zotlabs/Module/Mitem.php:189 -msgid "Edit this menu item" -msgstr "" - -#: ../../Zotlabs/Module/Mitem.php:206 -msgid "Menu item not found." -msgstr "" - -#: ../../Zotlabs/Module/Mitem.php:219 -msgid "Menu item deleted." -msgstr "" - -#: ../../Zotlabs/Module/Mitem.php:221 -msgid "Menu item could not be deleted." -msgstr "" - -#: ../../Zotlabs/Module/Mitem.php:228 -msgid "Edit Menu Element" -msgstr "" - -#: ../../Zotlabs/Module/Mitem.php:238 -msgid "Link text" -msgstr "" - -#: ../../Zotlabs/Module/Ratings.php:70 -msgid "No ratings" -msgstr "" - -#: ../../Zotlabs/Module/Ratings.php:98 -msgid "Rating: " -msgstr "" - -#: ../../Zotlabs/Module/Ratings.php:99 -msgid "Website: " -msgstr "" - -#: ../../Zotlabs/Module/Ratings.php:101 -msgid "Description: " -msgstr "" - -#: ../../Zotlabs/Module/Attach.php:13 -msgid "Item not available." -msgstr "" - -#: ../../Zotlabs/Module/Moderate.php:37 -msgid "Comment approved" -msgstr "" - -#: ../../Zotlabs/Module/Moderate.php:41 -msgid "Comment deleted" -msgstr "" - -#: ../../Zotlabs/Module/Notify.php:57 -#: ../../Zotlabs/Module/Notifications.php:38 -msgid "No more system notifications." -msgstr "" - -#: ../../Zotlabs/Module/Notify.php:61 -#: ../../Zotlabs/Module/Notifications.php:42 -msgid "System Notifications" -msgstr "" - -#: ../../Zotlabs/Module/Editpost.php:38 ../../Zotlabs/Module/Editpost.php:43 -msgid "Item is not editable" -msgstr "" - -#: ../../Zotlabs/Module/Api.php:72 ../../Zotlabs/Module/Api.php:93 -msgid "Authorize application connection" -msgstr "" - -#: ../../Zotlabs/Module/Api.php:73 -msgid "Return to your app and insert this Security Code:" -msgstr "" - -#: ../../Zotlabs/Module/Api.php:83 -msgid "Please login to continue." -msgstr "" - -#: ../../Zotlabs/Module/Api.php:95 -msgid "" -"Do you want to authorize this application to access your posts and contacts, " -"and/or create new posts for you?" -msgstr "" - -#: ../../Zotlabs/Module/Page.php:165 -msgid "" -"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod " -"tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, " -"quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo " -"consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse " -"cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat " -"non proident, sunt in culpa qui officia deserunt mollit anim id est laborum." -msgstr "" - -#: ../../Zotlabs/Module/Siteinfo.php:20 -msgid "About this site" -msgstr "" - -#: ../../Zotlabs/Module/Siteinfo.php:21 -msgid "Site Name" -msgstr "" - -#: ../../Zotlabs/Module/Siteinfo.php:25 -msgid "Administrator" -msgstr "" - -#: ../../Zotlabs/Module/Siteinfo.php:28 -msgid "Software and Project information" -msgstr "" - -#: ../../Zotlabs/Module/Siteinfo.php:29 -msgid "This site is powered by $Projectname" -msgstr "" - -#: ../../Zotlabs/Module/Siteinfo.php:30 -msgid "" -"Federated and decentralised networking and identity services provided by Zot" -msgstr "" - -#: ../../Zotlabs/Module/Siteinfo.php:32 -#, php-format -msgid "Version %s" -msgstr "" - -#: ../../Zotlabs/Module/Siteinfo.php:33 -msgid "Project homepage" -msgstr "" - -#: ../../Zotlabs/Module/Siteinfo.php:34 -msgid "Developer homepage" -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:140 -msgid "Create Channel" -msgstr "" - -#: ../../Zotlabs/Module/New_channel.php:141 -msgid "" -"A channel is your identity on this network. It can represent a person, a " -"blog, or a forum to name a few. Channels can make connections with other " -"channels to share information with highly detailed permissions." -msgstr "" - -#: ../../Zotlabs/Module/New_channel.php:142 -msgid "" -"or import an existing channel from another location." -msgstr "" - -#: ../../Zotlabs/Module/Profile.php:91 -msgid "vcard" -msgstr "" - -#: ../../Zotlabs/Module/Notifications.php:43 -#: ../../Zotlabs/Lib/ThreadItem.php:392 -msgid "Mark all seen" -msgstr "" - -#: ../../Zotlabs/Module/Search.php:224 -#, php-format -msgid "Items tagged with: %s" -msgstr "" - -#: ../../Zotlabs/Module/Search.php:226 -#, php-format -msgid "Search results for: %s" -msgstr "" - -#: ../../Zotlabs/Module/Webpages.php:52 -msgid "Import Webpage Elements" -msgstr "" - -#: ../../Zotlabs/Module/Webpages.php:53 -msgid "Import selected" -msgstr "" - -#: ../../Zotlabs/Module/Webpages.php:76 -msgid "Export Webpage Elements" -msgstr "" - -#: ../../Zotlabs/Module/Webpages.php:77 -msgid "Export selected" -msgstr "" - -#: ../../Zotlabs/Module/Webpages.php:235 ../../Zotlabs/Lib/Apps.php:226 -#: ../../include/nav.php:439 ../../include/conversation.php:1838 -msgid "Webpages" -msgstr "" - -#: ../../Zotlabs/Module/Webpages.php:245 ../../Zotlabs/Module/Events.php:478 -#: ../../Zotlabs/Module/Photos.php:1063 ../../Zotlabs/Lib/ThreadItem.php:739 -#: ../../include/conversation.php:1277 -msgid "Preview" -msgstr "" - -#: ../../Zotlabs/Module/Webpages.php:246 -msgid "Actions" -msgstr "" - -#: ../../Zotlabs/Module/Webpages.php:247 -msgid "Page Link" -msgstr "" - -#: ../../Zotlabs/Module/Webpages.php:248 -msgid "Page Title" -msgstr "" - -#: ../../Zotlabs/Module/Webpages.php:278 -msgid "Invalid file type." -msgstr "" - -#: ../../Zotlabs/Module/Webpages.php:290 -msgid "Error opening zip file" -msgstr "" - -#: ../../Zotlabs/Module/Webpages.php:301 -msgid "Invalid folder path." -msgstr "" - -#: ../../Zotlabs/Module/Webpages.php:328 -msgid "No webpage elements detected." -msgstr "" - -#: ../../Zotlabs/Module/Webpages.php:403 -msgid "Import complete." -msgstr "" - -#: ../../Zotlabs/Module/Invite.php:29 -msgid "Total invitation limit exceeded." -msgstr "" - -#: ../../Zotlabs/Module/Invite.php:53 -#, php-format -msgid "%s : Not a valid email address." -msgstr "" - -#: ../../Zotlabs/Module/Invite.php:67 -msgid "Please join us on $Projectname" -msgstr "" - -#: ../../Zotlabs/Module/Invite.php:77 -msgid "Invitation limit exceeded. Please contact your site administrator." -msgstr "" - -#: ../../Zotlabs/Module/Invite.php:82 -#, php-format -msgid "%s : Message delivery failed." -msgstr "" - -#: ../../Zotlabs/Module/Invite.php:86 -#, php-format -msgid "%d message sent." -msgid_plural "%d messages sent." -msgstr[0] "" -msgstr[1] "" - -#: ../../Zotlabs/Module/Invite.php:105 -msgid "You have no more invitations available" -msgstr "" - -#: ../../Zotlabs/Module/Invite.php:136 -msgid "Send invitations" -msgstr "" - -#: ../../Zotlabs/Module/Invite.php:137 -msgid "Enter email addresses, one per line:" -msgstr "" - -#: ../../Zotlabs/Module/Invite.php:139 -msgid "Please join my community on $Projectname." -msgstr "" - -#: ../../Zotlabs/Module/Invite.php:141 -msgid "You will need to supply this invitation code:" -msgstr "" - -#: ../../Zotlabs/Module/Invite.php:142 -msgid "1. Register at any $Projectname location (they are all inter-connected)" -msgstr "" - -#: ../../Zotlabs/Module/Invite.php:144 -msgid "2. Enter my $Projectname network address into the site searchbar." -msgstr "" - -#: ../../Zotlabs/Module/Invite.php:145 -msgid "or visit" -msgstr "" - -#: ../../Zotlabs/Module/Invite.php:147 -msgid "3. Click [Connect]" -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 login with your $Projectname ID or register as a new $Projectname member 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:122 -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 -#: ../../extend/addon/addon/redphotos/redphotohelper.php:71 -#: ../../extend/addon/addon/diaspora/Receiver.php:1369 -#: ../../include/text.php:1930 ../../include/conversation.php:116 -msgid "photo" -msgstr "" - -#: ../../Zotlabs/Module/Like.php:370 ../../Zotlabs/Module/Subthread.php:87 -#: ../../extend/addon/addon/diaspora/Receiver.php:1369 -#: ../../include/text.php:1936 ../../include/conversation.php:144 -msgid "status" -msgstr "" - -#: ../../Zotlabs/Module/Like.php:372 ../../Zotlabs/Module/Events.php:260 -#: ../../Zotlabs/Module/Tagger.php:51 ../../include/text.php:1933 -#: ../../include/event.php:1145 ../../include/conversation.php:119 -msgid "event" -msgstr "" - -#: ../../Zotlabs/Module/Like.php:423 -#: ../../extend/addon/addon/diaspora/Receiver.php:1398 -#: ../../include/conversation.php:160 -#, php-format -msgid "%1$s likes %2$s's %3$s" -msgstr "" - -#: ../../Zotlabs/Module/Like.php:425 ../../include/conversation.php:163 -#, php-format -msgid "%1$s doesn't like %2$s's %3$s" -msgstr "" - -#: ../../Zotlabs/Module/Like.php:427 -#, php-format -msgid "%1$s agrees with %2$s's %3$s" -msgstr "" - -#: ../../Zotlabs/Module/Like.php:429 -#, php-format -msgid "%1$s doesn't agree with %2$s's %3$s" -msgstr "" - -#: ../../Zotlabs/Module/Like.php:431 -#, php-format -msgid "%1$s abstains from a decision on %2$s's %3$s" -msgstr "" - -#: ../../Zotlabs/Module/Like.php:433 -#, php-format -msgid "%1$s is attending %2$s's %3$s" -msgstr "" - -#: ../../Zotlabs/Module/Like.php:435 -#, php-format -msgid "%1$s is not attending %2$s's %3$s" -msgstr "" - -#: ../../Zotlabs/Module/Like.php:437 -#, php-format -msgid "%1$s may attend %2$s's %3$s" -msgstr "" - -#: ../../Zotlabs/Module/Like.php:542 -msgid "Action completed." -msgstr "" - -#: ../../Zotlabs/Module/Like.php:543 -msgid "Thank you." +#: ../../Zotlabs/Module/Admin/Security.php:100 +msgid "Block embedded HTML from these domains" msgstr "" #: ../../Zotlabs/Module/Lockview.php:75 @@ -5091,1053 +3183,520 @@ msgstr "" msgid "Visible to:" msgstr "" -#: ../../Zotlabs/Module/Pconfig.php:26 ../../Zotlabs/Module/Pconfig.php:59 -msgid "This setting requires special processing and editing has been blocked." -msgstr "" - -#: ../../Zotlabs/Module/Pconfig.php:48 -msgid "Configuration Editor" -msgstr "" - -#: ../../Zotlabs/Module/Pconfig.php:49 -msgid "" -"Warning: Changing some settings could render your channel inoperable. Please " -"leave this page unless you are comfortable with and knowledgeable about how " -"to correctly use this feature." -msgstr "" - -#: ../../Zotlabs/Module/Subthread.php:118 -#, php-format -msgid "%1$s is following %2$s's %3$s" -msgstr "" - -#: ../../Zotlabs/Module/Subthread.php:120 -#, php-format -msgid "%1$s stopped following %2$s's %3$s" -msgstr "" - -#: ../../Zotlabs/Module/Mood.php:67 ../../include/conversation.php:256 -#, php-format -msgctxt "mood" -msgid "%1$s is %2$s" -msgstr "" - -#: ../../Zotlabs/Module/Mood.php:135 ../../Zotlabs/Lib/Apps.php:235 -msgid "Mood" -msgstr "" - -#: ../../Zotlabs/Module/Mood.php:136 -msgid "Set your current mood and tell your friends" -msgstr "" - -#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2280 -msgid "Blocks" -msgstr "" - -#: ../../Zotlabs/Module/Blocks.php:156 -msgid "Block Title" -msgstr "" - -#: ../../Zotlabs/Module/Cal.php:69 -msgid "Permissions denied." -msgstr "" - -#: ../../Zotlabs/Module/Cal.php:264 ../../Zotlabs/Module/Events.php:605 -msgid "l, F j" -msgstr "" - -#: ../../Zotlabs/Module/Cal.php:313 ../../Zotlabs/Module/Events.php:660 -#: ../../include/text.php:1752 -msgid "Link to Source" -msgstr "" - -#: ../../Zotlabs/Module/Cal.php:336 ../../Zotlabs/Module/Events.php:688 -msgid "Edit Event" -msgstr "" - -#: ../../Zotlabs/Module/Cal.php:336 ../../Zotlabs/Module/Events.php:688 -msgid "Create Event" -msgstr "" - -#: ../../Zotlabs/Module/Cal.php:337 ../../Zotlabs/Module/Cal.php:344 -#: ../../Zotlabs/Module/Events.php:689 ../../Zotlabs/Module/Events.php:698 -#: ../../Zotlabs/Module/Photos.php:911 ../../Zotlabs/Module/Cdav.php:819 -msgid "Previous" -msgstr "" - -#: ../../Zotlabs/Module/Cal.php:339 ../../Zotlabs/Module/Events.php:691 -#: ../../include/channel.php:1386 -msgid "Export" -msgstr "" - -#: ../../Zotlabs/Module/Cal.php:342 ../../include/text.php:2304 -msgid "Import" -msgstr "" - -#: ../../Zotlabs/Module/Cal.php:346 ../../Zotlabs/Module/Events.php:700 -#: ../../Zotlabs/Module/Cdav.php:821 -msgid "Today" -msgstr "" - -#: ../../Zotlabs/Module/Rate.php:156 -msgid "Website:" -msgstr "" - -#: ../../Zotlabs/Module/Rate.php:159 -#, php-format -msgid "Remote Channel [%s] (not yet known on this site)" -msgstr "" - -#: ../../Zotlabs/Module/Rate.php:160 -msgid "Rating (this information is public)" -msgstr "" - -#: ../../Zotlabs/Module/Rate.php:161 -msgid "Optionally explain your rating (this information is public)" -msgstr "" - -#: ../../Zotlabs/Module/Profile_photo.php:115 -#: ../../Zotlabs/Module/Profile_photo.php:226 -#: ../../include/photo/photo_driver.php:658 -msgid "Profile Photos" -msgstr "" - -#: ../../Zotlabs/Module/Profile_photo.php:196 -#: ../../extend/addon/addon/openclipatar/openclipatar.php:298 -msgid "" -"Shift-reload the page or clear browser cache if the new photo does not " -"display immediately." -msgstr "" - -#: ../../Zotlabs/Module/Profile_photo.php:422 -msgid "Use Photo for Profile" -msgstr "" - -#: ../../Zotlabs/Module/Profile_photo.php:422 -msgid "Upload Profile Photo" -msgstr "" - -#: ../../Zotlabs/Module/Profile_photo.php:423 -#: ../../extend/addon/addon/openclipatar/openclipatar.php:182 -#: ../../extend/addon/addon/openclipatar/openclipatar.php:194 -msgid "Use" -msgstr "" - -#: ../../Zotlabs/Module/Appman.php:38 ../../Zotlabs/Module/Appman.php:55 -msgid "App installed." -msgstr "" - -#: ../../Zotlabs/Module/Appman.php:48 -msgid "Malformed app." -msgstr "" - -#: ../../Zotlabs/Module/Appman.php:125 -msgid "Embed code" -msgstr "" - -#: ../../Zotlabs/Module/Appman.php:131 -msgid "Edit App" -msgstr "" - -#: ../../Zotlabs/Module/Appman.php:131 -msgid "Create App" -msgstr "" - -#: ../../Zotlabs/Module/Appman.php:136 -msgid "Name of app" -msgstr "" - -#: ../../Zotlabs/Module/Appman.php:137 -msgid "Location (URL) of app" -msgstr "" - -#: ../../Zotlabs/Module/Appman.php:138 ../../Zotlabs/Module/Rbmark.php:101 -#: ../../Zotlabs/Module/Events.php:473 ../../Zotlabs/Module/Cdav.php:811 -#: ../../extend/addon/addon/rendezvous/rendezvous.php:173 -msgid "Description" -msgstr "" - -#: ../../Zotlabs/Module/Appman.php:139 -msgid "Photo icon URL" -msgstr "" - -#: ../../Zotlabs/Module/Appman.php:139 -msgid "80 x 80 pixels - optional" -msgstr "" - -#: ../../Zotlabs/Module/Appman.php:140 -msgid "Categories (optional, comma separated list)" -msgstr "" - -#: ../../Zotlabs/Module/Appman.php:141 -msgid "Version ID" -msgstr "" - -#: ../../Zotlabs/Module/Appman.php:142 -msgid "Price of app" -msgstr "" - -#: ../../Zotlabs/Module/Appman.php:143 -msgid "Location (URL) to purchase app" -msgstr "" - -#: ../../Zotlabs/Module/Common.php:14 -msgid "No channel." -msgstr "" - -#: ../../Zotlabs/Module/Common.php:43 -msgid "Common connections" -msgstr "" - -#: ../../Zotlabs/Module/Common.php:48 -msgid "No connections in common." -msgstr "" - -#: ../../Zotlabs/Module/Help.php:23 -msgid "Documentation Search" -msgstr "" - -#: ../../Zotlabs/Module/Help.php:80 ../../include/nav.php:372 -#: ../../include/conversation.php:1770 -msgid "About" -msgstr "" - -#: ../../Zotlabs/Module/Help.php:82 -msgid "Administrators" -msgstr "" - -#: ../../Zotlabs/Module/Help.php:83 -msgid "Developers" -msgstr "" - -#: ../../Zotlabs/Module/Help.php:84 -msgid "Tutorials" -msgstr "" - -#: ../../Zotlabs/Module/Help.php:93 -msgid "$Projectname Documentation" -msgstr "" - -#: ../../Zotlabs/Module/Help.php:94 -msgid "Contents" -msgstr "" - -#: ../../Zotlabs/Module/Uexport.php:57 ../../Zotlabs/Module/Uexport.php:58 -msgid "Export Channel" -msgstr "" - -#: ../../Zotlabs/Module/Uexport.php:59 -msgid "" -"Export your basic channel information to a file. This acts as a backup of " -"your connections, permissions, profile and basic data, which can be used to " -"import your data to a new server hub, but does not contain your content." -msgstr "" - -#: ../../Zotlabs/Module/Uexport.php:60 -msgid "Export Content" -msgstr "" - -#: ../../Zotlabs/Module/Uexport.php:61 -msgid "" -"Export your channel information and recent content to a JSON backup that can " -"be restored or imported to another server hub. This backs up all of your " -"connections, permissions, profile data and several months of posts. This " -"file may be VERY large. Please be patient - it may take several minutes for " -"this download to begin." -msgstr "" - -#: ../../Zotlabs/Module/Uexport.php:63 -msgid "Export your posts from a given year." -msgstr "" - -#: ../../Zotlabs/Module/Uexport.php:65 -msgid "" -"You may also export your posts and conversations for a particular year or " -"month. Adjust the date in your browser location bar to select other dates. " -"If the export fails (possibly due to memory exhaustion on your server hub), " -"please try again selecting a more limited date range." -msgstr "" - -#: ../../Zotlabs/Module/Uexport.php:66 -#, php-format -msgid "" -"To select all posts for a given year, such as this year, visit %2$s" -msgstr "" - -#: ../../Zotlabs/Module/Uexport.php:67 -#, php-format -msgid "" -"To select all posts for a given month, such as January of this year, visit " -"%2$s" -msgstr "" - -#: ../../Zotlabs/Module/Uexport.php:68 -#, php-format -msgid "" -"These content files may be imported or restored by visiting " -"%2$s on any site containing your channel. For best results please import " -"or restore these in date order (oldest first)." -msgstr "" - -#: ../../Zotlabs/Module/Manage.php:143 -msgid "Create a new channel" -msgstr "" - -#: ../../Zotlabs/Module/Manage.php:168 ../../Zotlabs/Lib/Apps.php:222 -#: ../../include/nav.php:202 -msgid "Channel Manager" -msgstr "" - -#: ../../Zotlabs/Module/Manage.php:169 -msgid "Current Channel" -msgstr "" - -#: ../../Zotlabs/Module/Manage.php:171 -msgid "Switch to one of your channels by selecting it." -msgstr "" - -#: ../../Zotlabs/Module/Manage.php:172 -msgid "Default Channel" -msgstr "" - -#: ../../Zotlabs/Module/Manage.php:173 -msgid "Make Default" -msgstr "" - -#: ../../Zotlabs/Module/Manage.php:176 -#, php-format -msgid "%d new messages" -msgstr "" - -#: ../../Zotlabs/Module/Manage.php:177 -#, php-format -msgid "%d new introductions" -msgstr "" - -#: ../../Zotlabs/Module/Manage.php:179 -msgid "Delegated Channel" -msgstr "" - -#: ../../Zotlabs/Module/Lostpass.php:19 -msgid "No valid account found." -msgstr "" - -#: ../../Zotlabs/Module/Lostpass.php:33 -msgid "Password reset request issued. Check your email." -msgstr "" - -#: ../../Zotlabs/Module/Lostpass.php:39 ../../Zotlabs/Module/Lostpass.php:108 -#, php-format -msgid "Site Member (%s)" -msgstr "" - -#: ../../Zotlabs/Module/Lostpass.php:44 ../../Zotlabs/Module/Lostpass.php:49 -#, php-format -msgid "Password reset requested at %s" -msgstr "" - -#: ../../Zotlabs/Module/Lostpass.php:68 -msgid "" -"Request could not be verified. (You may have previously submitted it.) " -"Password reset failed." -msgstr "" - -#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1599 -msgid "Password Reset" -msgstr "" - -#: ../../Zotlabs/Module/Lostpass.php:92 -msgid "Your password has been reset as requested." -msgstr "" - -#: ../../Zotlabs/Module/Lostpass.php:93 -msgid "Your new password is" -msgstr "" - -#: ../../Zotlabs/Module/Lostpass.php:94 -msgid "Save or copy your new password - and then" -msgstr "" - -#: ../../Zotlabs/Module/Lostpass.php:95 -msgid "click here to login" -msgstr "" - -#: ../../Zotlabs/Module/Lostpass.php:96 -msgid "" -"Your password may be changed from the Settings page after " -"successful login." -msgstr "" - -#: ../../Zotlabs/Module/Lostpass.php:117 -#, php-format -msgid "Your password has changed at %s" -msgstr "" - -#: ../../Zotlabs/Module/Lostpass.php:130 -msgid "Forgot your Password?" -msgstr "" - -#: ../../Zotlabs/Module/Lostpass.php:131 -msgid "" -"Enter your email address and submit to have your password reset. Then check " -"your email for further instructions." -msgstr "" - -#: ../../Zotlabs/Module/Lostpass.php:132 -msgid "Email Address" -msgstr "" - -#: ../../Zotlabs/Module/Lostpass.php:133 -msgid "Reset" -msgstr "" - -#: ../../Zotlabs/Module/Rbmark.php:94 -msgid "Select a bookmark folder" -msgstr "" - -#: ../../Zotlabs/Module/Rbmark.php:99 -msgid "Save Bookmark" -msgstr "" - -#: ../../Zotlabs/Module/Rbmark.php:100 -msgid "URL of bookmark" -msgstr "" - -#: ../../Zotlabs/Module/Rbmark.php:105 -msgid "Or enter new bookmark folder name" -msgstr "" - -#: ../../Zotlabs/Module/Follow.php:31 -msgid "Channel added." -msgstr "" - -#: ../../Zotlabs/Module/Regmod.php:15 -msgid "Please login." -msgstr "" - -#: ../../Zotlabs/Module/Removeaccount.php:35 -msgid "" -"Account removals are not allowed within 48 hours of changing the account " -"password." -msgstr "" - -#: ../../Zotlabs/Module/Removeaccount.php:57 -msgid "Remove This Account" -msgstr "" - -#: ../../Zotlabs/Module/Removeaccount.php:58 -#: ../../Zotlabs/Module/Removeme.php:61 -msgid "WARNING: " -msgstr "" - -#: ../../Zotlabs/Module/Removeaccount.php:58 -msgid "" -"This account and all its channels will be completely removed from the " -"network. " -msgstr "" - -#: ../../Zotlabs/Module/Removeaccount.php:58 -#: ../../Zotlabs/Module/Removeme.php:61 -msgid "This action is permanent and can not be undone!" -msgstr "" - -#: ../../Zotlabs/Module/Removeaccount.php:59 -#: ../../Zotlabs/Module/Removeme.php:62 -msgid "Please enter your password for verification:" -msgstr "" - -#: ../../Zotlabs/Module/Removeaccount.php:60 -msgid "" -"Remove this account, all its channels and all its channel clones from the " -"network" -msgstr "" - -#: ../../Zotlabs/Module/Removeaccount.php:60 -msgid "" -"By default only the instances of the channels located on this hub will be " -"removed from the network" -msgstr "" - -#: ../../Zotlabs/Module/Removeaccount.php:61 -#: ../../Zotlabs/Module/Settings/Account.php:120 -msgid "Remove Account" -msgstr "" - -#: ../../Zotlabs/Module/Pdledit.php:21 -msgid "Layout updated." -msgstr "" - -#: ../../Zotlabs/Module/Pdledit.php:34 ../../Zotlabs/Module/Chat.php:217 -msgid "Feature disabled." -msgstr "" - -#: ../../Zotlabs/Module/Pdledit.php:42 ../../Zotlabs/Module/Pdledit.php:69 -msgid "Edit System Page Description" -msgstr "" - -#: ../../Zotlabs/Module/Pdledit.php:64 -msgid "Layout not found." -msgstr "" - -#: ../../Zotlabs/Module/Pdledit.php:70 -msgid "Module Name:" -msgstr "" - -#: ../../Zotlabs/Module/Pdledit.php:71 -msgid "Layout Help" -msgstr "" - -#: ../../Zotlabs/Module/Profperm.php:34 ../../Zotlabs/Module/Profperm.php:63 -msgid "Invalid profile identifier." -msgstr "" - -#: ../../Zotlabs/Module/Profperm.php:111 -msgid "Profile Visibility Editor" -msgstr "" - -#: ../../Zotlabs/Module/Profperm.php:113 ../../include/channel.php:1383 +#: ../../Zotlabs/Module/Lockview.php:117 ../../Zotlabs/Module/Lockview.php:153 +#: ../../Zotlabs/Module/Acl.php:117 ../../include/acl_selectors.php:183 +msgctxt "acl" msgid "Profile" msgstr "" -#: ../../Zotlabs/Module/Profperm.php:115 -msgid "Click on a contact to add or remove." +#: ../../Zotlabs/Module/Moderate.php:37 +msgid "Comment approved" msgstr "" -#: ../../Zotlabs/Module/Profperm.php:124 -msgid "Visible To" +#: ../../Zotlabs/Module/Moderate.php:41 +msgid "Comment deleted" msgstr "" -#: ../../Zotlabs/Module/Import.php:143 +#: ../../Zotlabs/Module/Settings/Permcats.php:37 +msgid "Permission category saved." +msgstr "" + +#: ../../Zotlabs/Module/Settings/Permcats.php:61 +msgid "" +"Use this form to create permission rules for various classes of people or " +"connections." +msgstr "" + +#: ../../Zotlabs/Module/Settings/Permcats.php:94 +msgid "Permission Categories" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Permcats.php:102 +msgid "Permission Name" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Permcats.php:103 +#: ../../Zotlabs/Module/Settings/Tokens.php:161 +#: ../../Zotlabs/Module/Connedit.php:904 +msgid "My Settings" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Permcats.php:105 +#: ../../Zotlabs/Module/Settings/Tokens.php:163 +#: ../../Zotlabs/Module/Connedit.php:899 +msgid "inherited" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Permcats.php:108 +#: ../../Zotlabs/Module/Settings/Tokens.php:166 +#: ../../Zotlabs/Module/Connedit.php:906 +msgid "Individual Permissions" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Permcats.php:109 +#: ../../Zotlabs/Module/Settings/Tokens.php:167 +#: ../../Zotlabs/Module/Connedit.php:907 +msgid "" +"Some permissions may be inherited from your channel's privacy settings, which have higher priority than " +"individual settings. You can not change those settings here." +msgstr "" + +#: ../../Zotlabs/Module/Settings/Channel.php:62 +#: ../../Zotlabs/Module/Settings/Channel.php:66 +#: ../../Zotlabs/Module/Settings/Channel.php:67 +#: ../../Zotlabs/Module/Settings/Channel.php:70 +#: ../../Zotlabs/Module/Settings/Channel.php:81 +#: ../../Zotlabs/Module/Connedit.php:707 ../../Zotlabs/Widget/Affinity.php:28 +#: ../../include/selectors.php:123 ../../include/channel.php:408 +#: ../../include/channel.php:409 ../../include/channel.php:416 +msgid "Friends" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Channel.php:255 +#: ../../addon/rendezvous/rendezvous.php:82 +#: ../../addon/openstreetmap/openstreetmap.php:184 +#: ../../addon/msgfooter/msgfooter.php:54 ../../addon/logrot/logrot.php:54 +#: ../../addon/twitter/twitter.php:766 ../../addon/piwik/piwik.php:116 +#: ../../addon/xmpp/xmpp.php:102 +msgid "Settings updated." +msgstr "" + +#: ../../Zotlabs/Module/Settings/Channel.php:316 +msgid "Nobody except yourself" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Channel.php:317 +msgid "Only those you specifically allow" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Channel.php:318 +msgid "Approved connections" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Channel.php:319 +msgid "Any connections" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Channel.php:320 +msgid "Anybody on this website" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Channel.php:321 +msgid "Anybody in this network" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Channel.php:322 +msgid "Anybody authenticated" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Channel.php:323 +msgid "Anybody on the internet" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Channel.php:399 +msgid "Publish your default profile in the network directory" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Channel.php:404 +msgid "Allow us to suggest you as a potential friend to new members?" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Channel.php:408 +#: ../../Zotlabs/Module/Profile_photo.php:429 +#: ../../Zotlabs/Module/Cover_photo.php:365 +msgid "or" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Channel.php:413 +msgid "Your channel address is" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Channel.php:416 +msgid "Your files/photos are accessible via WebDAV at" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Channel.php:478 +msgid "Channel Settings" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Channel.php:485 +msgid "Basic Settings" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Channel.php:486 ../../include/channel.php:1373 +msgid "Full Name:" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Channel.php:487 +#: ../../Zotlabs/Module/Settings/Account.php:119 +msgid "Email Address:" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Channel.php:488 +msgid "Your Timezone:" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Channel.php:489 +msgid "Default Post Location:" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Channel.php:489 +msgid "Geographical location to display on your posts" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Channel.php:490 +msgid "Use Browser Location:" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Channel.php:492 +msgid "Adult Content" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Channel.php:492 +msgid "" +"This channel frequently or regularly publishes adult content. (Please tag " +"any adult material and/or nudity with #NSFW)" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Channel.php:494 +msgid "Security and Privacy Settings" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Channel.php:496 +msgid "Your permissions are already configured. Click to view/adjust" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Channel.php:498 +msgid "Hide my online presence" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Channel.php:498 +msgid "Prevents displaying in your profile that you are online" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Channel.php:500 +msgid "Simple Privacy Settings:" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Channel.php:501 +msgid "" +"Very Public - extremely permissive (should be used with caution)" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Channel.php:502 +msgid "" +"Typical - default public, privacy when desired (similar to social " +"network permissions but with improved privacy)" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Channel.php:503 +msgid "Private - default private, never open or public" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Channel.php:504 +msgid "Blocked - default blocked to/from everybody" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Channel.php:506 +msgid "Allow others to tag your posts" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Channel.php:506 +msgid "" +"Often used by the community to retro-actively flag inappropriate content" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Channel.php:508 +msgid "Channel Permission Limits" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Channel.php:510 +msgid "Expire other channel content after this many days" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Channel.php:510 +msgid "0 or blank to use the website limit." +msgstr "" + +#: ../../Zotlabs/Module/Settings/Channel.php:510 #, php-format -msgid "Your service plan only allows %d channels." +msgid "This website expires after %d days." msgstr "" -#: ../../Zotlabs/Module/Import.php:157 -msgid "No channel. Import failed." +#: ../../Zotlabs/Module/Settings/Channel.php:510 +msgid "This website does not expire imported content." msgstr "" -#: ../../Zotlabs/Module/Import.php:470 -#: ../../extend/addon/addon/diaspora/import_diaspora.php:142 -msgid "Import completed." +#: ../../Zotlabs/Module/Settings/Channel.php:510 +msgid "The website limit takes precedence if lower than your limit." msgstr "" -#: ../../Zotlabs/Module/Import.php:498 -msgid "You must be logged in to use this feature." +#: ../../Zotlabs/Module/Settings/Channel.php:511 +msgid "Maximum Friend Requests/Day:" msgstr "" -#: ../../Zotlabs/Module/Import.php:503 -msgid "Import Channel" +#: ../../Zotlabs/Module/Settings/Channel.php:511 +msgid "May reduce spam activity" msgstr "" -#: ../../Zotlabs/Module/Import.php:504 +#: ../../Zotlabs/Module/Settings/Channel.php:512 +msgid "Default Access Control List (ACL)" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Channel.php:514 +msgid "Use my default audience setting for the type of object published" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Channel.php:521 +msgid "Channel permissions category:" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Channel.php:522 +msgid "Default Permissions Group" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Channel.php:528 +msgid "Maximum private messages per day from unknown people:" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Channel.php:528 +msgid "Useful to reduce spamming" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Channel.php:531 +msgid "Notification Settings" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Channel.php:532 +msgid "By default post a status message when:" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Channel.php:533 +msgid "accepting a friend request" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Channel.php:534 +msgid "joining a forum/community" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Channel.php:535 +msgid "making an interesting profile change" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Channel.php:536 +msgid "Send a notification email when:" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Channel.php:537 +msgid "You receive a connection request" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Channel.php:538 +msgid "Your connections are confirmed" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Channel.php:539 +msgid "Someone writes on your profile wall" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Channel.php:540 +msgid "Someone writes a followup comment" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Channel.php:541 +msgid "You receive a private message" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Channel.php:542 +msgid "You receive a friend suggestion" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Channel.php:543 +msgid "You are tagged in a post" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Channel.php:544 +msgid "You are poked/prodded/etc. in a post" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Channel.php:546 +msgid "Someone likes your post/comment" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Channel.php:549 +msgid "Show visual notifications including:" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Channel.php:551 +msgid "Unseen grid activity" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Channel.php:552 +msgid "Unseen channel activity" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Channel.php:553 +msgid "Unseen private messages" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Channel.php:553 +#: ../../Zotlabs/Module/Settings/Channel.php:558 +#: ../../Zotlabs/Module/Settings/Channel.php:559 +#: ../../Zotlabs/Module/Settings/Channel.php:560 +#: ../../addon/jappixmini/jappixmini.php:343 +msgid "Recommended" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Channel.php:554 +msgid "Upcoming events" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Channel.php:555 +msgid "Events today" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Channel.php:556 +msgid "Upcoming birthdays" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Channel.php:556 +msgid "Not available in all themes" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Channel.php:557 +msgid "System (personal) notifications" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Channel.php:558 +msgid "System info messages" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Channel.php:559 +msgid "System critical alerts" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Channel.php:560 +msgid "New connections" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Channel.php:561 +msgid "System Registrations" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Channel.php:562 +msgid "Unseen shared files" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Channel.php:563 +msgid "Unseen public activity" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Channel.php:564 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." +"Also show new wall posts, private messages and connections under Notices" msgstr "" -#: ../../Zotlabs/Module/Import.php:506 -msgid "Or provide the old server/hub details" +#: ../../Zotlabs/Module/Settings/Channel.php:566 +msgid "Notify me of events this many days in advance" msgstr "" -#: ../../Zotlabs/Module/Import.php:507 -msgid "Your old identity address (xyz@example.com)" +#: ../../Zotlabs/Module/Settings/Channel.php:566 +msgid "Must be greater than 0" msgstr "" -#: ../../Zotlabs/Module/Import.php:508 -msgid "Your old login email address" +#: ../../Zotlabs/Module/Settings/Channel.php:572 +msgid "Advanced Account/Page Type Settings" msgstr "" -#: ../../Zotlabs/Module/Import.php:509 -msgid "Your old login password" +#: ../../Zotlabs/Module/Settings/Channel.php:573 +msgid "Change the behaviour of this account for special situations" msgstr "" -#: ../../Zotlabs/Module/Import.php:510 -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." +#: ../../Zotlabs/Module/Settings/Channel.php:575 +msgid "Miscellaneous Settings" msgstr "" -#: ../../Zotlabs/Module/Import.php:511 -msgid "Make this hub my primary location" +#: ../../Zotlabs/Module/Settings/Channel.php:576 +msgid "Default photo upload folder" msgstr "" -#: ../../Zotlabs/Module/Import.php:512 -msgid "Move this channel (disable all previous locations)" +#: ../../Zotlabs/Module/Settings/Channel.php:576 +#: ../../Zotlabs/Module/Settings/Channel.php:577 +msgid "%Y - current year, %m - current month" msgstr "" -#: ../../Zotlabs/Module/Import.php:513 -msgid "Import a few months of posts if possible (limited by available memory" +#: ../../Zotlabs/Module/Settings/Channel.php:577 +msgid "Default file upload folder" msgstr "" -#: ../../Zotlabs/Module/Import.php:514 -msgid "" -"This process may take several minutes to complete. Please submit the form " -"only once and leave this page open until finished." +#: ../../Zotlabs/Module/Settings/Channel.php:579 +msgid "Personal menu to display in your channel pages" msgstr "" -#: ../../Zotlabs/Module/Events.php:25 -msgid "Calendar entries imported." +#: ../../Zotlabs/Module/Settings/Channel.php:581 +msgid "Remove this channel." msgstr "" -#: ../../Zotlabs/Module/Events.php:27 -msgid "No calendar entries found." +#: ../../Zotlabs/Module/Settings/Channel.php:582 +msgid "Firefox Share $Projectname provider" msgstr "" -#: ../../Zotlabs/Module/Events.php:110 -msgid "Event can not end before it has started." -msgstr "" - -#: ../../Zotlabs/Module/Events.php:112 ../../Zotlabs/Module/Events.php:121 -#: ../../Zotlabs/Module/Events.php:143 -msgid "Unable to generate preview." -msgstr "" - -#: ../../Zotlabs/Module/Events.php:119 -msgid "Event title and start time are required." -msgstr "" - -#: ../../Zotlabs/Module/Events.php:141 ../../Zotlabs/Module/Events.php:265 -msgid "Event not found." -msgstr "" - -#: ../../Zotlabs/Module/Events.php:460 -msgid "Edit event title" -msgstr "" - -#: ../../Zotlabs/Module/Events.php:460 ../../Zotlabs/Module/Cdav.php:808 -msgid "Event title" -msgstr "" - -#: ../../Zotlabs/Module/Events.php:462 -msgid "Categories (comma-separated list)" -msgstr "" - -#: ../../Zotlabs/Module/Events.php:463 -msgid "Edit Category" -msgstr "" - -#: ../../Zotlabs/Module/Events.php:463 -msgid "Category" -msgstr "" - -#: ../../Zotlabs/Module/Events.php:466 -msgid "Edit start date and time" -msgstr "" - -#: ../../Zotlabs/Module/Events.php:466 ../../Zotlabs/Module/Cdav.php:809 -msgid "Start date and time" -msgstr "" - -#: ../../Zotlabs/Module/Events.php:467 ../../Zotlabs/Module/Events.php:470 -msgid "Finish date and time are not known or not relevant" -msgstr "" - -#: ../../Zotlabs/Module/Events.php:469 -msgid "Edit finish date and time" -msgstr "" - -#: ../../Zotlabs/Module/Events.php:469 -msgid "Finish date and time" -msgstr "" - -#: ../../Zotlabs/Module/Events.php:471 ../../Zotlabs/Module/Events.php:472 -msgid "Adjust for viewer timezone" -msgstr "" - -#: ../../Zotlabs/Module/Events.php:471 -msgid "" -"Important for events that happen in a particular place. Not practical for " -"global holidays." -msgstr "" - -#: ../../Zotlabs/Module/Events.php:473 -msgid "Edit Description" -msgstr "" - -#: ../../Zotlabs/Module/Events.php:475 -msgid "Edit Location" -msgstr "" - -#: ../../Zotlabs/Module/Events.php:479 ../../include/conversation.php:1340 -msgid "Permission settings" -msgstr "" - -#: ../../Zotlabs/Module/Events.php:489 -msgid "Timezone:" -msgstr "" - -#: ../../Zotlabs/Module/Events.php:494 -msgid "Advanced Options" -msgstr "" - -#: ../../Zotlabs/Module/Events.php:633 -msgid "Edit event" -msgstr "" - -#: ../../Zotlabs/Module/Events.php:635 -msgid "Delete event" -msgstr "" - -#: ../../Zotlabs/Module/Events.php:669 -msgid "calendar" -msgstr "" - -#: ../../Zotlabs/Module/Events.php:695 ../../Zotlabs/Module/Cdav.php:822 -msgid "Month" -msgstr "" - -#: ../../Zotlabs/Module/Events.php:696 ../../Zotlabs/Module/Cdav.php:823 -msgid "Week" -msgstr "" - -#: ../../Zotlabs/Module/Events.php:697 ../../Zotlabs/Module/Cdav.php:824 -msgid "Day" -msgstr "" - -#: ../../Zotlabs/Module/Events.php:731 -msgid "Event removed" -msgstr "" - -#: ../../Zotlabs/Module/Events.php:734 -msgid "Failed to remove event" -msgstr "" - -#: ../../Zotlabs/Module/Viewsrc.php:43 -msgid "item" -msgstr "" - -#: ../../Zotlabs/Module/Viewsrc.php:55 -msgid "Source of Item" -msgstr "" - -#: ../../Zotlabs/Module/Service_limits.php:23 -msgid "No service class restrictions found." -msgstr "" - -#: ../../Zotlabs/Module/Bookmarks.php:53 -msgid "Bookmark added" -msgstr "" - -#: ../../Zotlabs/Module/Bookmarks.php:76 -msgid "My Bookmarks" -msgstr "" - -#: ../../Zotlabs/Module/Bookmarks.php:87 -msgid "My Connections Bookmarks" -msgstr "" - -#: ../../Zotlabs/Module/Removeme.php:35 -msgid "" -"Channel removals are not allowed within 48 hours of changing the account " -"password." -msgstr "" - -#: ../../Zotlabs/Module/Removeme.php:60 -msgid "Remove This Channel" -msgstr "" - -#: ../../Zotlabs/Module/Removeme.php:61 -msgid "This channel will be completely removed from the network. " -msgstr "" - -#: ../../Zotlabs/Module/Removeme.php:63 -msgid "Remove this channel and all its clones from the network" -msgstr "" - -#: ../../Zotlabs/Module/Removeme.php:63 -msgid "" -"By default only the instance of the channel located on this hub will be " -"removed from the network" -msgstr "" - -#: ../../Zotlabs/Module/Removeme.php:64 -#: ../../Zotlabs/Module/Settings/Channel.php:574 -msgid "Remove Channel" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:95 -msgid "Blocked accounts" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:96 -msgid "Expired accounts" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:97 -msgid "Expiring accounts" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:110 -msgid "Clones" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:116 -msgid "Message queues" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:130 -msgid "Your software should be updated" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:135 -msgid "Summary" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:138 -msgid "Registered accounts" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:139 -msgid "Pending registrations" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:140 -msgid "Registered channels" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:141 -msgid "Active plugins" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:142 -msgid "Version" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:143 -msgid "Repository version (master)" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:144 -msgid "Repository version (dev)" -msgstr "" - -#: ../../Zotlabs/Module/Sharedwithme.php:99 -msgid "Files: shared with me" -msgstr "" - -#: ../../Zotlabs/Module/Sharedwithme.php:101 -msgid "NEW" -msgstr "" - -#: ../../Zotlabs/Module/Sharedwithme.php:104 -msgid "Remove all files" -msgstr "" - -#: ../../Zotlabs/Module/Sharedwithme.php:105 -msgid "Remove this file" -msgstr "" - -#: ../../Zotlabs/Module/Sources.php:37 -msgid "Failed to create source. No channel selected." -msgstr "" - -#: ../../Zotlabs/Module/Sources.php:51 -msgid "Source created." -msgstr "" - -#: ../../Zotlabs/Module/Sources.php:64 -msgid "Source updated." -msgstr "" - -#: ../../Zotlabs/Module/Sources.php:90 -msgid "*" -msgstr "" - -#: ../../Zotlabs/Module/Sources.php:96 -#: ../../Zotlabs/Widget/Settings_menu.php:125 ../../include/features.php:209 -msgid "Channel Sources" -msgstr "" - -#: ../../Zotlabs/Module/Sources.php:97 -msgid "Manage remote sources of content for your channel." -msgstr "" - -#: ../../Zotlabs/Module/Sources.php:98 ../../Zotlabs/Module/Sources.php:108 -msgid "New Source" -msgstr "" - -#: ../../Zotlabs/Module/Sources.php:109 ../../Zotlabs/Module/Sources.php:143 -msgid "" -"Import all or selected content from the following channel into this channel " -"and distribute it according to your channel settings." -msgstr "" - -#: ../../Zotlabs/Module/Sources.php:110 ../../Zotlabs/Module/Sources.php:144 -msgid "Only import content with these words (one per line)" -msgstr "" - -#: ../../Zotlabs/Module/Sources.php:110 ../../Zotlabs/Module/Sources.php:144 -msgid "Leave blank to import all public content" -msgstr "" - -#: ../../Zotlabs/Module/Sources.php:111 ../../Zotlabs/Module/Sources.php:148 -msgid "Channel Name" -msgstr "" - -#: ../../Zotlabs/Module/Sources.php:112 ../../Zotlabs/Module/Sources.php:147 -msgid "" -"Add the following categories to posts imported from this source (comma " -"separated)" -msgstr "" - -#: ../../Zotlabs/Module/Sources.php:112 ../../Zotlabs/Module/Sources.php:147 -#: ../../Zotlabs/Module/Settings/Oauth.php:93 -msgid "Optional" -msgstr "" - -#: ../../Zotlabs/Module/Sources.php:133 ../../Zotlabs/Module/Sources.php:161 -msgid "Source not found." -msgstr "" - -#: ../../Zotlabs/Module/Sources.php:140 -msgid "Edit Source" -msgstr "" - -#: ../../Zotlabs/Module/Sources.php:141 -msgid "Delete Source" -msgstr "" - -#: ../../Zotlabs/Module/Sources.php:169 -msgid "Source removed" -msgstr "" - -#: ../../Zotlabs/Module/Sources.php:171 -msgid "Unable to remove source." -msgstr "" - -#: ../../Zotlabs/Module/Poke.php:180 ../../Zotlabs/Lib/Apps.php:236 -#: ../../include/conversation.php:1039 -msgid "Poke" -msgstr "" - -#: ../../Zotlabs/Module/Poke.php:181 -msgid "Poke somebody" -msgstr "" - -#: ../../Zotlabs/Module/Poke.php:184 -msgid "Poke/Prod" -msgstr "" - -#: ../../Zotlabs/Module/Poke.php:185 -msgid "Poke, prod or do other things to somebody" -msgstr "" - -#: ../../Zotlabs/Module/Poke.php:192 -msgid "Recipient" -msgstr "" - -#: ../../Zotlabs/Module/Poke.php:193 -msgid "Choose what you wish to do to recipient" -msgstr "" - -#: ../../Zotlabs/Module/Poke.php:196 ../../Zotlabs/Module/Poke.php:197 -msgid "Make this post private" -msgstr "" - -#: ../../Zotlabs/Module/Suggest.php:37 -msgid "" -"No suggestions available. If this is a new site, please try again in 24 " -"hours." -msgstr "" - -#: ../../Zotlabs/Module/Suggest.php:56 ../../Zotlabs/Widget/Suggestions.php:46 -msgid "Ignore/Hide" -msgstr "" - -#: ../../Zotlabs/Module/Rmagic.php:35 -msgid "Authentication failed." -msgstr "" - -#: ../../Zotlabs/Module/Rmagic.php:75 ../../include/channel.php:2000 -msgid "Remote Authentication" -msgstr "" - -#: ../../Zotlabs/Module/Rmagic.php:76 ../../include/channel.php:2001 -msgid "Enter your channel address (e.g. channel@example.com)" -msgstr "" - -#: ../../Zotlabs/Module/Rmagic.php:77 ../../include/channel.php:2002 -msgid "Authenticate" +#: ../../Zotlabs/Module/Settings/Channel.php:583 +msgid "Start calendar week on Monday" msgstr "" #: ../../Zotlabs/Module/Settings/Features.php:45 msgid "Additional Features" msgstr "" -#: ../../Zotlabs/Module/Settings/Oauth.php:34 -msgid "Name is required" +#: ../../Zotlabs/Module/Settings/Tokens.php:31 +#, php-format +msgid "This channel is limited to %d tokens" msgstr "" -#: ../../Zotlabs/Module/Settings/Oauth.php:38 -msgid "Key and Secret are required" +#: ../../Zotlabs/Module/Settings/Tokens.php:37 +msgid "Name and Password are required." msgstr "" -#: ../../Zotlabs/Module/Settings/Oauth.php:86 -#: ../../Zotlabs/Module/Settings/Oauth.php:112 -#: ../../Zotlabs/Module/Settings/Oauth.php:148 -msgid "Add application" +#: ../../Zotlabs/Module/Settings/Tokens.php:77 +msgid "Token saved." msgstr "" -#: ../../Zotlabs/Module/Settings/Oauth.php:89 -msgid "Name of application" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Oauth.php:90 -#: ../../Zotlabs/Module/Settings/Oauth.php:116 -#: ../../extend/addon/addon/statusnet/statusnet.php:893 -#: ../../extend/addon/addon/twitter/twitter.php:775 -msgid "Consumer Key" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Oauth.php:90 -#: ../../Zotlabs/Module/Settings/Oauth.php:91 -msgid "Automatically generated - change if desired. Max length 20" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Oauth.php:91 -#: ../../Zotlabs/Module/Settings/Oauth.php:117 -#: ../../extend/addon/addon/statusnet/statusnet.php:892 -#: ../../extend/addon/addon/twitter/twitter.php:776 -msgid "Consumer Secret" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Oauth.php:92 -#: ../../Zotlabs/Module/Settings/Oauth.php:118 -msgid "Redirect" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Oauth.php:92 +#: ../../Zotlabs/Module/Settings/Tokens.php:113 msgid "" -"Redirect URI - leave blank unless your application specifically requires this" +"Use this form to create temporary access identifiers to share things with " +"non-members. These identities may be used in Access Control Lists and " +"visitors may login using these credentials to access private content." msgstr "" -#: ../../Zotlabs/Module/Settings/Oauth.php:93 -#: ../../Zotlabs/Module/Settings/Oauth.php:119 -msgid "Icon url" +#: ../../Zotlabs/Module/Settings/Tokens.php:115 +msgid "" +"You may also provide dropbox style access links to friends and " +"associates by adding the Login Password to any specific site URL as shown. " +"Examples:" msgstr "" -#: ../../Zotlabs/Module/Settings/Oauth.php:104 -msgid "Application not found." +#: ../../Zotlabs/Module/Settings/Tokens.php:150 +#: ../../Zotlabs/Widget/Settings_menu.php:92 +msgid "Guest Access Tokens" msgstr "" -#: ../../Zotlabs/Module/Settings/Oauth.php:147 -msgid "Connected Apps" +#: ../../Zotlabs/Module/Settings/Tokens.php:157 +msgid "Login Name" msgstr "" -#: ../../Zotlabs/Module/Settings/Oauth.php:151 -msgid "Client key starts with" +#: ../../Zotlabs/Module/Settings/Tokens.php:158 +msgid "Login Password" msgstr "" -#: ../../Zotlabs/Module/Settings/Oauth.php:152 -msgid "No name" +#: ../../Zotlabs/Module/Settings/Tokens.php:159 +msgid "Expires (yyyy-mm-dd)" msgstr "" -#: ../../Zotlabs/Module/Settings/Oauth.php:153 -msgid "Remove authorization" +#: ../../Zotlabs/Module/Settings/Tokens.php:160 +#: ../../Zotlabs/Module/Connedit.php:903 +msgid "Their Settings" msgstr "" #: ../../Zotlabs/Module/Settings/Account.php:20 @@ -6204,413 +3763,36 @@ msgstr "" msgid "Used to provide a member experience matched to your comfort level" msgstr "" -#: ../../Zotlabs/Module/Settings/Account.php:119 -#: ../../Zotlabs/Module/Settings/Channel.php:483 -msgid "Email Address:" +#: ../../Zotlabs/Module/Settings/Account.php:120 +#: ../../Zotlabs/Module/Removeaccount.php:61 +msgid "Remove Account" msgstr "" #: ../../Zotlabs/Module/Settings/Account.php:121 msgid "Remove this account including all its channels" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:251 -#: ../../extend/addon/addon/logrot/logrot.php:54 -#: ../../extend/addon/addon/msgfooter/msgfooter.php:54 -#: ../../extend/addon/addon/openstreetmap/openstreetmap.php:184 -#: ../../extend/addon/addon/piwik/piwik.php:116 -#: ../../extend/addon/addon/twitter/twitter.php:766 -#: ../../extend/addon/addon/xmpp/xmpp.php:102 -#: ../../extend/addon/addon/rendezvous/rendezvous.php:82 -msgid "Settings updated." -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:312 -msgid "Nobody except yourself" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:313 -msgid "Only those you specifically allow" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:314 -msgid "Approved connections" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:315 -msgid "Any connections" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:316 -msgid "Anybody on this website" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:317 -msgid "Anybody in this network" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:318 -msgid "Anybody authenticated" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:319 -msgid "Anybody on the internet" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:395 -msgid "Publish your default profile in the network directory" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:400 -msgid "Allow us to suggest you as a potential friend to new members?" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:409 -msgid "Your channel address is" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:412 -msgid "Your files/photos are accessible via WebDAV at" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:474 -msgid "Channel Settings" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:481 -msgid "Basic Settings" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:482 -#: ../../include/channel.php:1271 -msgid "Full Name:" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:484 -msgid "Your Timezone:" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:485 -msgid "Default Post Location:" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:485 -msgid "Geographical location to display on your posts" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:486 -msgid "Use Browser Location:" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:488 -msgid "Adult Content" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:488 -msgid "" -"This channel frequently or regularly publishes adult content. (Please tag " -"any adult material and/or nudity with #NSFW)" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:490 -msgid "Security and Privacy Settings" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:492 -msgid "Your permissions are already configured. Click to view/adjust" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:494 -msgid "Hide my online presence" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:494 -msgid "Prevents displaying in your profile that you are online" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:496 -msgid "Simple Privacy Settings:" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:497 -msgid "" -"Very Public - extremely permissive (should be used with caution)" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:498 -msgid "" -"Typical - default public, privacy when desired (similar to social " -"network permissions but with improved privacy)" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:499 -msgid "Private - default private, never open or public" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:500 -msgid "Blocked - default blocked to/from everybody" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:502 -msgid "Allow others to tag your posts" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:502 -msgid "" -"Often used by the community to retro-actively flag inappropriate content" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:504 -msgid "Channel Permission Limits" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:506 -msgid "Expire other channel content after this many days" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:506 -msgid "0 or blank to use the website limit." -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:506 -#, php-format -msgid "This website expires after %d days." -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:506 -msgid "This website does not expire imported content." -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:506 -msgid "The website limit takes precedence if lower than your limit." -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:507 -msgid "Maximum Friend Requests/Day:" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:507 -msgid "May reduce spam activity" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:508 -msgid "Default Access Control List (ACL)" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:510 -msgid "Use my default audience setting for the type of object published" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:517 -msgid "Channel permissions category:" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:518 -msgid "Default Permissions Group" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:524 -msgid "Maximum private messages per day from unknown people:" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:524 -msgid "Useful to reduce spamming" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:527 -msgid "Notification Settings" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:528 -msgid "By default post a status message when:" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:529 -msgid "accepting a friend request" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:530 -msgid "joining a forum/community" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:531 -msgid "making an interesting profile change" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:532 -msgid "Send a notification email when:" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:533 -msgid "You receive a connection request" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:534 -msgid "Your connections are confirmed" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:535 -msgid "Someone writes on your profile wall" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:536 -msgid "Someone writes a followup comment" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:537 -msgid "You receive a private message" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:538 -msgid "You receive a friend suggestion" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:539 -msgid "You are tagged in a post" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:540 -msgid "You are poked/prodded/etc. in a post" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:542 -msgid "Someone likes your post/comment" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:545 -msgid "Show visual notifications including:" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:547 -msgid "Unseen grid activity" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:548 -msgid "Unseen channel activity" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:549 -msgid "Unseen private messages" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:549 -#: ../../Zotlabs/Module/Settings/Channel.php:554 -#: ../../Zotlabs/Module/Settings/Channel.php:555 -#: ../../Zotlabs/Module/Settings/Channel.php:556 -#: ../../extend/addon/addon/jappixmini/jappixmini.php:343 -msgid "Recommended" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:550 -msgid "Upcoming events" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:551 -msgid "Events today" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:552 -msgid "Upcoming birthdays" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:552 -msgid "Not available in all themes" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:553 -msgid "System (personal) notifications" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:554 -msgid "System info messages" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:555 -msgid "System critical alerts" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:556 -msgid "New connections" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:557 -msgid "System Registrations" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:558 -msgid "" -"Also show new wall posts, private messages and connections under Notices" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:560 -msgid "Notify me of events this many days in advance" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:560 -msgid "Must be greater than 0" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:566 -msgid "Advanced Account/Page Type Settings" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:567 -msgid "Change the behaviour of this account for special situations" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:569 -msgid "Miscellaneous Settings" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:570 -msgid "Default photo upload folder" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:570 -#: ../../Zotlabs/Module/Settings/Channel.php:571 -msgid "%Y - current year, %m - current month" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:571 -msgid "Default file upload folder" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:573 -msgid "Personal menu to display in your channel pages" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:575 -msgid "Remove this channel." -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:576 -msgid "Firefox Share $Projectname provider" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:577 -msgid "Start calendar week on Monday" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Featured.php:20 +#: ../../Zotlabs/Module/Settings/Featured.php:21 msgid "Affinity Slider settings updated." msgstr "" -#: ../../Zotlabs/Module/Settings/Featured.php:34 +#: ../../Zotlabs/Module/Settings/Featured.php:36 msgid "No feature settings configured" msgstr "" -#: ../../Zotlabs/Module/Settings/Featured.php:41 +#: ../../Zotlabs/Module/Settings/Featured.php:43 msgid "Default maximum affinity level" msgstr "" -#: ../../Zotlabs/Module/Settings/Featured.php:46 +#: ../../Zotlabs/Module/Settings/Featured.php:48 msgid "Default minimum affinity level" msgstr "" -#: ../../Zotlabs/Module/Settings/Featured.php:50 +#: ../../Zotlabs/Module/Settings/Featured.php:52 msgid "Affinity Slider Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Featured.php:60 +#: ../../Zotlabs/Module/Settings/Featured.php:62 msgid "Feature/Addon Settings" msgstr "" @@ -6727,78 +3909,104 @@ msgstr "" msgid "Grid page max height of content (in pixels)" msgstr "" -#: ../../Zotlabs/Module/Settings/Tokens.php:31 -#, php-format -msgid "This channel is limited to %d tokens" +#: ../../Zotlabs/Module/Settings/Oauth.php:34 +msgid "Name is required" msgstr "" -#: ../../Zotlabs/Module/Settings/Tokens.php:37 -msgid "Name and Password are required." +#: ../../Zotlabs/Module/Settings/Oauth.php:38 +msgid "Key and Secret are required" msgstr "" -#: ../../Zotlabs/Module/Settings/Tokens.php:77 -msgid "Token saved." +#: ../../Zotlabs/Module/Settings/Oauth.php:86 +#: ../../Zotlabs/Module/Settings/Oauth.php:112 +#: ../../Zotlabs/Module/Settings/Oauth.php:148 +msgid "Add application" msgstr "" -#: ../../Zotlabs/Module/Settings/Tokens.php:113 +#: ../../Zotlabs/Module/Settings/Oauth.php:89 +msgid "Name of application" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Oauth.php:90 +#: ../../Zotlabs/Module/Settings/Oauth.php:116 +#: ../../addon/statusnet/statusnet.php:893 ../../addon/twitter/twitter.php:775 +msgid "Consumer Key" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Oauth.php:90 +#: ../../Zotlabs/Module/Settings/Oauth.php:91 +msgid "Automatically generated - change if desired. Max length 20" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Oauth.php:91 +#: ../../Zotlabs/Module/Settings/Oauth.php:117 +#: ../../addon/statusnet/statusnet.php:892 ../../addon/twitter/twitter.php:776 +msgid "Consumer Secret" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Oauth.php:92 +#: ../../Zotlabs/Module/Settings/Oauth.php:118 +msgid "Redirect" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Oauth.php:92 msgid "" -"Use this form to create temporary access identifiers to share things with " -"non-members. These identities may be used in Access Control Lists and " -"visitors may login using these credentials to access private content." +"Redirect URI - leave blank unless your application specifically requires this" msgstr "" -#: ../../Zotlabs/Module/Settings/Tokens.php:115 -msgid "" -"You may also provide dropbox style access links to friends and " -"associates by adding the Login Password to any specific site URL as shown. " -"Examples:" +#: ../../Zotlabs/Module/Settings/Oauth.php:93 +#: ../../Zotlabs/Module/Settings/Oauth.php:119 +msgid "Icon url" msgstr "" -#: ../../Zotlabs/Module/Settings/Tokens.php:150 -#: ../../Zotlabs/Widget/Settings_menu.php:92 -msgid "Guest Access Tokens" +#: ../../Zotlabs/Module/Settings/Oauth.php:93 +#: ../../Zotlabs/Module/Sources.php:112 ../../Zotlabs/Module/Sources.php:147 +msgid "Optional" msgstr "" -#: ../../Zotlabs/Module/Settings/Tokens.php:157 -msgid "Login Name" +#: ../../Zotlabs/Module/Settings/Oauth.php:104 +msgid "Application not found." msgstr "" -#: ../../Zotlabs/Module/Settings/Tokens.php:158 -msgid "Login Password" +#: ../../Zotlabs/Module/Settings/Oauth.php:147 +msgid "Connected Apps" msgstr "" -#: ../../Zotlabs/Module/Settings/Tokens.php:159 -msgid "Expires (yyyy-mm-dd)" +#: ../../Zotlabs/Module/Settings/Oauth.php:151 +msgid "Client key starts with" msgstr "" -#: ../../Zotlabs/Module/Settings/Permcats.php:37 -msgid "Permission category saved." +#: ../../Zotlabs/Module/Settings/Oauth.php:152 +msgid "No name" msgstr "" -#: ../../Zotlabs/Module/Settings/Permcats.php:61 -msgid "" -"Use this form to create permission rules for various classes of people or " -"connections." +#: ../../Zotlabs/Module/Settings/Oauth.php:153 +msgid "Remove authorization" msgstr "" -#: ../../Zotlabs/Module/Settings/Permcats.php:94 -msgid "Permission Categories" +#: ../../Zotlabs/Module/Embedphotos.php:140 ../../Zotlabs/Module/Photos.php:753 +#: ../../Zotlabs/Module/Photos.php:1292 ../../Zotlabs/Widget/Portfolio.php:78 +#: ../../Zotlabs/Widget/Album.php:78 +msgid "View Photo" msgstr "" -#: ../../Zotlabs/Module/Settings/Permcats.php:102 -msgid "Permission Name" +#: ../../Zotlabs/Module/Embedphotos.php:156 ../../Zotlabs/Module/Photos.php:784 +#: ../../Zotlabs/Widget/Portfolio.php:97 ../../Zotlabs/Widget/Album.php:95 +msgid "Edit Album" msgstr "" -#: ../../Zotlabs/Module/Tagrm.php:48 ../../Zotlabs/Module/Tagrm.php:98 -msgid "Tag removed" +#: ../../Zotlabs/Module/Embedphotos.php:158 ../../Zotlabs/Module/Photos.php:786 +#: ../../Zotlabs/Module/Photos.php:1323 +#: ../../Zotlabs/Module/Profile_photo.php:423 +#: ../../Zotlabs/Module/Cover_photo.php:361 +#: ../../Zotlabs/Storage/Browser.php:230 ../../Zotlabs/Storage/Browser.php:337 +#: ../../Zotlabs/Widget/Cdav.php:132 ../../Zotlabs/Widget/Cdav.php:168 +#: ../../Zotlabs/Widget/Portfolio.php:99 ../../Zotlabs/Widget/Album.php:97 +msgid "Upload" msgstr "" -#: ../../Zotlabs/Module/Tagrm.php:123 -msgid "Remove Item Tag" -msgstr "" - -#: ../../Zotlabs/Module/Tagrm.php:125 -msgid "Select a tag to remove: " +#: ../../Zotlabs/Module/Achievements.php:38 +msgid "Some blurb about what to do when you're new here" msgstr "" #: ../../Zotlabs/Module/Thing.php:114 @@ -6854,16 +4062,1565 @@ msgstr "" msgid "URL for photo of thing (optional)" msgstr "" +#: ../../Zotlabs/Module/Thing.php:313 ../../Zotlabs/Module/Thing.php:363 +#: ../../Zotlabs/Module/Photos.php:649 ../../Zotlabs/Module/Photos.php:1013 +#: ../../Zotlabs/Module/Connedit.php:672 ../../Zotlabs/Module/Chat.php:235 +#: ../../Zotlabs/Module/Filestorage.php:142 ../../include/acl_selectors.php:218 +msgid "Permissions" +msgstr "" + #: ../../Zotlabs/Module/Thing.php:353 msgid "Add Thing to your Profile" msgstr "" -#: ../../Zotlabs/Module/Tagger.php:55 ../../include/bbcode.php:334 +#: ../../Zotlabs/Module/Notify.php:57 ../../Zotlabs/Module/Notifications.php:38 +msgid "No more system notifications." +msgstr "" + +#: ../../Zotlabs/Module/Notify.php:61 ../../Zotlabs/Module/Notifications.php:42 +msgid "System Notifications" +msgstr "" + +#: ../../Zotlabs/Module/Follow.php:31 +msgid "Channel added." +msgstr "" + +#: ../../Zotlabs/Module/Import.php:143 +#, php-format +msgid "Your service plan only allows %d channels." +msgstr "" + +#: ../../Zotlabs/Module/Import.php:157 +msgid "No channel. Import failed." +msgstr "" + +#: ../../Zotlabs/Module/Import.php:470 +#: ../../addon/diaspora/import_diaspora.php:142 +msgid "Import completed." +msgstr "" + +#: ../../Zotlabs/Module/Import.php:498 +msgid "You must be logged in to use this feature." +msgstr "" + +#: ../../Zotlabs/Module/Import.php:503 +msgid "Import Channel" +msgstr "" + +#: ../../Zotlabs/Module/Import.php:504 +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:506 +msgid "Or provide the old server/hub details" +msgstr "" + +#: ../../Zotlabs/Module/Import.php:507 +msgid "Your old identity address (xyz@example.com)" +msgstr "" + +#: ../../Zotlabs/Module/Import.php:508 +msgid "Your old login email address" +msgstr "" + +#: ../../Zotlabs/Module/Import.php:509 +msgid "Your old login password" +msgstr "" + +#: ../../Zotlabs/Module/Import.php:510 +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:511 +msgid "Make this hub my primary location" +msgstr "" + +#: ../../Zotlabs/Module/Import.php:512 +msgid "Move this channel (disable all previous locations)" +msgstr "" + +#: ../../Zotlabs/Module/Import.php:513 +msgid "Import a few months of posts if possible (limited by available memory" +msgstr "" + +#: ../../Zotlabs/Module/Import.php:514 +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/Rmagic.php:35 +msgid "Authentication failed." +msgstr "" + +#: ../../Zotlabs/Module/Rmagic.php:75 ../../include/channel.php:2102 +msgid "Remote Authentication" +msgstr "" + +#: ../../Zotlabs/Module/Rmagic.php:76 ../../include/channel.php:2103 +msgid "Enter your channel address (e.g. channel@example.com)" +msgstr "" + +#: ../../Zotlabs/Module/Rmagic.php:77 ../../include/channel.php:2104 +msgid "Authenticate" +msgstr "" + +#: ../../Zotlabs/Module/Cal.php:62 ../../Zotlabs/Module/Chanview.php:96 +#: ../../Zotlabs/Module/Page.php:75 ../../Zotlabs/Module/Wall_upload.php:31 +#: ../../Zotlabs/Module/Block.php:41 +msgid "Channel not found." +msgstr "" + +#: ../../Zotlabs/Module/Cal.php:69 +msgid "Permissions denied." +msgstr "" + +#: ../../Zotlabs/Module/Cal.php:342 ../../include/text.php:2304 +msgid "Import" +msgstr "" + +#: ../../Zotlabs/Module/Api.php:72 ../../Zotlabs/Module/Api.php:93 +msgid "Authorize application connection" +msgstr "" + +#: ../../Zotlabs/Module/Api.php:73 +msgid "Return to your app and insert this Security Code:" +msgstr "" + +#: ../../Zotlabs/Module/Api.php:83 +msgid "Please login to continue." +msgstr "" + +#: ../../Zotlabs/Module/Api.php:95 +msgid "" +"Do you want to authorize this application to access your posts and contacts, " +"and/or create new posts for you?" +msgstr "" + +#: ../../Zotlabs/Module/Attach.php:13 +msgid "Item not available." +msgstr "" + +#: ../../Zotlabs/Module/Editblock.php:116 ../../Zotlabs/Module/Chat.php:207 +#: ../../Zotlabs/Module/Editwebpage.php:143 ../../Zotlabs/Module/Mail.php:288 +#: ../../Zotlabs/Module/Mail.php:430 ../../include/conversation.php:1225 +msgid "Insert web link" +msgstr "" + +#: ../../Zotlabs/Module/Editblock.php:129 ../../include/conversation.php:1336 +msgid "Title (optional)" +msgstr "" + +#: ../../Zotlabs/Module/Editblock.php:138 +msgid "Edit Block" +msgstr "" + +#: ../../Zotlabs/Module/Profile.php:93 +msgid "vcard" +msgstr "" + +#: ../../Zotlabs/Module/Apps.php:45 ../../Zotlabs/Lib/Apps.php:224 +msgid "Apps" +msgstr "" + +#: ../../Zotlabs/Module/Apps.php:48 +msgid "Manage apps" +msgstr "" + +#: ../../Zotlabs/Module/Apps.php:49 +msgid "Create new app" +msgstr "" + +#: ../../Zotlabs/Module/Mood.php:67 ../../include/conversation.php:256 +#, php-format +msgctxt "mood" +msgid "%1$s is %2$s" +msgstr "" + +#: ../../Zotlabs/Module/Mood.php:120 ../../Zotlabs/Module/Mood.php:135 +#: ../../Zotlabs/Lib/Apps.php:247 +msgid "Mood" +msgstr "" + +#: ../../Zotlabs/Module/Mood.php:136 +msgid "Set your current mood and tell your friends" +msgstr "" + +#: ../../Zotlabs/Module/Connections.php:33 +#: ../../Zotlabs/Module/Connections.php:309 ../../Zotlabs/Lib/Apps.php:229 +#: ../../include/text.php:951 ../../include/nav.php:180 +msgid "Connections" +msgstr "" + +#: ../../Zotlabs/Module/Connections.php:54 +#: ../../Zotlabs/Module/Connections.php:156 +#: ../../Zotlabs/Module/Connections.php:245 +msgid "Blocked" +msgstr "" + +#: ../../Zotlabs/Module/Connections.php:59 +#: ../../Zotlabs/Module/Connections.php:163 +#: ../../Zotlabs/Module/Connections.php:244 +msgid "Ignored" +msgstr "" + +#: ../../Zotlabs/Module/Connections.php:64 +#: ../../Zotlabs/Module/Connections.php:177 +#: ../../Zotlabs/Module/Connections.php:243 +msgid "Hidden" +msgstr "" + +#: ../../Zotlabs/Module/Connections.php:69 +#: ../../Zotlabs/Module/Connections.php:170 +msgid "Archived/Unreachable" +msgstr "" + +#: ../../Zotlabs/Module/Connections.php:74 +#: ../../Zotlabs/Module/Connections.php:83 ../../Zotlabs/Module/Menu.php:116 +#: ../../include/conversation.php:1663 +msgid "New" +msgstr "" + +#: ../../Zotlabs/Module/Connections.php:88 +#: ../../Zotlabs/Module/Connections.php:102 +#: ../../Zotlabs/Module/Connedit.php:709 ../../Zotlabs/Widget/Affinity.php:30 +msgid "All" +msgstr "" + +#: ../../Zotlabs/Module/Connections.php:133 +msgid "New Connections" +msgstr "" + +#: ../../Zotlabs/Module/Connections.php:136 +msgid "Show pending (new) connections" +msgstr "" + +#: ../../Zotlabs/Module/Connections.php:143 +msgid "Show all connections" +msgstr "" + +#: ../../Zotlabs/Module/Connections.php:159 +msgid "Only show blocked connections" +msgstr "" + +#: ../../Zotlabs/Module/Connections.php:166 +msgid "Only show ignored connections" +msgstr "" + +#: ../../Zotlabs/Module/Connections.php:173 +msgid "Only show archived/unreachable connections" +msgstr "" + +#: ../../Zotlabs/Module/Connections.php:180 +msgid "Only show hidden connections" +msgstr "" + +#: ../../Zotlabs/Module/Connections.php:241 +msgid "Pending approval" +msgstr "" + +#: ../../Zotlabs/Module/Connections.php:242 +msgid "Archived" +msgstr "" + +#: ../../Zotlabs/Module/Connections.php:246 +msgid "Not connected at this location" +msgstr "" + +#: ../../Zotlabs/Module/Connections.php:258 +#, php-format +msgid "%1$s [%2$s]" +msgstr "" + +#: ../../Zotlabs/Module/Connections.php:259 +msgid "Edit connection" +msgstr "" + +#: ../../Zotlabs/Module/Connections.php:261 +msgid "Delete connection" +msgstr "" + +#: ../../Zotlabs/Module/Connections.php:270 +msgid "Channel address" +msgstr "" + +#: ../../Zotlabs/Module/Connections.php:272 +msgid "Network" +msgstr "" + +#: ../../Zotlabs/Module/Connections.php:275 +msgid "Call" +msgstr "" + +#: ../../Zotlabs/Module/Connections.php:277 +msgid "Status" +msgstr "" + +#: ../../Zotlabs/Module/Connections.php:279 +msgid "Connected" +msgstr "" + +#: ../../Zotlabs/Module/Connections.php:281 +msgid "Approve connection" +msgstr "" + +#: ../../Zotlabs/Module/Connections.php:283 +msgid "Ignore connection" +msgstr "" + +#: ../../Zotlabs/Module/Connections.php:284 +#: ../../Zotlabs/Module/Connedit.php:626 +msgid "Ignore" +msgstr "" + +#: ../../Zotlabs/Module/Connections.php:285 +msgid "Recent activity" +msgstr "" + +#: ../../Zotlabs/Module/Connections.php:314 +msgid "Search your connections" +msgstr "" + +#: ../../Zotlabs/Module/Connections.php:315 +msgid "Connections search" +msgstr "" + +#: ../../Zotlabs/Module/Connections.php:316 +#: ../../Zotlabs/Module/Directory.php:391 +#: ../../Zotlabs/Module/Directory.php:396 ../../include/contact_widgets.php:23 +msgid "Find" +msgstr "" + +#: ../../Zotlabs/Module/Viewsrc.php:43 +msgid "item" +msgstr "" + +#: ../../Zotlabs/Module/Viewsrc.php:55 +msgid "Source of Item" +msgstr "" + +#: ../../Zotlabs/Module/Bookmarks.php:11 ../../Zotlabs/Lib/Apps.php:227 +msgid "View Bookmarks" +msgstr "" + +#: ../../Zotlabs/Module/Bookmarks.php:56 +msgid "Bookmark added" +msgstr "" + +#: ../../Zotlabs/Module/Bookmarks.php:79 +msgid "My Bookmarks" +msgstr "" + +#: ../../Zotlabs/Module/Bookmarks.php:90 +msgid "My Connections Bookmarks" +msgstr "" + +#: ../../Zotlabs/Module/Removeaccount.php:35 +msgid "" +"Account removals are not allowed within 48 hours of changing the account " +"password." +msgstr "" + +#: ../../Zotlabs/Module/Removeaccount.php:57 +msgid "Remove This Account" +msgstr "" + +#: ../../Zotlabs/Module/Removeaccount.php:58 +msgid "" +"This account and all its channels will be completely removed from the " +"network. " +msgstr "" + +#: ../../Zotlabs/Module/Removeaccount.php:60 +msgid "" +"Remove this account, all its channels and all its channel clones from the " +"network" +msgstr "" + +#: ../../Zotlabs/Module/Removeaccount.php:60 +msgid "" +"By default only the instances of the channels located on this hub will be " +"removed from the network" +msgstr "" + +#: ../../Zotlabs/Module/Photos.php:78 +msgid "Page owner information could not be retrieved." +msgstr "" + +#: ../../Zotlabs/Module/Photos.php:94 ../../Zotlabs/Module/Photos.php:120 +msgid "Album not found." +msgstr "" + +#: ../../Zotlabs/Module/Photos.php:103 +msgid "Delete Album" +msgstr "" + +#: ../../Zotlabs/Module/Photos.php:174 ../../Zotlabs/Module/Photos.php:1025 +msgid "Delete Photo" +msgstr "" + +#: ../../Zotlabs/Module/Photos.php:501 +msgid "No photos selected" +msgstr "" + +#: ../../Zotlabs/Module/Photos.php:550 +msgid "Access to this item is restricted." +msgstr "" + +#: ../../Zotlabs/Module/Photos.php:558 ../../Zotlabs/Module/Fbrowser.php:29 +#: ../../Zotlabs/Lib/Apps.php:242 ../../include/conversation.php:1780 +#: ../../include/nav.php:378 +msgid "Photos" +msgstr "" + +#: ../../Zotlabs/Module/Photos.php:593 +#, php-format +msgid "%1$.2f MB of %2$.2f MB photo storage used." +msgstr "" + +#: ../../Zotlabs/Module/Photos.php:596 +#, php-format +msgid "%1$.2f MB photo storage used." +msgstr "" + +#: ../../Zotlabs/Module/Photos.php:638 +msgid "Upload Photos" +msgstr "" + +#: ../../Zotlabs/Module/Photos.php:642 +msgid "Enter an album name" +msgstr "" + +#: ../../Zotlabs/Module/Photos.php:643 +msgid "or select an existing album (doubleclick)" +msgstr "" + +#: ../../Zotlabs/Module/Photos.php:644 +msgid "Create a status post for this upload" +msgstr "" + +#: ../../Zotlabs/Module/Photos.php:645 +msgid "Caption (optional):" +msgstr "" + +#: ../../Zotlabs/Module/Photos.php:646 +msgid "Description (optional):" +msgstr "" + +#: ../../Zotlabs/Module/Photos.php:727 +msgid "Show Newest First" +msgstr "" + +#: ../../Zotlabs/Module/Photos.php:729 +msgid "Show Oldest First" +msgstr "" + +#: ../../Zotlabs/Module/Photos.php:834 +msgid "Permission denied. Access to this item may be restricted." +msgstr "" + +#: ../../Zotlabs/Module/Photos.php:836 +msgid "Photo not available" +msgstr "" + +#: ../../Zotlabs/Module/Photos.php:894 +msgid "Use as profile photo" +msgstr "" + +#: ../../Zotlabs/Module/Photos.php:895 +msgid "Use as cover photo" +msgstr "" + +#: ../../Zotlabs/Module/Photos.php:902 +msgid "Private Photo" +msgstr "" + +#: ../../Zotlabs/Module/Photos.php:917 +msgid "View Full Size" +msgstr "" + +#: ../../Zotlabs/Module/Photos.php:999 +msgid "Edit photo" +msgstr "" + +#: ../../Zotlabs/Module/Photos.php:1001 +msgid "Rotate CW (right)" +msgstr "" + +#: ../../Zotlabs/Module/Photos.php:1002 +msgid "Rotate CCW (left)" +msgstr "" + +#: ../../Zotlabs/Module/Photos.php:1005 +msgid "Move photo to album" +msgstr "" + +#: ../../Zotlabs/Module/Photos.php:1006 +msgid "Enter a new album name" +msgstr "" + +#: ../../Zotlabs/Module/Photos.php:1007 +msgid "or select an existing one (doubleclick)" +msgstr "" + +#: ../../Zotlabs/Module/Photos.php:1010 +msgid "Caption" +msgstr "" + +#: ../../Zotlabs/Module/Photos.php:1012 +msgid "Add a Tag" +msgstr "" + +#: ../../Zotlabs/Module/Photos.php:1020 +msgid "Example: @bob, @Barbara_Jensen, @jim@example.com" +msgstr "" + +#: ../../Zotlabs/Module/Photos.php:1023 +msgid "Flag as adult in album view" +msgstr "" + +#: ../../Zotlabs/Module/Photos.php:1042 ../../Zotlabs/Lib/ThreadItem.php:267 +msgid "I like this (toggle)" +msgstr "" + +#: ../../Zotlabs/Module/Photos.php:1043 ../../Zotlabs/Lib/ThreadItem.php:268 +msgid "I don't like this (toggle)" +msgstr "" + +#: ../../Zotlabs/Module/Photos.php:1045 ../../Zotlabs/Lib/ThreadItem.php:410 +#: ../../include/conversation.php:736 +msgid "Please wait" +msgstr "" + +#: ../../Zotlabs/Module/Photos.php:1061 ../../Zotlabs/Module/Photos.php:1179 +#: ../../Zotlabs/Lib/ThreadItem.php:727 +msgid "This is you" +msgstr "" + +#: ../../Zotlabs/Module/Photos.php:1063 ../../Zotlabs/Module/Photos.php:1181 +#: ../../Zotlabs/Lib/ThreadItem.php:729 ../../include/js_strings.php:6 +msgid "Comment" +msgstr "" + +#: ../../Zotlabs/Module/Photos.php:1079 ../../include/conversation.php:569 +msgctxt "title" +msgid "Likes" +msgstr "" + +#: ../../Zotlabs/Module/Photos.php:1079 ../../include/conversation.php:569 +msgctxt "title" +msgid "Dislikes" +msgstr "" + +#: ../../Zotlabs/Module/Photos.php:1080 ../../include/conversation.php:570 +msgctxt "title" +msgid "Agree" +msgstr "" + +#: ../../Zotlabs/Module/Photos.php:1080 ../../include/conversation.php:570 +msgctxt "title" +msgid "Disagree" +msgstr "" + +#: ../../Zotlabs/Module/Photos.php:1080 ../../include/conversation.php:570 +msgctxt "title" +msgid "Abstain" +msgstr "" + +#: ../../Zotlabs/Module/Photos.php:1081 ../../include/conversation.php:571 +msgctxt "title" +msgid "Attending" +msgstr "" + +#: ../../Zotlabs/Module/Photos.php:1081 ../../include/conversation.php:571 +msgctxt "title" +msgid "Not attending" +msgstr "" + +#: ../../Zotlabs/Module/Photos.php:1081 ../../include/conversation.php:571 +msgctxt "title" +msgid "Might attend" +msgstr "" + +#: ../../Zotlabs/Module/Photos.php:1098 ../../Zotlabs/Module/Photos.php:1110 +#: ../../Zotlabs/Lib/ThreadItem.php:187 ../../Zotlabs/Lib/ThreadItem.php:199 +msgid "View all" +msgstr "" + +#: ../../Zotlabs/Module/Photos.php:1102 ../../Zotlabs/Lib/ThreadItem.php:191 +#: ../../include/conversation.php:1904 ../../include/channel.php:1391 +#: ../../include/taxonomy.php:442 +msgctxt "noun" +msgid "Like" +msgid_plural "Likes" +msgstr[0] "" +msgstr[1] "" + +#: ../../Zotlabs/Module/Photos.php:1107 ../../Zotlabs/Lib/ThreadItem.php:196 +#: ../../include/conversation.php:1907 +msgctxt "noun" +msgid "Dislike" +msgid_plural "Dislikes" +msgstr[0] "" +msgstr[1] "" + +#: ../../Zotlabs/Module/Photos.php:1207 +msgid "Photo Tools" +msgstr "" + +#: ../../Zotlabs/Module/Photos.php:1216 +msgid "In This Photo:" +msgstr "" + +#: ../../Zotlabs/Module/Photos.php:1221 +msgid "Map" +msgstr "" + +#: ../../Zotlabs/Module/Photos.php:1229 ../../Zotlabs/Lib/ThreadItem.php:399 +msgctxt "noun" +msgid "Likes" +msgstr "" + +#: ../../Zotlabs/Module/Photos.php:1230 ../../Zotlabs/Lib/ThreadItem.php:400 +msgctxt "noun" +msgid "Dislikes" +msgstr "" + +#: ../../Zotlabs/Module/Photos.php:1235 ../../Zotlabs/Lib/ThreadItem.php:405 +#: ../../include/acl_selectors.php:220 +msgid "Close" +msgstr "" + +#: ../../Zotlabs/Module/Photos.php:1307 ../../Zotlabs/Module/Photos.php:1320 +#: ../../Zotlabs/Module/Photos.php:1321 ../../include/photos.php:526 +msgid "Recent Photos" +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:30 +msgid "Profile Unavailable." +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:44 ../../addon/gitwiki/Mod_Gitwiki.php:42 +msgid "Not found" +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:68 ../../addon/gitwiki/Mod_Gitwiki.php:62 +msgid "Invalid channel" +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:79 ../../Zotlabs/Lib/Apps.php:239 +#: ../../include/conversation.php:1854 ../../include/features.php:95 +#: ../../include/nav.php:451 +msgid "Wiki" +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:162 ../../addon/gitwiki/Mod_Gitwiki.php:146 +#: ../../include/conversation.php:1851 ../../include/nav.php:448 +msgid "Wikis" +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:168 ../../addon/gitwiki/Mod_Gitwiki.php:152 +msgid "Download" +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:170 ../../Zotlabs/Module/Chat.php:256 +#: ../../Zotlabs/Module/Profiles.php:834 ../../Zotlabs/Module/Manage.php:145 +#: ../../addon/gitwiki/Mod_Gitwiki.php:154 +msgid "Create New" +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:172 ../../addon/gitwiki/Mod_Gitwiki.php:156 +msgid "Wiki name" +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:173 ../../addon/gitwiki/Mod_Gitwiki.php:157 +msgid "Content type" +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:175 ../../Zotlabs/Storage/Browser.php:235 +#: ../../addon/gitwiki/Mod_Gitwiki.php:159 +msgid "Type" +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:182 ../../addon/gitwiki/Mod_Gitwiki.php:166 +msgid "Create a status post for this wiki" +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:224 ../../addon/gitwiki/Mod_Gitwiki.php:185 +msgid "Wiki not found" +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:248 ../../addon/gitwiki/Mod_Gitwiki.php:210 +msgid "Rename page" +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:258 ../../addon/gitwiki/Mod_Gitwiki.php:214 +msgid "Error retrieving page content" +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:264 +msgid "New page" +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:288 ../../addon/gitwiki/Mod_Gitwiki.php:242 +msgid "Revision Comparison" +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:289 ../../addon/gitwiki/Mod_Gitwiki.php:243 +msgid "Revert" +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:293 +msgid "Short description of your changes (optional)" +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:300 ../../addon/gitwiki/Mod_Gitwiki.php:252 +msgid "Source" +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:309 ../../addon/gitwiki/Mod_Gitwiki.php:260 +msgid "New page name" +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:314 ../../addon/gitwiki/Mod_Gitwiki.php:265 +#: ../../include/conversation.php:1229 +msgid "Embed image from photo albums" +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:315 ../../addon/gitwiki/Mod_Gitwiki.php:266 +#: ../../include/conversation.php:1323 +msgid "Embed an image from your albums" +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:317 ../../addon/gitwiki/Mod_Gitwiki.php:268 +#: ../../include/conversation.php:1325 ../../include/conversation.php:1372 +msgid "OK" +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:318 ../../addon/gitwiki/Mod_Gitwiki.php:269 +#: ../../include/conversation.php:1265 +msgid "Choose images to embed" +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:319 ../../addon/gitwiki/Mod_Gitwiki.php:270 +#: ../../include/conversation.php:1266 +msgid "Choose an album" +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:320 ../../addon/gitwiki/Mod_Gitwiki.php:271 +msgid "Choose a different album" +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:321 ../../addon/gitwiki/Mod_Gitwiki.php:272 +#: ../../include/conversation.php:1268 +msgid "Error getting album list" +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:322 ../../addon/gitwiki/Mod_Gitwiki.php:273 +#: ../../include/conversation.php:1269 +msgid "Error getting photo link" +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:323 ../../addon/gitwiki/Mod_Gitwiki.php:274 +#: ../../include/conversation.php:1270 +msgid "Error getting album" +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:391 ../../addon/gitwiki/Mod_Gitwiki.php:337 +msgid "Error creating wiki. Invalid name." +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:398 +msgid "A wiki with this name already exists." +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:411 ../../addon/gitwiki/Mod_Gitwiki.php:348 +msgid "Wiki created, but error creating Home page." +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:418 ../../addon/gitwiki/Mod_Gitwiki.php:353 +msgid "Error creating wiki" +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:430 +msgid "Wiki delete permission denied." +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:440 +msgid "Error deleting wiki" +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:466 ../../addon/gitwiki/Mod_Gitwiki.php:400 +msgid "New page created" +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:587 +msgid "Cannot delete Home" +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:651 +msgid "Current Revision" +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:651 +msgid "Selected Revision" +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:701 +msgid "You must be authenticated." +msgstr "" + +#: ../../Zotlabs/Module/Chanview.php:139 +msgid "toggle full screen mode" +msgstr "" + +#: ../../Zotlabs/Module/Pdledit.php:21 +msgid "Layout updated." +msgstr "" + +#: ../../Zotlabs/Module/Pdledit.php:34 ../../Zotlabs/Module/Chat.php:219 +msgid "Feature disabled." +msgstr "" + +#: ../../Zotlabs/Module/Pdledit.php:42 ../../Zotlabs/Module/Pdledit.php:69 +msgid "Edit System Page Description" +msgstr "" + +#: ../../Zotlabs/Module/Pdledit.php:64 +msgid "Layout not found." +msgstr "" + +#: ../../Zotlabs/Module/Pdledit.php:70 +msgid "Module Name:" +msgstr "" + +#: ../../Zotlabs/Module/Pdledit.php:71 +msgid "Layout Help" +msgstr "" + +#: ../../Zotlabs/Module/Poke.php:153 ../../Zotlabs/Module/Poke.php:182 +#: ../../Zotlabs/Lib/Apps.php:248 ../../include/conversation.php:1039 +msgid "Poke" +msgstr "" + +#: ../../Zotlabs/Module/Poke.php:183 +msgid "Poke somebody" +msgstr "" + +#: ../../Zotlabs/Module/Poke.php:186 +msgid "Poke/Prod" +msgstr "" + +#: ../../Zotlabs/Module/Poke.php:187 +msgid "Poke, prod or do other things to somebody" +msgstr "" + +#: ../../Zotlabs/Module/Poke.php:194 +msgid "Recipient" +msgstr "" + +#: ../../Zotlabs/Module/Poke.php:195 +msgid "Choose what you wish to do to recipient" +msgstr "" + +#: ../../Zotlabs/Module/Poke.php:198 ../../Zotlabs/Module/Poke.php:199 +msgid "Make this post private" +msgstr "" + +#: ../../Zotlabs/Module/Profile_photo.php:61 +#: ../../Zotlabs/Module/Cover_photo.php:56 +msgid "Image uploaded but image cropping failed." +msgstr "" + +#: ../../Zotlabs/Module/Profile_photo.php:115 +#: ../../Zotlabs/Module/Profile_photo.php:226 +#: ../../include/photo/photo_driver.php:658 +msgid "Profile Photos" +msgstr "" + +#: ../../Zotlabs/Module/Profile_photo.php:137 +#: ../../Zotlabs/Module/Cover_photo.php:159 +msgid "Image resize failed." +msgstr "" + +#: ../../Zotlabs/Module/Profile_photo.php:196 +#: ../../addon/openclipatar/openclipatar.php:298 +msgid "" +"Shift-reload the page or clear browser cache if the new photo does not " +"display immediately." +msgstr "" + +#: ../../Zotlabs/Module/Profile_photo.php:203 +#: ../../Zotlabs/Module/Cover_photo.php:173 ../../include/photos.php:145 +msgid "Unable to process image" +msgstr "" + +#: ../../Zotlabs/Module/Profile_photo.php:238 +#: ../../Zotlabs/Module/Cover_photo.php:197 +msgid "Image upload failed." +msgstr "" + +#: ../../Zotlabs/Module/Profile_photo.php:257 +#: ../../Zotlabs/Module/Cover_photo.php:214 +msgid "Unable to process image." +msgstr "" + +#: ../../Zotlabs/Module/Profile_photo.php:318 +#: ../../Zotlabs/Module/Profile_photo.php:365 +#: ../../Zotlabs/Module/Cover_photo.php:307 +#: ../../Zotlabs/Module/Cover_photo.php:322 +msgid "Photo not available." +msgstr "" + +#: ../../Zotlabs/Module/Profile_photo.php:420 +#: ../../Zotlabs/Module/Cover_photo.php:358 +msgid "Upload File:" +msgstr "" + +#: ../../Zotlabs/Module/Profile_photo.php:421 +#: ../../Zotlabs/Module/Cover_photo.php:359 +msgid "Select a profile:" +msgstr "" + +#: ../../Zotlabs/Module/Profile_photo.php:422 +msgid "Use Photo for Profile" +msgstr "" + +#: ../../Zotlabs/Module/Profile_photo.php:422 +msgid "Upload Profile Photo" +msgstr "" + +#: ../../Zotlabs/Module/Profile_photo.php:423 +#: ../../addon/openclipatar/openclipatar.php:182 +#: ../../addon/openclipatar/openclipatar.php:194 +msgid "Use" +msgstr "" + +#: ../../Zotlabs/Module/Profile_photo.php:429 +#: ../../Zotlabs/Module/Cover_photo.php:365 +msgid "skip this step" +msgstr "" + +#: ../../Zotlabs/Module/Profile_photo.php:429 +#: ../../Zotlabs/Module/Cover_photo.php:365 +msgid "select a photo from your photo albums" +msgstr "" + +#: ../../Zotlabs/Module/Profile_photo.php:448 +#: ../../Zotlabs/Module/Cover_photo.php:381 +msgid "Crop Image" +msgstr "" + +#: ../../Zotlabs/Module/Profile_photo.php:449 +#: ../../Zotlabs/Module/Cover_photo.php:382 +msgid "Please adjust the image cropping for optimum viewing." +msgstr "" + +#: ../../Zotlabs/Module/Profile_photo.php:451 +#: ../../Zotlabs/Module/Cover_photo.php:384 +msgid "Done Editing" +msgstr "" + +#: ../../Zotlabs/Module/Chatsvc.php:131 +msgid "Away" +msgstr "" + +#: ../../Zotlabs/Module/Chatsvc.php:136 +msgid "Online" +msgstr "" + +#: ../../Zotlabs/Module/Item.php:185 +msgid "Unable to locate original post." +msgstr "" + +#: ../../Zotlabs/Module/Item.php:470 +msgid "Empty post discarded." +msgstr "" + +#: ../../Zotlabs/Module/Item.php:844 +msgid "Duplicate post suppressed." +msgstr "" + +#: ../../Zotlabs/Module/Item.php:989 +msgid "System error. Post not saved." +msgstr "" + +#: ../../Zotlabs/Module/Item.php:1025 +msgid "Your comment is awaiting approval." +msgstr "" + +#: ../../Zotlabs/Module/Item.php:1123 +msgid "Unable to obtain post information from database." +msgstr "" + +#: ../../Zotlabs/Module/Item.php:1130 +#, php-format +msgid "You have reached your limit of %1$.0f top level posts." +msgstr "" + +#: ../../Zotlabs/Module/Item.php:1137 +#, php-format +msgid "You have reached your limit of %1$.0f webpages." +msgstr "" + +#: ../../Zotlabs/Module/Ping.php:280 +msgid "sent you a private message" +msgstr "" + +#: ../../Zotlabs/Module/Ping.php:331 +msgid "added your channel" +msgstr "" + +#: ../../Zotlabs/Module/Ping.php:341 +msgid "g A l F d" +msgstr "" + +#: ../../Zotlabs/Module/Ping.php:359 +msgid "[today]" +msgstr "" + +#: ../../Zotlabs/Module/Ping.php:368 +msgid "posted an event" +msgstr "" + +#: ../../Zotlabs/Module/Page.php:39 ../../Zotlabs/Module/Block.php:29 +msgid "Invalid item." +msgstr "" + +#: ../../Zotlabs/Module/Page.php:128 ../../Zotlabs/Module/Block.php:77 +#: ../../Zotlabs/Module/Display.php:122 +#: ../../Zotlabs/Lib/NativeWikiPage.php:500 ../../Zotlabs/Web/Router.php:146 +#: ../../include/help.php:68 +msgid "Page not found." +msgstr "" + +#: ../../Zotlabs/Module/Page.php:165 +msgid "" +"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod " +"tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, " +"quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo " +"consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse " +"cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat " +"non proident, sunt in culpa qui officia deserunt mollit anim id est laborum." +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:79 +msgid "Could not access contact record." +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:109 +msgid "Could not locate selected profile." +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:246 +msgid "Connection updated." +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:248 +msgid "Failed to update connection record." +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:298 +msgid "is now connected to" +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:423 +msgid "Could not access address book record." +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:471 +msgid "Refresh failed - channel is currently unavailable." +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:486 ../../Zotlabs/Module/Connedit.php:495 +#: ../../Zotlabs/Module/Connedit.php:504 ../../Zotlabs/Module/Connedit.php:513 +#: ../../Zotlabs/Module/Connedit.php:526 +msgid "Unable to set address book parameters." +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:550 +msgid "Connection has been removed." +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:590 ../../Zotlabs/Lib/Apps.php:241 +#: ../../addon/openclipatar/openclipatar.php:57 +#: ../../include/conversation.php:979 ../../include/nav.php:102 +msgid "View Profile" +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:593 +#, php-format +msgid "View %s's profile" +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:597 +msgid "Refresh Permissions" +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:600 +msgid "Fetch updated permissions" +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:604 +msgid "Refresh Photo" +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:607 +msgid "Fetch updated photo" +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:611 +msgid "Recent Activity" +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:614 +msgid "View recent posts and comments" +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:621 +msgid "Block (or Unblock) all communications with this connection" +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:622 +msgid "This connection is blocked!" +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:626 +msgid "Unignore" +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:629 +msgid "Ignore (or Unignore) all inbound communications from this connection" +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:630 +msgid "This connection is ignored!" +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:634 +msgid "Unarchive" +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:634 +msgid "Archive" +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:637 +msgid "" +"Archive (or Unarchive) this connection - mark channel dead but keep content" +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:638 +msgid "This connection is archived!" +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:642 +msgid "Unhide" +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:642 +msgid "Hide" +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:645 +msgid "Hide or Unhide this connection from your other connections" +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:646 +msgid "This connection is hidden!" +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:653 +msgid "Delete this connection" +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:661 +msgid "Fetch Vcard" +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:664 +msgid "Fetch electronic calling card for this connection" +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:675 +msgid "Open Individual Permissions section by default" +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:698 +msgid "Affinity" +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:701 +msgid "Open Set Affinity section by default" +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:705 ../../Zotlabs/Widget/Affinity.php:26 +msgid "Me" +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:706 ../../Zotlabs/Widget/Affinity.php:27 +msgid "Family" +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:708 ../../Zotlabs/Widget/Affinity.php:29 +msgid "Acquaintances" +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:735 +msgid "Filter" +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:738 +msgid "Open Custom Filter section by default" +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:775 +msgid "Approve this connection" +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:775 +msgid "Accept connection to allow communication" +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:780 +msgid "Set Affinity" +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:783 +msgid "Set Profile" +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:786 +msgid "Set Affinity & Profile" +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:851 +msgid "This connection is unreachable from this location." +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:852 +msgid "This connection may be unreachable from other channel locations." +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:854 +msgid "Location independence is not supported by their network." +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:860 +msgid "" +"This connection is unreachable from this location. Location independence is " +"not supported by their network." +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:863 +#: ../../Zotlabs/Widget/Settings_menu.php:109 +msgid "Connection Default Permissions" +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:863 ../../include/items.php:3925 +#, php-format +msgid "Connection: %s" +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:864 +msgid "Apply these permissions automatically" +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:864 +msgid "Connection requests will be approved without your interaction" +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:865 +msgid "Permission role" +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:866 +msgid "Add permission role" +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:873 +msgid "This connection's primary address is" +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:874 +msgid "Available locations:" +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:879 +msgid "" +"The permissions indicated on this page will be applied to all new " +"connections." +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:880 +msgid "Connection Tools" +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:882 +msgid "Slide to adjust your degree of friendship" +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:883 ../../Zotlabs/Module/Rate.php:155 +#: ../../include/js_strings.php:20 +msgid "Rating" +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:884 +msgid "Slide to adjust your rating" +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:885 ../../Zotlabs/Module/Connedit.php:890 +msgid "Optionally explain your rating" +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:887 +msgid "Custom Filter" +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:888 +msgid "Only import posts with this text" +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:888 ../../Zotlabs/Module/Connedit.php:889 +msgid "" +"words one per line or #tags or /patterns/ or lang=xx, leave blank to import " +"all posts" +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:889 +msgid "Do not import posts with this text" +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:891 +msgid "This information is public!" +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:896 +msgid "Connection Pending Approval" +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:901 +#, php-format +msgid "" +"Please choose the profile you would like to display to %s when viewing your " +"profile securely." +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:908 +msgid "" +"Some permissions may be inherited from your channel's privacy settings, 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:909 +msgid "Last update:" +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:918 +msgid "Details" +msgstr "" + +#: ../../Zotlabs/Module/Chat.php:94 ../../Zotlabs/Lib/Apps.php:228 +msgid "My Chatrooms" +msgstr "" + +#: ../../Zotlabs/Module/Chat.php:181 +msgid "Room not found" +msgstr "" + +#: ../../Zotlabs/Module/Chat.php:197 +msgid "Leave Room" +msgstr "" + +#: ../../Zotlabs/Module/Chat.php:198 +msgid "Delete Room" +msgstr "" + +#: ../../Zotlabs/Module/Chat.php:199 +msgid "I am away right now" +msgstr "" + +#: ../../Zotlabs/Module/Chat.php:200 +msgid "I am online" +msgstr "" + +#: ../../Zotlabs/Module/Chat.php:202 +msgid "Bookmark this room" +msgstr "" + +#: ../../Zotlabs/Module/Chat.php:205 ../../Zotlabs/Module/Mail.php:241 +#: ../../Zotlabs/Module/Mail.php:362 ../../include/conversation.php:1260 +msgid "Please enter a link URL:" +msgstr "" + +#: ../../Zotlabs/Module/Chat.php:206 ../../Zotlabs/Module/Mail.php:294 +#: ../../Zotlabs/Module/Mail.php:436 ../../Zotlabs/Lib/ThreadItem.php:742 +#: ../../include/conversation.php:1370 +msgid "Encrypt text" +msgstr "" + +#: ../../Zotlabs/Module/Chat.php:232 +msgid "New Chatroom" +msgstr "" + +#: ../../Zotlabs/Module/Chat.php:233 +msgid "Chatroom name" +msgstr "" + +#: ../../Zotlabs/Module/Chat.php:234 +msgid "Expiration of chats (minutes)" +msgstr "" + +#: ../../Zotlabs/Module/Chat.php:250 +#, php-format +msgid "%1$s's Chatrooms" +msgstr "" + +#: ../../Zotlabs/Module/Chat.php:255 +msgid "No chatrooms available" +msgstr "" + +#: ../../Zotlabs/Module/Chat.php:259 +msgid "Expiration" +msgstr "" + +#: ../../Zotlabs/Module/Chat.php:260 +msgid "min" +msgstr "" + +#: ../../Zotlabs/Module/Fbrowser.php:85 ../../Zotlabs/Lib/Apps.php:237 +#: ../../Zotlabs/Storage/Browser.php:225 ../../Zotlabs/Storage/Browser.php:247 +#: ../../include/conversation.php:1788 ../../include/nav.php:386 +msgid "Files" +msgstr "" + +#: ../../Zotlabs/Module/Menu.php:49 +msgid "Unable to update menu." +msgstr "" + +#: ../../Zotlabs/Module/Menu.php:60 +msgid "Unable to create menu." +msgstr "" + +#: ../../Zotlabs/Module/Menu.php:98 ../../Zotlabs/Module/Menu.php:110 +msgid "Menu Name" +msgstr "" + +#: ../../Zotlabs/Module/Menu.php:98 +msgid "Unique name (not visible on webpage) - required" +msgstr "" + +#: ../../Zotlabs/Module/Menu.php:99 ../../Zotlabs/Module/Menu.php:111 +msgid "Menu Title" +msgstr "" + +#: ../../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:2281 +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/Layouts.php:184 ../../include/text.php:2282 +msgid "Layouts" +msgstr "" + +#: ../../Zotlabs/Module/Layouts.php:186 ../../Zotlabs/Module/Help.php:18 +#: ../../Zotlabs/Lib/Apps.php:245 ../../include/nav.php:157 +#: ../../include/nav.php:264 ../../include/help.php:55 +#: ../../include/help.php:61 +msgid "Help" +msgstr "" + +#: ../../Zotlabs/Module/Layouts.php:186 +msgid "Comanche page description language help" +msgstr "" + +#: ../../Zotlabs/Module/Layouts.php:190 +msgid "Layout Description" +msgstr "" + +#: ../../Zotlabs/Module/Layouts.php:195 +msgid "Download PDL file" +msgstr "" + +#: ../../Zotlabs/Module/Tagger.php:55 ../../include/markdown.php:141 +#: ../../include/bbcode.php:334 msgid "post" msgstr "" -#: ../../Zotlabs/Module/Tagger.php:57 ../../include/text.php:1938 -#: ../../include/conversation.php:146 +#: ../../Zotlabs/Module/Tagger.php:57 ../../include/conversation.php:146 +#: ../../include/text.php:1938 msgid "comment" msgstr "" @@ -6872,6 +5629,1387 @@ msgstr "" msgid "%1$s tagged %2$s's %3$s with %4$s" msgstr "" +#: ../../Zotlabs/Module/Pconfig.php:26 ../../Zotlabs/Module/Pconfig.php:59 +msgid "This setting requires special processing and editing has been blocked." +msgstr "" + +#: ../../Zotlabs/Module/Pconfig.php:48 +msgid "Configuration Editor" +msgstr "" + +#: ../../Zotlabs/Module/Pconfig.php:49 +msgid "" +"Warning: Changing some settings could render your channel inoperable. Please " +"leave this page unless you are comfortable with and knowledgeable about how " +"to correctly use this feature." +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:143 +#: ../../include/items.php:3892 +msgid "Privacy group not found." +msgstr "" + +#: ../../Zotlabs/Module/Group.php:58 +msgid "Privacy group updated." +msgstr "" + +#: ../../Zotlabs/Module/Group.php:92 +msgid "Create a group of channels." +msgstr "" + +#: ../../Zotlabs/Module/Group.php:93 ../../Zotlabs/Module/Group.php:186 +msgid "Privacy group name: " +msgstr "" + +#: ../../Zotlabs/Module/Group.php:95 ../../Zotlabs/Module/Group.php:189 +msgid "Members are visible to other channels" +msgstr "" + +#: ../../Zotlabs/Module/Group.php:113 +msgid "Privacy group removed." +msgstr "" + +#: ../../Zotlabs/Module/Group.php:115 +msgid "Unable to remove privacy group." +msgstr "" + +#: ../../Zotlabs/Module/Group.php:185 +msgid "Privacy group editor" +msgstr "" + +#: ../../Zotlabs/Module/Group.php:199 ../../Zotlabs/Module/Help.php:81 +msgid "Members" +msgstr "" + +#: ../../Zotlabs/Module/Group.php:201 +msgid "All Connected Channels" +msgstr "" + +#: ../../Zotlabs/Module/Group.php:233 +msgid "Click on a channel to add or remove." +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:24 ../../Zotlabs/Module/Profiles.php:184 +#: ../../Zotlabs/Module/Profiles.php:241 ../../Zotlabs/Module/Profiles.php:659 +msgid "Profile not found." +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:44 +msgid "Profile deleted." +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:68 ../../Zotlabs/Module/Profiles.php:105 +msgid "Profile-" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:90 ../../Zotlabs/Module/Profiles.php:127 +msgid "New profile created." +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:111 +msgid "Profile unavailable to clone." +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:146 +msgid "Profile unavailable to export." +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:252 +msgid "Profile Name is required." +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:459 +msgid "Marital Status" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:463 +msgid "Romantic Partner" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:467 ../../Zotlabs/Module/Profiles.php:775 +msgid "Likes" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:471 ../../Zotlabs/Module/Profiles.php:776 +msgid "Dislikes" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:475 ../../Zotlabs/Module/Profiles.php:783 +msgid "Work/Employment" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:478 +msgid "Religion" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:482 +msgid "Political Views" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:486 +#: ../../addon/openid/MysqlProvider.php:74 +msgid "Gender" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:490 +msgid "Sexual Preference" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:494 +msgid "Homepage" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:498 +msgid "Interests" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:594 +msgid "Profile updated." +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:678 +msgid "Hide your connections list from viewers of this profile" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:725 +msgid "Edit Profile Details" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:727 +msgid "View this profile" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:728 ../../Zotlabs/Module/Profiles.php:827 +#: ../../include/channel.php:1183 +msgid "Edit visibility" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:729 +msgid "Profile Tools" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:730 +msgid "Change cover photo" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:731 ../../include/channel.php:1154 +msgid "Change profile photo" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:732 +msgid "Create a new profile using these settings" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:733 +msgid "Clone this profile" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:734 +msgid "Delete this profile" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:735 +msgid "Add profile things" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:736 ../../include/conversation.php:1654 +msgid "Personal" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:738 +msgid "Relation" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:739 ../../include/datetime.php:55 +msgid "Miscellaneous" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:741 +msgid "Import profile from file" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:742 +msgid "Export profile to file" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:743 +msgid "Your gender" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:744 +msgid "Marital status" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:745 +msgid "Sexual preference" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:748 +msgid "Profile name" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:750 +msgid "This is your default profile." +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:752 +msgid "Your full name" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:753 +msgid "Title/Description" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:756 +msgid "Street address" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:757 +msgid "Locality/City" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:758 +msgid "Region/State" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:759 +msgid "Postal/Zip code" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:765 +msgid "Who (if applicable)" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:765 +msgid "Examples: cathy123, Cathy Williams, cathy@example.com" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:766 +msgid "Since (date)" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:769 +msgid "Tell us about yourself" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:770 +#: ../../addon/openid/MysqlProvider.php:68 +msgid "Homepage URL" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:771 +msgid "Hometown" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:772 +msgid "Political views" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:773 +msgid "Religious views" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:774 +msgid "Keywords used in directory listings" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:774 +msgid "Example: fishing photography software" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:777 +msgid "Musical interests" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:778 +msgid "Books, literature" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:779 +msgid "Television" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:780 +msgid "Film/Dance/Culture/Entertainment" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:781 +msgid "Hobbies/Interests" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:782 +msgid "Love/Romance" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:784 +msgid "School/Education" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:785 +msgid "Contact information and social networks" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:786 +msgid "My other channels" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:788 +msgid "Communications" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:823 ../../include/channel.php:1179 +msgid "Profile Image" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:833 ../../include/channel.php:1161 +#: ../../include/nav.php:105 +msgid "Edit Profiles" +msgstr "" + +#: ../../Zotlabs/Module/Editwebpage.php:139 +msgid "Page link" +msgstr "" + +#: ../../Zotlabs/Module/Editwebpage.php:166 +msgid "Edit Webpage" +msgstr "" + +#: ../../Zotlabs/Module/Manage.php:145 +msgid "Create a new channel" +msgstr "" + +#: ../../Zotlabs/Module/Manage.php:170 ../../Zotlabs/Lib/Apps.php:234 +#: ../../include/nav.php:199 +msgid "Channel Manager" +msgstr "" + +#: ../../Zotlabs/Module/Manage.php:171 +msgid "Current Channel" +msgstr "" + +#: ../../Zotlabs/Module/Manage.php:173 +msgid "Switch to one of your channels by selecting it." +msgstr "" + +#: ../../Zotlabs/Module/Manage.php:174 +msgid "Default Channel" +msgstr "" + +#: ../../Zotlabs/Module/Manage.php:175 +msgid "Make Default" +msgstr "" + +#: ../../Zotlabs/Module/Manage.php:178 +#, php-format +msgid "%d new messages" +msgstr "" + +#: ../../Zotlabs/Module/Manage.php:179 +#, php-format +msgid "%d new introductions" +msgstr "" + +#: ../../Zotlabs/Module/Manage.php:181 +msgid "Delegated Channel" +msgstr "" + +#: ../../Zotlabs/Module/Dirsearch.php:33 +msgid "This directory server requires an access token" +msgstr "" + +#: ../../Zotlabs/Module/Siteinfo.php:19 +msgid "About this site" +msgstr "" + +#: ../../Zotlabs/Module/Siteinfo.php:20 +msgid "Site Name" +msgstr "" + +#: ../../Zotlabs/Module/Siteinfo.php:24 +msgid "Administrator" +msgstr "" + +#: ../../Zotlabs/Module/Siteinfo.php:26 ../../Zotlabs/Module/Register.php:221 +msgid "Terms of Service" +msgstr "" + +#: ../../Zotlabs/Module/Siteinfo.php:27 +msgid "Software and Project information" +msgstr "" + +#: ../../Zotlabs/Module/Siteinfo.php:28 +msgid "This site is powered by $Projectname" +msgstr "" + +#: ../../Zotlabs/Module/Siteinfo.php:29 +msgid "" +"Federated and decentralised networking and identity services provided by Zot" +msgstr "" + +#: ../../Zotlabs/Module/Siteinfo.php:31 +#, php-format +msgid "Version %s" +msgstr "" + +#: ../../Zotlabs/Module/Siteinfo.php:32 +msgid "Project homepage" +msgstr "" + +#: ../../Zotlabs/Module/Siteinfo.php:33 +msgid "Developer homepage" +msgstr "" + +#: ../../Zotlabs/Module/Ratings.php:70 +msgid "No ratings" +msgstr "" + +#: ../../Zotlabs/Module/Ratings.php:97 ../../Zotlabs/Module/Pubsites.php:35 +#: ../../include/conversation.php:1029 +msgid "Ratings" +msgstr "" + +#: ../../Zotlabs/Module/Ratings.php:98 +msgid "Rating: " +msgstr "" + +#: ../../Zotlabs/Module/Ratings.php:99 +msgid "Website: " +msgstr "" + +#: ../../Zotlabs/Module/Ratings.php:101 +msgid "Description: " +msgstr "" + +#: ../../Zotlabs/Module/Webpages.php:38 ../../Zotlabs/Module/Webpages.php:237 +#: ../../Zotlabs/Lib/Apps.php:238 ../../include/conversation.php:1838 +#: ../../include/nav.php:435 +msgid "Webpages" +msgstr "" + +#: ../../Zotlabs/Module/Webpages.php:54 +msgid "Import Webpage Elements" +msgstr "" + +#: ../../Zotlabs/Module/Webpages.php:55 +msgid "Import selected" +msgstr "" + +#: ../../Zotlabs/Module/Webpages.php:78 +msgid "Export Webpage Elements" +msgstr "" + +#: ../../Zotlabs/Module/Webpages.php:79 +msgid "Export selected" +msgstr "" + +#: ../../Zotlabs/Module/Webpages.php:248 +msgid "Actions" +msgstr "" + +#: ../../Zotlabs/Module/Webpages.php:249 +msgid "Page Link" +msgstr "" + +#: ../../Zotlabs/Module/Webpages.php:250 +msgid "Page Title" +msgstr "" + +#: ../../Zotlabs/Module/Webpages.php:280 +msgid "Invalid file type." +msgstr "" + +#: ../../Zotlabs/Module/Webpages.php:292 +msgid "Error opening zip file" +msgstr "" + +#: ../../Zotlabs/Module/Webpages.php:303 +msgid "Invalid folder path." +msgstr "" + +#: ../../Zotlabs/Module/Webpages.php:330 +msgid "No webpage elements detected." +msgstr "" + +#: ../../Zotlabs/Module/Webpages.php:405 +msgid "Import complete." +msgstr "" + +#: ../../Zotlabs/Module/Editpost.php:38 ../../Zotlabs/Module/Editpost.php:43 +msgid "Item is not editable" +msgstr "" + +#: ../../Zotlabs/Module/Editpost.php:108 ../../Zotlabs/Module/Rpost.php:140 +msgid "Edit post" +msgstr "" + +#: ../../Zotlabs/Module/Dreport.php:45 +msgid "Invalid message" +msgstr "" + +#: ../../Zotlabs/Module/Dreport.php:78 +msgid "no results" +msgstr "" + +#: ../../Zotlabs/Module/Dreport.php:93 +msgid "channel sync processed" +msgstr "" + +#: ../../Zotlabs/Module/Dreport.php:97 +msgid "queued" +msgstr "" + +#: ../../Zotlabs/Module/Dreport.php:101 +msgid "posted" +msgstr "" + +#: ../../Zotlabs/Module/Dreport.php:105 +msgid "accepted for delivery" +msgstr "" + +#: ../../Zotlabs/Module/Dreport.php:109 +msgid "updated" +msgstr "" + +#: ../../Zotlabs/Module/Dreport.php:112 +msgid "update ignored" +msgstr "" + +#: ../../Zotlabs/Module/Dreport.php:115 +msgid "permission denied" +msgstr "" + +#: ../../Zotlabs/Module/Dreport.php:119 +msgid "recipient not found" +msgstr "" + +#: ../../Zotlabs/Module/Dreport.php:122 +msgid "mail recalled" +msgstr "" + +#: ../../Zotlabs/Module/Dreport.php:125 +msgid "duplicate mail received" +msgstr "" + +#: ../../Zotlabs/Module/Dreport.php:128 +msgid "mail delivered" +msgstr "" + +#: ../../Zotlabs/Module/Dreport.php:148 +#, php-format +msgid "Delivery report for %1$s" +msgstr "" + +#: ../../Zotlabs/Module/Dreport.php:151 +msgid "Options" +msgstr "" + +#: ../../Zotlabs/Module/Dreport.php:152 +msgid "Redeliver" +msgstr "" + +#: ../../Zotlabs/Module/Sources.php:37 +msgid "Failed to create source. No channel selected." +msgstr "" + +#: ../../Zotlabs/Module/Sources.php:51 +msgid "Source created." +msgstr "" + +#: ../../Zotlabs/Module/Sources.php:64 +msgid "Source updated." +msgstr "" + +#: ../../Zotlabs/Module/Sources.php:90 +msgid "*" +msgstr "" + +#: ../../Zotlabs/Module/Sources.php:96 +#: ../../Zotlabs/Widget/Settings_menu.php:125 ../../include/features.php:209 +msgid "Channel Sources" +msgstr "" + +#: ../../Zotlabs/Module/Sources.php:97 +msgid "Manage remote sources of content for your channel." +msgstr "" + +#: ../../Zotlabs/Module/Sources.php:98 ../../Zotlabs/Module/Sources.php:108 +msgid "New Source" +msgstr "" + +#: ../../Zotlabs/Module/Sources.php:109 ../../Zotlabs/Module/Sources.php:143 +msgid "" +"Import all or selected content from the following channel into this channel " +"and distribute it according to your channel settings." +msgstr "" + +#: ../../Zotlabs/Module/Sources.php:110 ../../Zotlabs/Module/Sources.php:144 +msgid "Only import content with these words (one per line)" +msgstr "" + +#: ../../Zotlabs/Module/Sources.php:110 ../../Zotlabs/Module/Sources.php:144 +msgid "Leave blank to import all public content" +msgstr "" + +#: ../../Zotlabs/Module/Sources.php:111 ../../Zotlabs/Module/Sources.php:148 +msgid "Channel Name" +msgstr "" + +#: ../../Zotlabs/Module/Sources.php:112 ../../Zotlabs/Module/Sources.php:147 +msgid "" +"Add the following categories to posts imported from this source (comma " +"separated)" +msgstr "" + +#: ../../Zotlabs/Module/Sources.php:133 ../../Zotlabs/Module/Sources.php:161 +msgid "Source not found." +msgstr "" + +#: ../../Zotlabs/Module/Sources.php:140 +msgid "Edit Source" +msgstr "" + +#: ../../Zotlabs/Module/Sources.php:141 +msgid "Delete Source" +msgstr "" + +#: ../../Zotlabs/Module/Sources.php:169 +msgid "Source removed" +msgstr "" + +#: ../../Zotlabs/Module/Sources.php:171 +msgid "Unable to remove source." +msgstr "" + +#: ../../Zotlabs/Module/Rpost.php:63 ../../Zotlabs/Lib/Apps.php:257 +msgid "Post" +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 login with your $Projectname ID or register as a new $Projectname member 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:122 +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:423 ../../addon/diaspora/Receiver.php:1399 +#: ../../include/conversation.php:160 +#, php-format +msgid "%1$s likes %2$s's %3$s" +msgstr "" + +#: ../../Zotlabs/Module/Like.php:425 ../../include/conversation.php:163 +#, php-format +msgid "%1$s doesn't like %2$s's %3$s" +msgstr "" + +#: ../../Zotlabs/Module/Like.php:427 +#, php-format +msgid "%1$s agrees with %2$s's %3$s" +msgstr "" + +#: ../../Zotlabs/Module/Like.php:429 +#, php-format +msgid "%1$s doesn't agree with %2$s's %3$s" +msgstr "" + +#: ../../Zotlabs/Module/Like.php:431 +#, php-format +msgid "%1$s abstains from a decision on %2$s's %3$s" +msgstr "" + +#: ../../Zotlabs/Module/Like.php:433 +#, php-format +msgid "%1$s is attending %2$s's %3$s" +msgstr "" + +#: ../../Zotlabs/Module/Like.php:435 +#, php-format +msgid "%1$s is not attending %2$s's %3$s" +msgstr "" + +#: ../../Zotlabs/Module/Like.php:437 +#, php-format +msgid "%1$s may attend %2$s's %3$s" +msgstr "" + +#: ../../Zotlabs/Module/Like.php:547 +msgid "Action completed." +msgstr "" + +#: ../../Zotlabs/Module/Like.php:548 +msgid "Thank you." +msgstr "" + +#: ../../Zotlabs/Module/Directory.php:80 ../../Zotlabs/Lib/Apps.php:244 +msgid "Directory" +msgstr "" + +#: ../../Zotlabs/Module/Directory.php:245 +#, php-format +msgid "%d rating" +msgid_plural "%d ratings" +msgstr[0] "" +msgstr[1] "" + +#: ../../Zotlabs/Module/Directory.php:256 +msgid "Gender: " +msgstr "" + +#: ../../Zotlabs/Module/Directory.php:258 +msgid "Status: " +msgstr "" + +#: ../../Zotlabs/Module/Directory.php:260 +msgid "Homepage: " +msgstr "" + +#: ../../Zotlabs/Module/Directory.php:309 ../../include/channel.php:1416 +msgid "Age:" +msgstr "" + +#: ../../Zotlabs/Module/Directory.php:314 ../../include/channel.php:1251 +#: ../../include/event.php:52 ../../include/event.php:84 +msgid "Location:" +msgstr "" + +#: ../../Zotlabs/Module/Directory.php:320 +msgid "Description:" +msgstr "" + +#: ../../Zotlabs/Module/Directory.php:325 ../../include/channel.php:1432 +msgid "Hometown:" +msgstr "" + +#: ../../Zotlabs/Module/Directory.php:327 ../../include/channel.php:1440 +msgid "About:" +msgstr "" + +#: ../../Zotlabs/Module/Directory.php:328 ../../Zotlabs/Module/Suggest.php:56 +#: ../../Zotlabs/Widget/Follow.php:32 ../../Zotlabs/Widget/Suggestions.php:44 +#: ../../include/conversation.php:999 ../../include/channel.php:1236 +#: ../../include/connections.php:111 +msgid "Connect" +msgstr "" + +#: ../../Zotlabs/Module/Directory.php:329 +msgid "Public Forum:" +msgstr "" + +#: ../../Zotlabs/Module/Directory.php:332 +msgid "Keywords: " +msgstr "" + +#: ../../Zotlabs/Module/Directory.php:335 +msgid "Don't suggest" +msgstr "" + +#: ../../Zotlabs/Module/Directory.php:337 +msgid "Common connections:" +msgstr "" + +#: ../../Zotlabs/Module/Directory.php:386 +msgid "Global Directory" +msgstr "" + +#: ../../Zotlabs/Module/Directory.php:386 +msgid "Local Directory" +msgstr "" + +#: ../../Zotlabs/Module/Directory.php:392 +msgid "Finding:" +msgstr "" + +#: ../../Zotlabs/Module/Directory.php:395 ../../Zotlabs/Module/Suggest.php:64 +#: ../../include/contact_widgets.php:24 +msgid "Channel Suggestions" +msgstr "" + +#: ../../Zotlabs/Module/Directory.php:397 +msgid "next page" +msgstr "" + +#: ../../Zotlabs/Module/Directory.php:397 +msgid "previous page" +msgstr "" + +#: ../../Zotlabs/Module/Directory.php:398 +msgid "Sort options" +msgstr "" + +#: ../../Zotlabs/Module/Directory.php:399 +msgid "Alphabetic" +msgstr "" + +#: ../../Zotlabs/Module/Directory.php:400 +msgid "Reverse Alphabetic" +msgstr "" + +#: ../../Zotlabs/Module/Directory.php:401 +msgid "Newest to Oldest" +msgstr "" + +#: ../../Zotlabs/Module/Directory.php:402 +msgid "Oldest to Newest" +msgstr "" + +#: ../../Zotlabs/Module/Directory.php:419 +msgid "No entries (some entries may be hidden)." +msgstr "" + +#: ../../Zotlabs/Module/Xchan.php:10 +msgid "Xchan Lookup" +msgstr "" + +#: ../../Zotlabs/Module/Xchan.php:13 +msgid "Lookup xchan beginning with (or webbie): " +msgstr "" + +#: ../../Zotlabs/Module/Suggest.php:32 ../../Zotlabs/Lib/Apps.php:232 +#: ../../include/features.php:333 +msgid "Suggest Channels" +msgstr "" + +#: ../../Zotlabs/Module/Suggest.php:39 +msgid "" +"No suggestions available. If this is a new site, please try again in 24 " +"hours." +msgstr "" + +#: ../../Zotlabs/Module/Suggest.php:58 ../../Zotlabs/Widget/Suggestions.php:46 +msgid "Ignore/Hide" +msgstr "" + +#: ../../Zotlabs/Module/Oexchange.php:27 +msgid "Unable to find your hub." +msgstr "" + +#: ../../Zotlabs/Module/Oexchange.php:41 +msgid "Post successful." +msgstr "" + +#: ../../Zotlabs/Module/Mail.php:73 +msgid "Unable to lookup recipient." +msgstr "" + +#: ../../Zotlabs/Module/Mail.php:80 +msgid "Unable to communicate with requested channel." +msgstr "" + +#: ../../Zotlabs/Module/Mail.php:87 +msgid "Cannot verify requested channel." +msgstr "" + +#: ../../Zotlabs/Module/Mail.php:105 +msgid "Selected channel has private message restrictions. Send failed." +msgstr "" + +#: ../../Zotlabs/Module/Mail.php:143 ../../Zotlabs/Lib/Apps.php:246 +#: ../../include/nav.php:187 +msgid "Mail" +msgstr "" + +#: ../../Zotlabs/Module/Mail.php:160 +msgid "Messages" +msgstr "" + +#: ../../Zotlabs/Module/Mail.php:173 +msgid "message" +msgstr "" + +#: ../../Zotlabs/Module/Mail.php:214 +msgid "Message recalled." +msgstr "" + +#: ../../Zotlabs/Module/Mail.php:227 +msgid "Conversation removed." +msgstr "" + +#: ../../Zotlabs/Module/Mail.php:242 ../../Zotlabs/Module/Mail.php:363 +msgid "Expires YYYY-MM-DD HH:MM" +msgstr "" + +#: ../../Zotlabs/Module/Mail.php:270 +msgid "Requested channel is not in this network" +msgstr "" + +#: ../../Zotlabs/Module/Mail.php:278 +msgid "Send Private Message" +msgstr "" + +#: ../../Zotlabs/Module/Mail.php:279 ../../Zotlabs/Module/Mail.php:421 +msgid "To:" +msgstr "" + +#: ../../Zotlabs/Module/Mail.php:282 ../../Zotlabs/Module/Mail.php:423 +msgid "Subject:" +msgstr "" + +#: ../../Zotlabs/Module/Mail.php:287 ../../Zotlabs/Module/Mail.php:429 +#: ../../include/conversation.php:1320 +msgid "Attach file" +msgstr "" + +#: ../../Zotlabs/Module/Mail.php:289 +msgid "Send" +msgstr "" + +#: ../../Zotlabs/Module/Mail.php:292 ../../Zotlabs/Module/Mail.php:434 +#: ../../include/conversation.php:1365 +msgid "Set expiration date" +msgstr "" + +#: ../../Zotlabs/Module/Mail.php:393 +msgid "Delete message" +msgstr "" + +#: ../../Zotlabs/Module/Mail.php:394 +msgid "Delivery report" +msgstr "" + +#: ../../Zotlabs/Module/Mail.php:395 +msgid "Recall message" +msgstr "" + +#: ../../Zotlabs/Module/Mail.php:397 +msgid "Message has been recalled." +msgstr "" + +#: ../../Zotlabs/Module/Mail.php:414 +msgid "Delete Conversation" +msgstr "" + +#: ../../Zotlabs/Module/Mail.php:416 +msgid "" +"No secure communications available. You may be able to " +"respond from the sender's profile page." +msgstr "" + +#: ../../Zotlabs/Module/Mail.php:420 +msgid "Send Reply" +msgstr "" + +#: ../../Zotlabs/Module/Mail.php:425 +#, php-format +msgid "Your message for %s (%s):" +msgstr "" + +#: ../../Zotlabs/Module/Pubsites.php:24 ../../Zotlabs/Widget/Pubsites.php:12 +msgid "Public Hubs" +msgstr "" + +#: ../../Zotlabs/Module/Pubsites.php:27 +msgid "" +"The listed hubs allow public registration for the $Projectname network. All " +"hubs in the network are interlinked so membership on any of them conveys " +"membership in the network as a whole. Some hubs may require subscription or " +"provide tiered service plans. The hub itself may provide " +"additional details." +msgstr "" + +#: ../../Zotlabs/Module/Pubsites.php:33 +msgid "Hub URL" +msgstr "" + +#: ../../Zotlabs/Module/Pubsites.php:33 +msgid "Access Type" +msgstr "" + +#: ../../Zotlabs/Module/Pubsites.php:33 +msgid "Registration Policy" +msgstr "" + +#: ../../Zotlabs/Module/Pubsites.php:33 +msgid "Stats" +msgstr "" + +#: ../../Zotlabs/Module/Pubsites.php:33 +msgid "Software" +msgstr "" + +#: ../../Zotlabs/Module/Pubsites.php:48 +msgid "Rate" +msgstr "" + +#: ../../Zotlabs/Module/Impel.php:41 ../../include/bbcode.php:263 +msgid "webpage" +msgstr "" + +#: ../../Zotlabs/Module/Impel.php:46 ../../include/bbcode.php:269 +msgid "block" +msgstr "" + +#: ../../Zotlabs/Module/Impel.php:51 ../../include/bbcode.php:266 +msgid "layout" +msgstr "" + +#: ../../Zotlabs/Module/Impel.php:58 ../../include/bbcode.php:272 +msgid "menu" +msgstr "" + +#: ../../Zotlabs/Module/Impel.php:181 +#, php-format +msgid "%s element installed" +msgstr "" + +#: ../../Zotlabs/Module/Impel.php:184 +#, php-format +msgid "%s element installation failed" +msgstr "" + +#: ../../Zotlabs/Module/Rbmark.php:94 +msgid "Select a bookmark folder" +msgstr "" + +#: ../../Zotlabs/Module/Rbmark.php:99 +msgid "Save Bookmark" +msgstr "" + +#: ../../Zotlabs/Module/Rbmark.php:100 +msgid "URL of bookmark" +msgstr "" + +#: ../../Zotlabs/Module/Rbmark.php:105 +msgid "Or enter new bookmark folder name" +msgstr "" + +#: ../../Zotlabs/Module/Filer.php:52 +msgid "Enter a folder name" +msgstr "" + +#: ../../Zotlabs/Module/Filer.php:52 +msgid "or select an existing folder (doubleclick)" +msgstr "" + +#: ../../Zotlabs/Module/Filer.php:54 ../../Zotlabs/Lib/ThreadItem.php:137 +msgid "Save to Folder" +msgstr "" + +#: ../../Zotlabs/Module/Probe.php:11 ../../Zotlabs/Lib/Apps.php:231 +msgid "Remote Diagnostics" +msgstr "" + +#: ../../Zotlabs/Module/Probe.php:30 ../../Zotlabs/Module/Probe.php:34 +#, php-format +msgid "Fetching URL returns error: %1$s" +msgstr "" + +#: ../../Zotlabs/Module/Register.php:49 +msgid "Maximum daily site registrations exceeded. Please try again tomorrow." +msgstr "" + +#: ../../Zotlabs/Module/Register.php:55 +msgid "" +"Please indicate acceptance of the Terms of Service. Registration failed." +msgstr "" + +#: ../../Zotlabs/Module/Register.php:89 +msgid "Passwords do not match." +msgstr "" + +#: ../../Zotlabs/Module/Register.php:131 +msgid "" +"Registration successful. Please check your email for validation instructions." +msgstr "" + +#: ../../Zotlabs/Module/Register.php:137 +msgid "Your registration is pending approval by the site owner." +msgstr "" + +#: ../../Zotlabs/Module/Register.php:140 +msgid "Your registration can not be processed." +msgstr "" + +#: ../../Zotlabs/Module/Register.php:184 +msgid "Registration on this hub is disabled." +msgstr "" + +#: ../../Zotlabs/Module/Register.php:193 +msgid "Registration on this hub is by approval only." +msgstr "" + +#: ../../Zotlabs/Module/Register.php:194 +msgid "Register at another affiliated hub." +msgstr "" + +#: ../../Zotlabs/Module/Register.php:204 +msgid "" +"This site has exceeded the number of allowed daily account registrations. " +"Please try again tomorrow." +msgstr "" + +#: ../../Zotlabs/Module/Register.php:227 +#, php-format +msgid "I accept the %s for this website" +msgstr "" + +#: ../../Zotlabs/Module/Register.php:229 +#, php-format +msgid "I am over 13 years of age and accept the %s for this website" +msgstr "" + +#: ../../Zotlabs/Module/Register.php:233 +msgid "Your email address" +msgstr "" + +#: ../../Zotlabs/Module/Register.php:234 +msgid "Choose a password" +msgstr "" + +#: ../../Zotlabs/Module/Register.php:235 +msgid "Please re-enter your password" +msgstr "" + +#: ../../Zotlabs/Module/Register.php:236 +msgid "Please enter your invitation code" +msgstr "" + +#: ../../Zotlabs/Module/Register.php:241 +msgid "no" +msgstr "" + +#: ../../Zotlabs/Module/Register.php:241 +msgid "yes" +msgstr "" + +#: ../../Zotlabs/Module/Register.php:256 +msgid "Membership on this site is by invitation only." +msgstr "" + +#: ../../Zotlabs/Module/Register.php:268 ../../boot.php:1582 +#: ../../include/nav.php:145 +msgid "Register" +msgstr "" + +#: ../../Zotlabs/Module/Register.php:269 +msgid "" +"This site may require email verification after submitting this form. If you " +"are returned to a login page, please check your email for instructions." +msgstr "" + +#: ../../Zotlabs/Module/Cover_photo.php:136 +#: ../../Zotlabs/Module/Cover_photo.php:186 +msgid "Cover Photos" +msgstr "" + +#: ../../Zotlabs/Module/Cover_photo.php:237 ../../include/items.php:4273 +msgid "female" +msgstr "" + +#: ../../Zotlabs/Module/Cover_photo.php:238 ../../include/items.php:4274 +#, php-format +msgid "%1$s updated her %2$s" +msgstr "" + +#: ../../Zotlabs/Module/Cover_photo.php:239 ../../include/items.php:4275 +msgid "male" +msgstr "" + +#: ../../Zotlabs/Module/Cover_photo.php:240 ../../include/items.php:4276 +#, php-format +msgid "%1$s updated his %2$s" +msgstr "" + +#: ../../Zotlabs/Module/Cover_photo.php:242 ../../include/items.php:4278 +#, php-format +msgid "%1$s updated their %2$s" +msgstr "" + +#: ../../Zotlabs/Module/Cover_photo.php:244 ../../include/channel.php:1878 +msgid "cover photo" +msgstr "" + +#: ../../Zotlabs/Module/Cover_photo.php:360 +msgid "Upload Cover Photo" +msgstr "" + +#: ../../Zotlabs/Module/Help.php:23 +msgid "Documentation Search" +msgstr "" + +#: ../../Zotlabs/Module/Help.php:80 ../../include/conversation.php:1770 +#: ../../include/nav.php:368 +msgid "About" +msgstr "" + +#: ../../Zotlabs/Module/Help.php:82 +msgid "Administrators" +msgstr "" + +#: ../../Zotlabs/Module/Help.php:83 +msgid "Developers" +msgstr "" + +#: ../../Zotlabs/Module/Help.php:84 +msgid "Tutorials" +msgstr "" + +#: ../../Zotlabs/Module/Help.php:93 +msgid "$Projectname Documentation" +msgstr "" + +#: ../../Zotlabs/Module/Help.php:94 +msgid "Contents" +msgstr "" + +#: ../../Zotlabs/Module/Tagrm.php:48 ../../Zotlabs/Module/Tagrm.php:98 +msgid "Tag removed" +msgstr "" + +#: ../../Zotlabs/Module/Tagrm.php:123 +msgid "Remove Item Tag" +msgstr "" + +#: ../../Zotlabs/Module/Tagrm.php:125 +msgid "Select a tag to remove: " +msgstr "" + +#: ../../Zotlabs/Module/Network.php:96 +msgid "No such group" +msgstr "" + +#: ../../Zotlabs/Module/Network.php:136 +msgid "No such channel" +msgstr "" + +#: ../../Zotlabs/Module/Network.php:141 +msgid "forum" +msgstr "" + +#: ../../Zotlabs/Module/Network.php:153 +msgid "Search Results For:" +msgstr "" + +#: ../../Zotlabs/Module/Network.php:157 ../../Zotlabs/Lib/Apps.php:235 +msgid "Activity" +msgstr "" + +#: ../../Zotlabs/Module/Network.php:221 +msgid "Privacy group is empty" +msgstr "" + +#: ../../Zotlabs/Module/Network.php:230 +msgid "Privacy group: " +msgstr "" + +#: ../../Zotlabs/Module/Network.php:256 +msgid "Invalid connection." +msgstr "" + +#: ../../Zotlabs/Module/Network.php:275 ../../addon/redred/redred.php:65 +msgid "Invalid channel." +msgstr "" + +#: ../../Zotlabs/Module/Acl.php:344 +msgid "network" +msgstr "" + +#: ../../Zotlabs/Module/Acl.php:354 +msgid "RSS" +msgstr "" + +#: ../../Zotlabs/Module/Home.php:74 ../../Zotlabs/Module/Home.php:82 +#: ../../addon/opensearch/opensearch.php:42 +msgid "$Projectname" +msgstr "" + +#: ../../Zotlabs/Module/Home.php:92 +#, php-format +msgid "Welcome to %s" +msgstr "" + +#: ../../Zotlabs/Module/Filestorage.php:79 +msgid "Permission Denied." +msgstr "" + +#: ../../Zotlabs/Module/Filestorage.php:95 +msgid "File not found." +msgstr "" + +#: ../../Zotlabs/Module/Filestorage.php:137 +msgid "Edit file permissions" +msgstr "" + +#: ../../Zotlabs/Module/Filestorage.php:149 +msgid "Set/edit permissions" +msgstr "" + +#: ../../Zotlabs/Module/Filestorage.php:150 +msgid "Include all files and sub folders" +msgstr "" + +#: ../../Zotlabs/Module/Filestorage.php:151 +msgid "Return to file list" +msgstr "" + +#: ../../Zotlabs/Module/Filestorage.php:153 +msgid "Copy/paste this code to attach file to a post" +msgstr "" + +#: ../../Zotlabs/Module/Filestorage.php:154 +msgid "Copy/paste this URL to link file from a web page" +msgstr "" + +#: ../../Zotlabs/Module/Filestorage.php:156 +msgid "Share this file" +msgstr "" + +#: ../../Zotlabs/Module/Filestorage.php:157 +msgid "Show URL to this file" +msgstr "" + +#: ../../Zotlabs/Module/Filestorage.php:158 +#: ../../Zotlabs/Storage/Browser.php:351 +msgid "Show in your contacts shared folder" +msgstr "" + +#: ../../Zotlabs/Module/Common.php:14 +msgid "No channel." +msgstr "" + +#: ../../Zotlabs/Module/Common.php:43 +msgid "Common connections" +msgstr "" + +#: ../../Zotlabs/Module/Common.php:48 +msgid "No connections in common." +msgstr "" + #: ../../Zotlabs/Module/Viewconnections.php:65 msgid "No connections." msgstr "" @@ -6885,434 +7023,330 @@ msgstr "" msgid "View Connections" msgstr "" -#: ../../Zotlabs/Module/Photos.php:78 -msgid "Page owner information could not be retrieved." +#: ../../Zotlabs/Module/Admin.php:97 +msgid "Blocked accounts" msgstr "" -#: ../../Zotlabs/Module/Photos.php:94 ../../Zotlabs/Module/Photos.php:120 -msgid "Album not found." +#: ../../Zotlabs/Module/Admin.php:98 +msgid "Expired accounts" msgstr "" -#: ../../Zotlabs/Module/Photos.php:103 -msgid "Delete Album" +#: ../../Zotlabs/Module/Admin.php:99 +msgid "Expiring accounts" msgstr "" -#: ../../Zotlabs/Module/Photos.php:174 ../../Zotlabs/Module/Photos.php:1023 -msgid "Delete Photo" +#: ../../Zotlabs/Module/Admin.php:112 +msgid "Clones" msgstr "" -#: ../../Zotlabs/Module/Photos.php:501 -msgid "No photos selected" +#: ../../Zotlabs/Module/Admin.php:118 +msgid "Message queues" msgstr "" -#: ../../Zotlabs/Module/Photos.php:550 -msgid "Access to this item is restricted." +#: ../../Zotlabs/Module/Admin.php:132 +msgid "Your software should be updated" msgstr "" -#: ../../Zotlabs/Module/Photos.php:591 +#: ../../Zotlabs/Module/Admin.php:137 +msgid "Summary" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:140 +msgid "Registered accounts" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:141 +msgid "Pending registrations" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:142 +msgid "Registered channels" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:143 +msgid "Active plugins" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:144 +msgid "Version" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:145 +msgid "Repository version (master)" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:146 +msgid "Repository version (dev)" +msgstr "" + +#: ../../Zotlabs/Module/Service_limits.php:23 +msgid "No service class restrictions found." +msgstr "" + +#: ../../Zotlabs/Module/Rate.php:156 +msgid "Website:" +msgstr "" + +#: ../../Zotlabs/Module/Rate.php:159 #, php-format -msgid "%1$.2f MB of %2$.2f MB photo storage used." +msgid "Remote Channel [%s] (not yet known on this site)" msgstr "" -#: ../../Zotlabs/Module/Photos.php:594 +#: ../../Zotlabs/Module/Rate.php:160 +msgid "Rating (this information is public)" +msgstr "" + +#: ../../Zotlabs/Module/Rate.php:161 +msgid "Optionally explain your rating (this information is public)" +msgstr "" + +#: ../../Zotlabs/Module/Lostpass.php:19 +msgid "No valid account found." +msgstr "" + +#: ../../Zotlabs/Module/Lostpass.php:33 +msgid "Password reset request issued. Check your email." +msgstr "" + +#: ../../Zotlabs/Module/Lostpass.php:39 ../../Zotlabs/Module/Lostpass.php:108 #, php-format -msgid "%1$.2f MB photo storage used." +msgid "Site Member (%s)" msgstr "" -#: ../../Zotlabs/Module/Photos.php:636 -msgid "Upload Photos" -msgstr "" - -#: ../../Zotlabs/Module/Photos.php:640 -msgid "Enter an album name" -msgstr "" - -#: ../../Zotlabs/Module/Photos.php:641 -msgid "or select an existing album (doubleclick)" -msgstr "" - -#: ../../Zotlabs/Module/Photos.php:642 -msgid "Create a status post for this upload" -msgstr "" - -#: ../../Zotlabs/Module/Photos.php:643 -msgid "Caption (optional):" -msgstr "" - -#: ../../Zotlabs/Module/Photos.php:644 -msgid "Description (optional):" -msgstr "" - -#: ../../Zotlabs/Module/Photos.php:725 -msgid "Show Newest First" -msgstr "" - -#: ../../Zotlabs/Module/Photos.php:727 -msgid "Show Oldest First" -msgstr "" - -#: ../../Zotlabs/Module/Photos.php:751 ../../Zotlabs/Module/Photos.php:1290 -#: ../../Zotlabs/Module/Embedphotos.php:140 ../../Zotlabs/Widget/Album.php:78 -#: ../../Zotlabs/Widget/Portfolio.php:78 -msgid "View Photo" -msgstr "" - -#: ../../Zotlabs/Module/Photos.php:782 -#: ../../Zotlabs/Module/Embedphotos.php:156 ../../Zotlabs/Widget/Album.php:95 -#: ../../Zotlabs/Widget/Portfolio.php:97 -msgid "Edit Album" -msgstr "" - -#: ../../Zotlabs/Module/Photos.php:832 -msgid "Permission denied. Access to this item may be restricted." -msgstr "" - -#: ../../Zotlabs/Module/Photos.php:834 -msgid "Photo not available" -msgstr "" - -#: ../../Zotlabs/Module/Photos.php:892 -msgid "Use as profile photo" -msgstr "" - -#: ../../Zotlabs/Module/Photos.php:893 -msgid "Use as cover photo" -msgstr "" - -#: ../../Zotlabs/Module/Photos.php:900 -msgid "Private Photo" -msgstr "" - -#: ../../Zotlabs/Module/Photos.php:915 -msgid "View Full Size" -msgstr "" - -#: ../../Zotlabs/Module/Photos.php:997 -msgid "Edit photo" -msgstr "" - -#: ../../Zotlabs/Module/Photos.php:999 -msgid "Rotate CW (right)" -msgstr "" - -#: ../../Zotlabs/Module/Photos.php:1000 -msgid "Rotate CCW (left)" -msgstr "" - -#: ../../Zotlabs/Module/Photos.php:1003 -msgid "Move photo to album" -msgstr "" - -#: ../../Zotlabs/Module/Photos.php:1004 -msgid "Enter a new album name" -msgstr "" - -#: ../../Zotlabs/Module/Photos.php:1005 -msgid "or select an existing one (doubleclick)" -msgstr "" - -#: ../../Zotlabs/Module/Photos.php:1008 -msgid "Caption" -msgstr "" - -#: ../../Zotlabs/Module/Photos.php:1010 -msgid "Add a Tag" -msgstr "" - -#: ../../Zotlabs/Module/Photos.php:1018 -msgid "Example: @bob, @Barbara_Jensen, @jim@example.com" -msgstr "" - -#: ../../Zotlabs/Module/Photos.php:1021 -msgid "Flag as adult in album view" -msgstr "" - -#: ../../Zotlabs/Module/Photos.php:1040 ../../Zotlabs/Lib/ThreadItem.php:267 -msgid "I like this (toggle)" -msgstr "" - -#: ../../Zotlabs/Module/Photos.php:1041 ../../Zotlabs/Lib/ThreadItem.php:268 -msgid "I don't like this (toggle)" -msgstr "" - -#: ../../Zotlabs/Module/Photos.php:1043 ../../Zotlabs/Lib/ThreadItem.php:410 -#: ../../include/conversation.php:736 -msgid "Please wait" -msgstr "" - -#: ../../Zotlabs/Module/Photos.php:1059 ../../Zotlabs/Module/Photos.php:1177 -#: ../../Zotlabs/Lib/ThreadItem.php:727 -msgid "This is you" -msgstr "" - -#: ../../Zotlabs/Module/Photos.php:1061 ../../Zotlabs/Module/Photos.php:1179 -#: ../../Zotlabs/Lib/ThreadItem.php:729 ../../include/js_strings.php:6 -msgid "Comment" -msgstr "" - -#: ../../Zotlabs/Module/Photos.php:1077 ../../include/conversation.php:569 -msgctxt "title" -msgid "Likes" -msgstr "" - -#: ../../Zotlabs/Module/Photos.php:1077 ../../include/conversation.php:569 -msgctxt "title" -msgid "Dislikes" -msgstr "" - -#: ../../Zotlabs/Module/Photos.php:1078 ../../include/conversation.php:570 -msgctxt "title" -msgid "Agree" -msgstr "" - -#: ../../Zotlabs/Module/Photos.php:1078 ../../include/conversation.php:570 -msgctxt "title" -msgid "Disagree" -msgstr "" - -#: ../../Zotlabs/Module/Photos.php:1078 ../../include/conversation.php:570 -msgctxt "title" -msgid "Abstain" -msgstr "" - -#: ../../Zotlabs/Module/Photos.php:1079 ../../include/conversation.php:571 -msgctxt "title" -msgid "Attending" -msgstr "" - -#: ../../Zotlabs/Module/Photos.php:1079 ../../include/conversation.php:571 -msgctxt "title" -msgid "Not attending" -msgstr "" - -#: ../../Zotlabs/Module/Photos.php:1079 ../../include/conversation.php:571 -msgctxt "title" -msgid "Might attend" -msgstr "" - -#: ../../Zotlabs/Module/Photos.php:1096 ../../Zotlabs/Module/Photos.php:1108 -#: ../../Zotlabs/Lib/ThreadItem.php:187 ../../Zotlabs/Lib/ThreadItem.php:199 -msgid "View all" -msgstr "" - -#: ../../Zotlabs/Module/Photos.php:1100 ../../Zotlabs/Lib/ThreadItem.php:191 -#: ../../include/taxonomy.php:433 ../../include/conversation.php:1904 -#: ../../include/channel.php:1289 -msgctxt "noun" -msgid "Like" -msgid_plural "Likes" -msgstr[0] "" -msgstr[1] "" - -#: ../../Zotlabs/Module/Photos.php:1105 ../../Zotlabs/Lib/ThreadItem.php:196 -#: ../../include/conversation.php:1907 -msgctxt "noun" -msgid "Dislike" -msgid_plural "Dislikes" -msgstr[0] "" -msgstr[1] "" - -#: ../../Zotlabs/Module/Photos.php:1205 -msgid "Photo Tools" -msgstr "" - -#: ../../Zotlabs/Module/Photos.php:1214 -msgid "In This Photo:" -msgstr "" - -#: ../../Zotlabs/Module/Photos.php:1219 -msgid "Map" -msgstr "" - -#: ../../Zotlabs/Module/Photos.php:1227 ../../Zotlabs/Lib/ThreadItem.php:399 -msgctxt "noun" -msgid "Likes" -msgstr "" - -#: ../../Zotlabs/Module/Photos.php:1228 ../../Zotlabs/Lib/ThreadItem.php:400 -msgctxt "noun" -msgid "Dislikes" -msgstr "" - -#: ../../Zotlabs/Module/Photos.php:1233 ../../Zotlabs/Lib/ThreadItem.php:405 -#: ../../include/acl_selectors.php:220 -msgid "Close" -msgstr "" - -#: ../../Zotlabs/Module/Photos.php:1305 ../../Zotlabs/Module/Photos.php:1318 -#: ../../Zotlabs/Module/Photos.php:1319 ../../include/photos.php:526 -msgid "Recent Photos" -msgstr "" - -#: ../../Zotlabs/Module/Chat.php:25 ../../Zotlabs/Module/Channel.php:32 -#: ../../extend/addon/addon/chess/chess.php:403 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:28 -msgid "You must be logged in to see this page." -msgstr "" - -#: ../../Zotlabs/Module/Chat.php:179 -msgid "Room not found" -msgstr "" - -#: ../../Zotlabs/Module/Chat.php:195 -msgid "Leave Room" -msgstr "" - -#: ../../Zotlabs/Module/Chat.php:196 -msgid "Delete Room" -msgstr "" - -#: ../../Zotlabs/Module/Chat.php:197 -msgid "I am away right now" -msgstr "" - -#: ../../Zotlabs/Module/Chat.php:198 -msgid "I am online" -msgstr "" - -#: ../../Zotlabs/Module/Chat.php:200 -msgid "Bookmark this room" -msgstr "" - -#: ../../Zotlabs/Module/Chat.php:230 -msgid "New Chatroom" -msgstr "" - -#: ../../Zotlabs/Module/Chat.php:231 -msgid "Chatroom name" -msgstr "" - -#: ../../Zotlabs/Module/Chat.php:232 -msgid "Expiration of chats (minutes)" -msgstr "" - -#: ../../Zotlabs/Module/Chat.php:248 +#: ../../Zotlabs/Module/Lostpass.php:44 ../../Zotlabs/Module/Lostpass.php:49 #, php-format -msgid "%1$s's Chatrooms" +msgid "Password reset requested at %s" msgstr "" -#: ../../Zotlabs/Module/Chat.php:253 -msgid "No chatrooms available" +#: ../../Zotlabs/Module/Lostpass.php:68 +msgid "" +"Request could not be verified. (You may have previously submitted it.) " +"Password reset failed." msgstr "" -#: ../../Zotlabs/Module/Chat.php:257 -msgid "Expiration" +#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1609 +msgid "Password Reset" msgstr "" -#: ../../Zotlabs/Module/Chat.php:258 -msgid "min" +#: ../../Zotlabs/Module/Lostpass.php:92 +msgid "Your password has been reset as requested." msgstr "" -#: ../../Zotlabs/Module/Xchan.php:10 -msgid "Xchan Lookup" +#: ../../Zotlabs/Module/Lostpass.php:93 +msgid "Your new password is" msgstr "" -#: ../../Zotlabs/Module/Xchan.php:13 -msgid "Lookup xchan beginning with (or webbie): " +#: ../../Zotlabs/Module/Lostpass.php:94 +msgid "Save or copy your new password - and then" msgstr "" -#: ../../Zotlabs/Module/Channel.php:112 -msgid "Insufficient permissions. Request redirected to profile page." +#: ../../Zotlabs/Module/Lostpass.php:95 +msgid "click here to login" msgstr "" -#: ../../Zotlabs/Module/Apporder.php:34 -msgid "Change Order of Navigation Apps" +#: ../../Zotlabs/Module/Lostpass.php:96 +msgid "" +"Your password may be changed from the Settings page after " +"successful login." msgstr "" -#: ../../Zotlabs/Module/Apporder.php:35 -msgid "Use arrows to move the corresponding app up or down in the display list" +#: ../../Zotlabs/Module/Lostpass.php:117 +#, php-format +msgid "Your password has changed at %s" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:726 -msgid "INVALID EVENT DISMISSED!" +#: ../../Zotlabs/Module/Lostpass.php:130 +msgid "Forgot your Password?" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:727 -msgid "Summary: " +#: ../../Zotlabs/Module/Lostpass.php:131 +msgid "" +"Enter your email address and submit to have your password reset. Then check " +"your email for further instructions." msgstr "" -#: ../../Zotlabs/Module/Cdav.php:728 -msgid "Date: " +#: ../../Zotlabs/Module/Lostpass.php:132 +msgid "Email Address" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:729 ../../Zotlabs/Module/Cdav.php:736 -msgid "Reason: " +#: ../../Zotlabs/Module/Lostpass.php:133 +msgid "Reset" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:734 -msgid "INVALID CARD DISMISSED!" +#: ../../Zotlabs/Module/Notifications.php:43 +#: ../../Zotlabs/Lib/ThreadItem.php:392 +msgid "Mark all seen" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:735 -msgid "Name: " +#: ../../Zotlabs/Lib/Techlevels.php:10 +msgid "0. Beginner/Basic" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:809 ../../Zotlabs/Module/Cdav.php:810 -msgid "Example: YYYY-MM-DD HH:mm" +#: ../../Zotlabs/Lib/Techlevels.php:11 +msgid "1. Novice - not skilled but willing to learn" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:810 -msgid "End date and time" +#: ../../Zotlabs/Lib/Techlevels.php:12 +msgid "2. Intermediate - somewhat comfortable" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:825 -msgid "List month" +#: ../../Zotlabs/Lib/Techlevels.php:13 +msgid "3. Advanced - very comfortable" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:826 -msgid "List week" +#: ../../Zotlabs/Lib/Techlevels.php:14 +msgid "4. Expert - I can write computer code" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:827 -msgid "List day" +#: ../../Zotlabs/Lib/Techlevels.php:15 +msgid "5. Wizard - I probably know more than you do" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:834 -msgid "More" +#: ../../Zotlabs/Lib/Apps.php:225 +msgid "Site Admin" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:835 -msgid "Less" +#: ../../Zotlabs/Lib/Apps.php:226 ../../addon/buglink/buglink.php:16 +msgid "Report Bug" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:836 -msgid "Select calendar" +#: ../../Zotlabs/Lib/Apps.php:230 +msgid "Firefox Share" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:838 -msgid "Delete all" +#: ../../Zotlabs/Lib/Apps.php:233 ../../boot.php:1601 ../../include/nav.php:113 +msgid "Login" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:840 -msgid "Sorry! Editing of recurrent events is not yet implemented." +#: ../../Zotlabs/Lib/Apps.php:249 +msgid "Chat" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1181 -msgid "Default Calendar" +#: ../../Zotlabs/Lib/Apps.php:251 +msgid "Probe" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1191 -msgid "Default Addressbook" +#: ../../Zotlabs/Lib/Apps.php:252 +msgid "Suggest" msgstr "" -#: ../../Zotlabs/Lib/Chatroom.php:27 -msgid "Missing room name" +#: ../../Zotlabs/Lib/Apps.php:253 +msgid "Random Channel" msgstr "" -#: ../../Zotlabs/Lib/Chatroom.php:36 -msgid "Duplicate room name" +#: ../../Zotlabs/Lib/Apps.php:255 ../../Zotlabs/Widget/Admin.php:26 +msgid "Features" msgstr "" -#: ../../Zotlabs/Lib/Chatroom.php:86 ../../Zotlabs/Lib/Chatroom.php:94 -msgid "Invalid room specifier." +#: ../../Zotlabs/Lib/Apps.php:258 ../../addon/openid/MysqlProvider.php:58 +#: ../../addon/openid/MysqlProvider.php:59 +#: ../../addon/openid/MysqlProvider.php:60 +msgid "Profile Photo" msgstr "" -#: ../../Zotlabs/Lib/Chatroom.php:126 -msgid "Room not found." +#: ../../Zotlabs/Lib/Apps.php:391 +msgid "Purchase" msgstr "" -#: ../../Zotlabs/Lib/Chatroom.php:147 -msgid "Room is full" +#: ../../Zotlabs/Lib/Apps.php:395 +msgid "Undelete" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:401 +msgid "Add to app-tray" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:402 +msgid "Remove from app-tray" +msgstr "" + +#: ../../Zotlabs/Lib/Permcat.php:58 +msgctxt "permcat" +msgid "default" +msgstr "" + +#: ../../Zotlabs/Lib/Permcat.php:96 +msgctxt "permcat" +msgid "follower" +msgstr "" + +#: ../../Zotlabs/Lib/Permcat.php:100 +msgctxt "permcat" +msgid "contributor" +msgstr "" + +#: ../../Zotlabs/Lib/Permcat.php:104 +msgctxt "permcat" +msgid "publisher" +msgstr "" + +#: ../../Zotlabs/Lib/NativeWikiPage.php:42 +#: ../../Zotlabs/Lib/NativeWikiPage.php:83 +msgid "(No Title)" +msgstr "" + +#: ../../Zotlabs/Lib/NativeWikiPage.php:97 +msgid "Wiki page create failed." +msgstr "" + +#: ../../Zotlabs/Lib/NativeWikiPage.php:110 +msgid "Wiki not found." +msgstr "" + +#: ../../Zotlabs/Lib/NativeWikiPage.php:121 +msgid "Destination name already exists" +msgstr "" + +#: ../../Zotlabs/Lib/NativeWikiPage.php:147 +#: ../../Zotlabs/Lib/NativeWikiPage.php:342 +msgid "Page not found" +msgstr "" + +#: ../../Zotlabs/Lib/NativeWikiPage.php:177 +msgid "Error reading page content" +msgstr "" + +#: ../../Zotlabs/Lib/NativeWikiPage.php:333 +#: ../../Zotlabs/Lib/NativeWikiPage.php:381 +#: ../../Zotlabs/Lib/NativeWikiPage.php:448 +#: ../../Zotlabs/Lib/NativeWikiPage.php:489 +msgid "Error reading wiki" +msgstr "" + +#: ../../Zotlabs/Lib/NativeWikiPage.php:369 +msgid "Page update failed." +msgstr "" + +#: ../../Zotlabs/Lib/NativeWikiPage.php:403 +msgid "Nothing deleted" +msgstr "" + +#: ../../Zotlabs/Lib/NativeWikiPage.php:469 +msgid "Compare: object not found." +msgstr "" + +#: ../../Zotlabs/Lib/NativeWikiPage.php:475 +msgid "Page updated" +msgstr "" + +#: ../../Zotlabs/Lib/NativeWikiPage.php:478 +msgid "Untitled" +msgstr "" + +#: ../../Zotlabs/Lib/NativeWikiPage.php:484 +msgid "Wiki resource_id required for git commit" +msgstr "" + +#: ../../Zotlabs/Lib/NativeWikiPage.php:540 +#: ../../Zotlabs/Widget/Wiki_page_history.php:23 +msgctxt "wiki_history" +msgid "Message" +msgstr "" + +#: ../../Zotlabs/Lib/NativeWikiPage.php:578 +#: ../../addon/gitwiki/gitwiki_backend.php:579 ../../include/bbcode.php:667 +#: ../../include/bbcode.php:813 +msgid "Different viewers will see this text differently" msgstr "" #: ../../Zotlabs/Lib/PermissionDescription.php:34 @@ -7378,230 +7412,32 @@ msgstr "" msgid "This is your default setting for the audience of your webpages" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:96 ../../include/conversation.php:656 -msgid "Private Message" +#: ../../Zotlabs/Lib/Chatroom.php:27 +msgid "Missing room name" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:133 ../../include/conversation.php:648 -msgid "Select" +#: ../../Zotlabs/Lib/Chatroom.php:36 +msgid "Duplicate room name" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:158 -msgid "I will attend" +#: ../../Zotlabs/Lib/Chatroom.php:86 ../../Zotlabs/Lib/Chatroom.php:94 +msgid "Invalid room specifier." msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:158 -msgid "I will not attend" +#: ../../Zotlabs/Lib/Chatroom.php:126 +msgid "Room not found." msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:158 -msgid "I might attend" -msgstr "" - -#: ../../Zotlabs/Lib/ThreadItem.php:168 -msgid "I agree" -msgstr "" - -#: ../../Zotlabs/Lib/ThreadItem.php:168 -msgid "I disagree" -msgstr "" - -#: ../../Zotlabs/Lib/ThreadItem.php:168 -msgid "I abstain" -msgstr "" - -#: ../../Zotlabs/Lib/ThreadItem.php:224 -msgid "Add Star" -msgstr "" - -#: ../../Zotlabs/Lib/ThreadItem.php:225 -msgid "Remove Star" -msgstr "" - -#: ../../Zotlabs/Lib/ThreadItem.php:226 -msgid "Toggle Star Status" -msgstr "" - -#: ../../Zotlabs/Lib/ThreadItem.php:230 -msgid "starred" -msgstr "" - -#: ../../Zotlabs/Lib/ThreadItem.php:240 ../../include/conversation.php:663 -msgid "Message signature validated" -msgstr "" - -#: ../../Zotlabs/Lib/ThreadItem.php:241 ../../include/conversation.php:664 -msgid "Message signature incorrect" -msgstr "" - -#: ../../Zotlabs/Lib/ThreadItem.php:249 -msgid "Add Tag" -msgstr "" - -#: ../../Zotlabs/Lib/ThreadItem.php:267 ../../include/taxonomy.php:346 -msgid "like" -msgstr "" - -#: ../../Zotlabs/Lib/ThreadItem.php:268 ../../include/taxonomy.php:347 -msgid "dislike" -msgstr "" - -#: ../../Zotlabs/Lib/ThreadItem.php:272 -msgid "Share This" -msgstr "" - -#: ../../Zotlabs/Lib/ThreadItem.php:272 -msgid "share" -msgstr "" - -#: ../../Zotlabs/Lib/ThreadItem.php:281 -msgid "Delivery Report" -msgstr "" - -#: ../../Zotlabs/Lib/ThreadItem.php:299 -#, php-format -msgid "%d comment" -msgid_plural "%d comments" -msgstr[0] "" -msgstr[1] "" - -#: ../../Zotlabs/Lib/ThreadItem.php:328 ../../Zotlabs/Lib/ThreadItem.php:329 -#, php-format -msgid "View %s's profile - %s" -msgstr "" - -#: ../../Zotlabs/Lib/ThreadItem.php:332 -msgid "to" -msgstr "" - -#: ../../Zotlabs/Lib/ThreadItem.php:333 -msgid "via" -msgstr "" - -#: ../../Zotlabs/Lib/ThreadItem.php:334 -msgid "Wall-to-Wall" -msgstr "" - -#: ../../Zotlabs/Lib/ThreadItem.php:335 -msgid "via Wall-To-Wall:" -msgstr "" - -#: ../../Zotlabs/Lib/ThreadItem.php:348 ../../include/conversation.php:715 -#, php-format -msgid "from %s" -msgstr "" - -#: ../../Zotlabs/Lib/ThreadItem.php:351 ../../include/conversation.php:718 -#, php-format -msgid "last edited: %s" -msgstr "" - -#: ../../Zotlabs/Lib/ThreadItem.php:352 ../../include/conversation.php:719 -#, php-format -msgid "Expires: %s" -msgstr "" - -#: ../../Zotlabs/Lib/ThreadItem.php:358 -msgid "Attend" -msgstr "" - -#: ../../Zotlabs/Lib/ThreadItem.php:359 -msgid "Attendance Options" -msgstr "" - -#: ../../Zotlabs/Lib/ThreadItem.php:360 -msgid "Vote" -msgstr "" - -#: ../../Zotlabs/Lib/ThreadItem.php:361 -msgid "Voting Options" -msgstr "" - -#: ../../Zotlabs/Lib/ThreadItem.php:382 -#: ../../extend/addon/addon/bookmarker/bookmarker.php:38 -msgid "Save Bookmarks" -msgstr "" - -#: ../../Zotlabs/Lib/ThreadItem.php:383 -msgid "Add to Calendar" -msgstr "" - -#: ../../Zotlabs/Lib/ThreadItem.php:441 ../../include/js_strings.php:7 -#, php-format -msgid "%s show all" -msgstr "" - -#: ../../Zotlabs/Lib/ThreadItem.php:731 ../../include/conversation.php:1315 -msgid "Bold" -msgstr "" - -#: ../../Zotlabs/Lib/ThreadItem.php:732 ../../include/conversation.php:1316 -msgid "Italic" -msgstr "" - -#: ../../Zotlabs/Lib/ThreadItem.php:733 ../../include/conversation.php:1317 -msgid "Underline" -msgstr "" - -#: ../../Zotlabs/Lib/ThreadItem.php:734 ../../include/conversation.php:1318 -msgid "Quote" -msgstr "" - -#: ../../Zotlabs/Lib/ThreadItem.php:735 ../../include/conversation.php:1319 -msgid "Code" -msgstr "" - -#: ../../Zotlabs/Lib/ThreadItem.php:736 -msgid "Image" -msgstr "" - -#: ../../Zotlabs/Lib/ThreadItem.php:737 -msgid "Insert Link" -msgstr "" - -#: ../../Zotlabs/Lib/ThreadItem.php:738 -msgid "Video" -msgstr "" - -#: ../../Zotlabs/Lib/ThreadItem.php:747 -msgid "Your full name (required)" -msgstr "" - -#: ../../Zotlabs/Lib/ThreadItem.php:748 -msgid "Your email address (required)" -msgstr "" - -#: ../../Zotlabs/Lib/ThreadItem.php:749 -msgid "Your website URL (optional)" -msgstr "" - -#: ../../Zotlabs/Lib/Permcat.php:58 -msgctxt "permcat" -msgid "default" -msgstr "" - -#: ../../Zotlabs/Lib/Permcat.php:96 -msgctxt "permcat" -msgid "follower" -msgstr "" - -#: ../../Zotlabs/Lib/Permcat.php:100 -msgctxt "permcat" -msgid "contributor" -msgstr "" - -#: ../../Zotlabs/Lib/Permcat.php:104 -msgctxt "permcat" -msgid "publisher" +#: ../../Zotlabs/Lib/Chatroom.php:147 +msgid "Room is full" msgstr "" #: ../../Zotlabs/Lib/Enotify.php:60 msgid "$Projectname Notification" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:61 ../../extend/addon/addon/diaspora/p.php:46 -#: ../../extend/addon/addon/diaspora/util.php:253 -#: ../../extend/addon/addon/diaspora/util.php:266 +#: ../../Zotlabs/Lib/Enotify.php:61 ../../addon/diaspora/util.php:283 +#: ../../addon/diaspora/util.php:296 ../../addon/diaspora/p.php:46 msgid "$projectname" msgstr "" @@ -7830,413 +7666,298 @@ msgstr "" msgid "Wiki files deleted successfully" msgstr "" -#: ../../Zotlabs/Lib/Techlevels.php:10 -msgid "0. Beginner/Basic" -msgstr "" - -#: ../../Zotlabs/Lib/Techlevels.php:11 -msgid "1. Novice - not skilled but willing to learn" -msgstr "" - -#: ../../Zotlabs/Lib/Techlevels.php:12 -msgid "2. Intermediate - somewhat comfortable" -msgstr "" - -#: ../../Zotlabs/Lib/Techlevels.php:13 -msgid "3. Advanced - very comfortable" -msgstr "" - -#: ../../Zotlabs/Lib/Techlevels.php:14 -msgid "4. Expert - I can write computer code" -msgstr "" - -#: ../../Zotlabs/Lib/Techlevels.php:15 -msgid "5. Wizard - I probably know more than you do" -msgstr "" - -#: ../../Zotlabs/Lib/DB_Upgrade.php:93 +#: ../../Zotlabs/Lib/DB_Upgrade.php:95 #, php-format msgid "Update Error at %s" msgstr "" -#: ../../Zotlabs/Lib/DB_Upgrade.php:99 +#: ../../Zotlabs/Lib/DB_Upgrade.php:101 #, php-format msgid "Update %s failed. See error logs." msgstr "" -#: ../../Zotlabs/Lib/Apps.php:213 -msgid "Site Admin" +#: ../../Zotlabs/Lib/ThreadItem.php:96 ../../include/conversation.php:656 +msgid "Private Message" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:214 -#: ../../extend/addon/addon/buglink/buglink.php:16 -msgid "Report Bug" +#: ../../Zotlabs/Lib/ThreadItem.php:133 ../../include/conversation.php:648 +msgid "Select" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:215 -msgid "View Bookmarks" +#: ../../Zotlabs/Lib/ThreadItem.php:158 +msgid "I will attend" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:216 -msgid "My Chatrooms" +#: ../../Zotlabs/Lib/ThreadItem.php:158 +msgid "I will not attend" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:218 -msgid "Firefox Share" +#: ../../Zotlabs/Lib/ThreadItem.php:158 +msgid "I might attend" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:219 -msgid "Remote Diagnostics" +#: ../../Zotlabs/Lib/ThreadItem.php:168 +msgid "I agree" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:220 ../../include/features.php:333 -msgid "Suggest Channels" +#: ../../Zotlabs/Lib/ThreadItem.php:168 +msgid "I disagree" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:221 ../../include/nav.php:115 -#: ../../boot.php:1591 -msgid "Login" +#: ../../Zotlabs/Lib/ThreadItem.php:168 +msgid "I abstain" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:223 -msgid "Activity" +#: ../../Zotlabs/Lib/ThreadItem.php:224 +msgid "Add Star" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:227 ../../include/nav.php:455 -#: ../../include/features.php:95 ../../include/conversation.php:1854 -msgid "Wiki" +#: ../../Zotlabs/Lib/ThreadItem.php:225 +msgid "Remove Star" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:228 ../../include/nav.php:178 -msgid "Channel Home" +#: ../../Zotlabs/Lib/ThreadItem.php:226 +msgid "Toggle Star Status" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:231 ../../include/nav.php:198 -#: ../../include/nav.php:401 ../../include/nav.php:404 -#: ../../include/conversation.php:1799 ../../include/conversation.php:1802 -msgid "Events" +#: ../../Zotlabs/Lib/ThreadItem.php:230 +msgid "starred" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:232 -msgid "Directory" +#: ../../Zotlabs/Lib/ThreadItem.php:240 ../../include/conversation.php:663 +msgid "Message signature validated" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:234 ../../include/nav.php:190 -msgid "Mail" +#: ../../Zotlabs/Lib/ThreadItem.php:241 ../../include/conversation.php:664 +msgid "Message signature incorrect" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:237 -msgid "Chat" +#: ../../Zotlabs/Lib/ThreadItem.php:249 +msgid "Add Tag" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:239 -msgid "Probe" +#: ../../Zotlabs/Lib/ThreadItem.php:267 ../../include/taxonomy.php:355 +msgid "like" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:240 -msgid "Suggest" +#: ../../Zotlabs/Lib/ThreadItem.php:268 ../../include/taxonomy.php:356 +msgid "dislike" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:241 -msgid "Random Channel" +#: ../../Zotlabs/Lib/ThreadItem.php:272 +msgid "Share This" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:242 -msgid "Invite" +#: ../../Zotlabs/Lib/ThreadItem.php:272 +msgid "share" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:243 ../../Zotlabs/Widget/Admin.php:26 -msgid "Features" +#: ../../Zotlabs/Lib/ThreadItem.php:281 +msgid "Delivery Report" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:244 -#: ../../extend/addon/addon/openid/MysqlProvider.php:69 -msgid "Language" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:245 -msgid "Post" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:246 -#: ../../extend/addon/addon/openid/MysqlProvider.php:58 -#: ../../extend/addon/addon/openid/MysqlProvider.php:59 -#: ../../extend/addon/addon/openid/MysqlProvider.php:60 -msgid "Profile Photo" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:366 -msgid "Purchase" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:370 -msgid "Undelete" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:376 -msgid "Add to app-tray" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:377 -msgid "Remove from app-tray" -msgstr "" - -#: ../../Zotlabs/Lib/NativeWikiPage.php:42 -#: ../../Zotlabs/Lib/NativeWikiPage.php:83 -msgid "(No Title)" -msgstr "" - -#: ../../Zotlabs/Lib/NativeWikiPage.php:97 -msgid "Wiki page create failed." -msgstr "" - -#: ../../Zotlabs/Lib/NativeWikiPage.php:110 -msgid "Wiki not found." -msgstr "" - -#: ../../Zotlabs/Lib/NativeWikiPage.php:121 -msgid "Destination name already exists" -msgstr "" - -#: ../../Zotlabs/Lib/NativeWikiPage.php:147 -#: ../../Zotlabs/Lib/NativeWikiPage.php:342 -msgid "Page not found" -msgstr "" - -#: ../../Zotlabs/Lib/NativeWikiPage.php:177 -msgid "Error reading page content" -msgstr "" - -#: ../../Zotlabs/Lib/NativeWikiPage.php:333 -#: ../../Zotlabs/Lib/NativeWikiPage.php:381 -#: ../../Zotlabs/Lib/NativeWikiPage.php:448 -#: ../../Zotlabs/Lib/NativeWikiPage.php:489 -msgid "Error reading wiki" -msgstr "" - -#: ../../Zotlabs/Lib/NativeWikiPage.php:369 -msgid "Page update failed." -msgstr "" - -#: ../../Zotlabs/Lib/NativeWikiPage.php:403 -msgid "Nothing deleted" -msgstr "" - -#: ../../Zotlabs/Lib/NativeWikiPage.php:469 -msgid "Compare: object not found." -msgstr "" - -#: ../../Zotlabs/Lib/NativeWikiPage.php:475 -msgid "Page updated" -msgstr "" - -#: ../../Zotlabs/Lib/NativeWikiPage.php:478 -msgid "Untitled" -msgstr "" - -#: ../../Zotlabs/Lib/NativeWikiPage.php:484 -msgid "Wiki resource_id required for git commit" -msgstr "" - -#: ../../Zotlabs/Lib/NativeWikiPage.php:540 -#: ../../Zotlabs/Widget/Wiki_page_history.php:23 -msgctxt "wiki_history" -msgid "Message" -msgstr "" - -#: ../../Zotlabs/Lib/NativeWikiPage.php:578 -#: ../../extend/addon/addon/gitwiki/gitwiki_backend.php:579 -#: ../../include/bbcode.php:667 ../../include/bbcode.php:813 -msgid "Different viewers will see this text differently" -msgstr "" - -#: ../../Zotlabs/Widget/Admin.php:23 ../../Zotlabs/Widget/Admin.php:60 -msgid "Member registrations waiting for confirmation" -msgstr "" - -#: ../../Zotlabs/Widget/Admin.php:29 -msgid "Inspect queue" -msgstr "" - -#: ../../Zotlabs/Widget/Admin.php:31 -msgid "DB updates" -msgstr "" - -#: ../../Zotlabs/Widget/Admin.php:55 ../../include/nav.php:212 -msgid "Admin" -msgstr "" - -#: ../../Zotlabs/Widget/Admin.php:56 -msgid "Plugin Features" -msgstr "" - -#: ../../Zotlabs/Widget/Affinity.php:49 -msgid "Refresh" -msgstr "" - -#: ../../Zotlabs/Widget/Appcategories.php:39 -#: ../../Zotlabs/Widget/Tagcloud.php:25 ../../include/contact_widgets.php:91 -#: ../../include/taxonomy.php:218 ../../include/taxonomy.php:300 -msgid "Categories" -msgstr "" - -#: ../../Zotlabs/Widget/Appcategories.php:42 ../../Zotlabs/Widget/Filer.php:31 -#: ../../include/contact_widgets.php:56 ../../include/contact_widgets.php:94 -msgid "Everything" -msgstr "" - -#: ../../Zotlabs/Widget/Archive.php:43 -msgid "Archives" -msgstr "" - -#: ../../Zotlabs/Widget/Bookmarkedchats.php:24 -msgid "Bookmarked Chatrooms" -msgstr "" - -#: ../../Zotlabs/Widget/Chatroom_list.php:16 ../../include/nav.php:415 -#: ../../include/nav.php:418 ../../include/conversation.php:1813 -#: ../../include/conversation.php:1816 -msgid "Chatrooms" -msgstr "" - -#: ../../Zotlabs/Widget/Chatroom_list.php:20 -msgid "Overview" -msgstr "" - -#: ../../Zotlabs/Widget/Chatroom_members.php:11 -msgid "Chat Members" -msgstr "" - -#: ../../Zotlabs/Widget/Cover_photo.php:54 -msgid "Click to show more" -msgstr "" - -#: ../../Zotlabs/Widget/Eventstools.php:13 -msgid "Events Tools" -msgstr "" - -#: ../../Zotlabs/Widget/Eventstools.php:14 -msgid "Export Calendar" -msgstr "" - -#: ../../Zotlabs/Widget/Eventstools.php:15 -msgid "Import Calendar" -msgstr "" - -#: ../../Zotlabs/Widget/Filer.php:28 ../../include/contact_widgets.php:53 -#: ../../include/features.php:386 -msgid "Saved Folders" -msgstr "" - -#: ../../Zotlabs/Widget/Follow.php:22 +#: ../../Zotlabs/Lib/ThreadItem.php:299 #, php-format -msgid "You have %1$.0f of %2$.0f allowed connections." +msgid "%d comment" +msgid_plural "%d comments" +msgstr[0] "" +msgstr[1] "" + +#: ../../Zotlabs/Lib/ThreadItem.php:328 ../../Zotlabs/Lib/ThreadItem.php:329 +#, php-format +msgid "View %s's profile - %s" msgstr "" -#: ../../Zotlabs/Widget/Follow.php:29 -msgid "Add New Connection" +#: ../../Zotlabs/Lib/ThreadItem.php:332 +msgid "to" msgstr "" -#: ../../Zotlabs/Widget/Follow.php:30 -msgid "Enter channel address" +#: ../../Zotlabs/Lib/ThreadItem.php:333 +msgid "via" msgstr "" -#: ../../Zotlabs/Widget/Follow.php:31 -msgid "Examples: bob@example.com, https://example.com/barbara" +#: ../../Zotlabs/Lib/ThreadItem.php:334 +msgid "Wall-to-Wall" msgstr "" -#: ../../Zotlabs/Widget/Mailmenu.php:13 -msgid "Private Mail Menu" +#: ../../Zotlabs/Lib/ThreadItem.php:335 +msgid "via Wall-To-Wall:" msgstr "" -#: ../../Zotlabs/Widget/Mailmenu.php:15 -msgid "Combined View" +#: ../../Zotlabs/Lib/ThreadItem.php:348 ../../include/conversation.php:715 +#, php-format +msgid "from %s" msgstr "" -#: ../../Zotlabs/Widget/Mailmenu.php:20 ../../include/nav.php:193 -msgid "Inbox" +#: ../../Zotlabs/Lib/ThreadItem.php:351 ../../include/conversation.php:718 +#, php-format +msgid "last edited: %s" msgstr "" -#: ../../Zotlabs/Widget/Mailmenu.php:25 ../../include/nav.php:194 -msgid "Outbox" +#: ../../Zotlabs/Lib/ThreadItem.php:352 ../../include/conversation.php:719 +#, php-format +msgid "Expires: %s" msgstr "" -#: ../../Zotlabs/Widget/Mailmenu.php:30 ../../include/nav.php:195 -msgid "New Message" +#: ../../Zotlabs/Lib/ThreadItem.php:358 +msgid "Attend" msgstr "" -#: ../../Zotlabs/Widget/Notes.php:16 -msgid "Notes" +#: ../../Zotlabs/Lib/ThreadItem.php:359 +msgid "Attendance Options" msgstr "" -#: ../../Zotlabs/Widget/Photo.php:48 ../../Zotlabs/Widget/Photo_rand.php:58 -msgid "photo/image" +#: ../../Zotlabs/Lib/ThreadItem.php:360 +msgid "Vote" msgstr "" -#: ../../Zotlabs/Widget/Rating.php:51 -msgid "Rating Tools" +#: ../../Zotlabs/Lib/ThreadItem.php:361 +msgid "Voting Options" msgstr "" -#: ../../Zotlabs/Widget/Rating.php:55 ../../Zotlabs/Widget/Rating.php:57 -msgid "Rate Me" +#: ../../Zotlabs/Lib/ThreadItem.php:382 +#: ../../addon/bookmarker/bookmarker.php:38 +msgid "Save Bookmarks" msgstr "" -#: ../../Zotlabs/Widget/Rating.php:60 -msgid "View Ratings" +#: ../../Zotlabs/Lib/ThreadItem.php:383 +msgid "Add to Calendar" msgstr "" -#: ../../Zotlabs/Widget/Savedsearch.php:75 -msgid "Remove term" +#: ../../Zotlabs/Lib/ThreadItem.php:441 ../../include/js_strings.php:7 +#, php-format +msgid "%s show all" msgstr "" -#: ../../Zotlabs/Widget/Savedsearch.php:83 ../../include/features.php:297 -msgid "Saved Searches" +#: ../../Zotlabs/Lib/ThreadItem.php:731 ../../include/conversation.php:1315 +msgid "Bold" msgstr "" -#: ../../Zotlabs/Widget/Savedsearch.php:84 ../../include/group.php:336 -msgid "add" +#: ../../Zotlabs/Lib/ThreadItem.php:732 ../../include/conversation.php:1316 +msgid "Italic" msgstr "" -#: ../../Zotlabs/Widget/Suggestedchats.php:32 -msgid "Suggested Chatrooms" +#: ../../Zotlabs/Lib/ThreadItem.php:733 ../../include/conversation.php:1317 +msgid "Underline" msgstr "" -#: ../../Zotlabs/Widget/Suggestions.php:51 -msgid "Suggestions" +#: ../../Zotlabs/Lib/ThreadItem.php:734 ../../include/conversation.php:1318 +msgid "Quote" msgstr "" -#: ../../Zotlabs/Widget/Suggestions.php:52 -msgid "See more..." +#: ../../Zotlabs/Lib/ThreadItem.php:735 ../../include/conversation.php:1319 +msgid "Code" msgstr "" -#: ../../Zotlabs/Widget/Wiki_list.php:15 -#: ../../extend/addon/addon/gitwiki/gitwiki.php:95 -msgid "Wiki List" +#: ../../Zotlabs/Lib/ThreadItem.php:736 +msgid "Image" +msgstr "" + +#: ../../Zotlabs/Lib/ThreadItem.php:737 +msgid "Insert Link" +msgstr "" + +#: ../../Zotlabs/Lib/ThreadItem.php:738 +msgid "Video" +msgstr "" + +#: ../../Zotlabs/Lib/ThreadItem.php:747 +msgid "Your full name (required)" +msgstr "" + +#: ../../Zotlabs/Lib/ThreadItem.php:748 +msgid "Your email address (required)" +msgstr "" + +#: ../../Zotlabs/Lib/ThreadItem.php:749 +msgid "Your website URL (optional)" +msgstr "" + +#: ../../Zotlabs/Zot/Auth.php:138 +msgid "" +"Remote authentication blocked. You are logged into this site locally. Please " +"logout and retry." +msgstr "" + +#: ../../Zotlabs/Zot/Auth.php:250 ../../addon/openid/Mod_Openid.php:76 +#: ../../addon/openid/Mod_Openid.php:178 +#, php-format +msgid "Welcome %s. Remote authentication successful." +msgstr "" + +#: ../../Zotlabs/Storage/Browser.php:107 ../../Zotlabs/Storage/Browser.php:238 +msgid "parent" +msgstr "" + +#: ../../Zotlabs/Storage/Browser.php:131 ../../include/text.php:2692 +msgid "Collection" +msgstr "" + +#: ../../Zotlabs/Storage/Browser.php:134 +msgid "Principal" +msgstr "" + +#: ../../Zotlabs/Storage/Browser.php:137 +msgid "Addressbook" +msgstr "" + +#: ../../Zotlabs/Storage/Browser.php:140 +msgid "Calendar" +msgstr "" + +#: ../../Zotlabs/Storage/Browser.php:143 +msgid "Schedule Inbox" +msgstr "" + +#: ../../Zotlabs/Storage/Browser.php:146 +msgid "Schedule Outbox" +msgstr "" + +#: ../../Zotlabs/Storage/Browser.php:226 +msgid "Total" +msgstr "" + +#: ../../Zotlabs/Storage/Browser.php:228 +msgid "Shared" +msgstr "" + +#: ../../Zotlabs/Storage/Browser.php:304 +#, php-format +msgid "You are using %1$s of your available file storage." +msgstr "" + +#: ../../Zotlabs/Storage/Browser.php:309 +#, php-format +msgid "You are using %1$s of %2$s available file storage. (%3$s%)" +msgstr "" + +#: ../../Zotlabs/Storage/Browser.php:320 +msgid "WARNING:" +msgstr "" + +#: ../../Zotlabs/Storage/Browser.php:330 +msgid "" +"Please use DAV to upload large (video, audio) files.
See Cloud Desktop " +"Clients" +msgstr "" + +#: ../../Zotlabs/Storage/Browser.php:334 +msgid "Create new folder" +msgstr "" + +#: ../../Zotlabs/Storage/Browser.php:336 +msgid "Upload file" +msgstr "" + +#: ../../Zotlabs/Storage/Browser.php:350 +msgid "Drop files here to immediately upload" msgstr "" #: ../../Zotlabs/Widget/Forums.php:85 msgid "Forums" msgstr "" -#: ../../Zotlabs/Widget/Tasklist.php:23 -msgid "Tasks" -msgstr "" - -#: ../../Zotlabs/Widget/Wiki_pages.php:52 -#: ../../extend/addon/addon/gitwiki/gitwiki.php:76 -msgid "Wiki Pages" -msgstr "" - -#: ../../Zotlabs/Widget/Wiki_pages.php:58 -#: ../../extend/addon/addon/gitwiki/gitwiki.php:81 -msgid "Add new page" -msgstr "" - -#: ../../Zotlabs/Widget/Wiki_pages.php:59 -#: ../../extend/addon/addon/gitwiki/gitwiki.php:82 -msgid "Page name" -msgstr "" - #: ../../Zotlabs/Widget/Cdav.php:37 msgid "Select Channel" msgstr "" @@ -8313,6 +8034,105 @@ msgstr "" msgid "Select an addressbook to import to" msgstr "" +#: ../../Zotlabs/Widget/Appcategories.php:39 +#: ../../Zotlabs/Widget/Tagcloud.php:25 ../../include/contact_widgets.php:91 +#: ../../include/taxonomy.php:227 ../../include/taxonomy.php:309 +msgid "Categories" +msgstr "" + +#: ../../Zotlabs/Widget/Appcategories.php:42 ../../Zotlabs/Widget/Filer.php:31 +#: ../../include/contact_widgets.php:56 ../../include/contact_widgets.php:94 +msgid "Everything" +msgstr "" + +#: ../../Zotlabs/Widget/Eventstools.php:13 +msgid "Events Tools" +msgstr "" + +#: ../../Zotlabs/Widget/Eventstools.php:14 +msgid "Export Calendar" +msgstr "" + +#: ../../Zotlabs/Widget/Eventstools.php:15 +msgid "Import Calendar" +msgstr "" + +#: ../../Zotlabs/Widget/Suggestedchats.php:32 +msgid "Suggested Chatrooms" +msgstr "" + +#: ../../Zotlabs/Widget/Mailmenu.php:13 +msgid "Private Mail Menu" +msgstr "" + +#: ../../Zotlabs/Widget/Mailmenu.php:15 +msgid "Combined View" +msgstr "" + +#: ../../Zotlabs/Widget/Mailmenu.php:20 ../../include/nav.php:190 +msgid "Inbox" +msgstr "" + +#: ../../Zotlabs/Widget/Mailmenu.php:25 ../../include/nav.php:191 +msgid "Outbox" +msgstr "" + +#: ../../Zotlabs/Widget/Mailmenu.php:30 ../../include/nav.php:192 +msgid "New Message" +msgstr "" + +#: ../../Zotlabs/Widget/Chatroom_list.php:16 +#: ../../include/conversation.php:1813 ../../include/conversation.php:1816 +#: ../../include/nav.php:411 ../../include/nav.php:414 +msgid "Chatrooms" +msgstr "" + +#: ../../Zotlabs/Widget/Chatroom_list.php:20 +msgid "Overview" +msgstr "" + +#: ../../Zotlabs/Widget/Rating.php:51 +msgid "Rating Tools" +msgstr "" + +#: ../../Zotlabs/Widget/Rating.php:55 ../../Zotlabs/Widget/Rating.php:57 +msgid "Rate Me" +msgstr "" + +#: ../../Zotlabs/Widget/Rating.php:60 +msgid "View Ratings" +msgstr "" + +#: ../../Zotlabs/Widget/Activity.php:50 +msgctxt "widget" +msgid "Activity" +msgstr "" + +#: ../../Zotlabs/Widget/Follow.php:22 +#, php-format +msgid "You have %1$.0f of %2$.0f allowed connections." +msgstr "" + +#: ../../Zotlabs/Widget/Follow.php:29 +msgid "Add New Connection" +msgstr "" + +#: ../../Zotlabs/Widget/Follow.php:30 +msgid "Enter channel address" +msgstr "" + +#: ../../Zotlabs/Widget/Follow.php:31 +msgid "Examples: bob@example.com, https://example.com/barbara" +msgstr "" + +#: ../../Zotlabs/Widget/Wiki_list.php:15 ../../addon/gitwiki/gitwiki.php:95 +msgid "Wiki List" +msgstr "" + +#: ../../Zotlabs/Widget/Archive.php:43 +msgid "Archives" +msgstr "" + #: ../../Zotlabs/Widget/Conversations.php:17 msgid "Received Messages" msgstr "" @@ -8329,13 +8149,89 @@ msgstr "" msgid "No messages." msgstr "" -#: ../../Zotlabs/Widget/Conversations.php:53 +#: ../../Zotlabs/Widget/Conversations.php:55 msgid "Delete conversation" msgstr "" -#: ../../Zotlabs/Widget/Activity.php:50 -msgctxt "widget" -msgid "Activity" +#: ../../Zotlabs/Widget/Chatroom_members.php:11 +msgid "Chat Members" +msgstr "" + +#: ../../Zotlabs/Widget/Photo.php:48 ../../Zotlabs/Widget/Photo_rand.php:58 +msgid "photo/image" +msgstr "" + +#: ../../Zotlabs/Widget/Savedsearch.php:75 +msgid "Remove term" +msgstr "" + +#: ../../Zotlabs/Widget/Savedsearch.php:83 ../../include/features.php:297 +msgid "Saved Searches" +msgstr "" + +#: ../../Zotlabs/Widget/Savedsearch.php:84 ../../include/group.php:337 +msgid "add" +msgstr "" + +#: ../../Zotlabs/Widget/Notes.php:16 +msgid "Notes" +msgstr "" + +#: ../../Zotlabs/Widget/Wiki_pages.php:52 ../../addon/gitwiki/gitwiki.php:76 +msgid "Wiki Pages" +msgstr "" + +#: ../../Zotlabs/Widget/Wiki_pages.php:58 ../../addon/gitwiki/gitwiki.php:81 +msgid "Add new page" +msgstr "" + +#: ../../Zotlabs/Widget/Wiki_pages.php:59 ../../addon/gitwiki/gitwiki.php:82 +msgid "Page name" +msgstr "" + +#: ../../Zotlabs/Widget/Affinity.php:49 +msgid "Refresh" +msgstr "" + +#: ../../Zotlabs/Widget/Tasklist.php:23 +msgid "Tasks" +msgstr "" + +#: ../../Zotlabs/Widget/Suggestions.php:51 +msgid "Suggestions" +msgstr "" + +#: ../../Zotlabs/Widget/Suggestions.php:52 +msgid "See more..." +msgstr "" + +#: ../../Zotlabs/Widget/Filer.php:28 ../../include/contact_widgets.php:53 +#: ../../include/features.php:386 +msgid "Saved Folders" +msgstr "" + +#: ../../Zotlabs/Widget/Cover_photo.php:54 +msgid "Click to show more" +msgstr "" + +#: ../../Zotlabs/Widget/Admin.php:23 ../../Zotlabs/Widget/Admin.php:60 +msgid "Member registrations waiting for confirmation" +msgstr "" + +#: ../../Zotlabs/Widget/Admin.php:29 +msgid "Inspect queue" +msgstr "" + +#: ../../Zotlabs/Widget/Admin.php:31 +msgid "DB updates" +msgstr "" + +#: ../../Zotlabs/Widget/Admin.php:55 ../../include/nav.php:215 +msgid "Admin" +msgstr "" + +#: ../../Zotlabs/Widget/Admin.php:56 +msgid "Plugin Features" msgstr "" #: ../../Zotlabs/Widget/Settings_menu.php:35 @@ -8378,857 +8274,497 @@ msgstr "" msgid "Premium Channel Settings" msgstr "" -#: ../../extend/addon/addon/adultphotoflag/adultphotoflag.php:24 +#: ../../Zotlabs/Widget/Bookmarkedchats.php:24 +msgid "Bookmarked Chatrooms" +msgstr "" + +#: ../../util/nconfig.php:34 +msgid "Source channel not found." +msgstr "" + +#: ../../boot.php:1581 +msgid "Create an account to access services and applications" +msgstr "" + +#: ../../boot.php:1600 ../../include/nav.php:99 ../../include/nav.php:123 +#: ../../include/nav.php:140 +msgid "Logout" +msgstr "" + +#: ../../boot.php:1603 +msgid "Login/Email" +msgstr "" + +#: ../../boot.php:1604 +msgid "Password" +msgstr "" + +#: ../../boot.php:1605 +msgid "Remember me" +msgstr "" + +#: ../../boot.php:1608 +msgid "Forgot your password?" +msgstr "" + +#: ../../boot.php:2146 +msgid "toggle mobile" +msgstr "" + +#: ../../boot.php:2299 +#, php-format +msgid "[$Projectname] Website SSL error for %s" +msgstr "" + +#: ../../boot.php:2304 +msgid "Website SSL certificate is not valid. Please correct." +msgstr "" + +#: ../../boot.php:2423 +#, php-format +msgid "[$Projectname] Cron tasks not running on %s" +msgstr "" + +#: ../../boot.php:2428 +msgid "Cron/Scheduled tasks not running." +msgstr "" + +#: ../../boot.php:2429 ../../include/datetime.php:286 +msgid "never" +msgstr "" + +#: ../../view/theme/redbasic/php/config.php:16 +#: ../../view/theme/redbasic/php/config.php:19 +msgid "Focus (Hubzilla default)" +msgstr "" + +#: ../../view/theme/redbasic/php/config.php:99 +msgid "Theme settings" +msgstr "" + +#: ../../view/theme/redbasic/php/config.php:100 +msgid "Narrow navbar" +msgstr "" + +#: ../../view/theme/redbasic/php/config.php:101 +msgid "Navigation bar background color" +msgstr "" + +#: ../../view/theme/redbasic/php/config.php:102 +msgid "Navigation bar icon color " +msgstr "" + +#: ../../view/theme/redbasic/php/config.php:103 +msgid "Navigation bar active icon color " +msgstr "" + +#: ../../view/theme/redbasic/php/config.php:104 +msgid "Link color" +msgstr "" + +#: ../../view/theme/redbasic/php/config.php:105 +msgid "Set font-color for banner" +msgstr "" + +#: ../../view/theme/redbasic/php/config.php:106 +msgid "Set the background color" +msgstr "" + +#: ../../view/theme/redbasic/php/config.php:107 +msgid "Set the background image" +msgstr "" + +#: ../../view/theme/redbasic/php/config.php:108 +msgid "Set the background color of items" +msgstr "" + +#: ../../view/theme/redbasic/php/config.php:109 +msgid "Set the background color of comments" +msgstr "" + +#: ../../view/theme/redbasic/php/config.php:110 +msgid "Set font-size for the entire application" +msgstr "" + +#: ../../view/theme/redbasic/php/config.php:110 +msgid "Examples: 1rem, 100%, 16px" +msgstr "" + +#: ../../view/theme/redbasic/php/config.php:111 +msgid "Set font-color for posts and comments" +msgstr "" + +#: ../../view/theme/redbasic/php/config.php:112 +msgid "Set radius of corners" +msgstr "" + +#: ../../view/theme/redbasic/php/config.php:112 +msgid "Example: 4px" +msgstr "" + +#: ../../view/theme/redbasic/php/config.php:113 +msgid "Set shadow depth of photos" +msgstr "" + +#: ../../view/theme/redbasic/php/config.php:114 +msgid "Set maximum width of content region in pixel" +msgstr "" + +#: ../../view/theme/redbasic/php/config.php:114 +msgid "Leave empty for default width" +msgstr "" + +#: ../../view/theme/redbasic/php/config.php:115 +msgid "Left align page content" +msgstr "" + +#: ../../view/theme/redbasic/php/config.php:116 +msgid "Set size of conversation author photo" +msgstr "" + +#: ../../view/theme/redbasic/php/config.php:117 +msgid "Set size of followup author photos" +msgstr "" + +#: ../../addon/rendezvous/rendezvous.php:57 +msgid "Errors encountered deleting database table " +msgstr "" + +#: ../../addon/rendezvous/rendezvous.php:95 ../../addon/twitter/twitter.php:773 +msgid "Submit Settings" +msgstr "" + +#: ../../addon/rendezvous/rendezvous.php:96 +msgid "Drop tables when uninstalling?" +msgstr "" + +#: ../../addon/rendezvous/rendezvous.php:96 +msgid "" +"If checked, the Rendezvous database tables will be deleted when the plugin " +"is uninstalled." +msgstr "" + +#: ../../addon/rendezvous/rendezvous.php:97 +msgid "Mapbox Access Token" +msgstr "" + +#: ../../addon/rendezvous/rendezvous.php:97 +msgid "" +"If you enter a Mapbox access token, it will be used to retrieve map tiles " +"from Mapbox instead of the default OpenStreetMap tile server." +msgstr "" + +#: ../../addon/rendezvous/rendezvous.php:162 +msgid "Rendezvous" +msgstr "" + +#: ../../addon/rendezvous/rendezvous.php:167 +msgid "" +"This identity has been deleted by another member due to inactivity. Please " +"press the \"New identity\" button or refresh the page to register a new " +"identity. You may use the same name." +msgstr "" + +#: ../../addon/rendezvous/rendezvous.php:168 +msgid "Welcome to Rendezvous!" +msgstr "" + +#: ../../addon/rendezvous/rendezvous.php:169 +msgid "" +"Enter your name to join this rendezvous. To begin sharing your location with " +"the other members, tap the GPS control. When your location is discovered, a " +"red dot will appear and others will be able to see you on the map." +msgstr "" + +#: ../../addon/rendezvous/rendezvous.php:171 +msgid "Let's meet here" +msgstr "" + +#: ../../addon/rendezvous/rendezvous.php:174 +msgid "New marker" +msgstr "" + +#: ../../addon/rendezvous/rendezvous.php:175 +msgid "Edit marker" +msgstr "" + +#: ../../addon/rendezvous/rendezvous.php:176 +msgid "New identity" +msgstr "" + +#: ../../addon/rendezvous/rendezvous.php:177 +msgid "Delete marker" +msgstr "" + +#: ../../addon/rendezvous/rendezvous.php:178 +msgid "Delete member" +msgstr "" + +#: ../../addon/rendezvous/rendezvous.php:179 +msgid "Edit proximity alert" +msgstr "" + +#: ../../addon/rendezvous/rendezvous.php:180 +msgid "" +"A proximity alert will be issued when this member is within a certain radius " +"of you.

Enter a radius in meters (0 to disable):" +msgstr "" + +#: ../../addon/rendezvous/rendezvous.php:180 +#: ../../addon/rendezvous/rendezvous.php:185 +msgid "distance" +msgstr "" + +#: ../../addon/rendezvous/rendezvous.php:181 +msgid "Proximity alert distance (meters)" +msgstr "" + +#: ../../addon/rendezvous/rendezvous.php:182 +#: ../../addon/rendezvous/rendezvous.php:184 +msgid "" +"A proximity alert will be issued when you are within a certain radius of the " +"marker location.

Enter a radius in meters (0 to disable):" +msgstr "" + +#: ../../addon/rendezvous/rendezvous.php:183 +msgid "Marker proximity alert" +msgstr "" + +#: ../../addon/rendezvous/rendezvous.php:186 +msgid "Reminder note" +msgstr "" + +#: ../../addon/rendezvous/rendezvous.php:187 +msgid "" +"Enter a note to be displayed when you are within the specified proximity..." +msgstr "" + +#: ../../addon/rendezvous/rendezvous.php:199 +msgid "Add new rendezvous" +msgstr "" + +#: ../../addon/rendezvous/rendezvous.php:200 +msgid "" +"Create a new rendezvous and share the access link with those you wish to " +"invite to the group. Those who open the link become members of the " +"rendezvous. They can view other member locations, add markers to the map, or " +"share their own locations with the group." +msgstr "" + +#: ../../addon/skeleton/skeleton.php:59 +msgid "Some setting" +msgstr "" + +#: ../../addon/skeleton/skeleton.php:61 +msgid "A setting" +msgstr "" + +#: ../../addon/skeleton/skeleton.php:64 +msgid "Skeleton Settings" +msgstr "" + +#: ../../addon/gnusoc/gnusoc.php:200 +msgid "GNU-Social Protocol Settings updated." +msgstr "" + +#: ../../addon/gnusoc/gnusoc.php:219 +msgid "" +"The GNU-Social protocol does not support location independence. Connections " +"you make within that network may be unreachable from alternate channel " +"locations." +msgstr "" + +#: ../../addon/gnusoc/gnusoc.php:222 +msgid "Enable the GNU-Social protocol for this channel" +msgstr "" + +#: ../../addon/gnusoc/gnusoc.php:226 +msgid "GNU-Social Protocol Settings" +msgstr "" + +#: ../../addon/gnusoc/gnusoc.php:417 +msgid "Follow" +msgstr "" + +#: ../../addon/gnusoc/gnusoc.php:420 +#, php-format +msgid "%1$s is now following %2$s" +msgstr "" + +#: ../../addon/planets/planets.php:121 +msgid "Planets Settings updated." +msgstr "" + +#: ../../addon/planets/planets.php:149 +msgid "Enable Planets Plugin" +msgstr "" + +#: ../../addon/planets/planets.php:153 +msgid "Planets Settings" +msgstr "" + +#: ../../addon/openclipatar/openclipatar.php:50 +#: ../../addon/openclipatar/openclipatar.php:128 +msgid "System defaults:" +msgstr "" + +#: ../../addon/openclipatar/openclipatar.php:54 +msgid "Preferred Clipart IDs" +msgstr "" + +#: ../../addon/openclipatar/openclipatar.php:54 +msgid "List of preferred clipart ids. These will be shown first." +msgstr "" + +#: ../../addon/openclipatar/openclipatar.php:55 +msgid "Default Search Term" +msgstr "" + +#: ../../addon/openclipatar/openclipatar.php:55 +msgid "The default search term. These will be shown second." +msgstr "" + +#: ../../addon/openclipatar/openclipatar.php:56 +msgid "Return After" +msgstr "" + +#: ../../addon/openclipatar/openclipatar.php:56 +msgid "Page to load after image selection." +msgstr "" + +#: ../../addon/openclipatar/openclipatar.php:58 ../../include/channel.php:1165 +#: ../../include/nav.php:107 +msgid "Edit Profile" +msgstr "" + +#: ../../addon/openclipatar/openclipatar.php:59 +msgid "Profile List" +msgstr "" + +#: ../../addon/openclipatar/openclipatar.php:61 +msgid "Order of Preferred" +msgstr "" + +#: ../../addon/openclipatar/openclipatar.php:61 +msgid "Sort order of preferred clipart ids." +msgstr "" + +#: ../../addon/openclipatar/openclipatar.php:62 +#: ../../addon/openclipatar/openclipatar.php:68 +msgid "Newest first" +msgstr "" + +#: ../../addon/openclipatar/openclipatar.php:65 +msgid "As entered" +msgstr "" + +#: ../../addon/openclipatar/openclipatar.php:67 +msgid "Order of other" +msgstr "" + +#: ../../addon/openclipatar/openclipatar.php:67 +msgid "Sort order of other clipart ids." +msgstr "" + +#: ../../addon/openclipatar/openclipatar.php:69 +msgid "Most downloaded first" +msgstr "" + +#: ../../addon/openclipatar/openclipatar.php:70 +msgid "Most liked first" +msgstr "" + +#: ../../addon/openclipatar/openclipatar.php:72 +msgid "Preferred IDs Message" +msgstr "" + +#: ../../addon/openclipatar/openclipatar.php:72 +msgid "Message to display above preferred results." +msgstr "" + +#: ../../addon/openclipatar/openclipatar.php:78 +msgid "Uploaded by: " +msgstr "" + +#: ../../addon/openclipatar/openclipatar.php:78 +msgid "Drawn by: " +msgstr "" + +#: ../../addon/openclipatar/openclipatar.php:192 +msgid "Or select from a free OpenClipart.org image:" +msgstr "" + +#: ../../addon/openclipatar/openclipatar.php:195 +msgid "Search Term" +msgstr "" + +#: ../../addon/openclipatar/openclipatar.php:232 +msgid "Unknown error. Please try again later." +msgstr "" + +#: ../../addon/openclipatar/openclipatar.php:308 +msgid "Profile photo updated successfully." +msgstr "" + +#: ../../addon/adultphotoflag/adultphotoflag.php:24 msgid "Flag Adult Photos" msgstr "" -#: ../../extend/addon/addon/adultphotoflag/adultphotoflag.php:25 +#: ../../addon/adultphotoflag/adultphotoflag.php:25 msgid "" "Provide photo edit option to hide inappropriate photos from default album " "view" msgstr "" -#: ../../extend/addon/addon/chords/Mod_Chords.php:44 -msgid "" -"This is a fairly comprehensive and complete guitar chord dictionary which " -"will list most of the available ways to play a certain chord, starting from " -"the base of the fingerboard up to a few frets beyond the twelfth fret " -"(beyond which everything repeats). A couple of non-standard tunings are " -"provided for the benefit of slide players, etc." +#: ../../addon/wppost/wppost.php:45 +msgid "Post to WordPress" msgstr "" -#: ../../extend/addon/addon/chords/Mod_Chords.php:46 -msgid "" -"Chord names start with a root note (A-G) and may include sharps (#) and " -"flats (b). This software will parse most of the standard naming conventions " -"such as maj, min, dim, sus(2 or 4), aug, with optional repeating elements." +#: ../../addon/wppost/wppost.php:82 +msgid "Enable WordPress Post Plugin" msgstr "" -#: ../../extend/addon/addon/chords/Mod_Chords.php:48 -msgid "" -"Valid examples include A, A7, Am7, Amaj7, Amaj9, Ammaj7, Aadd4, Asus2Add4, " -"E7b13b11 ..." +#: ../../addon/wppost/wppost.php:86 +msgid "WordPress username" msgstr "" -#: ../../extend/addon/addon/chords/Mod_Chords.php:51 -msgid "Guitar Chords" +#: ../../addon/wppost/wppost.php:90 +msgid "WordPress password" msgstr "" -#: ../../extend/addon/addon/chords/Mod_Chords.php:52 -msgid "The complete online chord dictionary" +#: ../../addon/wppost/wppost.php:94 +msgid "WordPress API URL" msgstr "" -#: ../../extend/addon/addon/chords/Mod_Chords.php:57 -msgid "Tuning" +#: ../../addon/wppost/wppost.php:95 +msgid "Typically https://your-blog.tld/xmlrpc.php" msgstr "" -#: ../../extend/addon/addon/chords/Mod_Chords.php:58 -msgid "Chord name: example: Em7" +#: ../../addon/wppost/wppost.php:98 +msgid "WordPress blogid" msgstr "" -#: ../../extend/addon/addon/chords/Mod_Chords.php:59 -msgid "Show for left handed stringing" +#: ../../addon/wppost/wppost.php:99 +msgid "For multi-user sites such as wordpress.com, otherwise leave blank" msgstr "" -#: ../../extend/addon/addon/chords/chords.php:33 -msgid "Quick Reference" +#: ../../addon/wppost/wppost.php:105 +msgid "Post to WordPress by default" msgstr "" -#: ../../extend/addon/addon/dirstats/dirstats.php:94 -msgid "Hubzilla Directory Stats" +#: ../../addon/wppost/wppost.php:109 +msgid "Forward comments (requires hubzilla_wp plugin)" msgstr "" -#: ../../extend/addon/addon/dirstats/dirstats.php:95 -msgid "Total Hubs" +#: ../../addon/wppost/wppost.php:113 +msgid "WordPress Post Settings" msgstr "" -#: ../../extend/addon/addon/dirstats/dirstats.php:97 -msgid "Hubzilla Hubs" +#: ../../addon/wppost/wppost.php:129 +msgid "Wordpress Settings saved." msgstr "" -#: ../../extend/addon/addon/dirstats/dirstats.php:99 -msgid "Friendica Hubs" -msgstr "" - -#: ../../extend/addon/addon/dirstats/dirstats.php:101 -msgid "Diaspora Pods" -msgstr "" - -#: ../../extend/addon/addon/dirstats/dirstats.php:103 -msgid "Hubzilla Channels" -msgstr "" - -#: ../../extend/addon/addon/dirstats/dirstats.php:105 -msgid "Friendica Channels" -msgstr "" - -#: ../../extend/addon/addon/dirstats/dirstats.php:107 -msgid "Diaspora Channels" -msgstr "" - -#: ../../extend/addon/addon/dirstats/dirstats.php:109 -msgid "Aged 35 and above" -msgstr "" - -#: ../../extend/addon/addon/dirstats/dirstats.php:111 -msgid "Aged 34 and under" -msgstr "" - -#: ../../extend/addon/addon/dirstats/dirstats.php:113 -msgid "Average Age" -msgstr "" - -#: ../../extend/addon/addon/dirstats/dirstats.php:115 -msgid "Known Chatrooms" -msgstr "" - -#: ../../extend/addon/addon/dirstats/dirstats.php:117 -msgid "Known Tags" -msgstr "" - -#: ../../extend/addon/addon/dirstats/dirstats.php:119 -msgid "" -"Please note Diaspora and Friendica statistics are merely those **this " -"directory** is aware of, and not all those known in the network. This also " -"applies to chatrooms," -msgstr "" - -#: ../../extend/addon/addon/donate/donate.php:21 -msgid "Project Servers and Resources" -msgstr "" - -#: ../../extend/addon/addon/donate/donate.php:22 -msgid "Project Creator and Tech Lead" -msgstr "" - -#: ../../extend/addon/addon/donate/donate.php:23 -msgid "Admin, developer, directorymin, support bloke" -msgstr "" - -#: ../../extend/addon/addon/donate/donate.php:50 -msgid "" -"And the hundreds of other people and organisations who helped make the " -"Hubzilla possible." -msgstr "" - -#: ../../extend/addon/addon/donate/donate.php:53 -msgid "" -"The Redmatrix/Hubzilla projects are provided primarily by volunteers giving " -"their time and expertise - and often paying out of pocket for services they " -"share with others." -msgstr "" - -#: ../../extend/addon/addon/donate/donate.php:54 -msgid "" -"There is no corporate funding and no ads, and we do not collect and sell " -"your personal information. (We don't control your personal information - " -"you do.)" -msgstr "" - -#: ../../extend/addon/addon/donate/donate.php:55 -msgid "" -"Help support our ground-breaking work in decentralisation, web identity, and " -"privacy." -msgstr "" - -#: ../../extend/addon/addon/donate/donate.php:57 -msgid "" -"Your donations keep servers and services running and also helps us to " -"provide innovative new features and continued development." -msgstr "" - -#: ../../extend/addon/addon/donate/donate.php:60 -msgid "Donate" -msgstr "" - -#: ../../extend/addon/addon/donate/donate.php:62 -msgid "" -"Choose a project, developer, or public hub to support with a one-time " -"donation" -msgstr "" - -#: ../../extend/addon/addon/donate/donate.php:63 -msgid "Donate Now" -msgstr "" - -#: ../../extend/addon/addon/donate/donate.php:64 -msgid "" -"Or become a project sponsor (Hubzilla Project only)" -msgstr "" - -#: ../../extend/addon/addon/donate/donate.php:65 -msgid "" -"Please indicate if you would like your first name or full name (or nothing) " -"to appear in our sponsor listing" -msgstr "" - -#: ../../extend/addon/addon/donate/donate.php:66 -msgid "Sponsor" -msgstr "" - -#: ../../extend/addon/addon/donate/donate.php:69 -msgid "Special thanks to: " -msgstr "" - -#: ../../extend/addon/addon/dwpost/dwpost.php:42 -msgid "Post to Dreamwidth" -msgstr "" - -#: ../../extend/addon/addon/dwpost/dwpost.php:73 -msgid "Enable Dreamwidth Post Plugin" -msgstr "" - -#: ../../extend/addon/addon/dwpost/dwpost.php:77 -msgid "Dreamwidth username" -msgstr "" - -#: ../../extend/addon/addon/dwpost/dwpost.php:81 -msgid "Dreamwidth password" -msgstr "" - -#: ../../extend/addon/addon/dwpost/dwpost.php:85 -msgid "Post to Dreamwidth by default" -msgstr "" - -#: ../../extend/addon/addon/dwpost/dwpost.php:89 -msgid "Dreamwidth Post Settings" -msgstr "" - -#: ../../extend/addon/addon/flattrwidget/flattrwidget.php:45 -msgid "Flattr this!" -msgstr "" - -#: ../../extend/addon/addon/flattrwidget/flattrwidget.php:83 -msgid "Flattr widget settings updated." -msgstr "" - -#: ../../extend/addon/addon/flattrwidget/flattrwidget.php:100 -msgid "Flattr user" -msgstr "" - -#: ../../extend/addon/addon/flattrwidget/flattrwidget.php:104 -msgid "URL of the Thing to flattr" -msgstr "" - -#: ../../extend/addon/addon/flattrwidget/flattrwidget.php:104 -msgid "If empty channel URL is used" -msgstr "" - -#: ../../extend/addon/addon/flattrwidget/flattrwidget.php:108 -msgid "Title of the Thing to flattr" -msgstr "" - -#: ../../extend/addon/addon/flattrwidget/flattrwidget.php:108 -msgid "If empty \"channel name on The Hubzilla\" will be used" -msgstr "" - -#: ../../extend/addon/addon/flattrwidget/flattrwidget.php:112 -msgid "Static or dynamic flattr button" -msgstr "" - -#: ../../extend/addon/addon/flattrwidget/flattrwidget.php:112 -msgid "static" -msgstr "" - -#: ../../extend/addon/addon/flattrwidget/flattrwidget.php:112 -msgid "dynamic" -msgstr "" - -#: ../../extend/addon/addon/flattrwidget/flattrwidget.php:116 -msgid "Alignment of the widget" -msgstr "" - -#: ../../extend/addon/addon/flattrwidget/flattrwidget.php:116 -msgid "left" -msgstr "" - -#: ../../extend/addon/addon/flattrwidget/flattrwidget.php:116 -msgid "right" -msgstr "" - -#: ../../extend/addon/addon/flattrwidget/flattrwidget.php:120 -msgid "Enable Flattr widget" -msgstr "" - -#: ../../extend/addon/addon/flattrwidget/flattrwidget.php:124 -msgid "Flattr Widget Settings" -msgstr "" - -#: ../../extend/addon/addon/frphotos/frphotos.php:91 -msgid "Friendica Photo Album Import" -msgstr "" - -#: ../../extend/addon/addon/frphotos/frphotos.php:92 -msgid "This will import all your Friendica photo albums to this Red channel." -msgstr "" - -#: ../../extend/addon/addon/frphotos/frphotos.php:93 -msgid "Friendica Server base URL" -msgstr "" - -#: ../../extend/addon/addon/frphotos/frphotos.php:94 -msgid "Friendica Login Username" -msgstr "" - -#: ../../extend/addon/addon/frphotos/frphotos.php:95 -msgid "Friendica Login Password" -msgstr "" - -#: ../../extend/addon/addon/hubwall/hubwall.php:19 -msgid "Send email to all members" -msgstr "" - -#: ../../extend/addon/addon/hubwall/hubwall.php:33 -#, php-format -msgid "$1%s Administrator" -msgstr "" - -#: ../../extend/addon/addon/hubwall/hubwall.php:50 -#: ../../extend/addon/addon/mailtest/mailtest.php:50 -msgid "No recipients found." -msgstr "" - -#: ../../extend/addon/addon/hubwall/hubwall.php:73 -#, php-format -msgid "%1$d of %2$d messages sent." -msgstr "" - -#: ../../extend/addon/addon/hubwall/hubwall.php:81 -msgid "Send email to all hub members." -msgstr "" - -#: ../../extend/addon/addon/hubwall/hubwall.php:92 -#: ../../extend/addon/addon/mailtest/mailtest.php:96 -msgid "Message subject" -msgstr "" - -#: ../../extend/addon/addon/hubwall/hubwall.php:93 -msgid "Sender Email address" -msgstr "" - -#: ../../extend/addon/addon/hubwall/hubwall.php:94 -msgid "Test mode (only send to hub administrator)" -msgstr "" - -#: ../../extend/addon/addon/ijpost/ijpost.php:42 -msgid "Post to Insanejournal" -msgstr "" - -#: ../../extend/addon/addon/ijpost/ijpost.php:73 -msgid "Enable InsaneJournal Post Plugin" -msgstr "" - -#: ../../extend/addon/addon/ijpost/ijpost.php:77 -msgid "InsaneJournal username" -msgstr "" - -#: ../../extend/addon/addon/ijpost/ijpost.php:81 -msgid "InsaneJournal password" -msgstr "" - -#: ../../extend/addon/addon/ijpost/ijpost.php:85 -msgid "Post to InsaneJournal by default" -msgstr "" - -#: ../../extend/addon/addon/ijpost/ijpost.php:89 -msgid "InsaneJournal Post Settings" -msgstr "" - -#: ../../extend/addon/addon/ijpost/ijpost.php:104 -msgid "Insane Journal Settings saved." -msgstr "" - -#: ../../extend/addon/addon/irc/irc.php:45 -msgid "Channels to auto connect" -msgstr "" - -#: ../../extend/addon/addon/irc/irc.php:45 -#: ../../extend/addon/addon/irc/irc.php:49 -msgid "Comma separated list" -msgstr "" - -#: ../../extend/addon/addon/irc/irc.php:49 -#: ../../extend/addon/addon/irc/irc.php:96 -msgid "Popular Channels" -msgstr "" - -#: ../../extend/addon/addon/irc/irc.php:53 -msgid "IRC Settings" -msgstr "" - -#: ../../extend/addon/addon/irc/irc.php:69 -msgid "IRC settings saved." -msgstr "" - -#: ../../extend/addon/addon/irc/irc.php:74 -msgid "IRC Chatroom" -msgstr "" - -#: ../../extend/addon/addon/jappixmini/jappixmini.php:305 -#: ../../include/channel.php:1154 ../../include/channel.php:1317 -msgid "Status:" -msgstr "" - -#: ../../extend/addon/addon/jappixmini/jappixmini.php:309 -msgid "Activate addon" -msgstr "" - -#: ../../extend/addon/addon/jappixmini/jappixmini.php:313 -msgid "Hide Jappixmini Chat-Widget from the webinterface" -msgstr "" - -#: ../../extend/addon/addon/jappixmini/jappixmini.php:318 -msgid "Jabber username" -msgstr "" - -#: ../../extend/addon/addon/jappixmini/jappixmini.php:324 -msgid "Jabber server" -msgstr "" - -#: ../../extend/addon/addon/jappixmini/jappixmini.php:330 -msgid "Jabber BOSH host URL" -msgstr "" - -#: ../../extend/addon/addon/jappixmini/jappixmini.php:337 -msgid "Jabber password" -msgstr "" - -#: ../../extend/addon/addon/jappixmini/jappixmini.php:343 -msgid "Encrypt Jabber password with Hubzilla password" -msgstr "" - -#: ../../extend/addon/addon/jappixmini/jappixmini.php:347 -#: ../../extend/addon/addon/redred/redred.php:115 -msgid "Hubzilla password" -msgstr "" - -#: ../../extend/addon/addon/jappixmini/jappixmini.php:351 -#: ../../extend/addon/addon/jappixmini/jappixmini.php:355 -msgid "Approve subscription requests from Hubzilla contacts automatically" -msgstr "" - -#: ../../extend/addon/addon/jappixmini/jappixmini.php:359 -msgid "Purge internal list of jabber addresses of contacts" -msgstr "" - -#: ../../extend/addon/addon/jappixmini/jappixmini.php:364 -msgid "Configuration Help" -msgstr "" - -#: ../../extend/addon/addon/jappixmini/jappixmini.php:371 -msgid "Jappix Mini Settings" -msgstr "" - -#: ../../extend/addon/addon/js_upload/js_upload.php:44 -msgid "Upload a file" -msgstr "" - -#: ../../extend/addon/addon/js_upload/js_upload.php:45 -msgid "Drop files here to upload" -msgstr "" - -#: ../../extend/addon/addon/js_upload/js_upload.php:47 -msgid "Failed" -msgstr "" - -#: ../../extend/addon/addon/js_upload/js_upload.php:315 -msgid "No files were uploaded." -msgstr "" - -#: ../../extend/addon/addon/js_upload/js_upload.php:322 -msgid "Uploaded file is empty" -msgstr "" - -#: ../../extend/addon/addon/js_upload/js_upload.php:335 -msgid "Image exceeds size limit of " -msgstr "" - -#: ../../extend/addon/addon/js_upload/js_upload.php:347 -msgid "File has an invalid extension, it should be one of " -msgstr "" - -#: ../../extend/addon/addon/js_upload/js_upload.php:359 -msgid "Upload was cancelled, or server error encountered" -msgstr "" - -#: ../../extend/addon/addon/ldapauth/ldapauth.php:61 -msgid "An account has been created for you." -msgstr "" - -#: ../../extend/addon/addon/ldapauth/ldapauth.php:68 -msgid "Authentication successful but rejected: account creation is disabled." -msgstr "" - -#: ../../extend/addon/addon/libertree/libertree.php:38 -msgid "Post to Libertree" -msgstr "" - -#: ../../extend/addon/addon/libertree/libertree.php:69 -msgid "Enable Libertree Post Plugin" -msgstr "" - -#: ../../extend/addon/addon/libertree/libertree.php:73 -msgid "Libertree API token" -msgstr "" - -#: ../../extend/addon/addon/libertree/libertree.php:77 -msgid "Libertree site URL" -msgstr "" - -#: ../../extend/addon/addon/libertree/libertree.php:81 -msgid "Post to Libertree by default" -msgstr "" - -#: ../../extend/addon/addon/libertree/libertree.php:85 -msgid "Libertree Post Settings" -msgstr "" - -#: ../../extend/addon/addon/libertree/libertree.php:99 -msgid "Libertree Settings saved." -msgstr "" - -#: ../../extend/addon/addon/ljpost/ljpost.php:42 -msgid "Post to LiveJournal" -msgstr "" - -#: ../../extend/addon/addon/ljpost/ljpost.php:70 -msgid "Enable LiveJournal Post Plugin" -msgstr "" - -#: ../../extend/addon/addon/ljpost/ljpost.php:74 -msgid "LiveJournal username" -msgstr "" - -#: ../../extend/addon/addon/ljpost/ljpost.php:78 -msgid "LiveJournal password" -msgstr "" - -#: ../../extend/addon/addon/ljpost/ljpost.php:82 -msgid "Post to LiveJournal by default" -msgstr "" - -#: ../../extend/addon/addon/ljpost/ljpost.php:86 -msgid "LiveJournal Post Settings" -msgstr "" - -#: ../../extend/addon/addon/ljpost/ljpost.php:101 -msgid "LiveJournal Settings saved." -msgstr "" - -#: ../../extend/addon/addon/logrot/logrot.php:36 -msgid "Logfile archive directory" -msgstr "" - -#: ../../extend/addon/addon/logrot/logrot.php:36 -msgid "Directory to store rotated logs" -msgstr "" - -#: ../../extend/addon/addon/logrot/logrot.php:37 -msgid "Logfile size in bytes before rotating" -msgstr "" - -#: ../../extend/addon/addon/logrot/logrot.php:38 -msgid "Number of logfiles to retain" -msgstr "" - -#: ../../extend/addon/addon/mailhost/mailhost.php:36 -msgid "Email notification hub" -msgstr "" - -#: ../../extend/addon/addon/mailhost/mailhost.php:36 -msgid "Hostname" -msgstr "" - -#: ../../extend/addon/addon/mailhost/mailhost.php:40 -msgid "Mailhost Settings" -msgstr "" - -#: ../../extend/addon/addon/mailhost/mailhost.php:54 -msgid "MAILHOST Settings saved." -msgstr "" - -#: ../../extend/addon/addon/moremoods/moremoods.php:19 -msgid "lonely" -msgstr "" - -#: ../../extend/addon/addon/moremoods/moremoods.php:20 -msgid "drunk" -msgstr "" - -#: ../../extend/addon/addon/moremoods/moremoods.php:21 -msgid "horny" -msgstr "" - -#: ../../extend/addon/addon/moremoods/moremoods.php:22 -msgid "stoned" -msgstr "" - -#: ../../extend/addon/addon/moremoods/moremoods.php:23 -msgid "fucked up" -msgstr "" - -#: ../../extend/addon/addon/moremoods/moremoods.php:24 -msgid "clusterfucked" -msgstr "" - -#: ../../extend/addon/addon/moremoods/moremoods.php:25 -msgid "crazy" -msgstr "" - -#: ../../extend/addon/addon/moremoods/moremoods.php:26 -msgid "hurt" -msgstr "" - -#: ../../extend/addon/addon/moremoods/moremoods.php:27 -msgid "sleepy" -msgstr "" - -#: ../../extend/addon/addon/moremoods/moremoods.php:28 -msgid "grumpy" -msgstr "" - -#: ../../extend/addon/addon/moremoods/moremoods.php:29 -msgid "high" -msgstr "" - -#: ../../extend/addon/addon/moremoods/moremoods.php:30 -msgid "semi-conscious" -msgstr "" - -#: ../../extend/addon/addon/moremoods/moremoods.php:31 -msgid "in love" -msgstr "" - -#: ../../extend/addon/addon/moremoods/moremoods.php:32 -msgid "in lust" -msgstr "" - -#: ../../extend/addon/addon/moremoods/moremoods.php:33 -msgid "naked" -msgstr "" - -#: ../../extend/addon/addon/moremoods/moremoods.php:34 -msgid "stinky" -msgstr "" - -#: ../../extend/addon/addon/moremoods/moremoods.php:35 -msgid "sweaty" -msgstr "" - -#: ../../extend/addon/addon/moremoods/moremoods.php:36 -msgid "bleeding out" -msgstr "" - -#: ../../extend/addon/addon/moremoods/moremoods.php:37 -msgid "victorious" -msgstr "" - -#: ../../extend/addon/addon/moremoods/moremoods.php:38 -msgid "defeated" -msgstr "" - -#: ../../extend/addon/addon/moremoods/moremoods.php:39 -msgid "envious" -msgstr "" - -#: ../../extend/addon/addon/moremoods/moremoods.php:40 -msgid "jealous" -msgstr "" - -#: ../../extend/addon/addon/morepokes/morepokes.php:19 -msgid "bitchslap" -msgstr "" - -#: ../../extend/addon/addon/morepokes/morepokes.php:19 -msgid "bitchslapped" -msgstr "" - -#: ../../extend/addon/addon/morepokes/morepokes.php:20 -msgid "shag" -msgstr "" - -#: ../../extend/addon/addon/morepokes/morepokes.php:20 -msgid "shagged" -msgstr "" - -#: ../../extend/addon/addon/morepokes/morepokes.php:21 -msgid "patent" -msgstr "" - -#: ../../extend/addon/addon/morepokes/morepokes.php:21 -msgid "patented" -msgstr "" - -#: ../../extend/addon/addon/morepokes/morepokes.php:22 -msgid "hug" -msgstr "" - -#: ../../extend/addon/addon/morepokes/morepokes.php:22 -msgid "hugged" -msgstr "" - -#: ../../extend/addon/addon/morepokes/morepokes.php:23 -msgid "murder" -msgstr "" - -#: ../../extend/addon/addon/morepokes/morepokes.php:23 -msgid "murdered" -msgstr "" - -#: ../../extend/addon/addon/morepokes/morepokes.php:24 -msgid "worship" -msgstr "" - -#: ../../extend/addon/addon/morepokes/morepokes.php:24 -msgid "worshipped" -msgstr "" - -#: ../../extend/addon/addon/morepokes/morepokes.php:25 -msgid "kiss" -msgstr "" - -#: ../../extend/addon/addon/morepokes/morepokes.php:25 -msgid "kissed" -msgstr "" - -#: ../../extend/addon/addon/morepokes/morepokes.php:26 -msgid "tempt" -msgstr "" - -#: ../../extend/addon/addon/morepokes/morepokes.php:26 -msgid "tempted" -msgstr "" - -#: ../../extend/addon/addon/morepokes/morepokes.php:27 -msgid "raise eyebrows at" -msgstr "" - -#: ../../extend/addon/addon/morepokes/morepokes.php:27 -msgid "raised their eyebrows at" -msgstr "" - -#: ../../extend/addon/addon/morepokes/morepokes.php:28 -msgid "insult" -msgstr "" - -#: ../../extend/addon/addon/morepokes/morepokes.php:28 -msgid "insulted" -msgstr "" - -#: ../../extend/addon/addon/morepokes/morepokes.php:29 -msgid "praise" -msgstr "" - -#: ../../extend/addon/addon/morepokes/morepokes.php:29 -msgid "praised" -msgstr "" - -#: ../../extend/addon/addon/morepokes/morepokes.php:30 -msgid "be dubious of" -msgstr "" - -#: ../../extend/addon/addon/morepokes/morepokes.php:30 -msgid "was dubious of" -msgstr "" - -#: ../../extend/addon/addon/morepokes/morepokes.php:31 -msgid "eat" -msgstr "" - -#: ../../extend/addon/addon/morepokes/morepokes.php:31 -msgid "ate" -msgstr "" - -#: ../../extend/addon/addon/morepokes/morepokes.php:32 -msgid "giggle and fawn at" -msgstr "" - -#: ../../extend/addon/addon/morepokes/morepokes.php:32 -msgid "giggled and fawned at" -msgstr "" - -#: ../../extend/addon/addon/morepokes/morepokes.php:33 -msgid "doubt" -msgstr "" - -#: ../../extend/addon/addon/morepokes/morepokes.php:33 -msgid "doubted" -msgstr "" - -#: ../../extend/addon/addon/morepokes/morepokes.php:34 -msgid "glare" -msgstr "" - -#: ../../extend/addon/addon/morepokes/morepokes.php:34 -msgid "glared at" -msgstr "" - -#: ../../extend/addon/addon/morepokes/morepokes.php:35 -msgid "fuck" -msgstr "" - -#: ../../extend/addon/addon/morepokes/morepokes.php:35 -msgid "fucked" -msgstr "" - -#: ../../extend/addon/addon/morepokes/morepokes.php:36 -msgid "bonk" -msgstr "" - -#: ../../extend/addon/addon/morepokes/morepokes.php:36 -msgid "bonked" -msgstr "" - -#: ../../extend/addon/addon/morepokes/morepokes.php:37 -msgid "declare undying love for" -msgstr "" - -#: ../../extend/addon/addon/morepokes/morepokes.php:37 -msgid "declared undying love for" -msgstr "" - -#: ../../extend/addon/addon/msgfooter/msgfooter.php:46 -#: ../../extend/addon/addon/xmpp/xmpp.php:91 -msgid "Save Settings" -msgstr "" - -#: ../../extend/addon/addon/msgfooter/msgfooter.php:47 -msgid "text to include in all outgoing posts from this site" -msgstr "" - -#: ../../extend/addon/addon/nofed/nofed.php:42 -msgid "Federate" -msgstr "" - -#: ../../extend/addon/addon/nofed/nofed.php:56 -msgid "nofed Settings saved." -msgstr "" - -#: ../../extend/addon/addon/nofed/nofed.php:72 -msgid "Allow Federation Toggle" -msgstr "" - -#: ../../extend/addon/addon/nofed/nofed.php:76 -msgid "Federate posts by default" -msgstr "" - -#: ../../extend/addon/addon/nofed/nofed.php:80 -msgid "NoFed Settings" -msgstr "" - -#: ../../extend/addon/addon/nsabait/nsabait.php:125 -msgid "Nsabait Settings updated." -msgstr "" - -#: ../../extend/addon/addon/nsabait/nsabait.php:157 -msgid "Enable NSAbait Plugin" -msgstr "" - -#: ../../extend/addon/addon/nsabait/nsabait.php:161 -msgid "NSAbait Settings" -msgstr "" - -#: ../../extend/addon/addon/nsfw/nsfw.php:80 +#: ../../addon/nsfw/nsfw.php:80 msgid "" "This plugin looks in posts for the words/text you specify below, and " "collapses any content containing those keywords so it is not displayed at " @@ -9238,567 +8774,1249 @@ msgid "" "can thereby be used as a general purpose content filter." msgstr "" -#: ../../extend/addon/addon/nsfw/nsfw.php:84 +#: ../../addon/nsfw/nsfw.php:84 msgid "Enable Content filter" msgstr "" -#: ../../extend/addon/addon/nsfw/nsfw.php:88 +#: ../../addon/nsfw/nsfw.php:88 msgid "Comma separated list of keywords to hide" msgstr "" -#: ../../extend/addon/addon/nsfw/nsfw.php:88 +#: ../../addon/nsfw/nsfw.php:88 msgid "Word, /regular-expression/, lang=xx, lang!=xx" msgstr "" -#: ../../extend/addon/addon/nsfw/nsfw.php:92 +#: ../../addon/nsfw/nsfw.php:92 msgid "Not Safe For Work Settings" msgstr "" -#: ../../extend/addon/addon/nsfw/nsfw.php:92 +#: ../../addon/nsfw/nsfw.php:92 msgid "General Purpose Content Filter" msgstr "" -#: ../../extend/addon/addon/nsfw/nsfw.php:110 +#: ../../addon/nsfw/nsfw.php:110 msgid "NSFW Settings saved." msgstr "" -#: ../../extend/addon/addon/nsfw/nsfw.php:207 +#: ../../addon/nsfw/nsfw.php:207 msgid "Possible adult content" msgstr "" -#: ../../extend/addon/addon/nsfw/nsfw.php:211 +#: ../../addon/nsfw/nsfw.php:211 #, php-format msgid "%s - view" msgstr "" -#: ../../extend/addon/addon/openclipatar/openclipatar.php:50 -#: ../../extend/addon/addon/openclipatar/openclipatar.php:128 -msgid "System defaults:" +#: ../../addon/ijpost/ijpost.php:42 +msgid "Post to Insanejournal" msgstr "" -#: ../../extend/addon/addon/openclipatar/openclipatar.php:54 -msgid "Preferred Clipart IDs" +#: ../../addon/ijpost/ijpost.php:73 +msgid "Enable InsaneJournal Post Plugin" msgstr "" -#: ../../extend/addon/addon/openclipatar/openclipatar.php:54 -msgid "List of preferred clipart ids. These will be shown first." +#: ../../addon/ijpost/ijpost.php:77 +msgid "InsaneJournal username" msgstr "" -#: ../../extend/addon/addon/openclipatar/openclipatar.php:55 -msgid "Default Search Term" +#: ../../addon/ijpost/ijpost.php:81 +msgid "InsaneJournal password" msgstr "" -#: ../../extend/addon/addon/openclipatar/openclipatar.php:55 -msgid "The default search term. These will be shown second." +#: ../../addon/ijpost/ijpost.php:85 +msgid "Post to InsaneJournal by default" msgstr "" -#: ../../extend/addon/addon/openclipatar/openclipatar.php:56 -msgid "Return After" +#: ../../addon/ijpost/ijpost.php:89 +msgid "InsaneJournal Post Settings" msgstr "" -#: ../../extend/addon/addon/openclipatar/openclipatar.php:56 -msgid "Page to load after image selection." +#: ../../addon/ijpost/ijpost.php:104 +msgid "Insane Journal Settings saved." msgstr "" -#: ../../extend/addon/addon/openclipatar/openclipatar.php:58 -#: ../../include/nav.php:109 ../../include/channel.php:1063 -msgid "Edit Profile" +#: ../../addon/js_upload/js_upload.php:44 +msgid "Upload a file" msgstr "" -#: ../../extend/addon/addon/openclipatar/openclipatar.php:59 -msgid "Profile List" +#: ../../addon/js_upload/js_upload.php:45 +msgid "Drop files here to upload" msgstr "" -#: ../../extend/addon/addon/openclipatar/openclipatar.php:61 -msgid "Order of Preferred" +#: ../../addon/js_upload/js_upload.php:47 +msgid "Failed" msgstr "" -#: ../../extend/addon/addon/openclipatar/openclipatar.php:61 -msgid "Sort order of preferred clipart ids." +#: ../../addon/js_upload/js_upload.php:315 +msgid "No files were uploaded." msgstr "" -#: ../../extend/addon/addon/openclipatar/openclipatar.php:62 -#: ../../extend/addon/addon/openclipatar/openclipatar.php:68 -msgid "Newest first" +#: ../../addon/js_upload/js_upload.php:322 +msgid "Uploaded file is empty" msgstr "" -#: ../../extend/addon/addon/openclipatar/openclipatar.php:65 -msgid "As entered" +#: ../../addon/js_upload/js_upload.php:335 +msgid "Image exceeds size limit of " msgstr "" -#: ../../extend/addon/addon/openclipatar/openclipatar.php:67 -msgid "Order of other" +#: ../../addon/js_upload/js_upload.php:347 +msgid "File has an invalid extension, it should be one of " msgstr "" -#: ../../extend/addon/addon/openclipatar/openclipatar.php:67 -msgid "Sort order of other clipart ids." +#: ../../addon/js_upload/js_upload.php:359 +msgid "Upload was cancelled, or server error encountered" msgstr "" -#: ../../extend/addon/addon/openclipatar/openclipatar.php:69 -msgid "Most downloaded first" +#: ../../addon/dwpost/dwpost.php:42 +msgid "Post to Dreamwidth" msgstr "" -#: ../../extend/addon/addon/openclipatar/openclipatar.php:70 -msgid "Most liked first" +#: ../../addon/dwpost/dwpost.php:73 +msgid "Enable Dreamwidth Post Plugin" msgstr "" -#: ../../extend/addon/addon/openclipatar/openclipatar.php:72 -msgid "Preferred IDs Message" +#: ../../addon/dwpost/dwpost.php:77 +msgid "Dreamwidth username" msgstr "" -#: ../../extend/addon/addon/openclipatar/openclipatar.php:72 -msgid "Message to display above preferred results." +#: ../../addon/dwpost/dwpost.php:81 +msgid "Dreamwidth password" msgstr "" -#: ../../extend/addon/addon/openclipatar/openclipatar.php:78 -msgid "Uploaded by: " +#: ../../addon/dwpost/dwpost.php:85 +msgid "Post to Dreamwidth by default" msgstr "" -#: ../../extend/addon/addon/openclipatar/openclipatar.php:78 -msgid "Drawn by: " +#: ../../addon/dwpost/dwpost.php:89 +msgid "Dreamwidth Post Settings" msgstr "" -#: ../../extend/addon/addon/openclipatar/openclipatar.php:192 -msgid "Or select from a free OpenClipart.org image:" +#: ../../addon/firefox/firefox.php:23 +msgid "Install Firefox Sharing Tools" msgstr "" -#: ../../extend/addon/addon/openclipatar/openclipatar.php:195 -msgid "Search Term" +#: ../../addon/firefox/firefox.php:34 +msgid "Share content from Firefox to $Projectname" msgstr "" -#: ../../extend/addon/addon/openclipatar/openclipatar.php:232 -msgid "Unknown error. Please try again later." +#: ../../addon/firefox/firefox.php:37 +msgid "Install Firefox Sharing Tools to this web browser" msgstr "" -#: ../../extend/addon/addon/openclipatar/openclipatar.php:308 -msgid "Profile photo updated successfully." +#: ../../addon/dirstats/dirstats.php:94 +msgid "Hubzilla Directory Stats" msgstr "" -#: ../../extend/addon/addon/openstreetmap/openstreetmap.php:146 -msgid "View Larger" +#: ../../addon/dirstats/dirstats.php:95 +msgid "Total Hubs" msgstr "" -#: ../../extend/addon/addon/openstreetmap/openstreetmap.php:169 -msgid "Tile Server URL" +#: ../../addon/dirstats/dirstats.php:97 +msgid "Hubzilla Hubs" msgstr "" -#: ../../extend/addon/addon/openstreetmap/openstreetmap.php:169 +#: ../../addon/dirstats/dirstats.php:99 +msgid "Friendica Hubs" +msgstr "" + +#: ../../addon/dirstats/dirstats.php:101 +msgid "Diaspora Pods" +msgstr "" + +#: ../../addon/dirstats/dirstats.php:103 +msgid "Hubzilla Channels" +msgstr "" + +#: ../../addon/dirstats/dirstats.php:105 +msgid "Friendica Channels" +msgstr "" + +#: ../../addon/dirstats/dirstats.php:107 +msgid "Diaspora Channels" +msgstr "" + +#: ../../addon/dirstats/dirstats.php:109 +msgid "Aged 35 and above" +msgstr "" + +#: ../../addon/dirstats/dirstats.php:111 +msgid "Aged 34 and under" +msgstr "" + +#: ../../addon/dirstats/dirstats.php:113 +msgid "Average Age" +msgstr "" + +#: ../../addon/dirstats/dirstats.php:115 +msgid "Known Chatrooms" +msgstr "" + +#: ../../addon/dirstats/dirstats.php:117 +msgid "Known Tags" +msgstr "" + +#: ../../addon/dirstats/dirstats.php:119 msgid "" -"A list of public tile servers" +"Please note Diaspora and Friendica statistics are merely those **this " +"directory** is aware of, and not all those known in the network. This also " +"applies to chatrooms," msgstr "" -#: ../../extend/addon/addon/openstreetmap/openstreetmap.php:170 -msgid "Nominatim (reverse geocoding) Server URL" +#: ../../addon/mailhost/mailhost.php:36 +msgid "Email notification hub" msgstr "" -#: ../../extend/addon/addon/openstreetmap/openstreetmap.php:170 -msgid "" -"A list of Nominatim servers" +#: ../../addon/mailhost/mailhost.php:36 +msgid "Hostname" msgstr "" -#: ../../extend/addon/addon/openstreetmap/openstreetmap.php:171 -msgid "Default zoom" +#: ../../addon/mailhost/mailhost.php:40 +msgid "Mailhost Settings" msgstr "" -#: ../../extend/addon/addon/openstreetmap/openstreetmap.php:171 -msgid "" -"The default zoom level. (1:world, 18:highest, also depends on tile server)" +#: ../../addon/mailhost/mailhost.php:54 +msgid "MAILHOST Settings saved." msgstr "" -#: ../../extend/addon/addon/openstreetmap/openstreetmap.php:172 -msgid "Include marker on map" +#: ../../addon/likebanner/likebanner.php:51 +msgid "Your Webbie:" msgstr "" -#: ../../extend/addon/addon/openstreetmap/openstreetmap.php:172 -msgid "Include a marker on the map." +#: ../../addon/likebanner/likebanner.php:54 +msgid "Fontsize (px):" msgstr "" -#: ../../extend/addon/addon/pageheader/pageheader.php:43 -msgid "Message to display on every page on this server" +#: ../../addon/likebanner/likebanner.php:68 +msgid "Link:" msgstr "" -#: ../../extend/addon/addon/pageheader/pageheader.php:48 -msgid "Pageheader Settings" +#: ../../addon/likebanner/likebanner.php:70 +msgid "Like us on Hubzilla" msgstr "" -#: ../../extend/addon/addon/pageheader/pageheader.php:64 -msgid "pageheader Settings saved." +#: ../../addon/likebanner/likebanner.php:72 +msgid "Embed:" msgstr "" -#: ../../extend/addon/addon/piwik/piwik.php:85 -msgid "" -"This website is tracked using the Piwik " -"analytics tool." -msgstr "" - -#: ../../extend/addon/addon/piwik/piwik.php:88 -#, php-format -msgid "" -"If you do not want that your visits are logged this way you can " -"set a cookie to prevent Piwik from tracking further visits of the site " -"(opt-out)." -msgstr "" - -#: ../../extend/addon/addon/piwik/piwik.php:96 -msgid "Piwik Base URL" -msgstr "" - -#: ../../extend/addon/addon/piwik/piwik.php:96 -msgid "" -"Absolute path to your Piwik installation. (without protocol (http/s), with " -"trailing slash)" -msgstr "" - -#: ../../extend/addon/addon/piwik/piwik.php:97 -msgid "Site ID" -msgstr "" - -#: ../../extend/addon/addon/piwik/piwik.php:98 -msgid "Show opt-out cookie link?" -msgstr "" - -#: ../../extend/addon/addon/piwik/piwik.php:99 -msgid "Asynchronous tracking" -msgstr "" - -#: ../../extend/addon/addon/piwik/piwik.php:100 -msgid "Enable frontend JavaScript error tracking" -msgstr "" - -#: ../../extend/addon/addon/piwik/piwik.php:100 -msgid "This feature requires Piwik >= 2.2.0" -msgstr "" - -#: ../../extend/addon/addon/planets/planets.php:121 -msgid "Planets Settings updated." -msgstr "" - -#: ../../extend/addon/addon/planets/planets.php:149 -msgid "Enable Planets Plugin" -msgstr "" - -#: ../../extend/addon/addon/planets/planets.php:153 -msgid "Planets Settings" -msgstr "" - -#: ../../extend/addon/addon/pumpio/pumpio.php:148 -msgid "You are now authenticated to pumpio." -msgstr "" - -#: ../../extend/addon/addon/pumpio/pumpio.php:149 -msgid "return to the featured settings page" -msgstr "" - -#: ../../extend/addon/addon/pumpio/pumpio.php:163 -msgid "Post to Pump.io" -msgstr "" - -#: ../../extend/addon/addon/pumpio/pumpio.php:198 -msgid "Pump.io servername" -msgstr "" - -#: ../../extend/addon/addon/pumpio/pumpio.php:198 -msgid "Without \"http://\" or \"https://\"" -msgstr "" - -#: ../../extend/addon/addon/pumpio/pumpio.php:202 -msgid "Pump.io username" -msgstr "" - -#: ../../extend/addon/addon/pumpio/pumpio.php:202 -msgid "Without the servername" -msgstr "" - -#: ../../extend/addon/addon/pumpio/pumpio.php:213 -msgid "You are not authenticated to pumpio" -msgstr "" - -#: ../../extend/addon/addon/pumpio/pumpio.php:215 -msgid "(Re-)Authenticate your pump.io connection" -msgstr "" - -#: ../../extend/addon/addon/pumpio/pumpio.php:219 -msgid "Enable pump.io Post Plugin" -msgstr "" - -#: ../../extend/addon/addon/pumpio/pumpio.php:223 -msgid "Post to pump.io by default" -msgstr "" - -#: ../../extend/addon/addon/pumpio/pumpio.php:227 -msgid "Should posts be public" -msgstr "" - -#: ../../extend/addon/addon/pumpio/pumpio.php:231 -msgid "Mirror all public posts" -msgstr "" - -#: ../../extend/addon/addon/pumpio/pumpio.php:237 -msgid "Pump.io Post Settings" -msgstr "" - -#: ../../extend/addon/addon/pumpio/pumpio.php:266 -msgid "PumpIO Settings saved." -msgstr "" - -#: ../../extend/addon/addon/qrator/qrator.php:48 -msgid "QR code" -msgstr "" - -#: ../../extend/addon/addon/qrator/qrator.php:63 -msgid "QR Generator" -msgstr "" - -#: ../../extend/addon/addon/qrator/qrator.php:64 -msgid "Enter some text" -msgstr "" - -#: ../../extend/addon/addon/rainbowtag/rainbowtag.php:81 -msgid "Enable Rainbowtag" -msgstr "" - -#: ../../extend/addon/addon/rainbowtag/rainbowtag.php:85 -msgid "Rainbowtag Settings" -msgstr "" - -#: ../../extend/addon/addon/rainbowtag/rainbowtag.php:101 -msgid "Rainbowtag Settings saved." -msgstr "" - -#: ../../extend/addon/addon/randpost/randpost.php:97 -msgid "You're welcome." -msgstr "" - -#: ../../extend/addon/addon/randpost/randpost.php:98 -msgid "Ah shucks..." -msgstr "" - -#: ../../extend/addon/addon/randpost/randpost.php:99 -msgid "Don't mention it." -msgstr "" - -#: ../../extend/addon/addon/randpost/randpost.php:100 -msgid "<blush>" -msgstr "" - -#: ../../extend/addon/addon/redfiles/redfiles.php:119 -msgid "Redmatrix File Storage Import" -msgstr "" - -#: ../../extend/addon/addon/redfiles/redfiles.php:120 -msgid "This will import all your Redmatrix cloud files to this channel." -msgstr "" - -#: ../../extend/addon/addon/redfiles/redfiles.php:121 -#: ../../extend/addon/addon/redphotos/redphotos.php:131 -msgid "Redmatrix Server base URL" -msgstr "" - -#: ../../extend/addon/addon/redfiles/redfiles.php:122 -#: ../../extend/addon/addon/redphotos/redphotos.php:132 -msgid "Redmatrix Login Username" -msgstr "" - -#: ../../extend/addon/addon/redfiles/redfiles.php:123 -#: ../../extend/addon/addon/redphotos/redphotos.php:133 -msgid "Redmatrix Login Password" -msgstr "" - -#: ../../extend/addon/addon/redfiles/redfilehelper.php:64 -msgid "file" -msgstr "" - -#: ../../extend/addon/addon/redphotos/redphotos.php:106 +#: ../../addon/redphotos/redphotos.php:106 msgid "Photos imported" msgstr "" -#: ../../extend/addon/addon/redphotos/redphotos.php:129 +#: ../../addon/redphotos/redphotos.php:129 msgid "Redmatrix Photo Album Import" msgstr "" -#: ../../extend/addon/addon/redphotos/redphotos.php:130 +#: ../../addon/redphotos/redphotos.php:130 msgid "This will import all your Redmatrix photo albums to this channel." msgstr "" -#: ../../extend/addon/addon/redphotos/redphotos.php:134 +#: ../../addon/redphotos/redphotos.php:131 +#: ../../addon/redfiles/redfiles.php:121 +msgid "Redmatrix Server base URL" +msgstr "" + +#: ../../addon/redphotos/redphotos.php:132 +#: ../../addon/redfiles/redfiles.php:122 +msgid "Redmatrix Login Username" +msgstr "" + +#: ../../addon/redphotos/redphotos.php:133 +#: ../../addon/redfiles/redfiles.php:123 +msgid "Redmatrix Login Password" +msgstr "" + +#: ../../addon/redphotos/redphotos.php:134 msgid "Import just this album" msgstr "" -#: ../../extend/addon/addon/redphotos/redphotos.php:134 +#: ../../addon/redphotos/redphotos.php:134 msgid "Leave blank to import all albums" msgstr "" -#: ../../extend/addon/addon/redphotos/redphotos.php:135 +#: ../../addon/redphotos/redphotos.php:135 msgid "Maximum count to import" msgstr "" -#: ../../extend/addon/addon/redphotos/redphotos.php:135 +#: ../../addon/redphotos/redphotos.php:135 msgid "0 or blank to import all available" msgstr "" -#: ../../extend/addon/addon/redred/redred.php:45 -msgid "Post to Red" +#: ../../addon/irc/irc.php:45 +msgid "Channels to auto connect" msgstr "" -#: ../../extend/addon/addon/redred/redred.php:60 -msgid "Channel is required." +#: ../../addon/irc/irc.php:45 ../../addon/irc/irc.php:49 +msgid "Comma separated list" msgstr "" -#: ../../extend/addon/addon/redred/redred.php:76 -msgid "redred Settings saved." +#: ../../addon/irc/irc.php:49 ../../addon/irc/irc.php:96 +msgid "Popular Channels" msgstr "" -#: ../../extend/addon/addon/redred/redred.php:95 -msgid "Allow posting to another Hubzilla Channel" +#: ../../addon/irc/irc.php:53 +msgid "IRC Settings" msgstr "" -#: ../../extend/addon/addon/redred/redred.php:99 -msgid "Send public postings to Hubzilla channel by default" +#: ../../addon/irc/irc.php:69 +msgid "IRC settings saved." msgstr "" -#: ../../extend/addon/addon/redred/redred.php:103 -msgid "Hubzilla API Path" +#: ../../addon/irc/irc.php:74 +msgid "IRC Chatroom" msgstr "" -#: ../../extend/addon/addon/redred/redred.php:103 -#: ../../extend/addon/addon/rtof/rtof.php:89 -msgid "https://{sitename}/api" +#: ../../addon/ljpost/ljpost.php:42 +msgid "Post to LiveJournal" msgstr "" -#: ../../extend/addon/addon/redred/redred.php:107 -msgid "Hubzilla login name" +#: ../../addon/ljpost/ljpost.php:70 +msgid "Enable LiveJournal Post Plugin" msgstr "" -#: ../../extend/addon/addon/redred/redred.php:111 -msgid "Hubzilla channel name" +#: ../../addon/ljpost/ljpost.php:74 +msgid "LiveJournal username" msgstr "" -#: ../../extend/addon/addon/redred/redred.php:111 -#: ../../extend/addon/addon/openid/MysqlProvider.php:54 +#: ../../addon/ljpost/ljpost.php:78 +msgid "LiveJournal password" +msgstr "" + +#: ../../addon/ljpost/ljpost.php:82 +msgid "Post to LiveJournal by default" +msgstr "" + +#: ../../addon/ljpost/ljpost.php:86 +msgid "LiveJournal Post Settings" +msgstr "" + +#: ../../addon/ljpost/ljpost.php:101 +msgid "LiveJournal Settings saved." +msgstr "" + +#: ../../addon/openid/openid.php:49 +msgid "" +"We encountered a problem while logging in with the OpenID you provided. " +"Please check the correct spelling of the ID." +msgstr "" + +#: ../../addon/openid/openid.php:49 +msgid "The error message was:" +msgstr "" + +#: ../../addon/openid/MysqlProvider.php:52 +msgid "First Name" +msgstr "" + +#: ../../addon/openid/MysqlProvider.php:53 +msgid "Last Name" +msgstr "" + +#: ../../addon/openid/MysqlProvider.php:54 ../../addon/redred/redred.php:111 msgid "Nickname" msgstr "" -#: ../../extend/addon/addon/redred/redred.php:119 -msgid "Hubzilla Crosspost Settings" +#: ../../addon/openid/MysqlProvider.php:55 +msgid "Full Name" msgstr "" -#: ../../extend/addon/addon/rtof/rtof.php:45 -msgid "Post to Friendica" +#: ../../addon/openid/MysqlProvider.php:61 +msgid "Profile Photo 16px" msgstr "" -#: ../../extend/addon/addon/rtof/rtof.php:62 -msgid "rtof Settings saved." +#: ../../addon/openid/MysqlProvider.php:62 +msgid "Profile Photo 32px" msgstr "" -#: ../../extend/addon/addon/rtof/rtof.php:81 -msgid "Allow posting to Friendica" +#: ../../addon/openid/MysqlProvider.php:63 +msgid "Profile Photo 48px" msgstr "" -#: ../../extend/addon/addon/rtof/rtof.php:85 -msgid "Send public postings to Friendica by default" +#: ../../addon/openid/MysqlProvider.php:64 +msgid "Profile Photo 64px" msgstr "" -#: ../../extend/addon/addon/rtof/rtof.php:89 -msgid "Friendica API Path" +#: ../../addon/openid/MysqlProvider.php:65 +msgid "Profile Photo 80px" msgstr "" -#: ../../extend/addon/addon/rtof/rtof.php:93 -msgid "Friendica login name" +#: ../../addon/openid/MysqlProvider.php:66 +msgid "Profile Photo 128px" msgstr "" -#: ../../extend/addon/addon/rtof/rtof.php:97 -msgid "Friendica password" +#: ../../addon/openid/MysqlProvider.php:67 +msgid "Timezone" msgstr "" -#: ../../extend/addon/addon/rtof/rtof.php:101 -msgid "Hubzilla to Friendica Post Settings" +#: ../../addon/openid/MysqlProvider.php:70 +msgid "Birth Year" msgstr "" -#: ../../extend/addon/addon/sendzid/sendzid.php:25 -msgid "Extended Identity Sharing" +#: ../../addon/openid/MysqlProvider.php:71 +msgid "Birth Month" msgstr "" -#: ../../extend/addon/addon/sendzid/sendzid.php:26 -msgid "" -"Share your identity with all websites on the internet. When disabled, " -"identity is only shared with sites in the matrix." +#: ../../addon/openid/MysqlProvider.php:72 +msgid "Birth Day" msgstr "" -#: ../../extend/addon/addon/skeleton/skeleton.php:59 -msgid "Some setting" +#: ../../addon/openid/MysqlProvider.php:73 +msgid "Birthdate" msgstr "" -#: ../../extend/addon/addon/skeleton/skeleton.php:61 -msgid "A setting" +#: ../../addon/openid/Mod_Openid.php:30 +msgid "OpenID protocol error. No ID returned." msgstr "" -#: ../../extend/addon/addon/skeleton/skeleton.php:64 -msgid "Skeleton Settings" +#: ../../addon/openid/Mod_Openid.php:188 ../../include/auth.php:286 +msgid "Login failed." msgstr "" -#: ../../extend/addon/addon/smileybutton/smileybutton.php:211 -msgid "Deactivate the feature" +#: ../../addon/openid/Mod_Id.php:85 ../../include/selectors.php:49 +#: ../../include/selectors.php:66 ../../include/channel.php:1332 +msgid "Male" msgstr "" -#: ../../extend/addon/addon/smileybutton/smileybutton.php:215 -msgid "Hide the button and show the smilies directly." +#: ../../addon/openid/Mod_Id.php:87 ../../include/selectors.php:49 +#: ../../include/selectors.php:66 ../../include/channel.php:1330 +msgid "Female" msgstr "" -#: ../../extend/addon/addon/smileybutton/smileybutton.php:219 -msgid "Smileybutton Settings" +#: ../../addon/randpost/randpost.php:97 +msgid "You're welcome." msgstr "" -#: ../../extend/addon/addon/startpage/startpage.php:109 +#: ../../addon/randpost/randpost.php:98 +msgid "Ah shucks..." +msgstr "" + +#: ../../addon/randpost/randpost.php:99 +msgid "Don't mention it." +msgstr "" + +#: ../../addon/randpost/randpost.php:100 +msgid "<blush>" +msgstr "" + +#: ../../addon/startpage/startpage.php:109 msgid "Page to load after login" msgstr "" -#: ../../extend/addon/addon/startpage/startpage.php:109 +#: ../../addon/startpage/startpage.php:109 msgid "" "Examples: "apps", "network?f=&gid=37" (privacy " "collection), "channel" or "notifications/system" (leave " "blank for default network page (grid)." msgstr "" -#: ../../extend/addon/addon/startpage/startpage.php:113 +#: ../../addon/startpage/startpage.php:113 msgid "Startpage Settings" msgstr "" -#: ../../extend/addon/addon/statusnet/statusnet.php:143 +#: ../../addon/morepokes/morepokes.php:19 +msgid "bitchslap" +msgstr "" + +#: ../../addon/morepokes/morepokes.php:19 +msgid "bitchslapped" +msgstr "" + +#: ../../addon/morepokes/morepokes.php:20 +msgid "shag" +msgstr "" + +#: ../../addon/morepokes/morepokes.php:20 +msgid "shagged" +msgstr "" + +#: ../../addon/morepokes/morepokes.php:21 +msgid "patent" +msgstr "" + +#: ../../addon/morepokes/morepokes.php:21 +msgid "patented" +msgstr "" + +#: ../../addon/morepokes/morepokes.php:22 +msgid "hug" +msgstr "" + +#: ../../addon/morepokes/morepokes.php:22 +msgid "hugged" +msgstr "" + +#: ../../addon/morepokes/morepokes.php:23 +msgid "murder" +msgstr "" + +#: ../../addon/morepokes/morepokes.php:23 +msgid "murdered" +msgstr "" + +#: ../../addon/morepokes/morepokes.php:24 +msgid "worship" +msgstr "" + +#: ../../addon/morepokes/morepokes.php:24 +msgid "worshipped" +msgstr "" + +#: ../../addon/morepokes/morepokes.php:25 +msgid "kiss" +msgstr "" + +#: ../../addon/morepokes/morepokes.php:25 +msgid "kissed" +msgstr "" + +#: ../../addon/morepokes/morepokes.php:26 +msgid "tempt" +msgstr "" + +#: ../../addon/morepokes/morepokes.php:26 +msgid "tempted" +msgstr "" + +#: ../../addon/morepokes/morepokes.php:27 +msgid "raise eyebrows at" +msgstr "" + +#: ../../addon/morepokes/morepokes.php:27 +msgid "raised their eyebrows at" +msgstr "" + +#: ../../addon/morepokes/morepokes.php:28 +msgid "insult" +msgstr "" + +#: ../../addon/morepokes/morepokes.php:28 +msgid "insulted" +msgstr "" + +#: ../../addon/morepokes/morepokes.php:29 +msgid "praise" +msgstr "" + +#: ../../addon/morepokes/morepokes.php:29 +msgid "praised" +msgstr "" + +#: ../../addon/morepokes/morepokes.php:30 +msgid "be dubious of" +msgstr "" + +#: ../../addon/morepokes/morepokes.php:30 +msgid "was dubious of" +msgstr "" + +#: ../../addon/morepokes/morepokes.php:31 +msgid "eat" +msgstr "" + +#: ../../addon/morepokes/morepokes.php:31 +msgid "ate" +msgstr "" + +#: ../../addon/morepokes/morepokes.php:32 +msgid "giggle and fawn at" +msgstr "" + +#: ../../addon/morepokes/morepokes.php:32 +msgid "giggled and fawned at" +msgstr "" + +#: ../../addon/morepokes/morepokes.php:33 +msgid "doubt" +msgstr "" + +#: ../../addon/morepokes/morepokes.php:33 +msgid "doubted" +msgstr "" + +#: ../../addon/morepokes/morepokes.php:34 +msgid "glare" +msgstr "" + +#: ../../addon/morepokes/morepokes.php:34 +msgid "glared at" +msgstr "" + +#: ../../addon/morepokes/morepokes.php:35 +msgid "fuck" +msgstr "" + +#: ../../addon/morepokes/morepokes.php:35 +msgid "fucked" +msgstr "" + +#: ../../addon/morepokes/morepokes.php:36 +msgid "bonk" +msgstr "" + +#: ../../addon/morepokes/morepokes.php:36 +msgid "bonked" +msgstr "" + +#: ../../addon/morepokes/morepokes.php:37 +msgid "declare undying love for" +msgstr "" + +#: ../../addon/morepokes/morepokes.php:37 +msgid "declared undying love for" +msgstr "" + +#: ../../addon/diaspora/diaspora.php:715 +msgid "Diaspora Protocol Settings updated." +msgstr "" + +#: ../../addon/diaspora/diaspora.php:734 +msgid "" +"The Diaspora protocol does not support location independence. Connections " +"you make within that network may be unreachable from alternate channel " +"locations." +msgstr "" + +#: ../../addon/diaspora/diaspora.php:737 +msgid "Enable the Diaspora protocol for this channel" +msgstr "" + +#: ../../addon/diaspora/diaspora.php:741 +msgid "Allow any Diaspora member to comment on your public posts" +msgstr "" + +#: ../../addon/diaspora/diaspora.php:745 +msgid "Prevent your hashtags from being redirected to other sites" +msgstr "" + +#: ../../addon/diaspora/diaspora.php:749 +msgid "Sign and forward posts and comments with no existing Diaspora signature" +msgstr "" + +#: ../../addon/diaspora/diaspora.php:754 +msgid "Followed hashtags (comma separated, do not include the #)" +msgstr "" + +#: ../../addon/diaspora/diaspora.php:759 +msgid "Diaspora Protocol Settings" +msgstr "" + +#: ../../addon/diaspora/import_diaspora.php:16 +msgid "No username found in import file." +msgstr "" + +#: ../../addon/diaspora/import_diaspora.php:41 ../../include/import.php:62 +msgid "Unable to create a unique channel address. Import failed." +msgstr "" + +#: ../../addon/gitwiki/Mod_Gitwiki.php:107 +msgid "Error retrieving wiki" +msgstr "" + +#: ../../addon/gitwiki/Mod_Gitwiki.php:114 +msgid "Error creating zip file export folder" +msgstr "" + +#: ../../addon/gitwiki/Mod_Gitwiki.php:132 +msgid "Error downloading wiki: " +msgstr "" + +#: ../../addon/testdrive/testdrive.php:104 +#, php-format +msgid "Your account on %s will expire in a few days." +msgstr "" + +#: ../../addon/testdrive/testdrive.php:105 +msgid "Your $Productname test account is about to expire." +msgstr "" + +#: ../../addon/rainbowtag/rainbowtag.php:81 +msgid "Enable Rainbowtag" +msgstr "" + +#: ../../addon/rainbowtag/rainbowtag.php:85 +msgid "Rainbowtag Settings" +msgstr "" + +#: ../../addon/rainbowtag/rainbowtag.php:101 +msgid "Rainbowtag Settings saved." +msgstr "" + +#: ../../addon/upload_limits/upload_limits.php:25 +msgid "Show Upload Limits" +msgstr "" + +#: ../../addon/upload_limits/upload_limits.php:27 +msgid "Hubzilla configured maximum size: " +msgstr "" + +#: ../../addon/upload_limits/upload_limits.php:28 +msgid "PHP upload_max_filesize: " +msgstr "" + +#: ../../addon/upload_limits/upload_limits.php:29 +msgid "PHP post_max_size (must be larger than upload_max_filesize): " +msgstr "" + +#: ../../addon/visage/visage.php:93 +msgid "Recent Channel/Profile Viewers" +msgstr "" + +#: ../../addon/visage/visage.php:98 +msgid "This plugin/addon has not been configured." +msgstr "" + +#: ../../addon/visage/visage.php:99 +#, php-format +msgid "Please visit the Visage settings on %s" +msgstr "" + +#: ../../addon/visage/visage.php:99 +msgid "your feature settings page" +msgstr "" + +#: ../../addon/visage/visage.php:112 +msgid "No entries." +msgstr "" + +#: ../../addon/visage/visage.php:166 +msgid "Enable Visage Visitor Logging" +msgstr "" + +#: ../../addon/visage/visage.php:170 +msgid "Visage Settings" +msgstr "" + +#: ../../addon/nsabait/nsabait.php:125 +msgid "Nsabait Settings updated." +msgstr "" + +#: ../../addon/nsabait/nsabait.php:157 +msgid "Enable NSAbait Plugin" +msgstr "" + +#: ../../addon/nsabait/nsabait.php:161 +msgid "NSAbait Settings" +msgstr "" + +#: ../../addon/mailtest/mailtest.php:19 +msgid "Send test email" +msgstr "" + +#: ../../addon/mailtest/mailtest.php:50 ../../addon/hubwall/hubwall.php:50 +msgid "No recipients found." +msgstr "" + +#: ../../addon/mailtest/mailtest.php:66 +msgid "Mail sent." +msgstr "" + +#: ../../addon/mailtest/mailtest.php:68 +msgid "Sending of mail failed." +msgstr "" + +#: ../../addon/mailtest/mailtest.php:77 +msgid "Mail Test" +msgstr "" + +#: ../../addon/mailtest/mailtest.php:96 ../../addon/hubwall/hubwall.php:92 +msgid "Message subject" +msgstr "" + +#: ../../addon/openstreetmap/openstreetmap.php:146 +msgid "View Larger" +msgstr "" + +#: ../../addon/openstreetmap/openstreetmap.php:169 +msgid "Tile Server URL" +msgstr "" + +#: ../../addon/openstreetmap/openstreetmap.php:169 +msgid "" +"A list of public tile servers" +msgstr "" + +#: ../../addon/openstreetmap/openstreetmap.php:170 +msgid "Nominatim (reverse geocoding) Server URL" +msgstr "" + +#: ../../addon/openstreetmap/openstreetmap.php:170 +msgid "" +"A list of Nominatim servers" +msgstr "" + +#: ../../addon/openstreetmap/openstreetmap.php:171 +msgid "Default zoom" +msgstr "" + +#: ../../addon/openstreetmap/openstreetmap.php:171 +msgid "" +"The default zoom level. (1:world, 18:highest, also depends on tile server)" +msgstr "" + +#: ../../addon/openstreetmap/openstreetmap.php:172 +msgid "Include marker on map" +msgstr "" + +#: ../../addon/openstreetmap/openstreetmap.php:172 +msgid "Include a marker on the map." +msgstr "" + +#: ../../addon/msgfooter/msgfooter.php:46 ../../addon/xmpp/xmpp.php:91 +msgid "Save Settings" +msgstr "" + +#: ../../addon/msgfooter/msgfooter.php:47 +msgid "text to include in all outgoing posts from this site" +msgstr "" + +#: ../../addon/rtof/rtof.php:45 +msgid "Post to Friendica" +msgstr "" + +#: ../../addon/rtof/rtof.php:62 +msgid "rtof Settings saved." +msgstr "" + +#: ../../addon/rtof/rtof.php:81 +msgid "Allow posting to Friendica" +msgstr "" + +#: ../../addon/rtof/rtof.php:85 +msgid "Send public postings to Friendica by default" +msgstr "" + +#: ../../addon/rtof/rtof.php:89 +msgid "Friendica API Path" +msgstr "" + +#: ../../addon/rtof/rtof.php:89 ../../addon/redred/redred.php:103 +msgid "https://{sitename}/api" +msgstr "" + +#: ../../addon/rtof/rtof.php:93 +msgid "Friendica login name" +msgstr "" + +#: ../../addon/rtof/rtof.php:97 +msgid "Friendica password" +msgstr "" + +#: ../../addon/rtof/rtof.php:101 +msgid "Hubzilla to Friendica Post Settings" +msgstr "" + +#: ../../addon/jappixmini/jappixmini.php:305 ../../include/channel.php:1256 +#: ../../include/channel.php:1419 +msgid "Status:" +msgstr "" + +#: ../../addon/jappixmini/jappixmini.php:309 +msgid "Activate addon" +msgstr "" + +#: ../../addon/jappixmini/jappixmini.php:313 +msgid "Hide Jappixmini Chat-Widget from the webinterface" +msgstr "" + +#: ../../addon/jappixmini/jappixmini.php:318 +msgid "Jabber username" +msgstr "" + +#: ../../addon/jappixmini/jappixmini.php:324 +msgid "Jabber server" +msgstr "" + +#: ../../addon/jappixmini/jappixmini.php:330 +msgid "Jabber BOSH host URL" +msgstr "" + +#: ../../addon/jappixmini/jappixmini.php:337 +msgid "Jabber password" +msgstr "" + +#: ../../addon/jappixmini/jappixmini.php:343 +msgid "Encrypt Jabber password with Hubzilla password" +msgstr "" + +#: ../../addon/jappixmini/jappixmini.php:347 ../../addon/redred/redred.php:115 +msgid "Hubzilla password" +msgstr "" + +#: ../../addon/jappixmini/jappixmini.php:351 +#: ../../addon/jappixmini/jappixmini.php:355 +msgid "Approve subscription requests from Hubzilla contacts automatically" +msgstr "" + +#: ../../addon/jappixmini/jappixmini.php:359 +msgid "Purge internal list of jabber addresses of contacts" +msgstr "" + +#: ../../addon/jappixmini/jappixmini.php:364 +msgid "Configuration Help" +msgstr "" + +#: ../../addon/jappixmini/jappixmini.php:371 +msgid "Jappix Mini Settings" +msgstr "" + +#: ../../addon/superblock/superblock.php:112 +msgid "Currently blocked" +msgstr "" + +#: ../../addon/superblock/superblock.php:114 +msgid "No channels currently blocked" +msgstr "" + +#: ../../addon/superblock/superblock.php:120 +msgid "\"Superblock\" Settings" +msgstr "" + +#: ../../addon/superblock/superblock.php:345 +msgid "Block Completely" +msgstr "" + +#: ../../addon/superblock/superblock.php:394 +msgid "superblock settings updated" +msgstr "" + +#: ../../addon/nofed/nofed.php:42 +msgid "Federate" +msgstr "" + +#: ../../addon/nofed/nofed.php:56 +msgid "nofed Settings saved." +msgstr "" + +#: ../../addon/nofed/nofed.php:72 +msgid "Allow Federation Toggle" +msgstr "" + +#: ../../addon/nofed/nofed.php:76 +msgid "Federate posts by default" +msgstr "" + +#: ../../addon/nofed/nofed.php:80 +msgid "NoFed Settings" +msgstr "" + +#: ../../addon/redred/redred.php:45 +msgid "Post to Red" +msgstr "" + +#: ../../addon/redred/redred.php:60 +msgid "Channel is required." +msgstr "" + +#: ../../addon/redred/redred.php:76 +msgid "redred Settings saved." +msgstr "" + +#: ../../addon/redred/redred.php:95 +msgid "Allow posting to another Hubzilla Channel" +msgstr "" + +#: ../../addon/redred/redred.php:99 +msgid "Send public postings to Hubzilla channel by default" +msgstr "" + +#: ../../addon/redred/redred.php:103 +msgid "Hubzilla API Path" +msgstr "" + +#: ../../addon/redred/redred.php:107 +msgid "Hubzilla login name" +msgstr "" + +#: ../../addon/redred/redred.php:111 +msgid "Hubzilla channel name" +msgstr "" + +#: ../../addon/redred/redred.php:119 +msgid "Hubzilla Crosspost Settings" +msgstr "" + +#: ../../addon/logrot/logrot.php:36 +msgid "Logfile archive directory" +msgstr "" + +#: ../../addon/logrot/logrot.php:36 +msgid "Directory to store rotated logs" +msgstr "" + +#: ../../addon/logrot/logrot.php:37 +msgid "Logfile size in bytes before rotating" +msgstr "" + +#: ../../addon/logrot/logrot.php:38 +msgid "Number of logfiles to retain" +msgstr "" + +#: ../../addon/frphotos/frphotos.php:91 +msgid "Friendica Photo Album Import" +msgstr "" + +#: ../../addon/frphotos/frphotos.php:92 +msgid "This will import all your Friendica photo albums to this Red channel." +msgstr "" + +#: ../../addon/frphotos/frphotos.php:93 +msgid "Friendica Server base URL" +msgstr "" + +#: ../../addon/frphotos/frphotos.php:94 +msgid "Friendica Login Username" +msgstr "" + +#: ../../addon/frphotos/frphotos.php:95 +msgid "Friendica Login Password" +msgstr "" + +#: ../../addon/donate/donate.php:21 +msgid "Project Servers and Resources" +msgstr "" + +#: ../../addon/donate/donate.php:22 +msgid "Project Creator and Tech Lead" +msgstr "" + +#: ../../addon/donate/donate.php:23 +msgid "Admin, developer, directorymin, support bloke" +msgstr "" + +#: ../../addon/donate/donate.php:50 +msgid "" +"And the hundreds of other people and organisations who helped make the " +"Hubzilla possible." +msgstr "" + +#: ../../addon/donate/donate.php:53 +msgid "" +"The Redmatrix/Hubzilla projects are provided primarily by volunteers giving " +"their time and expertise - and often paying out of pocket for services they " +"share with others." +msgstr "" + +#: ../../addon/donate/donate.php:54 +msgid "" +"There is no corporate funding and no ads, and we do not collect and sell " +"your personal information. (We don't control your personal information - " +"you do.)" +msgstr "" + +#: ../../addon/donate/donate.php:55 +msgid "" +"Help support our ground-breaking work in decentralisation, web identity, and " +"privacy." +msgstr "" + +#: ../../addon/donate/donate.php:57 +msgid "" +"Your donations keep servers and services running and also helps us to " +"provide innovative new features and continued development." +msgstr "" + +#: ../../addon/donate/donate.php:60 +msgid "Donate" +msgstr "" + +#: ../../addon/donate/donate.php:62 +msgid "" +"Choose a project, developer, or public hub to support with a one-time " +"donation" +msgstr "" + +#: ../../addon/donate/donate.php:63 +msgid "Donate Now" +msgstr "" + +#: ../../addon/donate/donate.php:64 +msgid "" +"Or become a project sponsor (Hubzilla Project only)" +msgstr "" + +#: ../../addon/donate/donate.php:65 +msgid "" +"Please indicate if you would like your first name or full name (or nothing) " +"to appear in our sponsor listing" +msgstr "" + +#: ../../addon/donate/donate.php:66 +msgid "Sponsor" +msgstr "" + +#: ../../addon/donate/donate.php:69 +msgid "Special thanks to: " +msgstr "" + +#: ../../addon/chords/Mod_Chords.php:44 +msgid "" +"This is a fairly comprehensive and complete guitar chord dictionary which " +"will list most of the available ways to play a certain chord, starting from " +"the base of the fingerboard up to a few frets beyond the twelfth fret " +"(beyond which everything repeats). A couple of non-standard tunings are " +"provided for the benefit of slide players, etc." +msgstr "" + +#: ../../addon/chords/Mod_Chords.php:46 +msgid "" +"Chord names start with a root note (A-G) and may include sharps (#) and " +"flats (b). This software will parse most of the standard naming conventions " +"such as maj, min, dim, sus(2 or 4), aug, with optional repeating elements." +msgstr "" + +#: ../../addon/chords/Mod_Chords.php:48 +msgid "" +"Valid examples include A, A7, Am7, Amaj7, Amaj9, Ammaj7, Aadd4, Asus2Add4, " +"E7b13b11 ..." +msgstr "" + +#: ../../addon/chords/Mod_Chords.php:51 +msgid "Guitar Chords" +msgstr "" + +#: ../../addon/chords/Mod_Chords.php:52 +msgid "The complete online chord dictionary" +msgstr "" + +#: ../../addon/chords/Mod_Chords.php:57 +msgid "Tuning" +msgstr "" + +#: ../../addon/chords/Mod_Chords.php:58 +msgid "Chord name: example: Em7" +msgstr "" + +#: ../../addon/chords/Mod_Chords.php:59 +msgid "Show for left handed stringing" +msgstr "" + +#: ../../addon/chords/chords.php:33 +msgid "Quick Reference" +msgstr "" + +#: ../../addon/libertree/libertree.php:38 +msgid "Post to Libertree" +msgstr "" + +#: ../../addon/libertree/libertree.php:69 +msgid "Enable Libertree Post Plugin" +msgstr "" + +#: ../../addon/libertree/libertree.php:73 +msgid "Libertree API token" +msgstr "" + +#: ../../addon/libertree/libertree.php:77 +msgid "Libertree site URL" +msgstr "" + +#: ../../addon/libertree/libertree.php:81 +msgid "Post to Libertree by default" +msgstr "" + +#: ../../addon/libertree/libertree.php:85 +msgid "Libertree Post Settings" +msgstr "" + +#: ../../addon/libertree/libertree.php:99 +msgid "Libertree Settings saved." +msgstr "" + +#: ../../addon/flattrwidget/flattrwidget.php:45 +msgid "Flattr this!" +msgstr "" + +#: ../../addon/flattrwidget/flattrwidget.php:83 +msgid "Flattr widget settings updated." +msgstr "" + +#: ../../addon/flattrwidget/flattrwidget.php:100 +msgid "Flattr user" +msgstr "" + +#: ../../addon/flattrwidget/flattrwidget.php:104 +msgid "URL of the Thing to flattr" +msgstr "" + +#: ../../addon/flattrwidget/flattrwidget.php:104 +msgid "If empty channel URL is used" +msgstr "" + +#: ../../addon/flattrwidget/flattrwidget.php:108 +msgid "Title of the Thing to flattr" +msgstr "" + +#: ../../addon/flattrwidget/flattrwidget.php:108 +msgid "If empty \"channel name on The Hubzilla\" will be used" +msgstr "" + +#: ../../addon/flattrwidget/flattrwidget.php:112 +msgid "Static or dynamic flattr button" +msgstr "" + +#: ../../addon/flattrwidget/flattrwidget.php:112 +msgid "static" +msgstr "" + +#: ../../addon/flattrwidget/flattrwidget.php:112 +msgid "dynamic" +msgstr "" + +#: ../../addon/flattrwidget/flattrwidget.php:116 +msgid "Alignment of the widget" +msgstr "" + +#: ../../addon/flattrwidget/flattrwidget.php:116 +msgid "left" +msgstr "" + +#: ../../addon/flattrwidget/flattrwidget.php:116 +msgid "right" +msgstr "" + +#: ../../addon/flattrwidget/flattrwidget.php:120 +msgid "Enable Flattr widget" +msgstr "" + +#: ../../addon/flattrwidget/flattrwidget.php:124 +msgid "Flattr Widget Settings" +msgstr "" + +#: ../../addon/statusnet/statusnet.php:143 msgid "Post to GNU social" msgstr "" -#: ../../extend/addon/addon/statusnet/statusnet.php:195 +#: ../../addon/statusnet/statusnet.php:195 msgid "" "Please contact your site administrator.
The provided API URL is not " "valid." msgstr "" -#: ../../extend/addon/addon/statusnet/statusnet.php:232 +#: ../../addon/statusnet/statusnet.php:232 msgid "We could not contact the GNU social API with the Path you entered." msgstr "" -#: ../../extend/addon/addon/statusnet/statusnet.php:266 +#: ../../addon/statusnet/statusnet.php:266 msgid "GNU social settings updated." msgstr "" -#: ../../extend/addon/addon/statusnet/statusnet.php:310 +#: ../../addon/statusnet/statusnet.php:310 msgid "Globally Available GNU social OAuthKeys" msgstr "" -#: ../../extend/addon/addon/statusnet/statusnet.php:312 +#: ../../addon/statusnet/statusnet.php:312 msgid "" "There are preconfigured OAuth key pairs for some GNU social servers " "available. If you are using one of them, please use these credentials.
If not feel free to connect to any other GNU social instance (see below)." msgstr "" -#: ../../extend/addon/addon/statusnet/statusnet.php:327 +#: ../../addon/statusnet/statusnet.php:327 msgid "Provide your own OAuth Credentials" msgstr "" -#: ../../extend/addon/addon/statusnet/statusnet.php:329 +#: ../../addon/statusnet/statusnet.php:329 msgid "" "No consumer key pair for GNU social found. Register your Hubzilla Account as " "an desktop client on your GNU social account, copy the consumer key pair " @@ -9807,27 +10025,27 @@ msgid "" "Hubzilla installation at your favourite GNU social installation." msgstr "" -#: ../../extend/addon/addon/statusnet/statusnet.php:333 +#: ../../addon/statusnet/statusnet.php:333 msgid "OAuth Consumer Key" msgstr "" -#: ../../extend/addon/addon/statusnet/statusnet.php:337 +#: ../../addon/statusnet/statusnet.php:337 msgid "OAuth Consumer Secret" msgstr "" -#: ../../extend/addon/addon/statusnet/statusnet.php:341 +#: ../../addon/statusnet/statusnet.php:341 msgid "Base API Path" msgstr "" -#: ../../extend/addon/addon/statusnet/statusnet.php:341 +#: ../../addon/statusnet/statusnet.php:341 msgid "Remember the trailing /" msgstr "" -#: ../../extend/addon/addon/statusnet/statusnet.php:345 +#: ../../addon/statusnet/statusnet.php:345 msgid "GNU social application name" msgstr "" -#: ../../extend/addon/addon/statusnet/statusnet.php:368 +#: ../../addon/statusnet/statusnet.php:368 msgid "" "To connect to your GNU social account click the button below to get a " "security code from GNU social which you have to copy into the input box " @@ -9835,32 +10053,31 @@ msgid "" "posted to GNU social." msgstr "" -#: ../../extend/addon/addon/statusnet/statusnet.php:370 +#: ../../addon/statusnet/statusnet.php:370 msgid "Log in with GNU social" msgstr "" -#: ../../extend/addon/addon/statusnet/statusnet.php:373 +#: ../../addon/statusnet/statusnet.php:373 msgid "Copy the security code from GNU social here" msgstr "" -#: ../../extend/addon/addon/statusnet/statusnet.php:383 +#: ../../addon/statusnet/statusnet.php:383 msgid "Cancel Connection Process" msgstr "" -#: ../../extend/addon/addon/statusnet/statusnet.php:385 +#: ../../addon/statusnet/statusnet.php:385 msgid "Current GNU social API is" msgstr "" -#: ../../extend/addon/addon/statusnet/statusnet.php:389 +#: ../../addon/statusnet/statusnet.php:389 msgid "Cancel GNU social Connection" msgstr "" -#: ../../extend/addon/addon/statusnet/statusnet.php:401 -#: ../../extend/addon/addon/twitter/twitter.php:232 +#: ../../addon/statusnet/statusnet.php:401 ../../addon/twitter/twitter.php:232 msgid "Currently connected to: " msgstr "" -#: ../../extend/addon/addon/statusnet/statusnet.php:406 +#: ../../addon/statusnet/statusnet.php:406 msgid "" "Note: Due your privacy settings (Hide your profile " "details from unknown viewers?) the link potentially included in public " @@ -9868,300 +10085,109 @@ msgid "" "informing the visitor that the access to your profile has been restricted." msgstr "" -#: ../../extend/addon/addon/statusnet/statusnet.php:411 +#: ../../addon/statusnet/statusnet.php:411 msgid "Allow posting to GNU social" msgstr "" -#: ../../extend/addon/addon/statusnet/statusnet.php:411 +#: ../../addon/statusnet/statusnet.php:411 msgid "" "If enabled your public postings can be posted to the associated GNU-social " "account" msgstr "" -#: ../../extend/addon/addon/statusnet/statusnet.php:415 +#: ../../addon/statusnet/statusnet.php:415 msgid "Post to GNU social by default" msgstr "" -#: ../../extend/addon/addon/statusnet/statusnet.php:415 +#: ../../addon/statusnet/statusnet.php:415 msgid "" "If enabled your public postings will be posted to the associated GNU-social " "account by default" msgstr "" -#: ../../extend/addon/addon/statusnet/statusnet.php:424 -#: ../../extend/addon/addon/twitter/twitter.php:255 +#: ../../addon/statusnet/statusnet.php:424 ../../addon/twitter/twitter.php:255 msgid "Clear OAuth configuration" msgstr "" -#: ../../extend/addon/addon/statusnet/statusnet.php:432 +#: ../../addon/statusnet/statusnet.php:432 msgid "GNU social Post Settings" msgstr "" -#: ../../extend/addon/addon/statusnet/statusnet.php:891 +#: ../../addon/statusnet/statusnet.php:891 msgid "API URL" msgstr "" -#: ../../extend/addon/addon/statusnet/statusnet.php:894 +#: ../../addon/statusnet/statusnet.php:894 msgid "Application name" msgstr "" -#: ../../extend/addon/addon/superblock/superblock.php:112 -msgid "Currently blocked" +#: ../../addon/qrator/qrator.php:48 +msgid "QR code" msgstr "" -#: ../../extend/addon/addon/superblock/superblock.php:114 -msgid "No channels currently blocked" +#: ../../addon/qrator/qrator.php:63 +msgid "QR Generator" msgstr "" -#: ../../extend/addon/addon/superblock/superblock.php:120 -msgid "\"Superblock\" Settings" +#: ../../addon/qrator/qrator.php:64 +msgid "Enter some text" msgstr "" -#: ../../extend/addon/addon/superblock/superblock.php:345 -msgid "Block Completely" +#: ../../addon/chess/chess.php:276 ../../addon/chess/chess.php:433 +msgid "Invalid game." msgstr "" -#: ../../extend/addon/addon/superblock/superblock.php:394 -msgid "superblock settings updated" +#: ../../addon/chess/chess.php:282 ../../addon/chess/chess.php:439 +msgid "You are not a player in this game." msgstr "" -#: ../../extend/addon/addon/testdrive/testdrive.php:104 -#, php-format -msgid "Your account on %s will expire in a few days." +#: ../../addon/chess/chess.php:315 +msgid "You must be a local channel to create a game." msgstr "" -#: ../../extend/addon/addon/testdrive/testdrive.php:105 -msgid "Your $Productname test account is about to expire." +#: ../../addon/chess/chess.php:333 +msgid "You must select one opponent that is not yourself." msgstr "" -#: ../../extend/addon/addon/tictac/tictac.php:21 -msgid "Three Dimensional Tic-Tac-Toe" +#: ../../addon/chess/chess.php:336 +msgid "Creating new game..." msgstr "" -#: ../../extend/addon/addon/tictac/tictac.php:54 -msgid "3D Tic-Tac-Toe" +#: ../../addon/chess/chess.php:342 +msgid "You must select white or black." msgstr "" -#: ../../extend/addon/addon/tictac/tictac.php:59 -msgid "New game" +#: ../../addon/chess/chess.php:349 +msgid "Error creating new game." msgstr "" -#: ../../extend/addon/addon/tictac/tictac.php:60 -msgid "New game with handicap" +#: ../../addon/chess/chess.php:381 ../../include/channel.php:1016 +msgid "Requested channel is not available." msgstr "" -#: ../../extend/addon/addon/tictac/tictac.php:61 -msgid "" -"Three dimensional tic-tac-toe is just like the traditional game except that " -"it is played on multiple levels simultaneously. " +#: ../../addon/chess/chess.php:395 +msgid "You must select a local channel /chess/channelname" msgstr "" -#: ../../extend/addon/addon/tictac/tictac.php:62 -msgid "" -"In this case there are three levels. You win by getting three in a row on " -"any level, as well as up, down, and diagonally across the different levels." +#: ../../addon/chess/chess.php:923 +msgid "Enable notifications" msgstr "" -#: ../../extend/addon/addon/tictac/tictac.php:64 -msgid "" -"The handicap game disables the center position on the middle level because " -"the player claiming this square often has an unfair advantage." -msgstr "" - -#: ../../extend/addon/addon/tictac/tictac.php:183 -msgid "You go first..." -msgstr "" - -#: ../../extend/addon/addon/tictac/tictac.php:188 -msgid "I'm going first this time..." -msgstr "" - -#: ../../extend/addon/addon/tictac/tictac.php:194 -msgid "You won!" -msgstr "" - -#: ../../extend/addon/addon/tictac/tictac.php:200 -#: ../../extend/addon/addon/tictac/tictac.php:225 -msgid "\"Cat\" game!" -msgstr "" - -#: ../../extend/addon/addon/tictac/tictac.php:223 -msgid "I won!" -msgstr "" - -#: ../../extend/addon/addon/tour/tour.php:75 -msgid "Edit your profile and change settings." -msgstr "" - -#: ../../extend/addon/addon/tour/tour.php:76 -msgid "Click here to see activity from your connections." -msgstr "" - -#: ../../extend/addon/addon/tour/tour.php:77 -msgid "Click here to see your channel home." -msgstr "" - -#: ../../extend/addon/addon/tour/tour.php:78 -msgid "You can access your private messages from here." -msgstr "" - -#: ../../extend/addon/addon/tour/tour.php:79 -msgid "Create new events here." -msgstr "" - -#: ../../extend/addon/addon/tour/tour.php:80 -msgid "" -"You can accept new connections and change permissions for existing ones " -"here. You can also e.g. create groups of contacts." -msgstr "" - -#: ../../extend/addon/addon/tour/tour.php:81 -msgid "System notifications will arrive here" -msgstr "" - -#: ../../extend/addon/addon/tour/tour.php:82 -msgid "Search for content and users" -msgstr "" - -#: ../../extend/addon/addon/tour/tour.php:83 -msgid "Browse for new contacts" -msgstr "" - -#: ../../extend/addon/addon/tour/tour.php:84 -msgid "Launch installed apps" -msgstr "" - -#: ../../extend/addon/addon/tour/tour.php:85 -msgid "Looking for help? Click here." -msgstr "" - -#: ../../extend/addon/addon/tour/tour.php:86 -msgid "" -"New events have occurred in your network. Click here to see what has " -"happened!" -msgstr "" - -#: ../../extend/addon/addon/tour/tour.php:87 -msgid "You have received a new private message. Click here to see from who!" -msgstr "" - -#: ../../extend/addon/addon/tour/tour.php:88 -msgid "There are events this week. Click here too see which!" -msgstr "" - -#: ../../extend/addon/addon/tour/tour.php:89 -msgid "You have received a new introduction. Click here to see who!" -msgstr "" - -#: ../../extend/addon/addon/tour/tour.php:90 -msgid "" -"There is a new system notification. Click here to see what has happened!" -msgstr "" - -#: ../../extend/addon/addon/tour/tour.php:93 -msgid "Click here to share text, images, videos and sound." -msgstr "" - -#: ../../extend/addon/addon/tour/tour.php:94 -msgid "You can write an optional title for your update (good for long posts)." -msgstr "" - -#: ../../extend/addon/addon/tour/tour.php:95 -msgid "Entering some categories here makes it easier to find your post later." -msgstr "" - -#: ../../extend/addon/addon/tour/tour.php:96 -msgid "Share photos, links, location, etc." -msgstr "" - -#: ../../extend/addon/addon/tour/tour.php:97 -msgid "" -"Only want to share content for a while? Make it expire at a certain date." -msgstr "" - -#: ../../extend/addon/addon/tour/tour.php:98 -msgid "You can password protect content." -msgstr "" - -#: ../../extend/addon/addon/tour/tour.php:99 -msgid "Choose who you share with." -msgstr "" - -#: ../../extend/addon/addon/tour/tour.php:101 -msgid "Click here when you are done." -msgstr "" - -#: ../../extend/addon/addon/tour/tour.php:104 -msgid "Adjust from which channels posts should be displayed." -msgstr "" - -#: ../../extend/addon/addon/tour/tour.php:105 -msgid "Only show posts from channels in the specified privacy group." -msgstr "" - -#: ../../extend/addon/addon/tour/tour.php:109 -msgid "" -"Easily find posts containing tags (keywords preceded by the \"#\" symbol)." -msgstr "" - -#: ../../extend/addon/addon/tour/tour.php:110 -msgid "Easily find posts in given category." -msgstr "" - -#: ../../extend/addon/addon/tour/tour.php:111 -msgid "Easily find posts by date." -msgstr "" - -#: ../../extend/addon/addon/tour/tour.php:112 -msgid "" -"Suggested users who have volounteered to be shown as suggestions, and who we " -"think you might find interesting." -msgstr "" - -#: ../../extend/addon/addon/tour/tour.php:113 -msgid "Here you see channels you have connected to." -msgstr "" - -#: ../../extend/addon/addon/tour/tour.php:114 -msgid "Save your search so you can repeat it at a later date." -msgstr "" - -#: ../../extend/addon/addon/tour/tour.php:117 -msgid "" -"If you see this icon you can be sure that the sender is who it say it is. It " -"is normal that it is not always possible to verify the sender, so the icon " -"will be missing sometimes. There is usually no need to worry about that." -msgstr "" - -#: ../../extend/addon/addon/tour/tour.php:118 -msgid "" -"Danger! It seems someone tried to forge a message! This message is not " -"necessarily from who it says it is from!" -msgstr "" - -#: ../../extend/addon/addon/tour/tour.php:125 -msgid "" -"Welcome to Hubzilla! Would you like to see a tour of the UI?

You can " -"pause it at any time and continue where you left off by reloading the page, " -"or navigting to another page.

You can also advance by pressing the " -"return key" -msgstr "" - -#: ../../extend/addon/addon/twitter/twitter.php:99 +#: ../../addon/twitter/twitter.php:99 msgid "Post to Twitter" msgstr "" -#: ../../extend/addon/addon/twitter/twitter.php:154 +#: ../../addon/twitter/twitter.php:154 msgid "Twitter settings updated." msgstr "" -#: ../../extend/addon/addon/twitter/twitter.php:183 +#: ../../addon/twitter/twitter.php:183 msgid "" "No consumer key pair for Twitter found. Please contact your site " "administrator." msgstr "" -#: ../../extend/addon/addon/twitter/twitter.php:205 +#: ../../addon/twitter/twitter.php:205 msgid "" "At this Hubzilla instance the Twitter plugin was enabled but you have not " "yet connected your account to your Twitter account. To do so click the " @@ -10170,15 +10196,15 @@ msgid "" "be posted to Twitter." msgstr "" -#: ../../extend/addon/addon/twitter/twitter.php:207 +#: ../../addon/twitter/twitter.php:207 msgid "Log in with Twitter" msgstr "" -#: ../../extend/addon/addon/twitter/twitter.php:210 +#: ../../addon/twitter/twitter.php:210 msgid "Copy the PIN from Twitter here" msgstr "" -#: ../../extend/addon/addon/twitter/twitter.php:237 +#: ../../addon/twitter/twitter.php:237 msgid "" "Note: Due your privacy settings (Hide your profile " "details from unknown viewers?) the link potentially included in public " @@ -10186,615 +10212,1144 @@ msgid "" "the visitor that the access to your profile has been restricted." msgstr "" -#: ../../extend/addon/addon/twitter/twitter.php:242 +#: ../../addon/twitter/twitter.php:242 msgid "Allow posting to Twitter" msgstr "" -#: ../../extend/addon/addon/twitter/twitter.php:242 +#: ../../addon/twitter/twitter.php:242 msgid "" "If enabled your public postings can be posted to the associated Twitter " "account" msgstr "" -#: ../../extend/addon/addon/twitter/twitter.php:246 +#: ../../addon/twitter/twitter.php:246 msgid "Send public postings to Twitter by default" msgstr "" -#: ../../extend/addon/addon/twitter/twitter.php:246 +#: ../../addon/twitter/twitter.php:246 msgid "" "If enabled your public postings will be posted to the associated Twitter " "account by default" msgstr "" -#: ../../extend/addon/addon/twitter/twitter.php:264 +#: ../../addon/twitter/twitter.php:264 msgid "Twitter Post Settings" msgstr "" -#: ../../extend/addon/addon/twitter/twitter.php:773 -#: ../../extend/addon/addon/rendezvous/rendezvous.php:95 -msgid "Submit Settings" +#: ../../addon/smileybutton/smileybutton.php:211 +msgid "Deactivate the feature" msgstr "" -#: ../../extend/addon/addon/upload_limits/upload_limits.php:25 -msgid "Show Upload Limits" +#: ../../addon/smileybutton/smileybutton.php:215 +msgid "Hide the button and show the smilies directly." msgstr "" -#: ../../extend/addon/addon/upload_limits/upload_limits.php:27 -msgid "Hubzilla configured maximum size: " +#: ../../addon/smileybutton/smileybutton.php:219 +msgid "Smileybutton Settings" msgstr "" -#: ../../extend/addon/addon/upload_limits/upload_limits.php:28 -msgid "PHP upload_max_filesize: " +#: ../../addon/piwik/piwik.php:85 +msgid "" +"This website is tracked using the Piwik " +"analytics tool." msgstr "" -#: ../../extend/addon/addon/upload_limits/upload_limits.php:29 -msgid "PHP post_max_size (must be larger than upload_max_filesize): " -msgstr "" - -#: ../../extend/addon/addon/visage/visage.php:93 -msgid "Recent Channel/Profile Viewers" -msgstr "" - -#: ../../extend/addon/addon/visage/visage.php:98 -msgid "This plugin/addon has not been configured." -msgstr "" - -#: ../../extend/addon/addon/visage/visage.php:99 +#: ../../addon/piwik/piwik.php:88 #, php-format -msgid "Please visit the Visage settings on %s" +msgid "" +"If you do not want that your visits are logged this way you can " +"set a cookie to prevent Piwik from tracking further visits of the site " +"(opt-out)." msgstr "" -#: ../../extend/addon/addon/visage/visage.php:99 -msgid "your feature settings page" +#: ../../addon/piwik/piwik.php:96 +msgid "Piwik Base URL" msgstr "" -#: ../../extend/addon/addon/visage/visage.php:112 -msgid "No entries." +#: ../../addon/piwik/piwik.php:96 +msgid "" +"Absolute path to your Piwik installation. (without protocol (http/s), with " +"trailing slash)" msgstr "" -#: ../../extend/addon/addon/visage/visage.php:166 -msgid "Enable Visage Visitor Logging" +#: ../../addon/piwik/piwik.php:97 +msgid "Site ID" msgstr "" -#: ../../extend/addon/addon/visage/visage.php:170 -msgid "Visage Settings" +#: ../../addon/piwik/piwik.php:98 +msgid "Show opt-out cookie link?" msgstr "" -#: ../../extend/addon/addon/wholikesme/wholikesme.php:29 -msgid "Who likes me?" +#: ../../addon/piwik/piwik.php:99 +msgid "Asynchronous tracking" msgstr "" -#: ../../extend/addon/addon/wppost/wppost.php:45 -msgid "Post to WordPress" +#: ../../addon/piwik/piwik.php:100 +msgid "Enable frontend JavaScript error tracking" msgstr "" -#: ../../extend/addon/addon/wppost/wppost.php:82 -msgid "Enable WordPress Post Plugin" +#: ../../addon/piwik/piwik.php:100 +msgid "This feature requires Piwik >= 2.2.0" msgstr "" -#: ../../extend/addon/addon/wppost/wppost.php:86 -msgid "WordPress username" +#: ../../addon/tour/tour.php:75 +msgid "Edit your profile and change settings." msgstr "" -#: ../../extend/addon/addon/wppost/wppost.php:90 -msgid "WordPress password" +#: ../../addon/tour/tour.php:76 +msgid "Click here to see activity from your connections." msgstr "" -#: ../../extend/addon/addon/wppost/wppost.php:94 -msgid "WordPress API URL" +#: ../../addon/tour/tour.php:77 +msgid "Click here to see your channel home." msgstr "" -#: ../../extend/addon/addon/wppost/wppost.php:95 -msgid "Typically https://your-blog.tld/xmlrpc.php" +#: ../../addon/tour/tour.php:78 +msgid "You can access your private messages from here." msgstr "" -#: ../../extend/addon/addon/wppost/wppost.php:98 -msgid "WordPress blogid" +#: ../../addon/tour/tour.php:79 +msgid "Create new events here." msgstr "" -#: ../../extend/addon/addon/wppost/wppost.php:99 -msgid "For multi-user sites such as wordpress.com, otherwise leave blank" +#: ../../addon/tour/tour.php:80 +msgid "" +"You can accept new connections and change permissions for existing ones " +"here. You can also e.g. create groups of contacts." msgstr "" -#: ../../extend/addon/addon/wppost/wppost.php:105 -msgid "Post to WordPress by default" +#: ../../addon/tour/tour.php:81 +msgid "System notifications will arrive here" msgstr "" -#: ../../extend/addon/addon/wppost/wppost.php:109 -msgid "Forward comments (requires hubzilla_wp plugin)" +#: ../../addon/tour/tour.php:82 +msgid "Search for content and users" msgstr "" -#: ../../extend/addon/addon/wppost/wppost.php:113 -msgid "WordPress Post Settings" +#: ../../addon/tour/tour.php:83 +msgid "Browse for new contacts" msgstr "" -#: ../../extend/addon/addon/wppost/wppost.php:129 -msgid "Wordpress Settings saved." +#: ../../addon/tour/tour.php:84 +msgid "Launch installed apps" msgstr "" -#: ../../extend/addon/addon/xmpp/xmpp.php:31 +#: ../../addon/tour/tour.php:85 +msgid "Looking for help? Click here." +msgstr "" + +#: ../../addon/tour/tour.php:86 +msgid "" +"New events have occurred in your network. Click here to see what has " +"happened!" +msgstr "" + +#: ../../addon/tour/tour.php:87 +msgid "You have received a new private message. Click here to see from who!" +msgstr "" + +#: ../../addon/tour/tour.php:88 +msgid "There are events this week. Click here too see which!" +msgstr "" + +#: ../../addon/tour/tour.php:89 +msgid "You have received a new introduction. Click here to see who!" +msgstr "" + +#: ../../addon/tour/tour.php:90 +msgid "" +"There is a new system notification. Click here to see what has happened!" +msgstr "" + +#: ../../addon/tour/tour.php:93 +msgid "Click here to share text, images, videos and sound." +msgstr "" + +#: ../../addon/tour/tour.php:94 +msgid "You can write an optional title for your update (good for long posts)." +msgstr "" + +#: ../../addon/tour/tour.php:95 +msgid "Entering some categories here makes it easier to find your post later." +msgstr "" + +#: ../../addon/tour/tour.php:96 +msgid "Share photos, links, location, etc." +msgstr "" + +#: ../../addon/tour/tour.php:97 +msgid "" +"Only want to share content for a while? Make it expire at a certain date." +msgstr "" + +#: ../../addon/tour/tour.php:98 +msgid "You can password protect content." +msgstr "" + +#: ../../addon/tour/tour.php:99 +msgid "Choose who you share with." +msgstr "" + +#: ../../addon/tour/tour.php:101 +msgid "Click here when you are done." +msgstr "" + +#: ../../addon/tour/tour.php:104 +msgid "Adjust from which channels posts should be displayed." +msgstr "" + +#: ../../addon/tour/tour.php:105 +msgid "Only show posts from channels in the specified privacy group." +msgstr "" + +#: ../../addon/tour/tour.php:109 +msgid "" +"Easily find posts containing tags (keywords preceded by the \"#\" symbol)." +msgstr "" + +#: ../../addon/tour/tour.php:110 +msgid "Easily find posts in given category." +msgstr "" + +#: ../../addon/tour/tour.php:111 +msgid "Easily find posts by date." +msgstr "" + +#: ../../addon/tour/tour.php:112 +msgid "" +"Suggested users who have volounteered to be shown as suggestions, and who we " +"think you might find interesting." +msgstr "" + +#: ../../addon/tour/tour.php:113 +msgid "Here you see channels you have connected to." +msgstr "" + +#: ../../addon/tour/tour.php:114 +msgid "Save your search so you can repeat it at a later date." +msgstr "" + +#: ../../addon/tour/tour.php:117 +msgid "" +"If you see this icon you can be sure that the sender is who it say it is. It " +"is normal that it is not always possible to verify the sender, so the icon " +"will be missing sometimes. There is usually no need to worry about that." +msgstr "" + +#: ../../addon/tour/tour.php:118 +msgid "" +"Danger! It seems someone tried to forge a message! This message is not " +"necessarily from who it says it is from!" +msgstr "" + +#: ../../addon/tour/tour.php:125 +msgid "" +"Welcome to Hubzilla! Would you like to see a tour of the UI?

You can " +"pause it at any time and continue where you left off by reloading the page, " +"or navigting to another page.

You can also advance by pressing the " +"return key" +msgstr "" + +#: ../../addon/sendzid/sendzid.php:25 +msgid "Extended Identity Sharing" +msgstr "" + +#: ../../addon/sendzid/sendzid.php:26 +msgid "" +"Share your identity with all websites on the internet. When disabled, " +"identity is only shared with sites in the matrix." +msgstr "" + +#: ../../addon/tictac/tictac.php:21 +msgid "Three Dimensional Tic-Tac-Toe" +msgstr "" + +#: ../../addon/tictac/tictac.php:54 +msgid "3D Tic-Tac-Toe" +msgstr "" + +#: ../../addon/tictac/tictac.php:59 +msgid "New game" +msgstr "" + +#: ../../addon/tictac/tictac.php:60 +msgid "New game with handicap" +msgstr "" + +#: ../../addon/tictac/tictac.php:61 +msgid "" +"Three dimensional tic-tac-toe is just like the traditional game except that " +"it is played on multiple levels simultaneously. " +msgstr "" + +#: ../../addon/tictac/tictac.php:62 +msgid "" +"In this case there are three levels. You win by getting three in a row on " +"any level, as well as up, down, and diagonally across the different levels." +msgstr "" + +#: ../../addon/tictac/tictac.php:64 +msgid "" +"The handicap game disables the center position on the middle level because " +"the player claiming this square often has an unfair advantage." +msgstr "" + +#: ../../addon/tictac/tictac.php:183 +msgid "You go first..." +msgstr "" + +#: ../../addon/tictac/tictac.php:188 +msgid "I'm going first this time..." +msgstr "" + +#: ../../addon/tictac/tictac.php:194 +msgid "You won!" +msgstr "" + +#: ../../addon/tictac/tictac.php:200 ../../addon/tictac/tictac.php:225 +msgid "\"Cat\" game!" +msgstr "" + +#: ../../addon/tictac/tictac.php:223 +msgid "I won!" +msgstr "" + +#: ../../addon/pageheader/pageheader.php:43 +msgid "Message to display on every page on this server" +msgstr "" + +#: ../../addon/pageheader/pageheader.php:48 +msgid "Pageheader Settings" +msgstr "" + +#: ../../addon/pageheader/pageheader.php:64 +msgid "pageheader Settings saved." +msgstr "" + +#: ../../addon/authchoose/authchoose.php:67 +msgid "Only authenticate automatically to sites of your friends" +msgstr "" + +#: ../../addon/authchoose/authchoose.php:67 +msgid "By default you are automatically authenticated anywhere in the network" +msgstr "" + +#: ../../addon/authchoose/authchoose.php:71 +msgid "Authchoose Settings" +msgstr "" + +#: ../../addon/authchoose/authchoose.php:85 +msgid "Atuhchoose Settings updated." +msgstr "" + +#: ../../addon/moremoods/moremoods.php:19 +msgid "lonely" +msgstr "" + +#: ../../addon/moremoods/moremoods.php:20 +msgid "drunk" +msgstr "" + +#: ../../addon/moremoods/moremoods.php:21 +msgid "horny" +msgstr "" + +#: ../../addon/moremoods/moremoods.php:22 +msgid "stoned" +msgstr "" + +#: ../../addon/moremoods/moremoods.php:23 +msgid "fucked up" +msgstr "" + +#: ../../addon/moremoods/moremoods.php:24 +msgid "clusterfucked" +msgstr "" + +#: ../../addon/moremoods/moremoods.php:25 +msgid "crazy" +msgstr "" + +#: ../../addon/moremoods/moremoods.php:26 +msgid "hurt" +msgstr "" + +#: ../../addon/moremoods/moremoods.php:27 +msgid "sleepy" +msgstr "" + +#: ../../addon/moremoods/moremoods.php:28 +msgid "grumpy" +msgstr "" + +#: ../../addon/moremoods/moremoods.php:29 +msgid "high" +msgstr "" + +#: ../../addon/moremoods/moremoods.php:30 +msgid "semi-conscious" +msgstr "" + +#: ../../addon/moremoods/moremoods.php:31 +msgid "in love" +msgstr "" + +#: ../../addon/moremoods/moremoods.php:32 +msgid "in lust" +msgstr "" + +#: ../../addon/moremoods/moremoods.php:33 +msgid "naked" +msgstr "" + +#: ../../addon/moremoods/moremoods.php:34 +msgid "stinky" +msgstr "" + +#: ../../addon/moremoods/moremoods.php:35 +msgid "sweaty" +msgstr "" + +#: ../../addon/moremoods/moremoods.php:36 +msgid "bleeding out" +msgstr "" + +#: ../../addon/moremoods/moremoods.php:37 +msgid "victorious" +msgstr "" + +#: ../../addon/moremoods/moremoods.php:38 +msgid "defeated" +msgstr "" + +#: ../../addon/moremoods/moremoods.php:39 +msgid "envious" +msgstr "" + +#: ../../addon/moremoods/moremoods.php:40 +msgid "jealous" +msgstr "" + +#: ../../addon/xmpp/xmpp.php:31 msgid "XMPP settings updated." msgstr "" -#: ../../extend/addon/addon/xmpp/xmpp.php:53 +#: ../../addon/xmpp/xmpp.php:53 msgid "Enable Chat" msgstr "" -#: ../../extend/addon/addon/xmpp/xmpp.php:58 +#: ../../addon/xmpp/xmpp.php:58 msgid "Individual credentials" msgstr "" -#: ../../extend/addon/addon/xmpp/xmpp.php:64 +#: ../../addon/xmpp/xmpp.php:64 msgid "Jabber BOSH server" msgstr "" -#: ../../extend/addon/addon/xmpp/xmpp.php:69 +#: ../../addon/xmpp/xmpp.php:69 msgid "XMPP Settings" msgstr "" -#: ../../extend/addon/addon/xmpp/xmpp.php:92 +#: ../../addon/xmpp/xmpp.php:92 msgid "Jabber BOSH host" msgstr "" -#: ../../extend/addon/addon/xmpp/xmpp.php:93 +#: ../../addon/xmpp/xmpp.php:93 msgid "Use central userbase" msgstr "" -#: ../../extend/addon/addon/xmpp/xmpp.php:93 +#: ../../addon/xmpp/xmpp.php:93 msgid "" "If enabled, members will automatically login to an ejabberd server that has " "to be installed on this machine with synchronized credentials via the " "\"auth_ejabberd.php\" script." msgstr "" -#: ../../extend/addon/addon/chess/chess.php:276 -#: ../../extend/addon/addon/chess/chess.php:433 -msgid "Invalid game." +#: ../../addon/wholikesme/wholikesme.php:29 +msgid "Who likes me?" msgstr "" -#: ../../extend/addon/addon/chess/chess.php:282 -#: ../../extend/addon/addon/chess/chess.php:439 -msgid "You are not a player in this game." +#: ../../addon/pumpio/pumpio.php:148 +msgid "You are now authenticated to pumpio." msgstr "" -#: ../../extend/addon/addon/chess/chess.php:315 -msgid "You must be a local channel to create a game." +#: ../../addon/pumpio/pumpio.php:149 +msgid "return to the featured settings page" msgstr "" -#: ../../extend/addon/addon/chess/chess.php:333 -msgid "You must select one opponent that is not yourself." +#: ../../addon/pumpio/pumpio.php:163 +msgid "Post to Pump.io" msgstr "" -#: ../../extend/addon/addon/chess/chess.php:336 -msgid "Creating new game..." +#: ../../addon/pumpio/pumpio.php:198 +msgid "Pump.io servername" msgstr "" -#: ../../extend/addon/addon/chess/chess.php:342 -msgid "You must select white or black." +#: ../../addon/pumpio/pumpio.php:198 +msgid "Without \"http://\" or \"https://\"" msgstr "" -#: ../../extend/addon/addon/chess/chess.php:349 -msgid "Error creating new game." +#: ../../addon/pumpio/pumpio.php:202 +msgid "Pump.io username" msgstr "" -#: ../../extend/addon/addon/chess/chess.php:381 ../../include/channel.php:914 -msgid "Requested channel is not available." +#: ../../addon/pumpio/pumpio.php:202 +msgid "Without the servername" msgstr "" -#: ../../extend/addon/addon/chess/chess.php:395 -msgid "You must select a local channel /chess/channelname" +#: ../../addon/pumpio/pumpio.php:213 +msgid "You are not authenticated to pumpio" msgstr "" -#: ../../extend/addon/addon/chess/chess.php:923 -msgid "Enable notifications" +#: ../../addon/pumpio/pumpio.php:215 +msgid "(Re-)Authenticate your pump.io connection" msgstr "" -#: ../../extend/addon/addon/likebanner/likebanner.php:51 -msgid "Your Webbie:" +#: ../../addon/pumpio/pumpio.php:219 +msgid "Enable pump.io Post Plugin" msgstr "" -#: ../../extend/addon/addon/likebanner/likebanner.php:54 -msgid "Fontsize (px):" +#: ../../addon/pumpio/pumpio.php:223 +msgid "Post to pump.io by default" msgstr "" -#: ../../extend/addon/addon/likebanner/likebanner.php:68 -msgid "Link:" +#: ../../addon/pumpio/pumpio.php:227 +msgid "Should posts be public" msgstr "" -#: ../../extend/addon/addon/likebanner/likebanner.php:70 -msgid "Like us on Hubzilla" +#: ../../addon/pumpio/pumpio.php:231 +msgid "Mirror all public posts" msgstr "" -#: ../../extend/addon/addon/likebanner/likebanner.php:72 -msgid "Embed:" +#: ../../addon/pumpio/pumpio.php:237 +msgid "Pump.io Post Settings" msgstr "" -#: ../../extend/addon/addon/openid/Mod_Id.php:85 -#: ../../include/selectors.php:49 ../../include/selectors.php:66 -#: ../../include/channel.php:1230 -msgid "Male" +#: ../../addon/pumpio/pumpio.php:266 +msgid "PumpIO Settings saved." msgstr "" -#: ../../extend/addon/addon/openid/Mod_Id.php:87 -#: ../../include/selectors.php:49 ../../include/selectors.php:66 -#: ../../include/channel.php:1228 -msgid "Female" +#: ../../addon/ldapauth/ldapauth.php:61 +msgid "An account has been created for you." msgstr "" -#: ../../extend/addon/addon/openid/MysqlProvider.php:52 -msgid "First Name" +#: ../../addon/ldapauth/ldapauth.php:68 +msgid "Authentication successful but rejected: account creation is disabled." msgstr "" -#: ../../extend/addon/addon/openid/MysqlProvider.php:53 -msgid "Last Name" -msgstr "" - -#: ../../extend/addon/addon/openid/MysqlProvider.php:55 -msgid "Full Name" -msgstr "" - -#: ../../extend/addon/addon/openid/MysqlProvider.php:61 -msgid "Profile Photo 16px" -msgstr "" - -#: ../../extend/addon/addon/openid/MysqlProvider.php:62 -msgid "Profile Photo 32px" -msgstr "" - -#: ../../extend/addon/addon/openid/MysqlProvider.php:63 -msgid "Profile Photo 48px" -msgstr "" - -#: ../../extend/addon/addon/openid/MysqlProvider.php:64 -msgid "Profile Photo 64px" -msgstr "" - -#: ../../extend/addon/addon/openid/MysqlProvider.php:65 -msgid "Profile Photo 80px" -msgstr "" - -#: ../../extend/addon/addon/openid/MysqlProvider.php:66 -msgid "Profile Photo 128px" -msgstr "" - -#: ../../extend/addon/addon/openid/MysqlProvider.php:67 -msgid "Timezone" -msgstr "" - -#: ../../extend/addon/addon/openid/MysqlProvider.php:70 -msgid "Birth Year" -msgstr "" - -#: ../../extend/addon/addon/openid/MysqlProvider.php:71 -msgid "Birth Month" -msgstr "" - -#: ../../extend/addon/addon/openid/MysqlProvider.php:72 -msgid "Birth Day" -msgstr "" - -#: ../../extend/addon/addon/openid/MysqlProvider.php:73 -msgid "Birthdate" -msgstr "" - -#: ../../extend/addon/addon/openid/openid.php:49 -msgid "" -"We encountered a problem while logging in with the OpenID you provided. " -"Please check the correct spelling of the ID." -msgstr "" - -#: ../../extend/addon/addon/openid/openid.php:49 -msgid "The error message was:" -msgstr "" - -#: ../../extend/addon/addon/openid/Mod_Openid.php:30 -msgid "OpenID protocol error. No ID returned." -msgstr "" - -#: ../../extend/addon/addon/openid/Mod_Openid.php:188 -#: ../../include/auth.php:286 -msgid "Login failed." -msgstr "" - -#: ../../extend/addon/addon/authchoose/authchoose.php:67 -msgid "Only authenticate automatically to sites of your friends" -msgstr "" - -#: ../../extend/addon/addon/authchoose/authchoose.php:67 -msgid "By default you are automatically authenticated anywhere in the network" -msgstr "" - -#: ../../extend/addon/addon/authchoose/authchoose.php:71 -msgid "Authchoose Settings" -msgstr "" - -#: ../../extend/addon/addon/authchoose/authchoose.php:85 -msgid "Atuhchoose Settings updated." -msgstr "" - -#: ../../extend/addon/addon/mailtest/mailtest.php:19 -msgid "Send test email" -msgstr "" - -#: ../../extend/addon/addon/mailtest/mailtest.php:66 -msgid "Mail sent." -msgstr "" - -#: ../../extend/addon/addon/mailtest/mailtest.php:68 -msgid "Sending of mail failed." -msgstr "" - -#: ../../extend/addon/addon/mailtest/mailtest.php:77 -msgid "Mail Test" -msgstr "" - -#: ../../extend/addon/addon/rendezvous/rendezvous.php:57 -msgid "Errors encountered deleting database table " -msgstr "" - -#: ../../extend/addon/addon/rendezvous/rendezvous.php:96 -msgid "Drop tables when uninstalling?" -msgstr "" - -#: ../../extend/addon/addon/rendezvous/rendezvous.php:96 -msgid "" -"If checked, the Rendezvous database tables will be deleted when the plugin " -"is uninstalled." -msgstr "" - -#: ../../extend/addon/addon/rendezvous/rendezvous.php:97 -msgid "Mapbox Access Token" -msgstr "" - -#: ../../extend/addon/addon/rendezvous/rendezvous.php:97 -msgid "" -"If you enter a Mapbox access token, it will be used to retrieve map tiles " -"from Mapbox instead of the default OpenStreetMap tile server." -msgstr "" - -#: ../../extend/addon/addon/rendezvous/rendezvous.php:162 -msgid "Rendezvous" -msgstr "" - -#: ../../extend/addon/addon/rendezvous/rendezvous.php:167 -msgid "" -"This identity has been deleted by another member due to inactivity. Please " -"press the \"New identity\" button or refresh the page to register a new " -"identity. You may use the same name." -msgstr "" - -#: ../../extend/addon/addon/rendezvous/rendezvous.php:168 -msgid "Welcome to Rendezvous!" -msgstr "" - -#: ../../extend/addon/addon/rendezvous/rendezvous.php:169 -msgid "" -"Enter your name to join this rendezvous. To begin sharing your location with " -"the other members, tap the GPS control. When your location is discovered, a " -"red dot will appear and others will be able to see you on the map." -msgstr "" - -#: ../../extend/addon/addon/rendezvous/rendezvous.php:171 -msgid "Let's meet here" -msgstr "" - -#: ../../extend/addon/addon/rendezvous/rendezvous.php:174 -msgid "New marker" -msgstr "" - -#: ../../extend/addon/addon/rendezvous/rendezvous.php:175 -msgid "Edit marker" -msgstr "" - -#: ../../extend/addon/addon/rendezvous/rendezvous.php:176 -msgid "New identity" -msgstr "" - -#: ../../extend/addon/addon/rendezvous/rendezvous.php:177 -msgid "Delete marker" -msgstr "" - -#: ../../extend/addon/addon/rendezvous/rendezvous.php:178 -msgid "Delete member" -msgstr "" - -#: ../../extend/addon/addon/rendezvous/rendezvous.php:179 -msgid "Edit proximity alert" -msgstr "" - -#: ../../extend/addon/addon/rendezvous/rendezvous.php:180 -msgid "" -"A proximity alert will be issued when this member is within a certain radius " -"of you.

Enter a radius in meters (0 to disable):" -msgstr "" - -#: ../../extend/addon/addon/rendezvous/rendezvous.php:180 -#: ../../extend/addon/addon/rendezvous/rendezvous.php:185 -msgid "distance" -msgstr "" - -#: ../../extend/addon/addon/rendezvous/rendezvous.php:181 -msgid "Proximity alert distance (meters)" -msgstr "" - -#: ../../extend/addon/addon/rendezvous/rendezvous.php:182 -#: ../../extend/addon/addon/rendezvous/rendezvous.php:184 -msgid "" -"A proximity alert will be issued when you are within a certain radius of the " -"marker location.

Enter a radius in meters (0 to disable):" -msgstr "" - -#: ../../extend/addon/addon/rendezvous/rendezvous.php:183 -msgid "Marker proximity alert" -msgstr "" - -#: ../../extend/addon/addon/rendezvous/rendezvous.php:186 -msgid "Reminder note" -msgstr "" - -#: ../../extend/addon/addon/rendezvous/rendezvous.php:187 -msgid "" -"Enter a note to be displayed when you are within the specified proximity..." -msgstr "" - -#: ../../extend/addon/addon/rendezvous/rendezvous.php:199 -msgid "Add new rendezvous" -msgstr "" - -#: ../../extend/addon/addon/rendezvous/rendezvous.php:200 -msgid "" -"Create a new rendezvous and share the access link with those you wish to " -"invite to the group. Those who open the link become members of the " -"rendezvous. They can view other member locations, add markers to the map, or " -"share their own locations with the group." -msgstr "" - -#: ../../extend/addon/addon/firefox/firefox.php:23 -msgid "Install Firefox Sharing Tools" -msgstr "" - -#: ../../extend/addon/addon/firefox/firefox.php:34 -msgid "Share content from Firefox to $Projectname" -msgstr "" - -#: ../../extend/addon/addon/firefox/firefox.php:37 -msgid "Install Firefox Sharing Tools to this web browser" -msgstr "" - -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:107 -msgid "Error retrieving wiki" -msgstr "" - -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:114 -msgid "Error creating zip file export folder" -msgstr "" - -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:132 -msgid "Error downloading wiki: " -msgstr "" - -#: ../../extend/addon/addon/opensearch/opensearch.php:26 +#: ../../addon/opensearch/opensearch.php:26 #, php-format msgctxt "opensearch" msgid "Search %1$s (%2$s)" msgstr "" -#: ../../extend/addon/addon/opensearch/opensearch.php:28 +#: ../../addon/opensearch/opensearch.php:28 msgctxt "opensearch" msgid "$Projectname" msgstr "" -#: ../../extend/addon/addon/opensearch/opensearch.php:43 +#: ../../addon/opensearch/opensearch.php:43 msgid "Search $Projectname" msgstr "" -#: ../../extend/addon/addon/diaspora/import_diaspora.php:16 -msgid "No username found in import file." +#: ../../addon/redfiles/redfiles.php:119 +msgid "Redmatrix File Storage Import" msgstr "" -#: ../../extend/addon/addon/diaspora/import_diaspora.php:41 -#: ../../include/import.php:62 -msgid "Unable to create a unique channel address. Import failed." +#: ../../addon/redfiles/redfiles.php:120 +msgid "This will import all your Redmatrix cloud files to this channel." msgstr "" -#: ../../extend/addon/addon/diaspora/diaspora.php:710 -msgid "Diaspora Protocol Settings updated." +#: ../../addon/redfiles/redfilehelper.php:64 +msgid "file" msgstr "" -#: ../../extend/addon/addon/diaspora/diaspora.php:728 -msgid "" -"The Diaspora protocol does not support location independence. Connections " -"you make within that network may be unreachable from alternate channel " -"locations." +#: ../../addon/hubwall/hubwall.php:19 +msgid "Send email to all members" msgstr "" -#: ../../extend/addon/addon/diaspora/diaspora.php:731 -msgid "Enable the Diaspora protocol for this channel" -msgstr "" - -#: ../../extend/addon/addon/diaspora/diaspora.php:735 -msgid "Allow any Diaspora member to comment on your public posts" -msgstr "" - -#: ../../extend/addon/addon/diaspora/diaspora.php:739 -msgid "Prevent your hashtags from being redirected to other sites" -msgstr "" - -#: ../../extend/addon/addon/diaspora/diaspora.php:744 -msgid "Followed hashtags (comma separated, do not include the #)" -msgstr "" - -#: ../../extend/addon/addon/diaspora/diaspora.php:749 -msgid "Diaspora Protocol Settings" -msgstr "" - -#: ../../extend/addon/addon/gnusoc/gnusoc.php:200 -msgid "GNU-Social Protocol Settings updated." -msgstr "" - -#: ../../extend/addon/addon/gnusoc/gnusoc.php:219 -msgid "" -"The GNU-Social protocol does not support location independence. Connections " -"you make within that network may be unreachable from alternate channel " -"locations." -msgstr "" - -#: ../../extend/addon/addon/gnusoc/gnusoc.php:222 -msgid "Enable the GNU-Social protocol for this channel" -msgstr "" - -#: ../../extend/addon/addon/gnusoc/gnusoc.php:226 -msgid "GNU-Social Protocol Settings" -msgstr "" - -#: ../../extend/addon/addon/gnusoc/gnusoc.php:417 -msgid "Follow" -msgstr "" - -#: ../../extend/addon/addon/gnusoc/gnusoc.php:420 +#: ../../addon/hubwall/hubwall.php:33 #, php-format -msgid "%1$s is now following %2$s" +msgid "$1%s Administrator" msgstr "" -#: ../../include/dba/dba_driver.php:189 +#: ../../addon/hubwall/hubwall.php:73 #, php-format -msgid "Cannot locate DNS info for database server '%s'" +msgid "%1$d of %2$d messages sent." msgstr "" -#: ../../include/language.php:367 ../../include/text.php:1774 -msgid "default" +#: ../../addon/hubwall/hubwall.php:81 +msgid "Send email to all hub members." msgstr "" -#: ../../include/language.php:380 -msgid "Select an alternate language" +#: ../../addon/hubwall/hubwall.php:93 +msgid "Sender Email address" msgstr "" -#: ../../include/follow.php:26 -msgid "Channel is blocked on this site." +#: ../../addon/hubwall/hubwall.php:94 +msgid "Test mode (only send to hub administrator)" msgstr "" -#: ../../include/follow.php:31 -msgid "Channel location missing." +#: ../../include/selectors.php:30 +msgid "Frequently" msgstr "" -#: ../../include/follow.php:73 -msgid "Response from remote channel was incomplete." +#: ../../include/selectors.php:31 +msgid "Hourly" msgstr "" -#: ../../include/follow.php:90 -msgid "Channel was deleted and no longer exists." +#: ../../include/selectors.php:32 +msgid "Twice daily" msgstr "" -#: ../../include/follow.php:140 ../../include/follow.php:175 -msgid "Protocol disabled." +#: ../../include/selectors.php:33 +msgid "Daily" msgstr "" -#: ../../include/follow.php:163 -msgid "Channel discovery failed." +#: ../../include/selectors.php:34 +msgid "Weekly" msgstr "" -#: ../../include/follow.php:202 -msgid "Cannot connect to yourself." +#: ../../include/selectors.php:35 +msgid "Monthly" +msgstr "" + +#: ../../include/selectors.php:49 +msgid "Currently Male" +msgstr "" + +#: ../../include/selectors.php:49 +msgid "Currently Female" +msgstr "" + +#: ../../include/selectors.php:49 +msgid "Mostly Male" +msgstr "" + +#: ../../include/selectors.php:49 +msgid "Mostly Female" +msgstr "" + +#: ../../include/selectors.php:49 +msgid "Transgender" +msgstr "" + +#: ../../include/selectors.php:49 +msgid "Intersex" +msgstr "" + +#: ../../include/selectors.php:49 +msgid "Transsexual" +msgstr "" + +#: ../../include/selectors.php:49 +msgid "Hermaphrodite" +msgstr "" + +#: ../../include/selectors.php:49 ../../include/channel.php:1336 +msgid "Neuter" +msgstr "" + +#: ../../include/selectors.php:49 ../../include/channel.php:1338 +msgid "Non-specific" +msgstr "" + +#: ../../include/selectors.php:49 +msgid "Undecided" +msgstr "" + +#: ../../include/selectors.php:85 ../../include/selectors.php:104 +msgid "Males" +msgstr "" + +#: ../../include/selectors.php:85 ../../include/selectors.php:104 +msgid "Females" +msgstr "" + +#: ../../include/selectors.php:85 +msgid "Gay" +msgstr "" + +#: ../../include/selectors.php:85 +msgid "Lesbian" +msgstr "" + +#: ../../include/selectors.php:85 +msgid "No Preference" +msgstr "" + +#: ../../include/selectors.php:85 +msgid "Bisexual" +msgstr "" + +#: ../../include/selectors.php:85 +msgid "Autosexual" +msgstr "" + +#: ../../include/selectors.php:85 +msgid "Abstinent" +msgstr "" + +#: ../../include/selectors.php:85 +msgid "Virgin" +msgstr "" + +#: ../../include/selectors.php:85 +msgid "Deviant" +msgstr "" + +#: ../../include/selectors.php:85 +msgid "Fetish" +msgstr "" + +#: ../../include/selectors.php:85 +msgid "Oodles" +msgstr "" + +#: ../../include/selectors.php:85 +msgid "Nonsexual" +msgstr "" + +#: ../../include/selectors.php:123 ../../include/selectors.php:140 +msgid "Single" +msgstr "" + +#: ../../include/selectors.php:123 +msgid "Lonely" +msgstr "" + +#: ../../include/selectors.php:123 +msgid "Available" +msgstr "" + +#: ../../include/selectors.php:123 +msgid "Unavailable" +msgstr "" + +#: ../../include/selectors.php:123 +msgid "Has crush" +msgstr "" + +#: ../../include/selectors.php:123 +msgid "Infatuated" +msgstr "" + +#: ../../include/selectors.php:123 ../../include/selectors.php:140 +msgid "Dating" +msgstr "" + +#: ../../include/selectors.php:123 +msgid "Unfaithful" +msgstr "" + +#: ../../include/selectors.php:123 +msgid "Sex Addict" +msgstr "" + +#: ../../include/selectors.php:123 +msgid "Friends/Benefits" +msgstr "" + +#: ../../include/selectors.php:123 +msgid "Casual" +msgstr "" + +#: ../../include/selectors.php:123 +msgid "Engaged" +msgstr "" + +#: ../../include/selectors.php:123 ../../include/selectors.php:140 +msgid "Married" +msgstr "" + +#: ../../include/selectors.php:123 +msgid "Imaginarily married" +msgstr "" + +#: ../../include/selectors.php:123 +msgid "Partners" +msgstr "" + +#: ../../include/selectors.php:123 ../../include/selectors.php:140 +msgid "Cohabiting" +msgstr "" + +#: ../../include/selectors.php:123 +msgid "Common law" +msgstr "" + +#: ../../include/selectors.php:123 +msgid "Happy" +msgstr "" + +#: ../../include/selectors.php:123 +msgid "Not looking" +msgstr "" + +#: ../../include/selectors.php:123 +msgid "Swinger" +msgstr "" + +#: ../../include/selectors.php:123 +msgid "Betrayed" +msgstr "" + +#: ../../include/selectors.php:123 ../../include/selectors.php:140 +msgid "Separated" +msgstr "" + +#: ../../include/selectors.php:123 +msgid "Unstable" +msgstr "" + +#: ../../include/selectors.php:123 ../../include/selectors.php:140 +msgid "Divorced" +msgstr "" + +#: ../../include/selectors.php:123 +msgid "Imaginarily divorced" +msgstr "" + +#: ../../include/selectors.php:123 ../../include/selectors.php:140 +msgid "Widowed" +msgstr "" + +#: ../../include/selectors.php:123 +msgid "Uncertain" +msgstr "" + +#: ../../include/selectors.php:123 ../../include/selectors.php:140 +msgid "It's complicated" +msgstr "" + +#: ../../include/selectors.php:123 +msgid "Don't care" +msgstr "" + +#: ../../include/selectors.php:123 +msgid "Ask me" +msgstr "" + +#: ../../include/conversation.php:200 +#, php-format +msgid "%1$s is now connected with %2$s" +msgstr "" + +#: ../../include/conversation.php:235 +#, php-format +msgid "%1$s poked %2$s" +msgstr "" + +#: ../../include/conversation.php:239 ../../include/text.php:1096 +#: ../../include/text.php:1101 +msgid "poked" +msgstr "" + +#: ../../include/conversation.php:688 +#, php-format +msgid "View %s's profile @ %s" +msgstr "" + +#: ../../include/conversation.php:708 +msgid "Categories:" +msgstr "" + +#: ../../include/conversation.php:709 +msgid "Filed under:" +msgstr "" + +#: ../../include/conversation.php:734 +msgid "View in context" +msgstr "" + +#: ../../include/conversation.php:831 +msgid "remove" +msgstr "" + +#: ../../include/conversation.php:835 ../../include/nav.php:268 +msgid "Loading..." +msgstr "" + +#: ../../include/conversation.php:836 +msgid "Delete Selected Items" +msgstr "" + +#: ../../include/conversation.php:879 +msgid "View Source" +msgstr "" + +#: ../../include/conversation.php:889 +msgid "Follow Thread" +msgstr "" + +#: ../../include/conversation.php:898 +msgid "Unfollow Thread" +msgstr "" + +#: ../../include/conversation.php:989 +msgid "Activity/Posts" +msgstr "" + +#: ../../include/conversation.php:1009 +msgid "Edit Connection" +msgstr "" + +#: ../../include/conversation.php:1019 +msgid "Message" +msgstr "" + +#: ../../include/conversation.php:1153 +#, php-format +msgid "%s likes this." +msgstr "" + +#: ../../include/conversation.php:1153 +#, php-format +msgid "%s doesn't like this." +msgstr "" + +#: ../../include/conversation.php:1157 +#, php-format +msgid "%2$d people like this." +msgid_plural "%2$d people like this." +msgstr[0] "" +msgstr[1] "" + +#: ../../include/conversation.php:1159 +#, php-format +msgid "%2$d people don't like this." +msgid_plural "%2$d people don't like this." +msgstr[0] "" +msgstr[1] "" + +#: ../../include/conversation.php:1165 +msgid "and" +msgstr "" + +#: ../../include/conversation.php:1168 +#, php-format +msgid ", and %d other people" +msgid_plural ", and %d other people" +msgstr[0] "" +msgstr[1] "" + +#: ../../include/conversation.php:1169 +#, php-format +msgid "%s like this." +msgstr "" + +#: ../../include/conversation.php:1169 +#, php-format +msgid "%s don't like this." +msgstr "" + +#: ../../include/conversation.php:1212 +msgid "Set your location" +msgstr "" + +#: ../../include/conversation.php:1213 +msgid "Clear browser location" +msgstr "" + +#: ../../include/conversation.php:1261 +msgid "Tag term:" +msgstr "" + +#: ../../include/conversation.php:1262 +msgid "Where are you right now?" +msgstr "" + +#: ../../include/conversation.php:1267 +msgid "Choose a different album..." +msgstr "" + +#: ../../include/conversation.php:1271 +msgid "Comments enabled" +msgstr "" + +#: ../../include/conversation.php:1272 +msgid "Comments disabled" +msgstr "" + +#: ../../include/conversation.php:1310 +msgid "Page link name" +msgstr "" + +#: ../../include/conversation.php:1313 +msgid "Post as" +msgstr "" + +#: ../../include/conversation.php:1327 +msgid "Toggle voting" +msgstr "" + +#: ../../include/conversation.php:1330 +msgid "Disable comments" +msgstr "" + +#: ../../include/conversation.php:1331 +msgid "Toggle comments" +msgstr "" + +#: ../../include/conversation.php:1339 +msgid "Categories (optional, comma-separated list)" +msgstr "" + +#: ../../include/conversation.php:1362 +msgid "Other networks and post services" +msgstr "" + +#: ../../include/conversation.php:1368 +msgid "Set publish date" +msgstr "" + +#: ../../include/conversation.php:1631 +msgid "Discover" +msgstr "" + +#: ../../include/conversation.php:1634 +msgid "Imported public streams" +msgstr "" + +#: ../../include/conversation.php:1639 +msgid "Commented Order" +msgstr "" + +#: ../../include/conversation.php:1642 +msgid "Sort by Comment Date" +msgstr "" + +#: ../../include/conversation.php:1646 +msgid "Posted Order" +msgstr "" + +#: ../../include/conversation.php:1649 +msgid "Sort by Post Date" +msgstr "" + +#: ../../include/conversation.php:1657 +msgid "Posts that mention or involve you" +msgstr "" + +#: ../../include/conversation.php:1666 +msgid "Activity Stream - by date" +msgstr "" + +#: ../../include/conversation.php:1672 +msgid "Starred" +msgstr "" + +#: ../../include/conversation.php:1675 +msgid "Favourite Posts" +msgstr "" + +#: ../../include/conversation.php:1682 +msgid "Spam" +msgstr "" + +#: ../../include/conversation.php:1685 +msgid "Posts flagged as SPAM" +msgstr "" + +#: ../../include/conversation.php:1760 ../../include/nav.php:358 +msgid "Status Messages and Posts" +msgstr "" + +#: ../../include/conversation.php:1773 ../../include/nav.php:371 +msgid "Profile Details" +msgstr "" + +#: ../../include/conversation.php:1783 ../../include/nav.php:381 +#: ../../include/photos.php:525 +msgid "Photo Albums" +msgstr "" + +#: ../../include/conversation.php:1791 ../../include/nav.php:389 +msgid "Files and Storage" +msgstr "" + +#: ../../include/conversation.php:1827 ../../include/nav.php:424 +msgid "Bookmarks" +msgstr "" + +#: ../../include/conversation.php:1830 ../../include/nav.php:427 +msgid "Saved Bookmarks" +msgstr "" + +#: ../../include/conversation.php:1841 ../../include/nav.php:438 +msgid "View Webpages" +msgstr "" + +#: ../../include/conversation.php:1910 +msgctxt "noun" +msgid "Attending" +msgid_plural "Attending" +msgstr[0] "" +msgstr[1] "" + +#: ../../include/conversation.php:1913 +msgctxt "noun" +msgid "Not Attending" +msgid_plural "Not Attending" +msgstr[0] "" +msgstr[1] "" + +#: ../../include/conversation.php:1916 +msgctxt "noun" +msgid "Undecided" +msgid_plural "Undecided" +msgstr[0] "" +msgstr[1] "" + +#: ../../include/conversation.php:1919 +msgctxt "noun" +msgid "Agree" +msgid_plural "Agrees" +msgstr[0] "" +msgstr[1] "" + +#: ../../include/conversation.php:1922 +msgctxt "noun" +msgid "Disagree" +msgid_plural "Disagrees" +msgstr[0] "" +msgstr[1] "" + +#: ../../include/conversation.php:1925 +msgctxt "noun" +msgid "Abstain" +msgid_plural "Abstains" +msgstr[0] "" +msgstr[1] "" + +#: ../../include/dir_fns.php:141 +msgid "Directory Options" +msgstr "" + +#: ../../include/dir_fns.php:143 +msgid "Safe Mode" +msgstr "" + +#: ../../include/dir_fns.php:144 +msgid "Public Forums Only" +msgstr "" + +#: ../../include/dir_fns.php:145 +msgid "This Website Only" +msgstr "" + +#: ../../include/bookmarks.php:34 +#, php-format +msgid "%1$s's bookmarks" +msgstr "" + +#: ../../include/import.php:41 +msgid "" +"Cannot create a duplicate channel identifier on this system. Import failed." +msgstr "" + +#: ../../include/import.php:105 +msgid "Cloned channel not found. Import failed." msgstr "" #: ../../include/text.php:478 @@ -10834,11 +11389,6 @@ msgstr "" msgid "poke" msgstr "" -#: ../../include/text.php:1096 ../../include/text.php:1101 -#: ../../include/conversation.php:239 -msgid "poked" -msgstr "" - #: ../../include/text.php:1102 msgid "ping" msgstr "" @@ -11043,7 +11593,7 @@ msgstr "" msgid "Unknown Attachment" msgstr "" -#: ../../include/text.php:1386 ../../include/feedutils.php:777 +#: ../../include/text.php:1386 ../../include/feedutils.php:780 msgid "unknown" msgstr "" @@ -11059,6 +11609,10 @@ msgstr "" msgid "Download binary/encrypted content" msgstr "" +#: ../../include/text.php:1774 ../../include/language.php:367 +msgid "default" +msgstr "" + #: ../../include/text.php:1782 msgid "Page layout" msgstr "" @@ -11147,719 +11701,6 @@ msgstr "" msgid "Specify folder" msgstr "" -#: ../../include/account.php:35 -msgid "Not a valid email address" -msgstr "" - -#: ../../include/account.php:37 -msgid "Your email domain is not among those allowed on this site" -msgstr "" - -#: ../../include/account.php:43 -msgid "Your email address is already registered at this site." -msgstr "" - -#: ../../include/account.php:75 -msgid "An invitation is required." -msgstr "" - -#: ../../include/account.php:79 -msgid "Invitation could not be verified." -msgstr "" - -#: ../../include/account.php:157 -msgid "Please enter the required information." -msgstr "" - -#: ../../include/account.php:224 -msgid "Failed to store account information." -msgstr "" - -#: ../../include/account.php:291 -#, php-format -msgid "Registration confirmation for %s" -msgstr "" - -#: ../../include/account.php:360 -#, php-format -msgid "Registration request at %s" -msgstr "" - -#: ../../include/account.php:382 -msgid "your registration password" -msgstr "" - -#: ../../include/account.php:388 ../../include/account.php:450 -#, php-format -msgid "Registration details for %s" -msgstr "" - -#: ../../include/account.php:461 -msgid "Account approved." -msgstr "" - -#: ../../include/account.php:501 -#, php-format -msgid "Registration revoked for %s" -msgstr "" - -#: ../../include/account.php:780 ../../include/account.php:782 -msgid "Click here to upgrade." -msgstr "" - -#: ../../include/account.php:788 -msgid "This action exceeds the limits set by your subscription plan." -msgstr "" - -#: ../../include/account.php:793 -msgid "This action is not available under your subscription plan." -msgstr "" - -#: ../../include/connections.php:128 -msgid "New window" -msgstr "" - -#: ../../include/connections.php:129 -msgid "Open the selected location in a different window or browser tab" -msgstr "" - -#: ../../include/connections.php:676 ../../include/event.php:1292 -msgid "Home, Voice" -msgstr "" - -#: ../../include/connections.php:677 ../../include/event.php:1293 -msgid "Home, Fax" -msgstr "" - -#: ../../include/connections.php:679 ../../include/event.php:1295 -msgid "Work, Voice" -msgstr "" - -#: ../../include/connections.php:680 ../../include/event.php:1296 -msgid "Work, Fax" -msgstr "" - -#: ../../include/datetime.php:147 -msgid "Birthday" -msgstr "" - -#: ../../include/datetime.php:149 -msgid "Age: " -msgstr "" - -#: ../../include/datetime.php:151 -msgid "YYYY-MM-DD or MM-DD" -msgstr "" - -#: ../../include/datetime.php:286 ../../boot.php:2419 -msgid "never" -msgstr "" - -#: ../../include/datetime.php:292 -msgid "less than a second ago" -msgstr "" - -#: ../../include/datetime.php:310 -#, php-format -msgctxt "e.g. 22 hours ago, 1 minute ago" -msgid "%1$d %2$s ago" -msgstr "" - -#: ../../include/datetime.php:321 -msgctxt "relative_date" -msgid "year" -msgid_plural "years" -msgstr[0] "" -msgstr[1] "" - -#: ../../include/datetime.php:324 -msgctxt "relative_date" -msgid "month" -msgid_plural "months" -msgstr[0] "" -msgstr[1] "" - -#: ../../include/datetime.php:327 -msgctxt "relative_date" -msgid "week" -msgid_plural "weeks" -msgstr[0] "" -msgstr[1] "" - -#: ../../include/datetime.php:330 -msgctxt "relative_date" -msgid "day" -msgid_plural "days" -msgstr[0] "" -msgstr[1] "" - -#: ../../include/datetime.php:333 -msgctxt "relative_date" -msgid "hour" -msgid_plural "hours" -msgstr[0] "" -msgstr[1] "" - -#: ../../include/datetime.php:336 -msgctxt "relative_date" -msgid "minute" -msgid_plural "minutes" -msgstr[0] "" -msgstr[1] "" - -#: ../../include/datetime.php:339 -msgctxt "relative_date" -msgid "second" -msgid_plural "seconds" -msgstr[0] "" -msgstr[1] "" - -#: ../../include/datetime.php:576 -#, php-format -msgid "%1$s's birthday" -msgstr "" - -#: ../../include/datetime.php:577 -#, php-format -msgid "Happy Birthday %1$s" -msgstr "" - -#: ../../include/selectors.php:30 -msgid "Frequently" -msgstr "" - -#: ../../include/selectors.php:31 -msgid "Hourly" -msgstr "" - -#: ../../include/selectors.php:32 -msgid "Twice daily" -msgstr "" - -#: ../../include/selectors.php:33 -msgid "Daily" -msgstr "" - -#: ../../include/selectors.php:34 -msgid "Weekly" -msgstr "" - -#: ../../include/selectors.php:35 -msgid "Monthly" -msgstr "" - -#: ../../include/selectors.php:49 -msgid "Currently Male" -msgstr "" - -#: ../../include/selectors.php:49 -msgid "Currently Female" -msgstr "" - -#: ../../include/selectors.php:49 -msgid "Mostly Male" -msgstr "" - -#: ../../include/selectors.php:49 -msgid "Mostly Female" -msgstr "" - -#: ../../include/selectors.php:49 -msgid "Transgender" -msgstr "" - -#: ../../include/selectors.php:49 -msgid "Intersex" -msgstr "" - -#: ../../include/selectors.php:49 -msgid "Transsexual" -msgstr "" - -#: ../../include/selectors.php:49 -msgid "Hermaphrodite" -msgstr "" - -#: ../../include/selectors.php:49 ../../include/channel.php:1234 -msgid "Neuter" -msgstr "" - -#: ../../include/selectors.php:49 ../../include/channel.php:1236 -msgid "Non-specific" -msgstr "" - -#: ../../include/selectors.php:49 -msgid "Undecided" -msgstr "" - -#: ../../include/selectors.php:85 ../../include/selectors.php:104 -msgid "Males" -msgstr "" - -#: ../../include/selectors.php:85 ../../include/selectors.php:104 -msgid "Females" -msgstr "" - -#: ../../include/selectors.php:85 -msgid "Gay" -msgstr "" - -#: ../../include/selectors.php:85 -msgid "Lesbian" -msgstr "" - -#: ../../include/selectors.php:85 -msgid "No Preference" -msgstr "" - -#: ../../include/selectors.php:85 -msgid "Bisexual" -msgstr "" - -#: ../../include/selectors.php:85 -msgid "Autosexual" -msgstr "" - -#: ../../include/selectors.php:85 -msgid "Abstinent" -msgstr "" - -#: ../../include/selectors.php:85 -msgid "Virgin" -msgstr "" - -#: ../../include/selectors.php:85 -msgid "Deviant" -msgstr "" - -#: ../../include/selectors.php:85 -msgid "Fetish" -msgstr "" - -#: ../../include/selectors.php:85 -msgid "Oodles" -msgstr "" - -#: ../../include/selectors.php:85 -msgid "Nonsexual" -msgstr "" - -#: ../../include/selectors.php:123 ../../include/selectors.php:140 -msgid "Single" -msgstr "" - -#: ../../include/selectors.php:123 -msgid "Lonely" -msgstr "" - -#: ../../include/selectors.php:123 -msgid "Available" -msgstr "" - -#: ../../include/selectors.php:123 -msgid "Unavailable" -msgstr "" - -#: ../../include/selectors.php:123 -msgid "Has crush" -msgstr "" - -#: ../../include/selectors.php:123 -msgid "Infatuated" -msgstr "" - -#: ../../include/selectors.php:123 ../../include/selectors.php:140 -msgid "Dating" -msgstr "" - -#: ../../include/selectors.php:123 -msgid "Unfaithful" -msgstr "" - -#: ../../include/selectors.php:123 -msgid "Sex Addict" -msgstr "" - -#: ../../include/selectors.php:123 -msgid "Friends/Benefits" -msgstr "" - -#: ../../include/selectors.php:123 -msgid "Casual" -msgstr "" - -#: ../../include/selectors.php:123 -msgid "Engaged" -msgstr "" - -#: ../../include/selectors.php:123 ../../include/selectors.php:140 -msgid "Married" -msgstr "" - -#: ../../include/selectors.php:123 -msgid "Imaginarily married" -msgstr "" - -#: ../../include/selectors.php:123 -msgid "Partners" -msgstr "" - -#: ../../include/selectors.php:123 ../../include/selectors.php:140 -msgid "Cohabiting" -msgstr "" - -#: ../../include/selectors.php:123 -msgid "Common law" -msgstr "" - -#: ../../include/selectors.php:123 -msgid "Happy" -msgstr "" - -#: ../../include/selectors.php:123 -msgid "Not looking" -msgstr "" - -#: ../../include/selectors.php:123 -msgid "Swinger" -msgstr "" - -#: ../../include/selectors.php:123 -msgid "Betrayed" -msgstr "" - -#: ../../include/selectors.php:123 ../../include/selectors.php:140 -msgid "Separated" -msgstr "" - -#: ../../include/selectors.php:123 -msgid "Unstable" -msgstr "" - -#: ../../include/selectors.php:123 ../../include/selectors.php:140 -msgid "Divorced" -msgstr "" - -#: ../../include/selectors.php:123 -msgid "Imaginarily divorced" -msgstr "" - -#: ../../include/selectors.php:123 ../../include/selectors.php:140 -msgid "Widowed" -msgstr "" - -#: ../../include/selectors.php:123 -msgid "Uncertain" -msgstr "" - -#: ../../include/selectors.php:123 ../../include/selectors.php:140 -msgid "It's complicated" -msgstr "" - -#: ../../include/selectors.php:123 -msgid "Don't care" -msgstr "" - -#: ../../include/selectors.php:123 -msgid "Ask me" -msgstr "" - -#: ../../include/auth.php:148 -msgid "Logged out." -msgstr "" - -#: ../../include/auth.php:275 -msgid "Failed authentication" -msgstr "" - -#: ../../include/bookmarks.php:34 -#, php-format -msgid "%1$s's bookmarks" -msgstr "" - -#: ../../include/attach.php:250 ../../include/attach.php:339 -msgid "Item was not found." -msgstr "" - -#: ../../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:671 -#, php-format -msgid "File exceeds size limit of %d" -msgstr "" - -#: ../../include/attach.php:685 -#, php-format -msgid "You have reached your limit of %1$.0f Mbytes attachment storage." -msgstr "" - -#: ../../include/attach.php:855 -msgid "File upload failed. Possible system limit or action terminated." -msgstr "" - -#: ../../include/attach.php:868 -msgid "Stored file could not be verified. Upload failed." -msgstr "" - -#: ../../include/attach.php:923 ../../include/attach.php:939 -msgid "Path not available." -msgstr "" - -#: ../../include/attach.php:988 ../../include/attach.php:1153 -msgid "Empty pathname" -msgstr "" - -#: ../../include/attach.php:1014 -msgid "duplicate filename or path" -msgstr "" - -#: ../../include/attach.php:1039 -msgid "Path not found." -msgstr "" - -#: ../../include/attach.php:1107 -msgid "mkdir failed." -msgstr "" - -#: ../../include/attach.php:1111 -msgid "database storage failed." -msgstr "" - -#: ../../include/attach.php:1159 -msgid "Empty path" -msgstr "" - -#: ../../include/event.php:22 ../../include/event.php:69 -msgid "l F d, Y \\@ g:i A" -msgstr "" - -#: ../../include/event.php:30 ../../include/event.php:73 -msgid "Starts:" -msgstr "" - -#: ../../include/event.php:40 ../../include/event.php:77 -msgid "Finishes:" -msgstr "" - -#: ../../include/event.php:1008 -msgid "This event has been added to your calendar." -msgstr "" - -#: ../../include/event.php:1208 -msgid "Not specified" -msgstr "" - -#: ../../include/event.php:1209 -msgid "Needs Action" -msgstr "" - -#: ../../include/event.php:1210 -msgid "Completed" -msgstr "" - -#: ../../include/event.php:1211 -msgid "In Process" -msgstr "" - -#: ../../include/event.php:1212 -msgid "Cancelled" -msgstr "" - -#: ../../include/nav.php:90 -msgid "Remote authentication" -msgstr "" - -#: ../../include/nav.php:90 -msgid "Click to authenticate to your home hub" -msgstr "" - -#: ../../include/nav.php:101 ../../include/nav.php:125 ../../boot.php:1590 -msgid "Logout" -msgstr "" - -#: ../../include/nav.php:101 ../../include/nav.php:125 -msgid "End this session" -msgstr "" - -#: ../../include/nav.php:104 -msgid "Your profile page" -msgstr "" - -#: ../../include/nav.php:107 -msgid "Manage/Edit profiles" -msgstr "" - -#: ../../include/nav.php:109 -msgid "Edit your profile" -msgstr "" - -#: ../../include/nav.php:115 -msgid "Sign in" -msgstr "" - -#: ../../include/nav.php:140 -msgid "Take me home" -msgstr "" - -#: ../../include/nav.php:142 -msgid "Log me out of this site" -msgstr "" - -#: ../../include/nav.php:147 -msgid "Create an account" -msgstr "" - -#: ../../include/nav.php:159 -msgid "Help and documentation" -msgstr "" - -#: ../../include/nav.php:162 -msgid "Search site @name, #tag, ?docs, content" -msgstr "" - -#: ../../include/nav.php:174 -msgid "Grid" -msgstr "" - -#: ../../include/nav.php:174 -msgid "Your grid" -msgstr "" - -#: ../../include/nav.php:175 -msgid "View your network/grid" -msgstr "" - -#: ../../include/nav.php:176 -msgid "Mark all grid notifications seen" -msgstr "" - -#: ../../include/nav.php:178 -msgid "Channel home" -msgstr "" - -#: ../../include/nav.php:179 -msgid "View your channel home" -msgstr "" - -#: ../../include/nav.php:180 -msgid "Mark all channel notifications seen" -msgstr "" - -#: ../../include/nav.php:186 -msgid "Notices" -msgstr "" - -#: ../../include/nav.php:186 -msgid "Notifications" -msgstr "" - -#: ../../include/nav.php:187 -msgid "View all notifications" -msgstr "" - -#: ../../include/nav.php:188 -msgid "Mark all system notifications seen" -msgstr "" - -#: ../../include/nav.php:190 -msgid "Private mail" -msgstr "" - -#: ../../include/nav.php:191 -msgid "View your private messages" -msgstr "" - -#: ../../include/nav.php:192 -msgid "Mark all private messages seen" -msgstr "" - -#: ../../include/nav.php:198 -msgid "Event Calendar" -msgstr "" - -#: ../../include/nav.php:199 -msgid "View events" -msgstr "" - -#: ../../include/nav.php:200 -msgid "Mark all events seen" -msgstr "" - -#: ../../include/nav.php:202 -msgid "Manage Your Channels" -msgstr "" - -#: ../../include/nav.php:204 -msgid "Account/Channel Settings" -msgstr "" - -#: ../../include/nav.php:212 -msgid "Site Setup and Configuration" -msgstr "" - -#: ../../include/nav.php:259 ../../include/conversation.php:835 -msgid "Loading..." -msgstr "" - -#: ../../include/nav.php:264 -msgid "@name, #tag, ?doc, content" -msgstr "" - -#: ../../include/nav.php:265 -msgid "Please wait..." -msgstr "" - -#: ../../include/nav.php:268 -msgid "Add Apps" -msgstr "" - -#: ../../include/nav.php:269 -msgid "Arrange Apps" -msgstr "" - -#: ../../include/nav.php:270 -msgid "Toggle System Apps" -msgstr "" - -#: ../../include/nav.php:362 ../../include/conversation.php:1760 -msgid "Status Messages and Posts" -msgstr "" - -#: ../../include/nav.php:375 ../../include/conversation.php:1773 -msgid "Profile Details" -msgstr "" - -#: ../../include/nav.php:385 ../../include/conversation.php:1783 -#: ../../include/photos.php:525 -msgid "Photo Albums" -msgstr "" - -#: ../../include/nav.php:393 ../../include/conversation.php:1791 -msgid "Files and Storage" -msgstr "" - -#: ../../include/nav.php:428 ../../include/conversation.php:1827 -msgid "Bookmarks" -msgstr "" - -#: ../../include/nav.php:431 ../../include/conversation.php:1830 -msgid "Saved Bookmarks" -msgstr "" - -#: ../../include/nav.php:442 ../../include/conversation.php:1841 -msgid "View Webpages" -msgstr "" - #: ../../include/contact_widgets.php:11 #, php-format msgid "%d invitation available" @@ -11906,353 +11747,37 @@ msgstr[1] "" msgid "show more" msgstr "" -#: ../../include/features.php:54 -msgid "General Features" +#: ../../include/markdown.php:139 ../../include/bbcode.php:332 +#, php-format +msgid "%1$s wrote the following %2$s %3$s" msgstr "" -#: ../../include/features.php:59 -msgid "Multiple Profiles" +#: ../../include/follow.php:26 +msgid "Channel is blocked on this site." msgstr "" -#: ../../include/features.php:60 -msgid "Ability to create multiple profiles" +#: ../../include/follow.php:31 +msgid "Channel location missing." msgstr "" -#: ../../include/features.php:68 -msgid "Advanced Profiles" +#: ../../include/follow.php:73 +msgid "Response from remote channel was incomplete." msgstr "" -#: ../../include/features.php:69 -msgid "Additional profile sections and selections" +#: ../../include/follow.php:90 +msgid "Channel was deleted and no longer exists." msgstr "" -#: ../../include/features.php:77 -msgid "Profile Import/Export" +#: ../../include/follow.php:140 ../../include/follow.php:175 +msgid "Protocol disabled." msgstr "" -#: ../../include/features.php:78 -msgid "Save and load profile details across sites/channels" +#: ../../include/follow.php:163 +msgid "Channel discovery failed." msgstr "" -#: ../../include/features.php:86 -msgid "Web Pages" -msgstr "" - -#: ../../include/features.php:87 -msgid "Provide managed web pages on your channel" -msgstr "" - -#: ../../include/features.php:96 -msgid "Provide a wiki for your channel" -msgstr "" - -#: ../../include/features.php:113 -msgid "Private Notes" -msgstr "" - -#: ../../include/features.php:114 -msgid "Enables a tool to store notes and reminders (note: not encrypted)" -msgstr "" - -#: ../../include/features.php:122 -msgid "Navigation Channel Select" -msgstr "" - -#: ../../include/features.php:123 -msgid "Change channels directly from within the navigation dropdown menu" -msgstr "" - -#: ../../include/features.php:131 -msgid "Photo Location" -msgstr "" - -#: ../../include/features.php:132 -msgid "If location data is available on uploaded photos, link this to a map." -msgstr "" - -#: ../../include/features.php:140 -msgid "Access Controlled Chatrooms" -msgstr "" - -#: ../../include/features.php:141 -msgid "Provide chatrooms and chat services with access control." -msgstr "" - -#: ../../include/features.php:150 -msgid "Provide alternate connection permission roles." -msgstr "" - -#: ../../include/features.php:158 -msgid "Smart Birthdays" -msgstr "" - -#: ../../include/features.php:159 -msgid "" -"Make birthday events timezone aware in case your friends are scattered " -"across the planet." -msgstr "" - -#: ../../include/features.php:167 -msgid "Event Timezone Selection" -msgstr "" - -#: ../../include/features.php:168 -msgid "Allow event creation in timezones other than your own." -msgstr "" - -#: ../../include/features.php:176 -msgid "Advanced Directory Search" -msgstr "" - -#: ../../include/features.php:177 -msgid "Allows creation of complex directory search queries" -msgstr "" - -#: ../../include/features.php:185 -msgid "Advanced Theme and Layout Settings" -msgstr "" - -#: ../../include/features.php:186 -msgid "Allows fine tuning of themes and page layouts" -msgstr "" - -#: ../../include/features.php:196 -msgid "Post Composition Features" -msgstr "" - -#: ../../include/features.php:200 -msgid "Large Photos" -msgstr "" - -#: ../../include/features.php:201 -msgid "" -"Include large (1024px) photo thumbnails in posts. If not enabled, use small " -"(640px) photo thumbnails" -msgstr "" - -#: ../../include/features.php:210 -msgid "Automatically import channel content from other channels or feeds" -msgstr "" - -#: ../../include/features.php:218 -msgid "Even More Encryption" -msgstr "" - -#: ../../include/features.php:219 -msgid "" -"Allow optional encryption of content end-to-end with a shared secret key" -msgstr "" - -#: ../../include/features.php:227 -msgid "Enable Voting Tools" -msgstr "" - -#: ../../include/features.php:228 -msgid "Provide a class of post which others can vote on" -msgstr "" - -#: ../../include/features.php:236 -msgid "Disable Comments" -msgstr "" - -#: ../../include/features.php:237 -msgid "Provide the option to disable comments for a post" -msgstr "" - -#: ../../include/features.php:245 -msgid "Delayed Posting" -msgstr "" - -#: ../../include/features.php:246 -msgid "Allow posts to be published at a later date" -msgstr "" - -#: ../../include/features.php:254 -msgid "Content Expiration" -msgstr "" - -#: ../../include/features.php:255 -msgid "Remove posts/comments and/or private messages at a future time" -msgstr "" - -#: ../../include/features.php:263 -msgid "Suppress Duplicate Posts/Comments" -msgstr "" - -#: ../../include/features.php:264 -msgid "" -"Prevent posts with identical content to be published with less than two " -"minutes in between submissions." -msgstr "" - -#: ../../include/features.php:275 -msgid "Network and Stream Filtering" -msgstr "" - -#: ../../include/features.php:279 -msgid "Search by Date" -msgstr "" - -#: ../../include/features.php:280 -msgid "Ability to select posts by date ranges" -msgstr "" - -#: ../../include/features.php:288 ../../include/group.php:331 -msgid "Privacy Groups" -msgstr "" - -#: ../../include/features.php:289 -msgid "Enable management and selection of privacy groups" -msgstr "" - -#: ../../include/features.php:298 -msgid "Save search terms for re-use" -msgstr "" - -#: ../../include/features.php:306 -msgid "Network Personal Tab" -msgstr "" - -#: ../../include/features.php:307 -msgid "Enable tab to display only Network posts that you've interacted on" -msgstr "" - -#: ../../include/features.php:315 -msgid "Network New Tab" -msgstr "" - -#: ../../include/features.php:316 -msgid "Enable tab to display all new Network activity" -msgstr "" - -#: ../../include/features.php:324 -msgid "Affinity Tool" -msgstr "" - -#: ../../include/features.php:325 -msgid "Filter stream activity by depth of relationships" -msgstr "" - -#: ../../include/features.php:334 -msgid "Show friend and connection suggestions" -msgstr "" - -#: ../../include/features.php:342 -msgid "Connection Filtering" -msgstr "" - -#: ../../include/features.php:343 -msgid "Filter incoming posts from connections based on keywords/content" -msgstr "" - -#: ../../include/features.php:355 -msgid "Post/Comment Tools" -msgstr "" - -#: ../../include/features.php:359 -msgid "Community Tagging" -msgstr "" - -#: ../../include/features.php:360 -msgid "Ability to tag existing posts" -msgstr "" - -#: ../../include/features.php:368 -msgid "Post Categories" -msgstr "" - -#: ../../include/features.php:369 -msgid "Add categories to your posts" -msgstr "" - -#: ../../include/features.php:377 -msgid "Emoji Reactions" -msgstr "" - -#: ../../include/features.php:378 -msgid "Add emoji reaction ability to posts" -msgstr "" - -#: ../../include/features.php:387 -msgid "Ability to file posts under folders" -msgstr "" - -#: ../../include/features.php:395 -msgid "Dislike Posts" -msgstr "" - -#: ../../include/features.php:396 -msgid "Ability to dislike posts/comments" -msgstr "" - -#: ../../include/features.php:404 -msgid "Star Posts" -msgstr "" - -#: ../../include/features.php:405 -msgid "Ability to mark special posts with a star indicator" -msgstr "" - -#: ../../include/features.php:413 -msgid "Tag Cloud" -msgstr "" - -#: ../../include/features.php:414 -msgid "Provide a personal tag cloud on your channel page" -msgstr "" - -#: ../../include/features.php:425 -msgid "Premium Channel" -msgstr "" - -#: ../../include/features.php:426 -msgid "" -"Allows you to set restrictions and terms on those that connect with your " -"channel" -msgstr "" - -#: ../../include/network.php:751 -msgid "view full size" -msgstr "" - -#: ../../include/network.php:1691 ../../include/network.php:1692 -msgid "Friendica" -msgstr "" - -#: ../../include/network.php:1693 -msgid "OStatus" -msgstr "" - -#: ../../include/network.php:1694 -msgid "GNU-Social" -msgstr "" - -#: ../../include/network.php:1695 -msgid "RSS/Atom" -msgstr "" - -#: ../../include/network.php:1697 -msgid "Diaspora" -msgstr "" - -#: ../../include/network.php:1698 -msgid "Facebook" -msgstr "" - -#: ../../include/network.php:1699 -msgid "Zot" -msgstr "" - -#: ../../include/network.php:1700 -msgid "LinkedIn" -msgstr "" - -#: ../../include/network.php:1701 -msgid "XMPP/IM" -msgstr "" - -#: ../../include/network.php:1702 -msgid "MySpace" +#: ../../include/follow.php:186 +msgid "Cannot connect to yourself." msgstr "" #: ../../include/js_strings.php:5 @@ -12502,377 +12027,115 @@ msgctxt "calendar" msgid "All day" msgstr "" -#: ../../include/taxonomy.php:258 ../../include/taxonomy.php:279 -msgid "Tags" +#: ../../include/message.php:40 +msgid "Unable to determine sender." msgstr "" -#: ../../include/taxonomy.php:323 -msgid "Keywords" +#: ../../include/message.php:79 +msgid "No recipient provided." msgstr "" -#: ../../include/taxonomy.php:344 -msgid "have" +#: ../../include/message.php:84 +msgid "[no subject]" msgstr "" -#: ../../include/taxonomy.php:344 -msgid "has" +#: ../../include/message.php:214 +msgid "Stored post could not be verified." msgstr "" -#: ../../include/taxonomy.php:345 -msgid "want" +#: ../../include/activities.php:41 +msgid " and " msgstr "" -#: ../../include/taxonomy.php:345 -msgid "wants" +#: ../../include/activities.php:49 +msgid "public profile" msgstr "" -#: ../../include/taxonomy.php:346 -msgid "likes" +#: ../../include/activities.php:58 +#, php-format +msgid "%1$s changed %2$s to “%3$s”" msgstr "" -#: ../../include/taxonomy.php:347 -msgid "dislikes" +#: ../../include/activities.php:59 +#, php-format +msgid "Visit %1$s's %2$s" msgstr "" -#: ../../include/group.php:26 +#: ../../include/activities.php:62 +#, php-format +msgid "%1$s has an updated %2$s, changing %3$s." +msgstr "" + +#: ../../include/attach.php:250 ../../include/attach.php:339 +msgid "Item was not found." +msgstr "" + +#: ../../include/attach.php:501 +msgid "No source file." +msgstr "" + +#: ../../include/attach.php:523 +msgid "Cannot locate file to replace" +msgstr "" + +#: ../../include/attach.php:541 +msgid "Cannot locate file to revise/update" +msgstr "" + +#: ../../include/attach.php:674 +#, php-format +msgid "File exceeds size limit of %d" +msgstr "" + +#: ../../include/attach.php:688 +#, php-format +msgid "You have reached your limit of %1$.0f Mbytes attachment storage." +msgstr "" + +#: ../../include/attach.php:858 +msgid "File upload failed. Possible system limit or action terminated." +msgstr "" + +#: ../../include/attach.php:871 +msgid "Stored file could not be verified. Upload failed." +msgstr "" + +#: ../../include/attach.php:932 ../../include/attach.php:948 +msgid "Path not available." +msgstr "" + +#: ../../include/attach.php:997 ../../include/attach.php:1162 +msgid "Empty pathname" +msgstr "" + +#: ../../include/attach.php:1023 +msgid "duplicate filename or path" +msgstr "" + +#: ../../include/attach.php:1048 +msgid "Path not found." +msgstr "" + +#: ../../include/attach.php:1116 +msgid "mkdir failed." +msgstr "" + +#: ../../include/attach.php:1120 +msgid "database storage failed." +msgstr "" + +#: ../../include/attach.php:1168 +msgid "Empty path" +msgstr "" + +#: ../../include/security.php:117 +msgid "guest:" +msgstr "" + +#: ../../include/security.php:531 msgid "" -"A deleted group with this name was revived. Existing item permissions " -"may apply to this group and any future members. If this is " -"not what you intended, please create another group with a different name." -msgstr "" - -#: ../../include/group.php:268 -msgid "Add new connections to this privacy group" -msgstr "" - -#: ../../include/group.php:309 -msgid "edit" -msgstr "" - -#: ../../include/group.php:332 -msgid "Edit group" -msgstr "" - -#: ../../include/group.php:333 -msgid "Add privacy group" -msgstr "" - -#: ../../include/group.php:334 -msgid "Channels not in any privacy group" -msgstr "" - -#: ../../include/bbcode.php:194 ../../include/bbcode.php:1097 -#: ../../include/bbcode.php:1100 ../../include/bbcode.php:1105 -#: ../../include/bbcode.php:1108 ../../include/bbcode.php:1111 -#: ../../include/bbcode.php:1114 ../../include/bbcode.php:1119 -#: ../../include/bbcode.php:1122 ../../include/bbcode.php:1127 -#: ../../include/bbcode.php:1130 ../../include/bbcode.php:1133 -#: ../../include/bbcode.php:1136 -msgid "Image/photo" -msgstr "" - -#: ../../include/bbcode.php:233 ../../include/bbcode.php:1147 -msgid "Encrypted content" -msgstr "" - -#: ../../include/bbcode.php:249 -#, php-format -msgid "Install %s element: " -msgstr "" - -#: ../../include/bbcode.php:253 -#, php-format -msgid "" -"This post contains an installable %s element, however you lack permissions " -"to install it on this site." -msgstr "" - -#: ../../include/bbcode.php:332 -#, php-format -msgid "%1$s wrote the following %2$s %3$s" -msgstr "" - -#: ../../include/bbcode.php:409 ../../include/bbcode.php:417 -msgid "Click to open/close" -msgstr "" - -#: ../../include/bbcode.php:417 -msgid "spoiler" -msgstr "" - -#: ../../include/bbcode.php:1085 -msgid "$1 wrote:" -msgstr "" - -#: ../../include/import.php:41 -msgid "" -"Cannot create a duplicate channel identifier on this system. Import failed." -msgstr "" - -#: ../../include/import.php:105 -msgid "Cloned channel not found. Import failed." -msgstr "" - -#: ../../include/conversation.php:200 -#, php-format -msgid "%1$s is now connected with %2$s" -msgstr "" - -#: ../../include/conversation.php:235 -#, php-format -msgid "%1$s poked %2$s" -msgstr "" - -#: ../../include/conversation.php:688 -#, php-format -msgid "View %s's profile @ %s" -msgstr "" - -#: ../../include/conversation.php:708 -msgid "Categories:" -msgstr "" - -#: ../../include/conversation.php:709 -msgid "Filed under:" -msgstr "" - -#: ../../include/conversation.php:734 -msgid "View in context" -msgstr "" - -#: ../../include/conversation.php:831 -msgid "remove" -msgstr "" - -#: ../../include/conversation.php:836 -msgid "Delete Selected Items" -msgstr "" - -#: ../../include/conversation.php:879 -msgid "View Source" -msgstr "" - -#: ../../include/conversation.php:889 -msgid "Follow Thread" -msgstr "" - -#: ../../include/conversation.php:898 -msgid "Unfollow Thread" -msgstr "" - -#: ../../include/conversation.php:989 -msgid "Activity/Posts" -msgstr "" - -#: ../../include/conversation.php:1009 -msgid "Edit Connection" -msgstr "" - -#: ../../include/conversation.php:1019 -msgid "Message" -msgstr "" - -#: ../../include/conversation.php:1153 -#, php-format -msgid "%s likes this." -msgstr "" - -#: ../../include/conversation.php:1153 -#, php-format -msgid "%s doesn't like this." -msgstr "" - -#: ../../include/conversation.php:1157 -#, php-format -msgid "%2$d people like this." -msgid_plural "%2$d people like this." -msgstr[0] "" -msgstr[1] "" - -#: ../../include/conversation.php:1159 -#, php-format -msgid "%2$d people don't like this." -msgid_plural "%2$d people don't like this." -msgstr[0] "" -msgstr[1] "" - -#: ../../include/conversation.php:1165 -msgid "and" -msgstr "" - -#: ../../include/conversation.php:1168 -#, php-format -msgid ", and %d other people" -msgid_plural ", and %d other people" -msgstr[0] "" -msgstr[1] "" - -#: ../../include/conversation.php:1169 -#, php-format -msgid "%s like this." -msgstr "" - -#: ../../include/conversation.php:1169 -#, php-format -msgid "%s don't like this." -msgstr "" - -#: ../../include/conversation.php:1212 -msgid "Set your location" -msgstr "" - -#: ../../include/conversation.php:1213 -msgid "Clear browser location" -msgstr "" - -#: ../../include/conversation.php:1261 -msgid "Tag term:" -msgstr "" - -#: ../../include/conversation.php:1262 -msgid "Where are you right now?" -msgstr "" - -#: ../../include/conversation.php:1267 -msgid "Choose a different album..." -msgstr "" - -#: ../../include/conversation.php:1271 -msgid "Comments enabled" -msgstr "" - -#: ../../include/conversation.php:1272 -msgid "Comments disabled" -msgstr "" - -#: ../../include/conversation.php:1310 -msgid "Page link name" -msgstr "" - -#: ../../include/conversation.php:1313 -msgid "Post as" -msgstr "" - -#: ../../include/conversation.php:1327 -msgid "Toggle voting" -msgstr "" - -#: ../../include/conversation.php:1330 -msgid "Disable comments" -msgstr "" - -#: ../../include/conversation.php:1331 -msgid "Toggle comments" -msgstr "" - -#: ../../include/conversation.php:1339 -msgid "Categories (optional, comma-separated list)" -msgstr "" - -#: ../../include/conversation.php:1362 -msgid "Other networks and post services" -msgstr "" - -#: ../../include/conversation.php:1368 -msgid "Set publish date" -msgstr "" - -#: ../../include/conversation.php:1631 -msgid "Discover" -msgstr "" - -#: ../../include/conversation.php:1634 -msgid "Imported public streams" -msgstr "" - -#: ../../include/conversation.php:1639 -msgid "Commented Order" -msgstr "" - -#: ../../include/conversation.php:1642 -msgid "Sort by Comment Date" -msgstr "" - -#: ../../include/conversation.php:1646 -msgid "Posted Order" -msgstr "" - -#: ../../include/conversation.php:1649 -msgid "Sort by Post Date" -msgstr "" - -#: ../../include/conversation.php:1657 -msgid "Posts that mention or involve you" -msgstr "" - -#: ../../include/conversation.php:1666 -msgid "Activity Stream - by date" -msgstr "" - -#: ../../include/conversation.php:1672 -msgid "Starred" -msgstr "" - -#: ../../include/conversation.php:1675 -msgid "Favourite Posts" -msgstr "" - -#: ../../include/conversation.php:1682 -msgid "Spam" -msgstr "" - -#: ../../include/conversation.php:1685 -msgid "Posts flagged as SPAM" -msgstr "" - -#: ../../include/conversation.php:1910 -msgctxt "noun" -msgid "Attending" -msgid_plural "Attending" -msgstr[0] "" -msgstr[1] "" - -#: ../../include/conversation.php:1913 -msgctxt "noun" -msgid "Not Attending" -msgid_plural "Not Attending" -msgstr[0] "" -msgstr[1] "" - -#: ../../include/conversation.php:1916 -msgctxt "noun" -msgid "Undecided" -msgid_plural "Undecided" -msgstr[0] "" -msgstr[1] "" - -#: ../../include/conversation.php:1919 -msgctxt "noun" -msgid "Agree" -msgid_plural "Agrees" -msgstr[0] "" -msgstr[1] "" - -#: ../../include/conversation.php:1922 -msgctxt "noun" -msgid "Disagree" -msgid_plural "Disagrees" -msgstr[0] "" -msgstr[1] "" - -#: ../../include/conversation.php:1925 -msgctxt "noun" -msgid "Abstain" -msgid_plural "Abstains" -msgstr[0] "" -msgstr[1] "" - -#: ../../include/help.php:33 -msgid "Help:" -msgstr "" - -#: ../../include/help.php:65 -msgid "Not Found" +"The form security token was not correct. This probably happened because the " +"form has been opened for too long (>3 hours) before submitting it." msgstr "" #: ../../include/items.php:851 ../../include/items.php:903 @@ -12944,118 +12207,6 @@ msgctxt "edit_activity" msgid "Comment" msgstr "" -#: ../../include/photos.php:111 -#, php-format -msgid "Image exceeds website size limit of %lu bytes" -msgstr "" - -#: ../../include/photos.php:118 -msgid "Image file is empty." -msgstr "" - -#: ../../include/photos.php:257 -msgid "Photo storage failed." -msgstr "" - -#: ../../include/photos.php:297 -msgid "a new photo" -msgstr "" - -#: ../../include/photos.php:301 -#, php-format -msgctxt "photo_upload" -msgid "%1$s posted %2$s to %3$s" -msgstr "" - -#: ../../include/photos.php:530 -msgid "Upload New Photos" -msgstr "" - -#: ../../include/zot.php:646 -msgid "Invalid data packet" -msgstr "" - -#: ../../include/zot.php:662 -msgid "Unable to verify channel signature" -msgstr "" - -#: ../../include/zot.php:2310 -#, php-format -msgid "Unable to verify site signature for %s" -msgstr "" - -#: ../../include/zot.php:3770 -msgid "invalid target signature" -msgstr "" - -#: ../../include/acl_selectors.php:208 -msgid "Who can see this?" -msgstr "" - -#: ../../include/acl_selectors.php:209 -msgid "Custom selection" -msgstr "" - -#: ../../include/acl_selectors.php:210 -msgid "" -"Select \"Show\" to allow viewing. \"Don't show\" lets you override and limit " -"the scope of \"Show\"." -msgstr "" - -#: ../../include/acl_selectors.php:211 -msgid "Show" -msgstr "" - -#: ../../include/acl_selectors.php:212 -msgid "Don't show" -msgstr "" - -#: ../../include/acl_selectors.php:245 -#, php-format -msgid "" -"Post permissions %s cannot be changed %s after a post is shared.
These " -"permissions set who is allowed to view the post." -msgstr "" - -#: ../../include/activities.php:41 -msgid " and " -msgstr "" - -#: ../../include/activities.php:49 -msgid "public profile" -msgstr "" - -#: ../../include/activities.php:58 -#, php-format -msgid "%1$s changed %2$s to “%3$s”" -msgstr "" - -#: ../../include/activities.php:59 -#, php-format -msgid "Visit %1$s's %2$s" -msgstr "" - -#: ../../include/activities.php:62 -#, php-format -msgid "%1$s has an updated %2$s, changing %3$s." -msgstr "" - -#: ../../include/dir_fns.php:141 -msgid "Directory Options" -msgstr "" - -#: ../../include/dir_fns.php:143 -msgid "Safe Mode" -msgstr "" - -#: ../../include/dir_fns.php:144 -msgid "Public Forums Only" -msgstr "" - -#: ../../include/dir_fns.php:145 -msgid "This Website Only" -msgstr "" - #: ../../include/channel.php:33 msgid "Unable to obtain identity information from database" msgstr "" @@ -13093,301 +12244,1061 @@ msgstr "" msgid "Default Profile" msgstr "" -#: ../../include/channel.php:1060 +#: ../../include/channel.php:497 +msgid "Unable to retrieve modified identity" +msgstr "" + +#: ../../include/channel.php:1162 msgid "Create New Profile" msgstr "" -#: ../../include/channel.php:1080 +#: ../../include/channel.php:1182 msgid "Visible to everybody" msgstr "" -#: ../../include/channel.php:1153 ../../include/channel.php:1273 +#: ../../include/channel.php:1255 ../../include/channel.php:1375 msgid "Gender:" msgstr "" -#: ../../include/channel.php:1155 ../../include/channel.php:1328 +#: ../../include/channel.php:1257 ../../include/channel.php:1430 msgid "Homepage:" msgstr "" -#: ../../include/channel.php:1156 +#: ../../include/channel.php:1258 msgid "Online Now" msgstr "" -#: ../../include/channel.php:1232 +#: ../../include/channel.php:1334 msgid "Trans" msgstr "" -#: ../../include/channel.php:1278 +#: ../../include/channel.php:1380 msgid "Like this channel" msgstr "" -#: ../../include/channel.php:1302 +#: ../../include/channel.php:1404 msgid "j F, Y" msgstr "" -#: ../../include/channel.php:1303 +#: ../../include/channel.php:1405 msgid "j F" msgstr "" -#: ../../include/channel.php:1310 +#: ../../include/channel.php:1412 msgid "Birthday:" msgstr "" -#: ../../include/channel.php:1323 +#: ../../include/channel.php:1425 #, php-format msgid "for %1$d %2$s" msgstr "" -#: ../../include/channel.php:1326 +#: ../../include/channel.php:1428 msgid "Sexual Preference:" msgstr "" -#: ../../include/channel.php:1332 +#: ../../include/channel.php:1434 msgid "Tags:" msgstr "" -#: ../../include/channel.php:1334 +#: ../../include/channel.php:1436 msgid "Political Views:" msgstr "" -#: ../../include/channel.php:1336 +#: ../../include/channel.php:1438 msgid "Religion:" msgstr "" -#: ../../include/channel.php:1340 +#: ../../include/channel.php:1442 msgid "Hobbies/Interests:" msgstr "" -#: ../../include/channel.php:1342 +#: ../../include/channel.php:1444 msgid "Likes:" msgstr "" -#: ../../include/channel.php:1344 +#: ../../include/channel.php:1446 msgid "Dislikes:" msgstr "" -#: ../../include/channel.php:1346 +#: ../../include/channel.php:1448 msgid "Contact information and Social Networks:" msgstr "" -#: ../../include/channel.php:1348 +#: ../../include/channel.php:1450 msgid "My other channels:" msgstr "" -#: ../../include/channel.php:1350 +#: ../../include/channel.php:1452 msgid "Musical interests:" msgstr "" -#: ../../include/channel.php:1352 +#: ../../include/channel.php:1454 msgid "Books, literature:" msgstr "" -#: ../../include/channel.php:1354 +#: ../../include/channel.php:1456 msgid "Television:" msgstr "" -#: ../../include/channel.php:1356 +#: ../../include/channel.php:1458 msgid "Film/dance/culture/entertainment:" msgstr "" -#: ../../include/channel.php:1358 +#: ../../include/channel.php:1460 msgid "Love/Romance:" msgstr "" -#: ../../include/channel.php:1360 +#: ../../include/channel.php:1462 msgid "Work/employment:" msgstr "" -#: ../../include/channel.php:1362 +#: ../../include/channel.php:1464 msgid "School/education:" msgstr "" -#: ../../include/channel.php:1385 +#: ../../include/channel.php:1487 msgid "Like this thing" msgstr "" -#: ../../include/channel.php:2154 +#: ../../include/channel.php:2256 #, php-format msgid "User '%s' deleted" msgstr "" -#: ../../include/security.php:117 -msgid "guest:" +#: ../../include/event.php:22 ../../include/event.php:69 +msgid "l F d, Y \\@ g:i A" msgstr "" -#: ../../include/security.php:531 +#: ../../include/event.php:30 ../../include/event.php:73 +msgid "Starts:" +msgstr "" + +#: ../../include/event.php:40 ../../include/event.php:77 +msgid "Finishes:" +msgstr "" + +#: ../../include/event.php:1008 +msgid "This event has been added to your calendar." +msgstr "" + +#: ../../include/event.php:1208 +msgid "Not specified" +msgstr "" + +#: ../../include/event.php:1209 +msgid "Needs Action" +msgstr "" + +#: ../../include/event.php:1210 +msgid "Completed" +msgstr "" + +#: ../../include/event.php:1211 +msgid "In Process" +msgstr "" + +#: ../../include/event.php:1212 +msgid "Cancelled" +msgstr "" + +#: ../../include/event.php:1292 ../../include/connections.php:676 +msgid "Home, Voice" +msgstr "" + +#: ../../include/event.php:1293 ../../include/connections.php:677 +msgid "Home, Fax" +msgstr "" + +#: ../../include/event.php:1295 ../../include/connections.php:679 +msgid "Work, Voice" +msgstr "" + +#: ../../include/event.php:1296 ../../include/connections.php:680 +msgid "Work, Fax" +msgstr "" + +#: ../../include/network.php:751 +msgid "view full size" +msgstr "" + +#: ../../include/network.php:1691 ../../include/network.php:1692 +msgid "Friendica" +msgstr "" + +#: ../../include/network.php:1693 +msgid "OStatus" +msgstr "" + +#: ../../include/network.php:1694 +msgid "GNU-Social" +msgstr "" + +#: ../../include/network.php:1695 +msgid "RSS/Atom" +msgstr "" + +#: ../../include/network.php:1696 +msgid "ActivityPub" +msgstr "" + +#: ../../include/network.php:1698 +msgid "Diaspora" +msgstr "" + +#: ../../include/network.php:1699 +msgid "Facebook" +msgstr "" + +#: ../../include/network.php:1700 +msgid "Zot" +msgstr "" + +#: ../../include/network.php:1701 +msgid "LinkedIn" +msgstr "" + +#: ../../include/network.php:1702 +msgid "XMPP/IM" +msgstr "" + +#: ../../include/network.php:1703 +msgid "MySpace" +msgstr "" + +#: ../../include/language.php:380 +msgid "Select an alternate language" +msgstr "" + +#: ../../include/acl_selectors.php:208 +msgid "Who can see this?" +msgstr "" + +#: ../../include/acl_selectors.php:209 +msgid "Custom selection" +msgstr "" + +#: ../../include/acl_selectors.php:210 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." +"Select \"Show\" to allow viewing. \"Don't show\" lets you override and limit " +"the scope of \"Show\"." msgstr "" -#: ../../include/oembed.php:315 +#: ../../include/acl_selectors.php:211 +msgid "Show" +msgstr "" + +#: ../../include/acl_selectors.php:212 +msgid "Don't show" +msgstr "" + +#: ../../include/acl_selectors.php:245 +#, php-format +msgid "" +"Post permissions %s cannot be changed %s after a post is shared.
These " +"permissions set who is allowed to view the post." +msgstr "" + +#: ../../include/dba/dba_driver.php:190 +#, php-format +msgid "Cannot locate DNS info for database server '%s'" +msgstr "" + +#: ../../include/bbcode.php:194 ../../include/bbcode.php:1097 +#: ../../include/bbcode.php:1100 ../../include/bbcode.php:1105 +#: ../../include/bbcode.php:1108 ../../include/bbcode.php:1111 +#: ../../include/bbcode.php:1114 ../../include/bbcode.php:1119 +#: ../../include/bbcode.php:1122 ../../include/bbcode.php:1127 +#: ../../include/bbcode.php:1130 ../../include/bbcode.php:1133 +#: ../../include/bbcode.php:1136 +msgid "Image/photo" +msgstr "" + +#: ../../include/bbcode.php:233 ../../include/bbcode.php:1147 +msgid "Encrypted content" +msgstr "" + +#: ../../include/bbcode.php:249 +#, php-format +msgid "Install %s element: " +msgstr "" + +#: ../../include/bbcode.php:253 +#, php-format +msgid "" +"This post contains an installable %s element, however you lack permissions " +"to install it on this site." +msgstr "" + +#: ../../include/bbcode.php:409 ../../include/bbcode.php:417 +msgid "Click to open/close" +msgstr "" + +#: ../../include/bbcode.php:417 +msgid "spoiler" +msgstr "" + +#: ../../include/bbcode.php:1085 +msgid "$1 wrote:" +msgstr "" + +#: ../../include/oembed.php:317 msgid " by " msgstr "" -#: ../../include/oembed.php:316 +#: ../../include/oembed.php:318 msgid " on " msgstr "" -#: ../../include/oembed.php:345 +#: ../../include/oembed.php:347 msgid "Embedded content" msgstr "" -#: ../../include/oembed.php:354 +#: ../../include/oembed.php:356 msgid "Embedding disabled" msgstr "" -#: ../../include/message.php:40 -msgid "Unable to determine sender." +#: ../../include/features.php:54 +msgid "General Features" msgstr "" -#: ../../include/message.php:79 -msgid "No recipient provided." +#: ../../include/features.php:59 +msgid "Multiple Profiles" msgstr "" -#: ../../include/message.php:84 -msgid "[no subject]" +#: ../../include/features.php:60 +msgid "Ability to create multiple profiles" msgstr "" -#: ../../include/message.php:214 -msgid "Stored post could not be verified." +#: ../../include/features.php:68 +msgid "Advanced Profiles" msgstr "" -#: ../../util/nconfig.php:34 -msgid "Source channel not found." +#: ../../include/features.php:69 +msgid "Additional profile sections and selections" msgstr "" -#: ../../view/theme/redbasic/php/config.php:16 -#: ../../view/theme/redbasic/php/config.php:19 -msgid "Focus (Hubzilla default)" +#: ../../include/features.php:77 +msgid "Profile Import/Export" msgstr "" -#: ../../view/theme/redbasic/php/config.php:99 -msgid "Theme settings" +#: ../../include/features.php:78 +msgid "Save and load profile details across sites/channels" msgstr "" -#: ../../view/theme/redbasic/php/config.php:100 -msgid "Narrow navbar" +#: ../../include/features.php:86 +msgid "Web Pages" msgstr "" -#: ../../view/theme/redbasic/php/config.php:101 -msgid "Navigation bar background color" +#: ../../include/features.php:87 +msgid "Provide managed web pages on your channel" msgstr "" -#: ../../view/theme/redbasic/php/config.php:102 -msgid "Navigation bar icon color " +#: ../../include/features.php:96 +msgid "Provide a wiki for your channel" msgstr "" -#: ../../view/theme/redbasic/php/config.php:103 -msgid "Navigation bar active icon color " +#: ../../include/features.php:113 +msgid "Private Notes" msgstr "" -#: ../../view/theme/redbasic/php/config.php:104 -msgid "Link color" +#: ../../include/features.php:114 +msgid "Enables a tool to store notes and reminders (note: not encrypted)" msgstr "" -#: ../../view/theme/redbasic/php/config.php:105 -msgid "Set font-color for banner" +#: ../../include/features.php:122 +msgid "Navigation Channel Select" msgstr "" -#: ../../view/theme/redbasic/php/config.php:106 -msgid "Set the background color" +#: ../../include/features.php:123 +msgid "Change channels directly from within the navigation dropdown menu" msgstr "" -#: ../../view/theme/redbasic/php/config.php:107 -msgid "Set the background image" +#: ../../include/features.php:131 +msgid "Photo Location" msgstr "" -#: ../../view/theme/redbasic/php/config.php:108 -msgid "Set the background color of items" +#: ../../include/features.php:132 +msgid "If location data is available on uploaded photos, link this to a map." msgstr "" -#: ../../view/theme/redbasic/php/config.php:109 -msgid "Set the background color of comments" +#: ../../include/features.php:140 +msgid "Access Controlled Chatrooms" msgstr "" -#: ../../view/theme/redbasic/php/config.php:110 -msgid "Set font-size for the entire application" +#: ../../include/features.php:141 +msgid "Provide chatrooms and chat services with access control." msgstr "" -#: ../../view/theme/redbasic/php/config.php:110 -msgid "Examples: 1rem, 100%, 16px" +#: ../../include/features.php:150 +msgid "Provide alternate connection permission roles." msgstr "" -#: ../../view/theme/redbasic/php/config.php:111 -msgid "Set font-color for posts and comments" +#: ../../include/features.php:158 +msgid "Smart Birthdays" msgstr "" -#: ../../view/theme/redbasic/php/config.php:112 -msgid "Set radius of corners" +#: ../../include/features.php:159 +msgid "" +"Make birthday events timezone aware in case your friends are scattered " +"across the planet." msgstr "" -#: ../../view/theme/redbasic/php/config.php:112 -msgid "Example: 4px" +#: ../../include/features.php:167 +msgid "Event Timezone Selection" msgstr "" -#: ../../view/theme/redbasic/php/config.php:113 -msgid "Set shadow depth of photos" +#: ../../include/features.php:168 +msgid "Allow event creation in timezones other than your own." msgstr "" -#: ../../view/theme/redbasic/php/config.php:114 -msgid "Set maximum width of content region in pixel" +#: ../../include/features.php:176 +msgid "Advanced Directory Search" msgstr "" -#: ../../view/theme/redbasic/php/config.php:114 -msgid "Leave empty for default width" +#: ../../include/features.php:177 +msgid "Allows creation of complex directory search queries" msgstr "" -#: ../../view/theme/redbasic/php/config.php:115 -msgid "Left align page content" +#: ../../include/features.php:185 +msgid "Advanced Theme and Layout Settings" msgstr "" -#: ../../view/theme/redbasic/php/config.php:116 -msgid "Set size of conversation author photo" +#: ../../include/features.php:186 +msgid "Allows fine tuning of themes and page layouts" msgstr "" -#: ../../view/theme/redbasic/php/config.php:117 -msgid "Set size of followup author photos" +#: ../../include/features.php:196 +msgid "Post Composition Features" msgstr "" -#: ../../boot.php:1571 -msgid "Create an account to access services and applications" +#: ../../include/features.php:200 +msgid "Large Photos" msgstr "" -#: ../../boot.php:1593 -msgid "Login/Email" +#: ../../include/features.php:201 +msgid "" +"Include large (1024px) photo thumbnails in posts. If not enabled, use small " +"(640px) photo thumbnails" msgstr "" -#: ../../boot.php:1594 -msgid "Password" +#: ../../include/features.php:210 +msgid "Automatically import channel content from other channels or feeds" msgstr "" -#: ../../boot.php:1595 -msgid "Remember me" +#: ../../include/features.php:218 +msgid "Even More Encryption" msgstr "" -#: ../../boot.php:1598 -msgid "Forgot your password?" +#: ../../include/features.php:219 +msgid "" +"Allow optional encryption of content end-to-end with a shared secret key" msgstr "" -#: ../../boot.php:2136 -msgid "toggle mobile" +#: ../../include/features.php:227 +msgid "Enable Voting Tools" msgstr "" -#: ../../boot.php:2289 +#: ../../include/features.php:228 +msgid "Provide a class of post which others can vote on" +msgstr "" + +#: ../../include/features.php:236 +msgid "Disable Comments" +msgstr "" + +#: ../../include/features.php:237 +msgid "Provide the option to disable comments for a post" +msgstr "" + +#: ../../include/features.php:245 +msgid "Delayed Posting" +msgstr "" + +#: ../../include/features.php:246 +msgid "Allow posts to be published at a later date" +msgstr "" + +#: ../../include/features.php:254 +msgid "Content Expiration" +msgstr "" + +#: ../../include/features.php:255 +msgid "Remove posts/comments and/or private messages at a future time" +msgstr "" + +#: ../../include/features.php:263 +msgid "Suppress Duplicate Posts/Comments" +msgstr "" + +#: ../../include/features.php:264 +msgid "" +"Prevent posts with identical content to be published with less than two " +"minutes in between submissions." +msgstr "" + +#: ../../include/features.php:275 +msgid "Network and Stream Filtering" +msgstr "" + +#: ../../include/features.php:279 +msgid "Search by Date" +msgstr "" + +#: ../../include/features.php:280 +msgid "Ability to select posts by date ranges" +msgstr "" + +#: ../../include/features.php:288 ../../include/group.php:332 +msgid "Privacy Groups" +msgstr "" + +#: ../../include/features.php:289 +msgid "Enable management and selection of privacy groups" +msgstr "" + +#: ../../include/features.php:298 +msgid "Save search terms for re-use" +msgstr "" + +#: ../../include/features.php:306 +msgid "Network Personal Tab" +msgstr "" + +#: ../../include/features.php:307 +msgid "Enable tab to display only Network posts that you've interacted on" +msgstr "" + +#: ../../include/features.php:315 +msgid "Network New Tab" +msgstr "" + +#: ../../include/features.php:316 +msgid "Enable tab to display all new Network activity" +msgstr "" + +#: ../../include/features.php:324 +msgid "Affinity Tool" +msgstr "" + +#: ../../include/features.php:325 +msgid "Filter stream activity by depth of relationships" +msgstr "" + +#: ../../include/features.php:334 +msgid "Show friend and connection suggestions" +msgstr "" + +#: ../../include/features.php:342 +msgid "Connection Filtering" +msgstr "" + +#: ../../include/features.php:343 +msgid "Filter incoming posts from connections based on keywords/content" +msgstr "" + +#: ../../include/features.php:355 +msgid "Post/Comment Tools" +msgstr "" + +#: ../../include/features.php:359 +msgid "Community Tagging" +msgstr "" + +#: ../../include/features.php:360 +msgid "Ability to tag existing posts" +msgstr "" + +#: ../../include/features.php:368 +msgid "Post Categories" +msgstr "" + +#: ../../include/features.php:369 +msgid "Add categories to your posts" +msgstr "" + +#: ../../include/features.php:377 +msgid "Emoji Reactions" +msgstr "" + +#: ../../include/features.php:378 +msgid "Add emoji reaction ability to posts" +msgstr "" + +#: ../../include/features.php:387 +msgid "Ability to file posts under folders" +msgstr "" + +#: ../../include/features.php:395 +msgid "Dislike Posts" +msgstr "" + +#: ../../include/features.php:396 +msgid "Ability to dislike posts/comments" +msgstr "" + +#: ../../include/features.php:404 +msgid "Star Posts" +msgstr "" + +#: ../../include/features.php:405 +msgid "Ability to mark special posts with a star indicator" +msgstr "" + +#: ../../include/features.php:413 +msgid "Tag Cloud" +msgstr "" + +#: ../../include/features.php:414 +msgid "Provide a personal tag cloud on your channel page" +msgstr "" + +#: ../../include/features.php:425 +msgid "Premium Channel" +msgstr "" + +#: ../../include/features.php:426 +msgid "" +"Allows you to set restrictions and terms on those that connect with your " +"channel" +msgstr "" + +#: ../../include/taxonomy.php:267 ../../include/taxonomy.php:288 +msgid "Tags" +msgstr "" + +#: ../../include/taxonomy.php:332 +msgid "Keywords" +msgstr "" + +#: ../../include/taxonomy.php:353 +msgid "have" +msgstr "" + +#: ../../include/taxonomy.php:353 +msgid "has" +msgstr "" + +#: ../../include/taxonomy.php:354 +msgid "want" +msgstr "" + +#: ../../include/taxonomy.php:354 +msgid "wants" +msgstr "" + +#: ../../include/taxonomy.php:355 +msgid "likes" +msgstr "" + +#: ../../include/taxonomy.php:356 +msgid "dislikes" +msgstr "" + +#: ../../include/account.php:35 +msgid "Not a valid email address" +msgstr "" + +#: ../../include/account.php:37 +msgid "Your email domain is not among those allowed on this site" +msgstr "" + +#: ../../include/account.php:43 +msgid "Your email address is already registered at this site." +msgstr "" + +#: ../../include/account.php:75 +msgid "An invitation is required." +msgstr "" + +#: ../../include/account.php:79 +msgid "Invitation could not be verified." +msgstr "" + +#: ../../include/account.php:157 +msgid "Please enter the required information." +msgstr "" + +#: ../../include/account.php:224 +msgid "Failed to store account information." +msgstr "" + +#: ../../include/account.php:291 #, php-format -msgid "[$Projectname] Website SSL error for %s" +msgid "Registration confirmation for %s" msgstr "" -#: ../../boot.php:2294 -msgid "Website SSL certificate is not valid. Please correct." -msgstr "" - -#: ../../boot.php:2413 +#: ../../include/account.php:360 #, php-format -msgid "[$Projectname] Cron tasks not running on %s" +msgid "Registration request at %s" msgstr "" -#: ../../boot.php:2418 -msgid "Cron/Scheduled tasks not running." +#: ../../include/account.php:382 +msgid "your registration password" +msgstr "" + +#: ../../include/account.php:388 ../../include/account.php:450 +#, php-format +msgid "Registration details for %s" +msgstr "" + +#: ../../include/account.php:461 +msgid "Account approved." +msgstr "" + +#: ../../include/account.php:501 +#, php-format +msgid "Registration revoked for %s" +msgstr "" + +#: ../../include/account.php:780 ../../include/account.php:782 +msgid "Click here to upgrade." +msgstr "" + +#: ../../include/account.php:788 +msgid "This action exceeds the limits set by your subscription plan." +msgstr "" + +#: ../../include/account.php:793 +msgid "This action is not available under your subscription plan." +msgstr "" + +#: ../../include/datetime.php:147 +msgid "Birthday" +msgstr "" + +#: ../../include/datetime.php:149 +msgid "Age: " +msgstr "" + +#: ../../include/datetime.php:151 +msgid "YYYY-MM-DD or MM-DD" +msgstr "" + +#: ../../include/datetime.php:292 +msgid "less than a second ago" +msgstr "" + +#: ../../include/datetime.php:310 +#, php-format +msgctxt "e.g. 22 hours ago, 1 minute ago" +msgid "%1$d %2$s ago" +msgstr "" + +#: ../../include/datetime.php:321 +msgctxt "relative_date" +msgid "year" +msgid_plural "years" +msgstr[0] "" +msgstr[1] "" + +#: ../../include/datetime.php:324 +msgctxt "relative_date" +msgid "month" +msgid_plural "months" +msgstr[0] "" +msgstr[1] "" + +#: ../../include/datetime.php:327 +msgctxt "relative_date" +msgid "week" +msgid_plural "weeks" +msgstr[0] "" +msgstr[1] "" + +#: ../../include/datetime.php:330 +msgctxt "relative_date" +msgid "day" +msgid_plural "days" +msgstr[0] "" +msgstr[1] "" + +#: ../../include/datetime.php:333 +msgctxt "relative_date" +msgid "hour" +msgid_plural "hours" +msgstr[0] "" +msgstr[1] "" + +#: ../../include/datetime.php:336 +msgctxt "relative_date" +msgid "minute" +msgid_plural "minutes" +msgstr[0] "" +msgstr[1] "" + +#: ../../include/datetime.php:339 +msgctxt "relative_date" +msgid "second" +msgid_plural "seconds" +msgstr[0] "" +msgstr[1] "" + +#: ../../include/datetime.php:576 +#, php-format +msgid "%1$s's birthday" +msgstr "" + +#: ../../include/datetime.php:577 +#, php-format +msgid "Happy Birthday %1$s" +msgstr "" + +#: ../../include/nav.php:90 +msgid "Remote authentication" +msgstr "" + +#: ../../include/nav.php:90 +msgid "Click to authenticate to your home hub" +msgstr "" + +#: ../../include/nav.php:99 ../../include/nav.php:123 +msgid "End this session" +msgstr "" + +#: ../../include/nav.php:102 +msgid "Your profile page" +msgstr "" + +#: ../../include/nav.php:105 +msgid "Manage/Edit profiles" +msgstr "" + +#: ../../include/nav.php:107 +msgid "Edit your profile" +msgstr "" + +#: ../../include/nav.php:113 +msgid "Sign in" +msgstr "" + +#: ../../include/nav.php:138 +msgid "Take me home" +msgstr "" + +#: ../../include/nav.php:140 +msgid "Log me out of this site" +msgstr "" + +#: ../../include/nav.php:145 +msgid "Create an account" +msgstr "" + +#: ../../include/nav.php:157 +msgid "Help and documentation" +msgstr "" + +#: ../../include/nav.php:160 +msgid "Search site @name, #tag, ?docs, content" +msgstr "" + +#: ../../include/nav.php:171 +msgid "Grid" +msgstr "" + +#: ../../include/nav.php:171 +msgid "Your grid" +msgstr "" + +#: ../../include/nav.php:172 +msgid "View your network/grid" +msgstr "" + +#: ../../include/nav.php:173 +msgid "Mark all grid notifications seen" +msgstr "" + +#: ../../include/nav.php:175 +msgid "Channel home" +msgstr "" + +#: ../../include/nav.php:176 +msgid "View your channel home" +msgstr "" + +#: ../../include/nav.php:177 +msgid "Mark all channel notifications seen" +msgstr "" + +#: ../../include/nav.php:183 +msgid "Notices" +msgstr "" + +#: ../../include/nav.php:183 +msgid "Notifications" +msgstr "" + +#: ../../include/nav.php:184 +msgid "View all notifications" +msgstr "" + +#: ../../include/nav.php:185 +msgid "Mark all system notifications seen" +msgstr "" + +#: ../../include/nav.php:187 +msgid "Private mail" +msgstr "" + +#: ../../include/nav.php:188 +msgid "View your private messages" +msgstr "" + +#: ../../include/nav.php:189 +msgid "Mark all private messages seen" +msgstr "" + +#: ../../include/nav.php:195 +msgid "Event Calendar" +msgstr "" + +#: ../../include/nav.php:196 +msgid "View events" +msgstr "" + +#: ../../include/nav.php:197 +msgid "Mark all events seen" +msgstr "" + +#: ../../include/nav.php:199 +msgid "Manage Your Channels" +msgstr "" + +#: ../../include/nav.php:201 +msgid "Account/Channel Settings" +msgstr "" + +#: ../../include/nav.php:203 +msgid "Shared Files" +msgstr "" + +#: ../../include/nav.php:203 +msgid "New files shared with me" +msgstr "" + +#: ../../include/nav.php:208 +msgid "Public stream" +msgstr "" + +#: ../../include/nav.php:208 +msgid "Public stream activities" +msgstr "" + +#: ../../include/nav.php:215 +msgid "Site Setup and Configuration" +msgstr "" + +#: ../../include/nav.php:274 +msgid "@name, #tag, ?doc, content" +msgstr "" + +#: ../../include/nav.php:275 +msgid "Please wait..." +msgstr "" + +#: ../../include/nav.php:278 +msgid "Add Apps" +msgstr "" + +#: ../../include/nav.php:279 +msgid "Arrange Apps" +msgstr "" + +#: ../../include/nav.php:280 +msgid "Toggle System Apps" +msgstr "" + +#: ../../include/photos.php:111 +#, php-format +msgid "Image exceeds website size limit of %lu bytes" +msgstr "" + +#: ../../include/photos.php:118 +msgid "Image file is empty." +msgstr "" + +#: ../../include/photos.php:257 +msgid "Photo storage failed." +msgstr "" + +#: ../../include/photos.php:297 +msgid "a new photo" +msgstr "" + +#: ../../include/photos.php:301 +#, php-format +msgctxt "photo_upload" +msgid "%1$s posted %2$s to %3$s" +msgstr "" + +#: ../../include/photos.php:530 +msgid "Upload New Photos" +msgstr "" + +#: ../../include/zot.php:653 +msgid "Invalid data packet" +msgstr "" + +#: ../../include/zot.php:680 +msgid "Unable to verify channel signature" +msgstr "" + +#: ../../include/zot.php:2338 +#, php-format +msgid "Unable to verify site signature for %s" +msgstr "" + +#: ../../include/zot.php:3946 +msgid "invalid target signature" +msgstr "" + +#: ../../include/group.php:26 +msgid "" +"A deleted group with this name was revived. Existing item permissions " +"may apply to this group and any future members. If this is " +"not what you intended, please create another group with a different name." +msgstr "" + +#: ../../include/group.php:268 +msgid "Add new connections to this privacy group" +msgstr "" + +#: ../../include/group.php:310 +msgid "edit" +msgstr "" + +#: ../../include/group.php:333 +msgid "Edit group" +msgstr "" + +#: ../../include/group.php:334 +msgid "Add privacy group" +msgstr "" + +#: ../../include/group.php:335 +msgid "Channels not in any privacy group" +msgstr "" + +#: ../../include/connections.php:128 +msgid "New window" +msgstr "" + +#: ../../include/connections.php:129 +msgid "Open the selected location in a different window or browser tab" +msgstr "" + +#: ../../include/auth.php:148 +msgid "Logged out." +msgstr "" + +#: ../../include/auth.php:275 +msgid "Failed authentication" +msgstr "" + +#: ../../include/help.php:33 +msgid "Help:" +msgstr "" + +#: ../../include/help.php:65 +msgid "Not Found" msgstr "" From 8b6a24c67d6cc5f96c9255a18fe1a61257bc76b8 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Tue, 1 Aug 2017 14:25:59 +0200 Subject: [PATCH 042/441] remove blugrid schema until somebody cares to fix it --- view/theme/redbasic/schema/bluegrid.css | 515 ------------------------ view/theme/redbasic/schema/bluegrid.php | 28 -- 2 files changed, 543 deletions(-) delete mode 100644 view/theme/redbasic/schema/bluegrid.css delete mode 100644 view/theme/redbasic/schema/bluegrid.php diff --git a/view/theme/redbasic/schema/bluegrid.css b/view/theme/redbasic/schema/bluegrid.css deleted file mode 100644 index 46e28197e..000000000 --- a/view/theme/redbasic/schema/bluegrid.css +++ /dev/null @@ -1,515 +0,0 @@ -body { - background-size: auto; -} - -.generic-content-wrapper-styled { - background-color: rgba(67,72,138,.8); - color: #FFF; -} - -.generic-content-wrapper-styled .btn-default:hover, #profile-jot-wrapper .btn-default:hover { - border: 1px solid #FFF; -} - -#profile-jot-wrapper { - background-color: inherit; - border: none; -} - -.generic-content-wrapper-styled a:hover, .generic-content-wrapper-styled a:focus, .generic-content-wrapper-styled .field.checkbox:hover label, .generic-content-wrapper-styled .field.checkbox:focus label, .allcontact-link:hover, .allcontact-link:focus { - color: rgba(255,255,255,.8); -} - -.generic-content-wrapper, .profile-jot-text, .comment-edit-text-empty, .comment-edit-text-full, input.widget-input, .wall-item-content-wrapper, .section-title-wrapper, .section-content-wrapper { - border-radius: 0px !important; -} - -.generic-content-wrapper { - background-color: rgba(255,255,255,.8); - color: #4d4d4d; -} - -.wall-item-content-wrapper { - background-color: #FFF; -} - -.hide-comments-outer, .wall-item-content-wrapper.comment, .wall-item-comment-wrapper { - background-color: transparent; -} - -.generic-content-wrapper-styled .generic-content-wrapper { - color: #4D4D4D; -} - -.generic-content-wrapper-styled .generic-content-wrapper a { - color: #43488A; -} - -.generic-content-wrapper #profile-jot-wrapper { - background-color: transparent; - color: #4D4D4D; -} - -.generic-content-wrapper input#jot-title, .generic-content-wrapper input#jot-pagetitle { - color: #4D4D4D; -} - -.generic-content-wrapper input#jot-title:hover, .generic-content-wrapper input#jot-title:focus { - color: #4D4D4D; - border-radius: 0px; -} - - -.fn, .widget h3, .nav-tabs a, .generic-content-wrapper-styled a, .dropdown-menu > li > a, #channels-desc, input#jot-title { - color: #fff; - border-radius: 0px -} - -ul.dropdown-menu.acpopup > li.textcomplete-item > a { - color: #43488A; -} - -ul.dropdown-menu.acpopup > li.textcomplete-item > a:hover, ul.dropdown-menu.acpopup > li.textcomplete-item > a:focus { - background-color: #43488A; - color: #FFF; - cursor: pointer; -} - -input#jot-title:hover, input#jot-title:focus { - color: #43488A; - border-radius: 0px; -} - -.navbar-inverse { - background-color: transparent; - border-color: transparent; - background-image: none; -} - -.navbar-inverse .navbar-nav > .active > a { - background-image: none; - background: rgba(255,255,255,.5); -} - -.navbar-inverse .navbar-nav > .active > a:hover, .navbar-inverse .navbar-nav > .active > a:focus { - background: rgba(255,255,255,.5); -} - -.navbar-inverse .navbar-nav > li > a:hover, -.navbar-inverse .navbar-nav > li > a:focus { - color: #43488A; - background: rgba(255,255,255,.5); -} - -.navbar-inverse .navbar-nav > .open > a, -.navbar-inverse .navbar-nav > .open > a:hover, -.navbar-inverse .navbar-nav > .open > a:focus { - background-color: #43488A; - color: #fff; -} - -#nav-search-text { - color: #fff; - background-color: #43488A; - border-radius: 0px; - border-color: transparent; -} - -nav .dropdown-menu, .wall-item-tools .dropdown-menu, .section-title-wrapper .dropdown-menu, .section-content-wrapper .dropdown-menu { - background-color: #43488A; - color: #fff; - border-radius: 0; - border: none; - box-shadow: 0px 6px 12px rgba(45,48,92,.176); -} - -.dropdown-menu > li > a:focus, .dropdown-menu > li > a:hover { - color: #43488A; - background-color: rgba(255,255,255,.7); - text-decoration: underline; -} - -.vcard .dropdown-menu { - background-color: rgba(255,255,255,.97); - border-radius: 0; - border: none; - box-shadow: 0px 6px 12px rgba(169,169,169,.176); -} - -.vcard .dropdown-menu a, .fc-today { - color: #43488A; -} - -.vcard .dropdown-menu > li > a:focus, .vcard .dropdown-menu > li > a:hover { - color: #43488A; - background-color: rgba( 255,255,255,.7); - text-decoration: underline; -} - -nav .badge { - background-color: rgba(255,255,255,.8); - color: #43488A; - border-radius: 0px !important; -} - -nav .badge:hover, nav .badge:focus { - background-color: rgba(67,72,138,.8); - color: #FFF; -} - -.field.checkbox > div > input:checked + label .onoffswitch-switch { - background-color: #43488A; -} - -.widget .field.checkbox:hover label { - color: rgba(255,255,255,.8); -} - -.widget .conv-participants { - color: #BBB; -} - -.widget .active:hover .conv-participants, .widget .active:focus .conv-participants { - color: inherit; -} - -.help-block, .comment-icon, .jot-icons, .admin-icons { - color: inherit; -} - -#adminpage table tr:hover, #adminpage table tr:hover a, #adminpage table tr td.tools a:hover, #adminpage table tr:focus, #adminpage table tr:focus a, #adminpage table tr td.tools a:focus { - color: #43488A; -} - -#adminpage table tr:hover .tools a, #adminpage table tr:focus .tools a, .generic-content-wrapper-styled > .descriptive-text { - color: #FFF; -} - -.generic-content-wrapper-styled > .sources-links { - font-weight: bold; -} - -.wall-item-tools .btn { - border-color: #43488A; -} - -.vcard, #contact-block, .widget { - background-color: rgba(67,72,138,.8); - color: #fff; - border-radius: 0; - border: none; - box-shadow: 0px 6px 12px rgba(45,48,92,.176); -} - -.tags a { - color: inherit; -} - -#profile-photo-wrapper { - border: none; -} - -.nav-tabs > li.active > a, .nav-tabs > li.active > a:hover, .nav-tabs > li.active > a:focus { - color: #43488A; - text-decoration: none; - border: none; -} - -.nav-tabs > li.active { - background-color: rgba(255,255,255,.5); -} - -.nav-tabs.nav-justified > .active > a, .nav-tabs.nav-justified > .active > a:hover { - border-color: transparent; -} - -.nav-tabs.nav-justified { - background-color: rgba(67,72,138,.8); - border-bottom: 1px solid rgba(255,255,255,.5); - border-radius: 0px; -} - -.nav-tabs.nav-justified > li > a { - border-bottom: 1px solid transparent; - border-radius: 0px; -} - -.nav > li > a:focus, .nav > li > a:hover { - text-decoration: underline; - background-color: rgba(255,255,255,.5); - color: #43488A; - border-radius: 0; - border-color: transparent; -} - -.nav > li > a { - color: #FFF; - border-radius: 0px; -} - -.fc-event { - border: none !important; - background-color: rgba(255,255,255,.7) !important; - color: #43488A !important; - text-shadow: none !important; -} - -div.rateme { - border-radius: 0px; - font-weight: 400; -} - -div.rateme:hover, div.rateme:focus, a.rateme:hover, a.rateme:focus { - background-color: #43488A; - border-radius: 0px; - color: #FFF; - font-weight: 400; - -webkit-transition: all .3s ease-in-out; - -moz-transition: all .3s ease-in-out; - transition: all .3s ease-in-out; -} - -.info { - background: rgba(255,255,255,.7) url("/images/hz-32.png") no-repeat scroll 15px center !important; - color: #43488A !important; -} - -.notice { - background: rgba(215,43,52,.7) url("/images/hz-white-32.png") no-repeat scroll 15px center !important; - color: #FFF !important; -} - -#chatTopBar { - background-color: rgba(255,255,255,.8); - color: #4d4d4d; - height: 500px; - width: 596px; - overflow-y: auto; -} - -.chat-item-text { - border-radius: 0px; - padding: 5px; - background-color: #FFF; -} - -input { - border-radius: 0px; -} - -.home-welcome { - color: #FFF; - margin-bottom: 30px; -} - -#login-main { - margin-top: 0; - color: #EEE; -} - -#remember_me_container label:hover, #remember_container label:hover { - color: #FFF; -} - -#login-main #lost-password-link, #login-main #register-link { - color: #FFF; -} - -#nav-login .modal-content { - background-color: #43488A; - background-image: url('/images/bggrid.png'); - box-shadow: 0 5px 15px rgba(0,0,0,.3); - -webkit-box-shadow: 0 5px 15px rgba(0,0,0,.3); -} - -#nav-login h3, #nav-login button.close { - color: #EEE; -} - -#nav-login .modal-header { - border-bottom: none; -} - -.directory-item { - margin-bottom: 0px; - padding-bottom: 20px; - background-color: #FFF; -} - -.directory-item.lframe { - background-color: transparent !important; -} - -.contact-entry-wrapper { - border: 1px solid rgba(255,255,255,.5); -} - -.contact-entry-edit:hover a, .contact-entry-edit:focus a, .generic-content-wrapper-styled > p > span.btn.btn-default > a:hover,.generic-content-wrapper-styled > p > span.btn.btn-default > a:focus, div#profile-edit-links a:hover, div#profile-edit-links a:focus { - color: #43488A; -} - -.profile-edit-side-link, input#profile-photo-upload, .allcontact-link, #newchannel-form .descriptive-paragraph { - color: #FFF; -} - -.profile-edit-side-link:hover, .profile-edit-side-link:focus { - color: #FFF; - text-decoration: none; -} - -.section-content-info-wrapper { - color: #fff; - background-color: #43488A; -} - -.section-content-info-wrapper a { - color: #fff; -} - -.btn, #event-edit-form .btn, input.directory-rating-submit { - border: 1px solid #FFF; - color: #FFF; - background-color: #43488A; - border-radius: 0; - font-weight: 400; - -webkit-transition: all .3s ease-in-out; - -moz-transition: all .3s ease-in-out; - transition: all .3s ease-in-out; -} - -.btn:hover, .btn:focus, #event-edit-form .btn:hover, #event-edit-form .btn:focus { - border: 1px solid #FFF; - outline: 0; - color: #43488A; - background-color: #FFF; -} - -.btn-default:hover, .btn-default:focus, .open > .dropdown-toggle.btn-default, input.directory-rating-submit:hover, input.directory-rating-submit:focus { - border: 1px solid #43488A; - outline: 0; - color: #43488A; - background-color: #FFF; -} - -.btn-primary, input#event-submit, input#rmagic-submit-button, input#lostpass-submit-button, input#side-follow-submit, .profile-edit-submit-wrapper > input.profile-edit-submit-button, input#profile-photo-submit, form#chat-form > input, div#adminpage > form > div.submit > input, input.sources-submit, input.contact-edit-submit, input#dbtn-submit, input#newchannel-submit-button, input#contacts-search-submit, input#register-submit-button { - background-color: #FFF; - color: #43488A; - border-radius: 0px; - -webkit-transition: all .3s ease-in-out; - -moz-transition: all .3s ease-in-out; - transition: all .3s ease-in-out; -} - -.btn-primary:hover, .btn-primary:focus, input#event-submit:hover, input#event-submit:focus, input#rmagic-submit-button:hover, input#rmagic-submit-button:focus, input#lostpass-submit-button:hover, input#lostpass-submit-button:focus, input#side-follow-submit:hover, input#side-follow-submit:focus, .profile-edit-submit-wrapper > input.profile-edit-submit-button:hover, .profile-edit-submit-wrapper > input.profile-edit-submit-button:focus, input#profile-photo-submit:hover, input#profile-photo-submit:focus, form#chat-form > input:hover, form#chat-form > input:focus, div#adminpage > form > div.submit > input:hover, div#adminpage > form > div.submit > input:focus, input.sources-submit:hover, input.sources-submit:focus, input.contact-edit-submit:focus, input.contact-edit-submit:hover, input#dbtn-submit:hover, input#dbtn-submit:focus, input#newchannel-submit-button:hover, input#newchannel-submit-button:focus, input#contacts-search-submit:hover, input#contacts-search-submit:focus, input#register-submit-button:hover, input#register-submit-button:focus { - border-color: #FFF; - background-color: #43488A; - color: #FFF; - border-radius: 0px; -} - -.comment-tools .btn, #prvmail-tools .btn, .generic-content-wrapper .btn { - border: 1px solid #43488A; - color: #43488A; - background-color: #FFF; -} - -.comment-tools .btn:hover, .comment-tools .btn:focus, #prvmail-tools .btn:hover, #prvmail-tools .btn:focus, .generic-content-wrapper .btn:hover, .generic-content-wrapper .btn:focus { - border: 1px solid #43488A !important; - color: #FFF; - background-color: #43488A; -} - -.comment-tools .btn-primary, #prvmail-submit .btn-primary, .settings-submit-wrapper .btn-primary, .generic-content-wrapper .btn-primary { - background-color: #43488A; - color: #FFF; - border: 1px solid #43488A; -} - -.comment-tools .btn-primary:hover, .comment-tools .btn-primary:focus, #prvmail-submit .btn-primary:hover, #prvmail-submit .btn-primary:focus, .settings-submit-wrapper .btn-primary:hover, .settings-submit-wrapper .btn-primary:focus, .generic-content-wrapper .btn-primary:hover, .generic-content-wrapper .btn-primary:focus { - border-color: #43488A; - background-color: #FFF; - color: #43488A; -} - -.btn-success { - color: #FFF !important; - background-color: #5CB85C !important; - border-color: #4CAE4C !important; -} - -.btn-success:hover, .btn-success:focus { - color: #FFF !important; - background-color: #449D44 !important; - border-color: #398439 !important; -} - -.btn-warning { - color: #FFF !important; - background-color: #F0AD4E !important; - border-color: #EEA236 !important; -} - -.btn-warning:hover, .btn-warning:focus { - color: #FFF !important; - background-color: #EC971F !important; - border-color: #D58512 !important; -} - -.btn-danger, form#chat-destroy > input { - background-color: #D9534F !important; - border-color: #D43F3A !important; - color: #FFF !important; -} -.btn-danger:hover, .btn-danger:focus, form#chat-destroy > input:hover, form#chat-destroy > input:focus { - color: #FFF !important; - background-color: #C9302C !important; - border-color: #AC2925 !important; -} - -a:hover > .fa-trash-o { - color: #C9302C !important; -} - -@media screen and (max-width: 767px) { - .navbar-inverse .navbar-collapse { - background-color: #43488A; - border: none; - } - .navbar-inverse .navbar-toggle { - border-color: #576295; - background-color: #43488A; - border-radius: 0px; - } - .navbar-inverse .navbar-toggle .icon-bar { - background-color: #FFF; - } - .navbar-inverse .navbar-toggle .fa-arrow-circle-down, .navbar-inverse .navbar-toggle .fa-arrow-circle-right, .navbar-inverse .navbar-toggle .fa-arrow-circle-up, .navbar-inverse .navbar-toggle .fa-arrow-circle-left, .navbar-inverse .navbar-toggle .fa-question-circle { - color: #FFF; - } - .navbar-inverse .navbar-toggle:hover .fa-arrow-circle-down, .navbar-inverse .navbar-toggle:focus .fa-arrow-circle-down, .navbar-inverse .navbar-toggle:hover .fa-arrow-circle-right, .navbar-inverse .navbar-toggle:focus .fa-arrow-circle-right, .navbar-inverse .navbar-toggle:hover .fa-arrow-circle-up, .navbar-inverse .navbar-toggle:focus .fa-arrow-circle-up, .navbar-inverse .navbar-toggle:hover .fa-arrow-circle-left, .navbar-inverse .navbar-toggle:focus .fa-arrow-circle-left { - color: #43488A; - } - .navbar-inverse .navbar-toggle:hover, .navbar-inverse .navbar-toggle:focus { - background-color: #FFF !important; - } - .navbar-toggle:hover .icon-bar , .navbar-toggle:focus .icon-bar { - background-color: #43488A !important; - } -} - -.help-content { - color: #FFF; - border: none; -} - -.help-content a { - color: #FFF; - font-weight: 600; -} - -.help-content-open { - -moz-box-shadow: none; - -webkit-box-shadow: none; - box-shadow: none; -} - diff --git a/view/theme/redbasic/schema/bluegrid.php b/view/theme/redbasic/schema/bluegrid.php deleted file mode 100644 index fdb552611..000000000 --- a/view/theme/redbasic/schema/bluegrid.php +++ /dev/null @@ -1,28 +0,0 @@ - Date: Tue, 1 Aug 2017 18:03:53 +0200 Subject: [PATCH 043/441] use small line-height only for larger screens --- view/css/bootstrap-red.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css index d7638714b..a3a8ce0be 100644 --- a/view/css/bootstrap-red.css +++ b/view/css/bootstrap-red.css @@ -5,13 +5,13 @@ nav .badge { position: absolute; font-size: 0.75rem; - line-height: 0.75; } @media screen and (min-width: 767px) { nav .badge { top: 0px; left: 0px; + line-height: 0.75; } } From 599b395e247c991756c7cf5db29608b2c817f476 Mon Sep 17 00:00:00 2001 From: git-marijus Date: Tue, 1 Aug 2017 23:20:39 +0200 Subject: [PATCH 044/441] finally fix recursive attachments permissions --- include/attach.php | 133 +++++++++++++++++++++++++++------------------ 1 file changed, 79 insertions(+), 54 deletions(-) diff --git a/include/attach.php b/include/attach.php index d19de2ea3..79a38590b 100644 --- a/include/attach.php +++ b/include/attach.php @@ -1605,7 +1605,10 @@ function file_activity($channel_id, $object, $allow_cid, $allow_gid, $deny_cid, $folder_hash = $object['folder']; - $r_perms = recursive_activity_recipients($arr_allow_cid, $arr_allow_gid, $arr_deny_cid, $arr_deny_gid, $folder_hash); + $r_perms = attach_recursive_perms($arr_allow_cid, $arr_allow_gid, $arr_deny_cid, $arr_deny_gid, $folder_hash); + + if($r_perms === false) //nobody has recursive perms - nobody must be notified + return; //split up returned perms $arr_allow_cid = $r_perms['allow_cid']; @@ -1768,7 +1771,7 @@ function get_file_activity_object($channel_id, $hash, $url) { } /** - * @brief Returns array of channels which have recursive permission for a file + * @brief Returns recursive permissions array or false if nobody has recursive permissions * * @param array $arr_allow_cid * @param array $arr_allow_gid @@ -1776,19 +1779,20 @@ function get_file_activity_object($channel_id, $hash, $url) { * @param array $arr_deny_gid * @param string $folder_hash */ -function recursive_activity_recipients($arr_allow_cid, $arr_allow_gid, $arr_deny_cid, $arr_deny_gid, $folder_hash) { +function attach_recursive_perms($arr_allow_cid, $arr_allow_gid, $arr_deny_cid, $arr_deny_gid, $folder_hash) { $ret = array(); $parent_arr = array(); $count_values = array(); $poster = App::get_observer(); - //turn allow_gid into allow_cid's - foreach($arr_allow_gid as $gid) { - $in_group = group_get_members($gid); + //lookup all channels in sharee group and add them to sharee $arr_allow_cid + if($arr_allow_gid) { + $in_group = expand_groups($arr_allow_gid); $arr_allow_cid = array_unique(array_merge($arr_allow_cid, $in_group)); } + //count existing parent folders - we will compare to that count later $count = 0; while($folder_hash) { $x = q("SELECT allow_cid, allow_gid, deny_cid, deny_gid, folder FROM attach WHERE hash = '%s' LIMIT 1", @@ -1797,30 +1801,20 @@ function recursive_activity_recipients($arr_allow_cid, $arr_allow_gid, $arr_deny //only process private folders if($x[0]['allow_cid'] || $x[0]['allow_gid'] || $x[0]['deny_cid'] || $x[0]['deny_gid']) { - $parent_arr['allow_cid'][] = expand_acl($x[0]['allow_cid']); $parent_arr['allow_gid'][] = expand_acl($x[0]['allow_gid']); - - /** - * @TODO should find a much better solution for the allow_cid <-> allow_gid problem. - * Do not use allow_gid for now. Instead lookup the members of the group directly and add them to allow_cid. - * */ - if($parent_arr['allow_gid']) { - foreach($parent_arr['allow_gid'][$count] as $gid) { - $in_group = group_get_members($gid); - $parent_arr['allow_cid'][$count] = array_unique(array_merge($parent_arr['allow_cid'][$count], $in_group)); - } - } - $parent_arr['deny_cid'][] = expand_acl($x[0]['deny_cid']); $parent_arr['deny_gid'][] = expand_acl($x[0]['deny_gid']); + //this is the number of all existing parent folders - we will compare to that count later $count++; } $folder_hash = $x[0]['folder']; } + //logger(EOL . 'parent_arr: ' . print_r($parent_arr,true)); + //if none of the parent folders is private just return file perms if(!$parent_arr['allow_cid'] && !$parent_arr['allow_gid'] && !$parent_arr['deny_cid'] && !$parent_arr['deny_gid']) { $ret['allow_gid'] = $arr_allow_gid; @@ -1831,7 +1825,7 @@ function recursive_activity_recipients($arr_allow_cid, $arr_allow_gid, $arr_deny return $ret; } - //if there are no perms on the file we get them from the first parent folder + //if there are no perms on the file we will work with the perms from the first parent folder if(!$arr_allow_cid && !$arr_allow_gid && !$arr_deny_cid && !$arr_deny_gid) { $arr_allow_cid = $parent_arr['allow_cid'][0]; $arr_allow_gid = $parent_arr['allow_gid'][0]; @@ -1839,51 +1833,82 @@ function recursive_activity_recipients($arr_allow_cid, $arr_allow_gid, $arr_deny $arr_deny_gid = $parent_arr['deny_gid'][0]; } - //allow_cid - $r_arr_allow_cid = false; - foreach ($parent_arr['allow_cid'] as $folder_arr_allow_cid) { - foreach ($folder_arr_allow_cid as $ac_hash) { - $count_values[$ac_hash]++; + + /*** + * + * check if sharee has perms for all parent folders + * + ***/ + + $r_arr_allow_cid = []; + + if($parent_arr['allow_cid']) { + //check sharee arr_allow_cid against allow_cid of all parent folders + foreach($parent_arr['allow_cid'] as $folder_arr_allow_cid) { + foreach($folder_arr_allow_cid as $ac_hash) { + $count_values[$ac_hash]++; + } } - } - foreach ($arr_allow_cid as $fac_hash) { - if($count_values[$fac_hash] == $count) - $r_arr_allow_cid[] = $fac_hash; + foreach($arr_allow_cid as $fac_hash) { + if($count_values[$fac_hash] == $count) + $r_arr_allow_cid[] = $fac_hash; + } + //logger(EOL . 'r_arr_allow_cid: ' . print_r($r_arr_allow_cid,true)); } - //allow_gid - $r_arr_allow_gid = false; - foreach ($parent_arr['allow_gid'] as $folder_arr_allow_gid) { - foreach ($folder_arr_allow_gid as $ag_hash) { - $count_values[$ag_hash]++; + if($parent_arr['allow_gid']) { + //check sharee arr_allow_cid against members of allow_gid of all parent folders + foreach($parent_arr['allow_gid'] as $folder_arr_allow_gid) { + //get the group members + $folder_arr_allow_cid = expand_groups($folder_arr_allow_gid); + foreach($folder_arr_allow_cid as $ac_hash) { + $count_values[$ac_hash]++; + } } + foreach($arr_allow_cid as $fac_hash) { + if($count_values[$fac_hash] == $count) + $r_arr_allow_cid[] = $fac_hash; + } + //logger(EOL . 'groups - r_arr_allow_cid: ' . print_r($r_arr_allow_cid,true)); } - foreach ($arr_allow_gid as $fag_hash) { - if($count_values[$fag_hash] == $count) - $r_arr_allow_gid[] = $fag_hash; + + + /*** + * + * check if sharee is denied somewhere in parent folders and deny him if so + * + ***/ + + //deny_cid + $r_arr_deny_cid = []; + + if($parent_arr['deny_cid']) { + foreach($parent_arr['deny_cid'] as $folder_arr_deny_cid) { + $r_arr_deny_cid = array_merge($arr_deny_cid, $folder_arr_deny_cid); + } + $r_arr_deny_cid = array_unique($r_arr_deny_cid); + //logger(EOL . 'r_arr_deny_cid: ' . print_r($r_arr_deny_cid,true)); } //deny_gid - foreach($parent_arr['deny_gid'] as $folder_arr_deny_gid) { - $r_arr_deny_gid = array_merge($arr_deny_gid, $folder_arr_deny_gid); - } - $r_arr_deny_gid = array_unique($r_arr_deny_gid); + $r_arr_deny_gid = []; - //deny_cid - foreach($parent_arr['deny_cid'] as $folder_arr_deny_cid) { - $r_arr_deny_cid = array_merge($arr_deny_cid, $folder_arr_deny_cid); + if($parent_arr['deny_cid']) { + foreach($parent_arr['deny_gid'] as $folder_arr_deny_gid) { + $r_arr_deny_gid = array_merge($arr_deny_gid, $folder_arr_deny_gid); + } + $r_arr_deny_gid = array_unique($r_arr_deny_gid); + //logger(EOL . 'r_arr_deny_gid: ' . print_r($r_arr_dr_arr_deny_gideny_cid,true)); } - $r_arr_deny_cid = array_unique($r_arr_deny_cid); - //if none is allowed restrict to self - if(($r_arr_allow_gid === false) && ($r_arr_allow_cid === false)) { - $ret['allow_cid'] = [$poster['xchan_hash']]; - } else { - $ret['allow_gid'] = $r_arr_allow_gid; - $ret['allow_cid'] = $r_arr_allow_cid; - $ret['deny_gid'] = $r_arr_deny_gid; - $ret['deny_cid'] = $r_arr_deny_cid; - } + //if no channel is allowed return false + if(! $r_arr_allow_cid) + return false; + + $ret['allow_gid'] = []; // eventual group members are already collected in $r_arr_allow_cid + $ret['allow_cid'] = $r_arr_allow_cid; + $ret['deny_gid'] = $r_arr_deny_gid; + $ret['deny_cid'] = $r_arr_deny_cid; return $ret; } From 2ba2187c2ed6fa32075bc52d23ff66ece87f03c4 Mon Sep 17 00:00:00 2001 From: git-marijus Date: Tue, 1 Aug 2017 23:45:41 +0200 Subject: [PATCH 045/441] do not show pubs notifications for items with ACTIVITY_OBJ_FILE obj_type --- Zotlabs/Module/Ping.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Zotlabs/Module/Ping.php b/Zotlabs/Module/Ping.php index 190208727..f38ed510e 100644 --- a/Zotlabs/Module/Ping.php +++ b/Zotlabs/Module/Ping.php @@ -147,11 +147,13 @@ class Ping extends \Zotlabs\Web\Controller { $pubs = q("SELECT count(id) as total from item WHERE uid = %d AND author_xchan != '%s' + AND obj_type != '%s' AND item_unseen = 1 AND created > '" . datetime_convert('UTC','UTC',$_SESSION['static_loadtime']) . "' $item_normal", intval($sys['channel_id']), - dbesc(get_observer_hash()) + dbesc(get_observer_hash()), + dbesc(ACTIVITY_OBJ_FILE) ); if($pubs) From 6614d465d6b90286f2d4e9546d9adb8bcb02dec1 Mon Sep 17 00:00:00 2001 From: git-marijus Date: Wed, 2 Aug 2017 00:28:05 +0200 Subject: [PATCH 046/441] css fix --- view/theme/redbasic/css/style.css | 1 + 1 file changed, 1 insertion(+) diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 2c881049e..fd2ceb2c9 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -484,6 +484,7 @@ footer { #nav-search-text { width: 280px; + padding: .15rem .5rem; } #nav-search-text::-webkit-input-placeholder { From a97b09210e977d52a5bda1dee2b1eddc19afc013 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Tue, 1 Aug 2017 18:05:04 -0700 Subject: [PATCH 047/441] auto preview when inserting a media item or embed into a post. Since this unanticipated action could be alarming (some might think the post was actually submitted), also provide a visible preview indicator within the previewed content. Remove the css for the old striped background image which hasn't been available for previewed content for a year or two. --- Zotlabs/Lib/ThreadItem.php | 1 + include/conversation.php | 2 ++ view/theme/redbasic/css/style.css | 3 +-- view/tpl/conv_item.tpl | 1 + view/tpl/jot-header.tpl | 2 ++ view/tpl/search_item.tpl | 1 + 6 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Zotlabs/Lib/ThreadItem.php b/Zotlabs/Lib/ThreadItem.php index 72d8af4dd..9ee16480a 100644 --- a/Zotlabs/Lib/ThreadItem.php +++ b/Zotlabs/Lib/ThreadItem.php @@ -407,6 +407,7 @@ class ThreadItem { 'showdislike' => $showdislike, 'comment' => $this->get_comment_box($indent), 'previewing' => ($conv->is_preview() ? true : false ), + 'preview_lbl' => t('This is an unsaved preview'), 'wait' => t('Please wait'), 'submid' => str_replace(['+','='], ['',''], base64_encode(substr($item['mid'],0,32))), 'thread_level' => $thread_level diff --git a/include/conversation.php b/include/conversation.php index 1c1a4479d..460c97efb 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -467,6 +467,7 @@ function conversation($items, $mode, $update, $page_mode = 'traditional', $prepa $preview = (($page_mode === 'preview') ? true : false); $previewing = (($preview) ? ' preview ' : ''); + $preview_lbl = t('This is an unsaved preview'); if ($mode === 'network') { @@ -684,6 +685,7 @@ function conversation($items, $mode, $update, $page_mode = 'traditional', $prepa 'mode' => $mode, 'approve' => t('Approve'), 'delete' => t('Delete'), + 'preview_lbl' => $preview_lbl, 'id' => (($preview) ? 'P0' : $item['item_id']), 'linktitle' => sprintf( t('View %s\'s profile @ %s'), $profile_name, $profile_url), 'profile_url' => $profile_link, diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 2c881049e..17956ef31 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -251,8 +251,7 @@ footer { margin-top: 15px; } -.preview { - background: url('../img/gray_and_white_diagonal_stripes_background_seamless.gif'); +.preview-indicator { } #theme-preview { diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index 36cb4cc83..663b02890 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -39,6 +39,7 @@

{{/if}}
+ {{if $item.previewing}} {{/if}} {{$item.name}}{{if $item.owner_url}} {{$item.via}} {{$item.owner_name}}{{/if}}
diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl index d8f296aa4..8adef6427 100755 --- a/view/tpl/jot-header.tpl +++ b/view/tpl/jot-header.tpl @@ -126,6 +126,7 @@ function enableOnUser(){ $('#jot-media').val($('#jot-media').val() + data.result.message); }, stop: function(e,data) { + preview_post(); $('#profile-rotator').spin(false); }, }); @@ -175,6 +176,7 @@ function enableOnUser(){ $('#profile-rotator').spin('tiny'); $.get('{{$baseurl}}/linkinfo?f=&binurl=' + reply, function(data) { addeditortext(data); + preview_post(); $('#profile-rotator').spin(false); }); } diff --git a/view/tpl/search_item.tpl b/view/tpl/search_item.tpl index 4ca6378b8..28667eb58 100755 --- a/view/tpl/search_item.tpl +++ b/view/tpl/search_item.tpl @@ -32,6 +32,7 @@
{{/if}}
+ {{if $item.previewing}} {{/if}} {{$item.name}}{{if $item.owner_url}} {{$item.via}} {{$item.owner_name}}{{/if}}
From 01fc5909384035a62d5a733c973e442ade55cc4e Mon Sep 17 00:00:00 2001 From: zotlabs Date: Tue, 1 Aug 2017 18:58:06 -0700 Subject: [PATCH 048/441] auto preview comments also on media/link add --- view/js/main.js | 1 + 1 file changed, 1 insertion(+) diff --git a/view/js/main.js b/view/js/main.js index 54450858a..aaadff99b 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -149,6 +149,7 @@ function insertCommentURL(comment, id) { textarea = document.getElementById("comment-edit-text-" +id); textarea.value = textarea.value + data; + preview_comment(id); $('body').css('cursor', 'auto'); }); } From 01526a9a79294fe5f96b7c3bfbd362f91feec433 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Tue, 1 Aug 2017 19:02:42 -0700 Subject: [PATCH 049/441] add auto post preview to 'select photo from albums' --- view/tpl/jot-header.tpl | 1 + 1 file changed, 1 insertion(+) diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl index 8adef6427..815d17c3c 100755 --- a/view/tpl/jot-header.tpl +++ b/view/tpl/jot-header.tpl @@ -423,6 +423,7 @@ function enableOnUser(){ function(ddata) { if (ddata['status']) { addeditortext(ddata['photolink']); + preview_post(); } else { window.console.log("{{$modalerrorlink}}" + ':' + ddata['errormsg']); } From 9359f9fe4d77de392660c2bf6f1df8becc9fa6bf Mon Sep 17 00:00:00 2001 From: zotlabs Date: Tue, 1 Aug 2017 22:25:55 -0700 Subject: [PATCH 050/441] plugin hook for update_unseen --- Zotlabs/Module/Channel.php | 10 +++++++--- Zotlabs/Module/Network.php | 13 +++++++++---- Zotlabs/Module/Notify.php | 16 ++++++++++------ doc/hook/update_unseen.bb | 9 +++++++++ doc/hooklist.bb | 3 +++ 5 files changed, 38 insertions(+), 13 deletions(-) create mode 100644 doc/hook/update_unseen.bb diff --git a/Zotlabs/Module/Channel.php b/Zotlabs/Module/Channel.php index a44984c97..c006d65d4 100644 --- a/Zotlabs/Module/Channel.php +++ b/Zotlabs/Module/Channel.php @@ -358,9 +358,13 @@ class Channel extends \Zotlabs\Web\Controller { } if($is_owner && $update_unseen) { - $r = q("UPDATE item SET item_unseen = 0 where item_unseen = 1 and item_wall = 1 AND uid = %d $update_unseen", - intval(local_channel()) - ); + $x = [ 'channel_id' => local_channel(), 'update' => 'unset' ]; + call_hooks('update_unseen',$x); + if($x['update'] === 'unset' || intval($x['update'])) { + $r = q("UPDATE item SET item_unseen = 0 where item_unseen = 1 and item_wall = 1 AND uid = %d $update_unseen", + intval(local_channel()) + ); + } } diff --git a/Zotlabs/Module/Network.php b/Zotlabs/Module/Network.php index 597ba084b..1954df549 100644 --- a/Zotlabs/Module/Network.php +++ b/Zotlabs/Module/Network.php @@ -545,10 +545,15 @@ class Network extends \Zotlabs\Web\Controller { } } - if(($update_unseen) && (! $firehose)) - $r = q("UPDATE item SET item_unseen = 0 WHERE item_unseen = 1 AND uid = %d $update_unseen ", - intval(local_channel()) - ); + if(($update_unseen) && (! $firehose)) { + $x = [ 'channel_id' => local_channel(), 'update' => 'unset' ]; + call_hooks('update_unseen',$x); + if($x['update'] === 'unset' || intval($x['update'])) { + $r = q("UPDATE item SET item_unseen = 0 WHERE item_unseen = 1 AND uid = %d $update_unseen ", + intval(local_channel()) + ); + } + } $mode = (($nouveau) ? 'network-new' : 'network'); diff --git a/Zotlabs/Module/Notify.php b/Zotlabs/Module/Notify.php index f592f6f37..3d6e1c2e7 100644 --- a/Zotlabs/Module/Notify.php +++ b/Zotlabs/Module/Notify.php @@ -15,12 +15,16 @@ class Notify extends \Zotlabs\Web\Controller { intval(local_channel()) ); if($r) { - q("update notify set seen = 1 where (( parent != '' and parent = '%s' and otype = '%s' ) or link = '%s' ) and uid = %d", - dbesc($r[0]['parent']), - dbesc($r[0]['otype']), - dbesc($r[0]['link']), - intval(local_channel()) - ); + $x = [ 'channel_id' => local_channel(), 'update' => 'unset' ]; + call_hooks('update_unseen',$x); + if($x['update'] === 'unset' || intval($x['update'])) { + q("update notify set seen = 1 where (( parent != '' and parent = '%s' and otype = '%s' ) or link = '%s' ) and uid = %d", + dbesc($r[0]['parent']), + dbesc($r[0]['otype']), + dbesc($r[0]['link']), + intval(local_channel()) + ); + } goaway($r[0]['link']); } goaway(z_root()); diff --git a/doc/hook/update_unseen.bb b/doc/hook/update_unseen.bb new file mode 100644 index 000000000..8fb02c239 --- /dev/null +++ b/doc/hook/update_unseen.bb @@ -0,0 +1,9 @@ +[h3]update_unseen[/h3] + +Called prior to automatically marking items 'seen'; allowing a plugin the choice to not perform this action. + +hook data + +[ 'channel_id' => local_channel(), 'update' => 'unset' ]; + +If 'update' is set to 0 or false on return, the update operation is not performed. \ No newline at end of file diff --git a/doc/hooklist.bb b/doc/hooklist.bb index da4d9596b..9a17fdb91 100644 --- a/doc/hooklist.bb +++ b/doc/hooklist.bb @@ -572,6 +572,9 @@ Hooks allow plugins/addons to "hook into" the code at many points and alter the [zrl=[baseurl]/help/hook/tagged]tagged[/zrl] Called when a delivery is processed which results in you being tagged +[zrl=[baseurl]/help/hook/update_unseen]update_unseen[/zrl] + Called prior to automatically marking items seen which were loaded in the browser + [zrl=[baseurl]/help/hook/validate_channelname]validate_channelname[/zrl] Used to validate the names used by a channel From 2dbf8a5e001a6c8f30396f5d8677d8f5a6fc06b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Jim=C3=A9nez=20Friaza?= Date: Wed, 2 Aug 2017 08:57:30 +0200 Subject: [PATCH 051/441] Updated the Spanish translation --- view/es-es/hmessages.po | 4352 ++++++++++++++++++++------------------- view/es-es/hstrings.php | 298 +-- 2 files changed, 2350 insertions(+), 2300 deletions(-) diff --git a/view/es-es/hmessages.po b/view/es-es/hmessages.po index f67a524d5..3f95bb6a7 100644 --- a/view/es-es/hmessages.po +++ b/view/es-es/hmessages.po @@ -13,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: Redmatrix\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-01 15:36+0200\n" -"PO-Revision-Date: 2017-05-04 10:22+0000\n" +"POT-Creation-Date: 2017-08-01 12:13+0200\n" +"PO-Revision-Date: 2017-08-02 06:49+0000\n" "Last-Translator: Manuel Jiménez Friaza \n" "Language-Team: Spanish (Spain) (http://www.transifex.com/Friendica/red-matrix/language/es_ES/)\n" "MIME-Version: 1.0\n" @@ -23,163 +23,147 @@ msgstr "" "Language: es_ES\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../../Zotlabs/Access/Permissions.php:46 +#: ../../Zotlabs/Access/Permissions.php:53 msgid "Can view my channel stream and posts" msgstr "Pueden verse la actividad y publicaciones de mi canal" -#: ../../Zotlabs/Access/Permissions.php:47 ../../include/permissions.php:42 +#: ../../Zotlabs/Access/Permissions.php:54 msgid "Can send me their channel stream and posts" msgstr "Se me pueden enviar entradas y contenido de un canal" -#: ../../Zotlabs/Access/Permissions.php:48 ../../include/permissions.php:36 +#: ../../Zotlabs/Access/Permissions.php:55 msgid "Can view my default channel profile" msgstr "Puede verse mi perfil de canal predeterminado." -#: ../../Zotlabs/Access/Permissions.php:49 ../../include/permissions.php:37 +#: ../../Zotlabs/Access/Permissions.php:56 msgid "Can view my connections" msgstr "Pueden verse mis conexiones" -#: ../../Zotlabs/Access/Permissions.php:50 ../../include/permissions.php:38 +#: ../../Zotlabs/Access/Permissions.php:57 msgid "Can view my file storage and photos" msgstr "Pueden verse mi repositorio de ficheros y mis fotos" -#: ../../Zotlabs/Access/Permissions.php:51 +#: ../../Zotlabs/Access/Permissions.php:58 msgid "Can upload/modify my file storage and photos" msgstr "Se pueden subir / modificar elementos en mi repositorio de ficheros y fotos" -#: ../../Zotlabs/Access/Permissions.php:52 +#: ../../Zotlabs/Access/Permissions.php:59 msgid "Can view my channel webpages" msgstr "Pueden verse las páginas personales de mi canal" -#: ../../Zotlabs/Access/Permissions.php:53 +#: ../../Zotlabs/Access/Permissions.php:60 msgid "Can view my wiki pages" msgstr "Pueden verse mis páginas wiki" -#: ../../Zotlabs/Access/Permissions.php:54 +#: ../../Zotlabs/Access/Permissions.php:61 msgid "Can create/edit my channel webpages" msgstr "Pueden crearse / modificarse páginas personales en mi canal" -#: ../../Zotlabs/Access/Permissions.php:55 +#: ../../Zotlabs/Access/Permissions.php:62 msgid "Can write to my wiki pages" msgstr "Se pueden modificar las páginas de mi wiki" -#: ../../Zotlabs/Access/Permissions.php:56 +#: ../../Zotlabs/Access/Permissions.php:63 msgid "Can post on my channel (wall) page" msgstr "Pueden crearse entradas en mi página de inicio del canal (“muro”)" -#: ../../Zotlabs/Access/Permissions.php:57 ../../include/permissions.php:44 +#: ../../Zotlabs/Access/Permissions.php:64 msgid "Can comment on or like my posts" msgstr "Pueden publicarse comentarios en mis publicaciones o marcar mis entradas con 'me gusta'." -#: ../../Zotlabs/Access/Permissions.php:58 ../../include/permissions.php:45 +#: ../../Zotlabs/Access/Permissions.php:65 msgid "Can send me private mail messages" msgstr "Se me pueden enviar mensajes privados" -#: ../../Zotlabs/Access/Permissions.php:59 +#: ../../Zotlabs/Access/Permissions.php:66 msgid "Can like/dislike profiles and profile things" msgstr "Se puede mostrar agrado o desagrado (Me gusta / No me gusta) en mis perfiles y sus distintos apartados" -#: ../../Zotlabs/Access/Permissions.php:60 +#: ../../Zotlabs/Access/Permissions.php:67 msgid "Can forward to all my channel connections via @+ mentions in posts" msgstr "Pueden reenviarse publicaciones a todas las conexiones de mi canal a través de @+ menciones en las entradas" -#: ../../Zotlabs/Access/Permissions.php:61 +#: ../../Zotlabs/Access/Permissions.php:68 msgid "Can chat with me" msgstr "Se puede chatear conmigo" -#: ../../Zotlabs/Access/Permissions.php:62 ../../include/permissions.php:53 +#: ../../Zotlabs/Access/Permissions.php:69 msgid "Can source my public posts in derived channels" msgstr "Pueden utilizarse mis entradas públicas como origen de contenidos en canales derivados" -#: ../../Zotlabs/Access/Permissions.php:63 +#: ../../Zotlabs/Access/Permissions.php:70 msgid "Can administer my channel" msgstr "Se puede administrar mi canal" #: ../../Zotlabs/Access/PermissionRoles.php:248 -#: ../../include/permissions.php:946 msgid "Social Networking" msgstr "Redes sociales" #: ../../Zotlabs/Access/PermissionRoles.php:249 -#: ../../include/permissions.php:946 msgid "Social - Mostly Public" msgstr "Social - Público en su mayor parte" #: ../../Zotlabs/Access/PermissionRoles.php:250 -#: ../../include/permissions.php:946 msgid "Social - Restricted" msgstr "Social - Restringido" #: ../../Zotlabs/Access/PermissionRoles.php:251 -#: ../../include/permissions.php:946 msgid "Social - Private" msgstr "Social - Privado" #: ../../Zotlabs/Access/PermissionRoles.php:254 -#: ../../include/permissions.php:947 msgid "Community Forum" msgstr "Foro de discusión" #: ../../Zotlabs/Access/PermissionRoles.php:255 -#: ../../include/permissions.php:947 msgid "Forum - Mostly Public" msgstr "Foro - Público en su mayor parte" #: ../../Zotlabs/Access/PermissionRoles.php:256 -#: ../../include/permissions.php:947 msgid "Forum - Restricted" msgstr "Foro - Restringido" #: ../../Zotlabs/Access/PermissionRoles.php:257 -#: ../../include/permissions.php:947 msgid "Forum - Private" msgstr "Foro - Privado" #: ../../Zotlabs/Access/PermissionRoles.php:260 -#: ../../include/permissions.php:948 msgid "Feed Republish" msgstr "Republicar un \"feed\"" #: ../../Zotlabs/Access/PermissionRoles.php:261 -#: ../../include/permissions.php:948 msgid "Feed - Mostly Public" msgstr "Feed - Público en su mayor parte" #: ../../Zotlabs/Access/PermissionRoles.php:262 -#: ../../include/permissions.php:948 msgid "Feed - Restricted" msgstr "Feed - Restringido" #: ../../Zotlabs/Access/PermissionRoles.php:265 -#: ../../include/permissions.php:949 msgid "Special Purpose" msgstr "Propósito especial" #: ../../Zotlabs/Access/PermissionRoles.php:266 -#: ../../include/permissions.php:949 msgid "Special - Celebrity/Soapbox" msgstr "Especial - Celebridad / Tribuna improvisada" #: ../../Zotlabs/Access/PermissionRoles.php:267 -#: ../../include/permissions.php:949 msgid "Special - Group Repository" msgstr "Especial - Repositorio de grupo" #: ../../Zotlabs/Access/PermissionRoles.php:270 -#: ../../Zotlabs/Module/New_channel.php:132 -#: ../../Zotlabs/Module/Settings/Channel.php:463 -#: ../../Zotlabs/Module/Connedit.php:914 ../../Zotlabs/Module/Profiles.php:798 -#: ../../Zotlabs/Module/Register.php:213 ../../addon/cdav/Mod_Cdav.php:1148 -#: ../../addon/cdav/cdav.php:277 ../../addon/cdav/cdav.php:284 -#: ../../include/selectors.php:49 ../../include/selectors.php:66 -#: ../../include/selectors.php:104 ../../include/selectors.php:140 -#: ../../include/permissions.php:950 ../../include/connections.php:675 -#: ../../include/connections.php:682 +#: ../../Zotlabs/Module/Cdav.php:1123 ../../Zotlabs/Module/New_channel.php:132 +#: ../../Zotlabs/Module/Settings/Channel.php:467 +#: ../../Zotlabs/Module/Connedit.php:932 ../../Zotlabs/Module/Profiles.php:798 +#: ../../Zotlabs/Module/Register.php:213 ../../include/selectors.php:49 +#: ../../include/selectors.php:66 ../../include/selectors.php:104 +#: ../../include/selectors.php:140 ../../include/event.php:1297 +#: ../../include/event.php:1304 ../../include/connections.php:681 +#: ../../include/connections.php:688 msgid "Other" msgstr "Otro" #: ../../Zotlabs/Access/PermissionRoles.php:271 -#: ../../include/permissions.php:950 msgid "Custom/Expert Mode" msgstr "Modo personalizado/experto" @@ -189,7 +173,7 @@ msgstr "Modo personalizado/experto" #: ../../Zotlabs/Module/Editblock.php:31 ../../Zotlabs/Module/Profile.php:20 #: ../../Zotlabs/Module/Layouts.php:31 ../../Zotlabs/Module/Editwebpage.php:32 #: ../../Zotlabs/Module/Webpages.php:33 -#: ../../Zotlabs/Module/Filestorage.php:59 ../../include/channel.php:945 +#: ../../Zotlabs/Module/Filestorage.php:51 ../../include/channel.php:1062 msgid "Requested profile is not available." msgstr "El perfil solicitado no está disponible." @@ -203,41 +187,43 @@ msgstr "El perfil solicitado no está disponible." #: ../../Zotlabs/Module/Appman.php:82 ../../Zotlabs/Module/Regmod.php:21 #: ../../Zotlabs/Module/New_channel.php:77 #: ../../Zotlabs/Module/New_channel.php:104 -#: ../../Zotlabs/Module/Sharedwithme.php:11 ../../Zotlabs/Module/Setup.php:212 +#: ../../Zotlabs/Module/Sharedwithme.php:16 ../../Zotlabs/Module/Setup.php:209 +#: ../../Zotlabs/Module/Moderate.php:13 #: ../../Zotlabs/Module/Achievements.php:34 ../../Zotlabs/Module/Thing.php:274 #: ../../Zotlabs/Module/Thing.php:294 ../../Zotlabs/Module/Thing.php:335 #: ../../Zotlabs/Module/Api.php:24 ../../Zotlabs/Module/Editblock.php:67 -#: ../../Zotlabs/Module/Profile.php:83 ../../Zotlabs/Module/Profile.php:100 +#: ../../Zotlabs/Module/Profile.php:85 ../../Zotlabs/Module/Profile.php:102 #: ../../Zotlabs/Module/Mood.php:116 ../../Zotlabs/Module/Connections.php:29 -#: ../../Zotlabs/Module/Viewsrc.php:19 ../../Zotlabs/Module/Bookmarks.php:61 +#: ../../Zotlabs/Module/Viewsrc.php:19 ../../Zotlabs/Module/Bookmarks.php:64 #: ../../Zotlabs/Module/Photos.php:69 ../../Zotlabs/Module/Wiki.php:50 -#: ../../Zotlabs/Module/Wiki.php:216 ../../Zotlabs/Module/Wiki.php:315 -#: ../../Zotlabs/Module/Pdledit.php:29 ../../Zotlabs/Module/Poke.php:137 +#: ../../Zotlabs/Module/Wiki.php:235 ../../Zotlabs/Module/Wiki.php:341 +#: ../../Zotlabs/Module/Pdledit.php:29 ../../Zotlabs/Module/Poke.php:149 #: ../../Zotlabs/Module/Profile_photo.php:280 #: ../../Zotlabs/Module/Profile_photo.php:293 -#: ../../Zotlabs/Module/Authtest.php:16 ../../Zotlabs/Module/Item.php:221 -#: ../../Zotlabs/Module/Item.php:231 ../../Zotlabs/Module/Item.php:1038 -#: ../../Zotlabs/Module/Page.php:35 ../../Zotlabs/Module/Page.php:91 -#: ../../Zotlabs/Module/Connedit.php:385 ../../Zotlabs/Module/Chat.php:98 -#: ../../Zotlabs/Module/Chat.php:103 ../../Zotlabs/Module/Menu.php:78 -#: ../../Zotlabs/Module/Layouts.php:71 ../../Zotlabs/Module/Layouts.php:78 -#: ../../Zotlabs/Module/Layouts.php:89 ../../Zotlabs/Module/Group.php:13 -#: ../../Zotlabs/Module/Profiles.php:198 ../../Zotlabs/Module/Profiles.php:635 +#: ../../Zotlabs/Module/Authtest.php:16 ../../Zotlabs/Module/Item.php:223 +#: ../../Zotlabs/Module/Item.php:240 ../../Zotlabs/Module/Item.php:250 +#: ../../Zotlabs/Module/Item.php:1076 ../../Zotlabs/Module/Page.php:34 +#: ../../Zotlabs/Module/Page.php:125 ../../Zotlabs/Module/Connedit.php:385 +#: ../../Zotlabs/Module/Chat.php:100 ../../Zotlabs/Module/Chat.php:105 +#: ../../Zotlabs/Module/Menu.php:78 ../../Zotlabs/Module/Layouts.php:71 +#: ../../Zotlabs/Module/Layouts.php:78 ../../Zotlabs/Module/Layouts.php:89 +#: ../../Zotlabs/Module/Group.php:13 ../../Zotlabs/Module/Profiles.php:198 +#: ../../Zotlabs/Module/Profiles.php:635 #: ../../Zotlabs/Module/Editwebpage.php:68 #: ../../Zotlabs/Module/Editwebpage.php:89 #: ../../Zotlabs/Module/Editwebpage.php:107 #: ../../Zotlabs/Module/Editwebpage.php:121 ../../Zotlabs/Module/Manage.php:10 -#: ../../Zotlabs/Module/Webpages.php:116 ../../Zotlabs/Module/Block.php:26 -#: ../../Zotlabs/Module/Block.php:76 ../../Zotlabs/Module/Editpost.php:17 +#: ../../Zotlabs/Module/Webpages.php:118 ../../Zotlabs/Module/Block.php:24 +#: ../../Zotlabs/Module/Block.php:74 ../../Zotlabs/Module/Editpost.php:17 #: ../../Zotlabs/Module/Sources.php:74 ../../Zotlabs/Module/Like.php:181 #: ../../Zotlabs/Module/Suggest.php:28 ../../Zotlabs/Module/Message.php:18 -#: ../../Zotlabs/Module/Mail.php:164 ../../Zotlabs/Module/Register.php:77 +#: ../../Zotlabs/Module/Mail.php:146 ../../Zotlabs/Module/Register.php:77 #: ../../Zotlabs/Module/Cover_photo.php:281 #: ../../Zotlabs/Module/Cover_photo.php:294 -#: ../../Zotlabs/Module/Network.php:15 ../../Zotlabs/Module/Filestorage.php:23 -#: ../../Zotlabs/Module/Filestorage.php:78 -#: ../../Zotlabs/Module/Filestorage.php:93 -#: ../../Zotlabs/Module/Filestorage.php:120 ../../Zotlabs/Module/Common.php:39 +#: ../../Zotlabs/Module/Network.php:15 ../../Zotlabs/Module/Filestorage.php:15 +#: ../../Zotlabs/Module/Filestorage.php:70 +#: ../../Zotlabs/Module/Filestorage.php:85 +#: ../../Zotlabs/Module/Filestorage.php:112 ../../Zotlabs/Module/Common.php:39 #: ../../Zotlabs/Module/Viewconnections.php:28 #: ../../Zotlabs/Module/Viewconnections.php:33 #: ../../Zotlabs/Module/Service_limits.php:11 @@ -245,16 +231,14 @@ msgstr "El perfil solicitado no está disponible." #: ../../Zotlabs/Lib/Chatroom.php:137 ../../Zotlabs/Web/WebServer.php:131 #: ../../addon/keepout/keepout.php:36 ../../addon/openid/Mod_Id.php:53 #: ../../addon/gitwiki/Mod_Gitwiki.php:196 -#: ../../addon/gitwiki/Mod_Gitwiki.php:292 -#: ../../addon/diaspora_reconnect/diaspora_reconnect.php:58 -#: ../../addon/pumpio/pumpio.php:40 ../../include/attach.php:144 -#: ../../include/attach.php:191 ../../include/attach.php:255 -#: ../../include/attach.php:269 ../../include/attach.php:276 -#: ../../include/attach.php:344 ../../include/attach.php:358 -#: ../../include/attach.php:365 ../../include/attach.php:442 -#: ../../include/attach.php:909 ../../include/attach.php:983 -#: ../../include/attach.php:1148 ../../include/items.php:3470 -#: ../../include/photos.php:27 +#: ../../addon/gitwiki/Mod_Gitwiki.php:292 ../../addon/pumpio/pumpio.php:40 +#: ../../include/attach.php:144 ../../include/attach.php:191 +#: ../../include/attach.php:255 ../../include/attach.php:269 +#: ../../include/attach.php:276 ../../include/attach.php:344 +#: ../../include/attach.php:358 ../../include/attach.php:365 +#: ../../include/attach.php:443 ../../include/attach.php:918 +#: ../../include/attach.php:992 ../../include/attach.php:1157 +#: ../../include/items.php:3440 ../../include/photos.php:28 msgid "Permission denied." msgstr "Acceso denegado." @@ -263,7 +247,7 @@ msgstr "Acceso denegado." msgid "Block Name" msgstr "Nombre del bloque" -#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2267 +#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2280 msgid "Blocks" msgstr "Bloques" @@ -272,25 +256,22 @@ msgid "Block Title" msgstr "Título del bloque" #: ../../Zotlabs/Module/Blocks.php:157 ../../Zotlabs/Module/Menu.php:114 -#: ../../Zotlabs/Module/Layouts.php:191 ../../Zotlabs/Module/Webpages.php:256 -#: ../../include/page_widgets.php:47 +#: ../../Zotlabs/Module/Layouts.php:191 ../../Zotlabs/Module/Webpages.php:251 msgid "Created" msgstr "Creado" #: ../../Zotlabs/Module/Blocks.php:158 ../../Zotlabs/Module/Menu.php:115 -#: ../../Zotlabs/Module/Layouts.php:192 ../../Zotlabs/Module/Webpages.php:257 -#: ../../include/page_widgets.php:48 +#: ../../Zotlabs/Module/Layouts.php:192 ../../Zotlabs/Module/Webpages.php:252 msgid "Edited" msgstr "Editado" -#: ../../Zotlabs/Module/Blocks.php:159 +#: ../../Zotlabs/Module/Blocks.php:159 ../../Zotlabs/Module/Cdav.php:1126 #: ../../Zotlabs/Module/New_channel.php:147 -#: ../../Zotlabs/Module/Connedit.php:917 ../../Zotlabs/Module/Menu.php:118 +#: ../../Zotlabs/Module/Connedit.php:935 ../../Zotlabs/Module/Menu.php:118 #: ../../Zotlabs/Module/Layouts.php:185 ../../Zotlabs/Module/Profiles.php:801 -#: ../../Zotlabs/Module/Webpages.php:244 ../../Zotlabs/Storage/Browser.php:228 -#: ../../Zotlabs/Storage/Browser.php:332 ../../addon/cdav/Mod_Cdav.php:1151 -#: ../../addon/cdav/include/widgets.php:127 -#: ../../addon/cdav/include/widgets.php:164 +#: ../../Zotlabs/Module/Webpages.php:239 ../../Zotlabs/Storage/Browser.php:229 +#: ../../Zotlabs/Storage/Browser.php:335 ../../Zotlabs/Widget/Cdav.php:127 +#: ../../Zotlabs/Widget/Cdav.php:164 msgid "Create" msgstr "Crear" @@ -298,52 +279,49 @@ msgstr "Crear" #: ../../Zotlabs/Module/Admin/Profs.php:154 #: ../../Zotlabs/Module/Settings/Oauth.php:149 #: ../../Zotlabs/Module/Thing.php:260 ../../Zotlabs/Module/Editblock.php:114 -#: ../../Zotlabs/Module/Connections.php:296 -#: ../../Zotlabs/Module/Connections.php:316 ../../Zotlabs/Module/Wiki.php:165 -#: ../../Zotlabs/Module/Wiki.php:275 ../../Zotlabs/Module/Menu.php:112 +#: ../../Zotlabs/Module/Connections.php:260 +#: ../../Zotlabs/Module/Connections.php:297 +#: ../../Zotlabs/Module/Connections.php:317 ../../Zotlabs/Module/Wiki.php:167 +#: ../../Zotlabs/Module/Wiki.php:300 ../../Zotlabs/Module/Menu.php:112 #: ../../Zotlabs/Module/Layouts.php:193 #: ../../Zotlabs/Module/Editwebpage.php:142 -#: ../../Zotlabs/Module/Webpages.php:245 ../../Zotlabs/Module/Editpost.php:80 -#: ../../Zotlabs/Lib/Apps.php:367 ../../Zotlabs/Lib/ThreadItem.php:107 -#: ../../Zotlabs/Storage/Browser.php:238 -#: ../../addon/cdav/include/widgets.php:125 -#: ../../addon/cdav/include/widgets.php:161 -#: ../../addon/gitwiki/Mod_Gitwiki.php:151 -#: ../../addon/gitwiki/Mod_Gitwiki.php:252 ../../include/channel.php:1044 -#: ../../include/channel.php:1048 ../../include/menu.php:113 -#: ../../include/page_widgets.php:9 ../../include/page_widgets.php:39 +#: ../../Zotlabs/Module/Webpages.php:240 ../../Zotlabs/Module/Editpost.php:85 +#: ../../Zotlabs/Lib/Apps.php:393 ../../Zotlabs/Lib/ThreadItem.php:107 +#: ../../Zotlabs/Storage/Browser.php:239 ../../Zotlabs/Widget/Cdav.php:125 +#: ../../Zotlabs/Widget/Cdav.php:161 ../../addon/gitwiki/Mod_Gitwiki.php:151 +#: ../../addon/gitwiki/Mod_Gitwiki.php:252 ../../include/channel.php:1161 +#: ../../include/channel.php:1165 ../../include/menu.php:113 msgid "Edit" msgstr "Editar" -#: ../../Zotlabs/Module/Blocks.php:161 ../../Zotlabs/Module/Photos.php:1042 -#: ../../Zotlabs/Module/Layouts.php:194 ../../Zotlabs/Module/Webpages.php:246 -#: ../../addon/cdav/include/widgets.php:123 -#: ../../include/conversation.php:1311 +#: ../../Zotlabs/Module/Blocks.php:161 ../../Zotlabs/Module/Photos.php:1044 +#: ../../Zotlabs/Module/Layouts.php:194 ../../Zotlabs/Module/Webpages.php:241 +#: ../../Zotlabs/Widget/Cdav.php:123 ../../include/conversation.php:1308 msgid "Share" msgstr "Compartir" #: ../../Zotlabs/Module/Blocks.php:162 ../../Zotlabs/Module/Editlayout.php:138 +#: ../../Zotlabs/Module/Cdav.php:838 ../../Zotlabs/Module/Cdav.php:1128 #: ../../Zotlabs/Module/Admin/Accounts.php:173 #: ../../Zotlabs/Module/Admin/Channels.php:149 #: ../../Zotlabs/Module/Admin/Profs.php:155 #: ../../Zotlabs/Module/Settings/Oauth.php:150 #: ../../Zotlabs/Module/Thing.php:261 ../../Zotlabs/Module/Editblock.php:139 -#: ../../Zotlabs/Module/Connections.php:267 -#: ../../Zotlabs/Module/Photos.php:1143 ../../Zotlabs/Module/Connedit.php:650 -#: ../../Zotlabs/Module/Connedit.php:919 ../../Zotlabs/Module/Group.php:177 +#: ../../Zotlabs/Module/Connections.php:268 +#: ../../Zotlabs/Module/Photos.php:1145 ../../Zotlabs/Module/Connedit.php:650 +#: ../../Zotlabs/Module/Connedit.php:937 ../../Zotlabs/Module/Group.php:179 #: ../../Zotlabs/Module/Profiles.php:803 #: ../../Zotlabs/Module/Editwebpage.php:167 -#: ../../Zotlabs/Module/Webpages.php:247 ../../Zotlabs/Lib/Apps.php:368 -#: ../../Zotlabs/Lib/ThreadItem.php:127 ../../Zotlabs/Storage/Browser.php:239 -#: ../../addon/cdav/Mod_Cdav.php:864 ../../addon/cdav/Mod_Cdav.php:1153 -#: ../../include/conversation.php:654 +#: ../../Zotlabs/Module/Webpages.php:242 ../../Zotlabs/Lib/Apps.php:394 +#: ../../Zotlabs/Lib/ThreadItem.php:127 ../../Zotlabs/Storage/Browser.php:240 +#: ../../include/conversation.php:649 ../../include/conversation.php:686 msgid "Delete" msgstr "Eliminar" #: ../../Zotlabs/Module/Blocks.php:166 ../../Zotlabs/Module/Events.php:694 -#: ../../Zotlabs/Module/Wiki.php:167 ../../Zotlabs/Module/Layouts.php:198 -#: ../../Zotlabs/Module/Webpages.php:251 ../../Zotlabs/Module/Pubsites.php:59 -#: ../../addon/gitwiki/Mod_Gitwiki.php:153 ../../include/page_widgets.php:42 +#: ../../Zotlabs/Module/Wiki.php:169 ../../Zotlabs/Module/Layouts.php:198 +#: ../../Zotlabs/Module/Webpages.php:246 ../../Zotlabs/Module/Pubsites.php:59 +#: ../../addon/gitwiki/Mod_Gitwiki.php:153 msgid "View" msgstr "Ver" @@ -376,52 +354,56 @@ msgid_plural "%d messages sent." msgstr[0] "%d mensajes enviados." msgstr[1] "%d mensajes enviados." -#: ../../Zotlabs/Module/Invite.php:105 +#: ../../Zotlabs/Module/Invite.php:98 ../../Zotlabs/Lib/Apps.php:254 +msgid "Invite" +msgstr "Invitar" + +#: ../../Zotlabs/Module/Invite.php:107 msgid "You have no more invitations available" msgstr "No tiene más invitaciones disponibles" -#: ../../Zotlabs/Module/Invite.php:136 +#: ../../Zotlabs/Module/Invite.php:138 msgid "Send invitations" msgstr "Enviar invitaciones" -#: ../../Zotlabs/Module/Invite.php:137 +#: ../../Zotlabs/Module/Invite.php:139 msgid "Enter email addresses, one per line:" msgstr "Introduzca las direcciones de correo electrónico, una por línea:" -#: ../../Zotlabs/Module/Invite.php:138 ../../Zotlabs/Module/Mail.php:303 +#: ../../Zotlabs/Module/Invite.php:140 ../../Zotlabs/Module/Mail.php:285 msgid "Your message:" msgstr "Su mensaje:" -#: ../../Zotlabs/Module/Invite.php:139 +#: ../../Zotlabs/Module/Invite.php:141 msgid "Please join my community on $Projectname." msgstr "Por favor, únase a mi comunidad en $Projectname." -#: ../../Zotlabs/Module/Invite.php:141 +#: ../../Zotlabs/Module/Invite.php:143 msgid "You will need to supply this invitation code:" msgstr "Tendrá que suministrar este código de invitación:" -#: ../../Zotlabs/Module/Invite.php:142 +#: ../../Zotlabs/Module/Invite.php:144 msgid "" "1. Register at any $Projectname location (they are all inter-connected)" msgstr "1. Regístrese en cualquier sitio de $Projectname (están todos interconectados)" -#: ../../Zotlabs/Module/Invite.php:144 +#: ../../Zotlabs/Module/Invite.php:146 msgid "2. Enter my $Projectname network address into the site searchbar." msgstr "2. Introduzca mi dirección $Projectname en la caja de búsqueda del sitio." -#: ../../Zotlabs/Module/Invite.php:145 +#: ../../Zotlabs/Module/Invite.php:147 msgid "or visit" msgstr "o visitar" -#: ../../Zotlabs/Module/Invite.php:147 +#: ../../Zotlabs/Module/Invite.php:149 msgid "3. Click [Connect]" msgstr "3. Pulse [conectar]" -#: ../../Zotlabs/Module/Invite.php:149 ../../Zotlabs/Module/Locs.php:121 +#: ../../Zotlabs/Module/Invite.php:151 ../../Zotlabs/Module/Locs.php:121 #: ../../Zotlabs/Module/Mitem.php:243 ../../Zotlabs/Module/Events.php:493 -#: ../../Zotlabs/Module/Appman.php:134 +#: ../../Zotlabs/Module/Appman.php:148 #: ../../Zotlabs/Module/Import_items.php:129 -#: ../../Zotlabs/Module/Setup.php:309 ../../Zotlabs/Module/Setup.php:357 +#: ../../Zotlabs/Module/Setup.php:308 ../../Zotlabs/Module/Setup.php:349 #: ../../Zotlabs/Module/Connect.php:98 #: ../../Zotlabs/Module/Admin/Features.php:66 #: ../../Zotlabs/Module/Admin/Plugins.php:438 @@ -429,35 +411,35 @@ msgstr "3. Pulse [conectar]" #: ../../Zotlabs/Module/Admin/Logs.php:84 #: ../../Zotlabs/Module/Admin/Channels.php:147 #: ../../Zotlabs/Module/Admin/Themes.php:158 -#: ../../Zotlabs/Module/Admin/Site.php:279 +#: ../../Zotlabs/Module/Admin/Site.php:271 #: ../../Zotlabs/Module/Admin/Profs.php:157 #: ../../Zotlabs/Module/Admin/Account_edit.php:74 #: ../../Zotlabs/Module/Admin/Security.php:104 #: ../../Zotlabs/Module/Settings/Permcats.php:110 -#: ../../Zotlabs/Module/Settings/Channel.php:476 +#: ../../Zotlabs/Module/Settings/Channel.php:480 #: ../../Zotlabs/Module/Settings/Features.php:47 #: ../../Zotlabs/Module/Settings/Tokens.php:168 #: ../../Zotlabs/Module/Settings/Account.php:118 -#: ../../Zotlabs/Module/Settings/Featured.php:50 +#: ../../Zotlabs/Module/Settings/Featured.php:52 #: ../../Zotlabs/Module/Settings/Display.php:203 #: ../../Zotlabs/Module/Settings/Oauth.php:87 #: ../../Zotlabs/Module/Thing.php:320 ../../Zotlabs/Module/Thing.php:370 -#: ../../Zotlabs/Module/Import.php:514 ../../Zotlabs/Module/Cal.php:343 -#: ../../Zotlabs/Module/Mood.php:139 ../../Zotlabs/Module/Photos.php:657 -#: ../../Zotlabs/Module/Photos.php:1022 ../../Zotlabs/Module/Photos.php:1062 -#: ../../Zotlabs/Module/Photos.php:1180 ../../Zotlabs/Module/Wiki.php:169 -#: ../../Zotlabs/Module/Pdledit.php:74 ../../Zotlabs/Module/Poke.php:186 -#: ../../Zotlabs/Module/Connedit.php:882 ../../Zotlabs/Module/Chat.php:194 -#: ../../Zotlabs/Module/Chat.php:240 ../../Zotlabs/Module/Pconfig.php:107 -#: ../../Zotlabs/Module/Group.php:85 ../../Zotlabs/Module/Profiles.php:726 +#: ../../Zotlabs/Module/Import.php:518 ../../Zotlabs/Module/Cal.php:343 +#: ../../Zotlabs/Module/Mood.php:139 ../../Zotlabs/Module/Photos.php:659 +#: ../../Zotlabs/Module/Photos.php:1024 ../../Zotlabs/Module/Photos.php:1064 +#: ../../Zotlabs/Module/Photos.php:1182 ../../Zotlabs/Module/Wiki.php:171 +#: ../../Zotlabs/Module/Pdledit.php:74 ../../Zotlabs/Module/Poke.php:200 +#: ../../Zotlabs/Module/Connedit.php:900 ../../Zotlabs/Module/Chat.php:196 +#: ../../Zotlabs/Module/Chat.php:242 ../../Zotlabs/Module/Pconfig.php:107 +#: ../../Zotlabs/Module/Group.php:87 ../../Zotlabs/Module/Profiles.php:726 #: ../../Zotlabs/Module/Sources.php:114 ../../Zotlabs/Module/Sources.php:149 -#: ../../Zotlabs/Module/Xchan.php:15 ../../Zotlabs/Module/Mail.php:449 -#: ../../Zotlabs/Module/Filestorage.php:165 ../../Zotlabs/Module/Rate.php:166 -#: ../../Zotlabs/Lib/ThreadItem.php:732 +#: ../../Zotlabs/Module/Xchan.php:15 ../../Zotlabs/Module/Mail.php:431 +#: ../../Zotlabs/Module/Filestorage.php:155 ../../Zotlabs/Module/Rate.php:166 +#: ../../Zotlabs/Lib/ThreadItem.php:730 #: ../../Zotlabs/Widget/Eventstools.php:16 -#: ../../view/theme/redbasic/php/config.php:84 -#: ../../addon/skeleton/skeleton.php:65 ../../addon/gnusoc/gnusoc.php:134 -#: ../../addon/cdav/cdav.php:246 ../../addon/planets/planets.php:157 +#: ../../view/theme/redbasic/php/config.php:95 +#: ../../addon/skeleton/skeleton.php:65 ../../addon/gnusoc/gnusoc.php:226 +#: ../../addon/planets/planets.php:153 #: ../../addon/openclipatar/openclipatar.php:53 #: ../../addon/wppost/wppost.php:113 ../../addon/nsfw/nsfw.php:92 #: ../../addon/ijpost/ijpost.php:89 ../../addon/dwpost/dwpost.php:89 @@ -465,7 +447,7 @@ msgstr "3. Pulse [conectar]" #: ../../addon/likebanner/likebanner.php:57 #: ../../addon/redphotos/redphotos.php:136 ../../addon/irc/irc.php:53 #: ../../addon/ljpost/ljpost.php:86 ../../addon/startpage/startpage.php:113 -#: ../../addon/diaspora/diaspora.php:712 +#: ../../addon/diaspora/diaspora.php:759 #: ../../addon/gitwiki/Mod_Gitwiki.php:155 #: ../../addon/rainbowtag/rainbowtag.php:85 ../../addon/visage/visage.php:170 #: ../../addon/nsabait/nsabait.php:161 ../../addon/mailtest/mailtest.php:100 @@ -481,11 +463,11 @@ msgstr "3. Pulse [conectar]" #: ../../addon/statusnet/statusnet.php:432 #: ../../addon/statusnet/statusnet.php:899 ../../addon/twitter/twitter.php:217 #: ../../addon/twitter/twitter.php:259 -#: ../../addon/smileybutton/smileybutton.php:281 +#: ../../addon/smileybutton/smileybutton.php:219 #: ../../addon/piwik/piwik.php:95 ../../addon/pageheader/pageheader.php:48 -#: ../../addon/xmpp/xmpp.php:69 ../../addon/pumpio/pumpio.php:237 -#: ../../addon/redfiles/redfiles.php:124 ../../addon/hubwall/hubwall.php:95 -#: ../../include/js_strings.php:22 +#: ../../addon/authchoose/authchoose.php:71 ../../addon/xmpp/xmpp.php:69 +#: ../../addon/pumpio/pumpio.php:237 ../../addon/redfiles/redfiles.php:124 +#: ../../addon/hubwall/hubwall.php:95 ../../include/js_strings.php:22 msgid "Submit" msgstr "Enviar" @@ -511,12 +493,12 @@ msgid "Edit Layout" msgstr "Modificar la plantilla" #: ../../Zotlabs/Module/Profperm.php:28 ../../Zotlabs/Module/Subthread.php:62 -#: ../../Zotlabs/Module/Import_items.php:120 ../../Zotlabs/Module/Group.php:72 +#: ../../Zotlabs/Module/Import_items.php:120 ../../Zotlabs/Module/Group.php:74 #: ../../Zotlabs/Module/Dreport.php:10 ../../Zotlabs/Module/Dreport.php:68 #: ../../Zotlabs/Module/Like.php:283 ../../Zotlabs/Web/WebServer.php:130 #: ../../addon/redphotos/redphotos.php:119 #: ../../addon/frphotos/frphotos.php:81 ../../addon/redfiles/redfiles.php:109 -#: ../../include/items.php:327 +#: ../../include/items.php:340 msgid "Permission denied" msgstr "Permiso denegado" @@ -528,7 +510,7 @@ msgstr "Identificador del perfil no válido" msgid "Profile Visibility Editor" msgstr "Editor de visibilidad del perfil" -#: ../../Zotlabs/Module/Profperm.php:113 ../../include/channel.php:1362 +#: ../../Zotlabs/Module/Profperm.php:113 ../../include/channel.php:1485 msgid "Profile" msgstr "Perfil" @@ -541,10 +523,291 @@ msgid "Visible To" msgstr "Visible para" #: ../../Zotlabs/Module/Profperm.php:140 -#: ../../Zotlabs/Module/Connections.php:141 +#: ../../Zotlabs/Module/Connections.php:140 msgid "All Connections" msgstr "Todas las conexiones" +#: ../../Zotlabs/Module/Cdav.php:726 +msgid "INVALID EVENT DISMISSED!" +msgstr "¡EVENTO NO VÁLIDO RECHAZADO!" + +#: ../../Zotlabs/Module/Cdav.php:727 +msgid "Summary: " +msgstr "Resumen: " + +#: ../../Zotlabs/Module/Cdav.php:727 ../../Zotlabs/Module/Cdav.php:728 +#: ../../Zotlabs/Module/Cdav.php:735 ../../Zotlabs/Module/Embedphotos.php:146 +#: ../../Zotlabs/Module/Photos.php:759 ../../Zotlabs/Module/Photos.php:1215 +#: ../../Zotlabs/Lib/Apps.php:721 ../../Zotlabs/Lib/Apps.php:799 +#: ../../Zotlabs/Storage/Browser.php:164 ../../Zotlabs/Widget/Portfolio.php:86 +#: ../../Zotlabs/Widget/Album.php:84 ../../include/conversation.php:1107 +msgid "Unknown" +msgstr "Desconocido" + +#: ../../Zotlabs/Module/Cdav.php:728 +msgid "Date: " +msgstr "Fecha: " + +#: ../../Zotlabs/Module/Cdav.php:729 ../../Zotlabs/Module/Cdav.php:736 +msgid "Reason: " +msgstr "Razón: " + +#: ../../Zotlabs/Module/Cdav.php:734 +msgid "INVALID CARD DISMISSED!" +msgstr "¡TARJETA NO VÁLIDA RECHAZADA!" + +#: ../../Zotlabs/Module/Cdav.php:735 +msgid "Name: " +msgstr "Nombre: " + +#: ../../Zotlabs/Module/Cdav.php:768 +msgid "CalDAV" +msgstr "CalDAV" + +#: ../../Zotlabs/Module/Cdav.php:809 ../../Zotlabs/Module/Events.php:460 +msgid "Event title" +msgstr "Título del evento" + +#: ../../Zotlabs/Module/Cdav.php:810 ../../Zotlabs/Module/Events.php:466 +msgid "Start date and time" +msgstr "Fecha y hora de comienzo" + +#: ../../Zotlabs/Module/Cdav.php:810 ../../Zotlabs/Module/Cdav.php:811 +msgid "Example: YYYY-MM-DD HH:mm" +msgstr "Ejemplo: YYYY-MM-DD HH:mm" + +#: ../../Zotlabs/Module/Cdav.php:811 +msgid "End date and time" +msgstr "Fecha y hora de finalización" + +#: ../../Zotlabs/Module/Cdav.php:812 ../../Zotlabs/Module/Events.php:473 +#: ../../Zotlabs/Module/Appman.php:138 ../../Zotlabs/Module/Rbmark.php:101 +#: ../../addon/rendezvous/rendezvous.php:173 +msgid "Description" +msgstr "Descripción" + +#: ../../Zotlabs/Module/Cdav.php:813 ../../Zotlabs/Module/Locs.php:117 +#: ../../Zotlabs/Module/Events.php:475 ../../Zotlabs/Module/Profiles.php:509 +#: ../../Zotlabs/Module/Profiles.php:737 ../../Zotlabs/Module/Pubsites.php:51 +#: ../../include/js_strings.php:25 +msgid "Location" +msgstr "Ubicación" + +#: ../../Zotlabs/Module/Cdav.php:820 ../../Zotlabs/Module/Events.php:689 +#: ../../Zotlabs/Module/Events.php:698 ../../Zotlabs/Module/Cal.php:337 +#: ../../Zotlabs/Module/Cal.php:344 ../../Zotlabs/Module/Photos.php:913 +msgid "Previous" +msgstr "Anterior" + +#: ../../Zotlabs/Module/Cdav.php:821 ../../Zotlabs/Module/Events.php:690 +#: ../../Zotlabs/Module/Events.php:699 ../../Zotlabs/Module/Setup.php:263 +#: ../../Zotlabs/Module/Cal.php:338 ../../Zotlabs/Module/Cal.php:345 +#: ../../Zotlabs/Module/Photos.php:922 +msgid "Next" +msgstr "Siguiente" + +#: ../../Zotlabs/Module/Cdav.php:822 ../../Zotlabs/Module/Events.php:700 +#: ../../Zotlabs/Module/Cal.php:346 +msgid "Today" +msgstr "Hoy" + +#: ../../Zotlabs/Module/Cdav.php:823 ../../Zotlabs/Module/Events.php:695 +msgid "Month" +msgstr "Mes" + +#: ../../Zotlabs/Module/Cdav.php:824 ../../Zotlabs/Module/Events.php:696 +msgid "Week" +msgstr "Semana" + +#: ../../Zotlabs/Module/Cdav.php:825 ../../Zotlabs/Module/Events.php:697 +msgid "Day" +msgstr "Día" + +#: ../../Zotlabs/Module/Cdav.php:826 +msgid "List month" +msgstr "Lista mensual" + +#: ../../Zotlabs/Module/Cdav.php:827 +msgid "List week" +msgstr "Lista semanal" + +#: ../../Zotlabs/Module/Cdav.php:828 +msgid "List day" +msgstr "Lista diaria" + +#: ../../Zotlabs/Module/Cdav.php:835 +msgid "More" +msgstr "Más" + +#: ../../Zotlabs/Module/Cdav.php:836 +msgid "Less" +msgstr "Menos" + +#: ../../Zotlabs/Module/Cdav.php:837 +msgid "Select calendar" +msgstr "Seleccionar un calendario" + +#: ../../Zotlabs/Module/Cdav.php:839 +msgid "Delete all" +msgstr "Eliminar todos" + +#: ../../Zotlabs/Module/Cdav.php:840 ../../Zotlabs/Module/Cdav.php:1129 +#: ../../Zotlabs/Module/Admin/Plugins.php:423 +#: ../../Zotlabs/Module/Settings/Oauth.php:88 +#: ../../Zotlabs/Module/Settings/Oauth.php:114 +#: ../../Zotlabs/Module/Wiki.php:290 ../../Zotlabs/Module/Wiki.php:316 +#: ../../Zotlabs/Module/Connedit.php:938 ../../Zotlabs/Module/Fbrowser.php:66 +#: ../../Zotlabs/Module/Fbrowser.php:88 ../../Zotlabs/Module/Profiles.php:804 +#: ../../Zotlabs/Module/Filer.php:55 ../../Zotlabs/Module/Tagrm.php:15 +#: ../../Zotlabs/Module/Tagrm.php:138 ../../addon/js_upload/js_upload.php:46 +#: ../../addon/gitwiki/Mod_Gitwiki.php:244 +#: ../../addon/gitwiki/Mod_Gitwiki.php:267 ../../include/conversation.php:1324 +#: ../../include/conversation.php:1373 +msgid "Cancel" +msgstr "Cancelar" + +#: ../../Zotlabs/Module/Cdav.php:841 +msgid "Sorry! Editing of recurrent events is not yet implemented." +msgstr "¡Disculpas! La edición de eventos recurrentes aún no se ha implementado." + +#: ../../Zotlabs/Module/Cdav.php:969 +msgid "CardDAV" +msgstr "CardDAV" + +#: ../../Zotlabs/Module/Cdav.php:1111 +#: ../../Zotlabs/Module/Sharedwithme.php:105 +#: ../../Zotlabs/Module/Admin/Channels.php:159 +#: ../../Zotlabs/Module/Settings/Oauth.php:89 +#: ../../Zotlabs/Module/Settings/Oauth.php:115 +#: ../../Zotlabs/Module/Wiki.php:174 ../../Zotlabs/Module/Connedit.php:920 +#: ../../Zotlabs/Module/Chat.php:251 ../../Zotlabs/Lib/NativeWikiPage.php:539 +#: ../../Zotlabs/Storage/Browser.php:234 +#: ../../Zotlabs/Widget/Wiki_page_history.php:22 +#: ../../addon/rendezvous/rendezvous.php:172 +#: ../../addon/gitwiki/Mod_Gitwiki.php:158 +msgid "Name" +msgstr "Nombre" + +#: ../../Zotlabs/Module/Cdav.php:1112 ../../Zotlabs/Module/Connedit.php:921 +msgid "Organisation" +msgstr "Organización" + +#: ../../Zotlabs/Module/Cdav.php:1113 ../../Zotlabs/Module/Connedit.php:922 +msgid "Title" +msgstr "Título" + +#: ../../Zotlabs/Module/Cdav.php:1114 ../../Zotlabs/Module/Connedit.php:923 +#: ../../Zotlabs/Module/Profiles.php:789 +msgid "Phone" +msgstr "Teléfono" + +#: ../../Zotlabs/Module/Cdav.php:1115 +#: ../../Zotlabs/Module/Admin/Accounts.php:169 +#: ../../Zotlabs/Module/Admin/Accounts.php:181 +#: ../../Zotlabs/Module/Connedit.php:924 ../../Zotlabs/Module/Profiles.php:790 +#: ../../addon/openid/MysqlProvider.php:56 +#: ../../addon/openid/MysqlProvider.php:57 ../../addon/rtof/rtof.php:93 +#: ../../addon/redred/redred.php:107 ../../include/network.php:1697 +msgid "Email" +msgstr "Correo electrónico" + +#: ../../Zotlabs/Module/Cdav.php:1116 ../../Zotlabs/Module/Connedit.php:925 +#: ../../Zotlabs/Module/Profiles.php:791 +msgid "Instant messenger" +msgstr "Mensajería instantánea" + +#: ../../Zotlabs/Module/Cdav.php:1117 ../../Zotlabs/Module/Connedit.php:926 +#: ../../Zotlabs/Module/Profiles.php:792 +msgid "Website" +msgstr "Sitio web" + +#: ../../Zotlabs/Module/Cdav.php:1118 ../../Zotlabs/Module/Locs.php:118 +#: ../../Zotlabs/Module/Admin/Channels.php:160 +#: ../../Zotlabs/Module/Connedit.php:927 ../../Zotlabs/Module/Profiles.php:502 +#: ../../Zotlabs/Module/Profiles.php:793 +msgid "Address" +msgstr "Dirección" + +#: ../../Zotlabs/Module/Cdav.php:1119 ../../Zotlabs/Module/Connedit.php:928 +#: ../../Zotlabs/Module/Profiles.php:794 +msgid "Note" +msgstr "Nota" + +#: ../../Zotlabs/Module/Cdav.php:1120 ../../Zotlabs/Module/Connedit.php:929 +#: ../../Zotlabs/Module/Profiles.php:795 ../../include/event.php:1290 +#: ../../include/connections.php:674 +msgid "Mobile" +msgstr "Móvil" + +#: ../../Zotlabs/Module/Cdav.php:1121 ../../Zotlabs/Module/Connedit.php:930 +#: ../../Zotlabs/Module/Profiles.php:796 ../../include/event.php:1291 +#: ../../include/connections.php:675 +msgid "Home" +msgstr "Inicio" + +#: ../../Zotlabs/Module/Cdav.php:1122 ../../Zotlabs/Module/Connedit.php:931 +#: ../../Zotlabs/Module/Profiles.php:797 ../../include/event.php:1294 +#: ../../include/connections.php:678 +msgid "Work" +msgstr "Trabajo" + +#: ../../Zotlabs/Module/Cdav.php:1124 ../../Zotlabs/Module/Connedit.php:933 +#: ../../Zotlabs/Module/Profiles.php:799 +#: ../../addon/jappixmini/jappixmini.php:368 +msgid "Add Contact" +msgstr "Añadir un contacto" + +#: ../../Zotlabs/Module/Cdav.php:1125 ../../Zotlabs/Module/Connedit.php:934 +#: ../../Zotlabs/Module/Profiles.php:800 +msgid "Add Field" +msgstr "Añadir un campo" + +#: ../../Zotlabs/Module/Cdav.php:1127 +#: ../../Zotlabs/Module/Admin/Plugins.php:453 +#: ../../Zotlabs/Module/Settings/Oauth.php:42 +#: ../../Zotlabs/Module/Settings/Oauth.php:113 +#: ../../Zotlabs/Module/Connedit.php:936 ../../Zotlabs/Module/Profiles.php:802 +#: ../../Zotlabs/Lib/Apps.php:384 +msgid "Update" +msgstr "Actualizar" + +#: ../../Zotlabs/Module/Cdav.php:1130 ../../Zotlabs/Module/Connedit.php:939 +msgid "P.O. Box" +msgstr "Buzón de correos" + +#: ../../Zotlabs/Module/Cdav.php:1131 ../../Zotlabs/Module/Connedit.php:940 +msgid "Additional" +msgstr "Adicional" + +#: ../../Zotlabs/Module/Cdav.php:1132 ../../Zotlabs/Module/Connedit.php:941 +msgid "Street" +msgstr "Calle" + +#: ../../Zotlabs/Module/Cdav.php:1133 ../../Zotlabs/Module/Connedit.php:942 +msgid "Locality" +msgstr "Localidad" + +#: ../../Zotlabs/Module/Cdav.php:1134 ../../Zotlabs/Module/Connedit.php:943 +msgid "Region" +msgstr "Provincia, región o estado" + +#: ../../Zotlabs/Module/Cdav.php:1135 ../../Zotlabs/Module/Connedit.php:944 +msgid "ZIP Code" +msgstr "Código postal" + +#: ../../Zotlabs/Module/Cdav.php:1136 ../../Zotlabs/Module/Connedit.php:945 +#: ../../Zotlabs/Module/Profiles.php:760 +msgid "Country" +msgstr "País" + +#: ../../Zotlabs/Module/Cdav.php:1183 +msgid "Default Calendar" +msgstr "Calendario por defecto" + +#: ../../Zotlabs/Module/Cdav.php:1193 +msgid "Default Addressbook" +msgstr "Agenda de direcciones por defecto" + #: ../../Zotlabs/Module/Regdir.php:49 ../../Zotlabs/Module/Dirsearch.php:25 msgid "This site is not a directory server" msgstr "Este sitio no es un servidor de directorio" @@ -554,20 +817,30 @@ msgstr "Este sitio no es un servidor de directorio" msgid "You must be logged in to see this page." msgstr "Debe haber iniciado sesión para poder ver esta página." -#: ../../Zotlabs/Module/Channel.php:47 ../../Zotlabs/Module/Hcard.php:35 -#: ../../Zotlabs/Module/Profile.php:43 +#: ../../Zotlabs/Module/Channel.php:47 ../../Zotlabs/Module/Hcard.php:37 +#: ../../Zotlabs/Module/Profile.php:45 msgid "Posts and comments" msgstr "Publicaciones y comentarios" -#: ../../Zotlabs/Module/Channel.php:54 ../../Zotlabs/Module/Hcard.php:42 -#: ../../Zotlabs/Module/Profile.php:50 +#: ../../Zotlabs/Module/Channel.php:54 ../../Zotlabs/Module/Hcard.php:44 +#: ../../Zotlabs/Module/Profile.php:52 msgid "Only posts" msgstr "Solo publicaciones" +#: ../../Zotlabs/Module/Channel.php:97 ../../Zotlabs/Lib/Apps.php:240 +#: ../../include/nav.php:175 +msgid "Channel Home" +msgstr "Mi canal" + #: ../../Zotlabs/Module/Channel.php:112 msgid "Insufficient permissions. Request redirected to profile page." msgstr "Permisos insuficientes. Petición redirigida a la página del perfil." +#: ../../Zotlabs/Module/Lang.php:8 ../../Zotlabs/Lib/Apps.php:256 +#: ../../addon/openid/MysqlProvider.php:69 +msgid "Language" +msgstr "Idioma" + #: ../../Zotlabs/Module/Uexport.php:57 ../../Zotlabs/Module/Uexport.php:58 msgid "Export Channel" msgstr "Exportar el canal" @@ -633,19 +906,20 @@ msgstr "Estos ficheros pueden ser importados o restaurados visitando What next" -msgstr "

Siguiente paso

" +#: ../../Zotlabs/Module/Setup.php:743 +msgid "

What next?

" +msgstr "

¿Qué sigue?

" -#: ../../Zotlabs/Module/Setup.php:747 +#: ../../Zotlabs/Module/Setup.php:744 msgid "" "IMPORTANT: You will need to [manually] setup a scheduled task for the " "poller." @@ -1978,8 +2193,8 @@ msgstr "Intentar ejecutar este paso de actualización automáticamente" #: ../../Zotlabs/Module/Admin/Plugins.php:259 #: ../../Zotlabs/Module/Admin/Themes.php:72 ../../Zotlabs/Module/Thing.php:89 #: ../../Zotlabs/Module/Viewsrc.php:25 ../../Zotlabs/Module/Display.php:35 -#: ../../Zotlabs/Module/Filestorage.php:32 ../../Zotlabs/Module/Admin.php:60 -#: ../../include/items.php:3391 +#: ../../Zotlabs/Module/Filestorage.php:24 ../../Zotlabs/Module/Admin.php:62 +#: ../../include/items.php:3361 msgid "Item not found." msgstr "Elemento no encontrado." @@ -2010,9 +2225,9 @@ msgstr "Activar" #: ../../Zotlabs/Module/Admin/Channels.php:145 #: ../../Zotlabs/Module/Admin/Themes.php:122 #: ../../Zotlabs/Module/Admin/Themes.php:156 -#: ../../Zotlabs/Module/Admin/Site.php:277 +#: ../../Zotlabs/Module/Admin/Site.php:269 #: ../../Zotlabs/Module/Admin/Security.php:86 -#: ../../Zotlabs/Module/Admin.php:137 +#: ../../Zotlabs/Module/Admin.php:136 msgid "Administration" msgstr "Administración" @@ -2028,8 +2243,8 @@ msgid "Toggle" msgstr "Cambiar" #: ../../Zotlabs/Module/Admin/Plugins.php:344 -#: ../../Zotlabs/Module/Admin/Themes.php:125 ../../Zotlabs/Lib/Apps.php:223 -#: ../../Zotlabs/Widget/Settings_menu.php:131 ../../include/nav.php:207 +#: ../../Zotlabs/Module/Admin/Themes.php:125 ../../Zotlabs/Lib/Apps.php:236 +#: ../../Zotlabs/Widget/Settings_menu.php:133 ../../include/nav.php:201 msgid "Settings" msgstr "Ajustes" @@ -2092,25 +2307,10 @@ msgstr "Descargar el repositorio" msgid "Install new repo" msgstr "Instalar un nuevo repositorio" -#: ../../Zotlabs/Module/Admin/Plugins.php:422 ../../Zotlabs/Lib/Apps.php:358 +#: ../../Zotlabs/Module/Admin/Plugins.php:422 ../../Zotlabs/Lib/Apps.php:384 msgid "Install" msgstr "Instalar" -#: ../../Zotlabs/Module/Admin/Plugins.php:423 -#: ../../Zotlabs/Module/Settings/Oauth.php:88 -#: ../../Zotlabs/Module/Settings/Oauth.php:114 -#: ../../Zotlabs/Module/Wiki.php:265 ../../Zotlabs/Module/Wiki.php:290 -#: ../../Zotlabs/Module/Connedit.php:920 ../../Zotlabs/Module/Fbrowser.php:66 -#: ../../Zotlabs/Module/Fbrowser.php:88 ../../Zotlabs/Module/Profiles.php:804 -#: ../../Zotlabs/Module/Filer.php:55 ../../Zotlabs/Module/Tagrm.php:15 -#: ../../Zotlabs/Module/Tagrm.php:138 ../../addon/cdav/Mod_Cdav.php:866 -#: ../../addon/cdav/Mod_Cdav.php:1154 ../../addon/js_upload/js_upload.php:46 -#: ../../addon/gitwiki/Mod_Gitwiki.php:244 -#: ../../addon/gitwiki/Mod_Gitwiki.php:267 ../../include/conversation.php:1327 -#: ../../include/conversation.php:1376 -msgid "Cancel" -msgstr "Cancelar" - #: ../../Zotlabs/Module/Admin/Plugins.php:445 msgid "Manage Repos" msgstr "Gestionar los repositorios" @@ -2123,20 +2323,12 @@ msgstr "Repositorios de los plugins instalados" msgid "Install a New Plugin Repository" msgstr "Instalar un nuevo repositorio de plugins" -#: ../../Zotlabs/Module/Admin/Plugins.php:453 -#: ../../Zotlabs/Module/Settings/Oauth.php:42 -#: ../../Zotlabs/Module/Settings/Oauth.php:113 -#: ../../Zotlabs/Module/Connedit.php:918 ../../Zotlabs/Module/Profiles.php:802 -#: ../../Zotlabs/Lib/Apps.php:358 ../../addon/cdav/Mod_Cdav.php:1152 -msgid "Update" -msgstr "Actualizar" - #: ../../Zotlabs/Module/Admin/Plugins.php:454 msgid "Switch branch" msgstr "Cambiar la rama" #: ../../Zotlabs/Module/Admin/Plugins.php:455 -#: ../../Zotlabs/Module/Photos.php:960 ../../Zotlabs/Module/Tagrm.php:137 +#: ../../Zotlabs/Module/Photos.php:962 ../../Zotlabs/Module/Tagrm.php:137 #: ../../addon/superblock/superblock.php:116 msgid "Remove" msgstr "Eliminar" @@ -2176,7 +2368,7 @@ msgstr "La cuenta '%s' ha sido desbloqueada" #: ../../Zotlabs/Module/Admin/Accounts.php:165 #: ../../Zotlabs/Module/Admin/Accounts.php:178 -#: ../../Zotlabs/Widget/Admin.php:23 +#: ../../Zotlabs/Module/Admin.php:96 ../../Zotlabs/Widget/Admin.php:23 msgid "Accounts" msgstr "Cuentas" @@ -2193,21 +2385,12 @@ msgstr "Inscripciones en espera de confirmación" msgid "Request date" msgstr "Fecha de solicitud" -#: ../../Zotlabs/Module/Admin/Accounts.php:169 -#: ../../Zotlabs/Module/Admin/Accounts.php:181 -#: ../../Zotlabs/Module/Connedit.php:906 ../../Zotlabs/Module/Profiles.php:790 -#: ../../addon/cdav/Mod_Cdav.php:1140 ../../addon/openid/MysqlProvider.php:56 -#: ../../addon/openid/MysqlProvider.php:57 ../../addon/rtof/rtof.php:93 -#: ../../addon/redred/redred.php:107 ../../include/network.php:2315 -msgid "Email" -msgstr "Correo electrónico" - #: ../../Zotlabs/Module/Admin/Accounts.php:170 msgid "No registrations." msgstr "Sin registros." #: ../../Zotlabs/Module/Admin/Accounts.php:171 -#: ../../Zotlabs/Module/Connections.php:281 +#: ../../Zotlabs/Module/Connections.php:282 ../../include/conversation.php:685 msgid "Approve" msgstr "Aprobar" @@ -2229,7 +2412,7 @@ msgstr "Desbloquear" msgid "ID" msgstr "ID" -#: ../../Zotlabs/Module/Admin/Accounts.php:182 ../../include/group.php:287 +#: ../../Zotlabs/Module/Admin/Accounts.php:182 ../../include/group.php:288 msgid "All Channels" msgstr "Todos los canales" @@ -2343,7 +2526,7 @@ msgid "Channel '%s' code disallowed" msgstr "Código no permitido al canal '%s'" #: ../../Zotlabs/Module/Admin/Channels.php:146 -#: ../../Zotlabs/Widget/Admin.php:24 +#: ../../Zotlabs/Module/Admin.php:110 ../../Zotlabs/Widget/Admin.php:24 msgid "Channels" msgstr "Canales" @@ -2364,7 +2547,7 @@ msgid "Disallow Code" msgstr "No permitir código" #: ../../Zotlabs/Module/Admin/Channels.php:154 -#: ../../include/conversation.php:1760 ../../include/nav.php:369 +#: ../../include/conversation.php:1757 ../../include/nav.php:355 msgid "Channel" msgstr "Canal" @@ -2409,381 +2592,382 @@ msgstr "[Experimental]" msgid "[Unsupported]" msgstr "[No soportado]" -#: ../../Zotlabs/Module/Admin/Site.php:144 +#: ../../Zotlabs/Module/Admin/Site.php:142 msgid "Site settings updated." msgstr "Ajustes del sitio actualizados." -#: ../../Zotlabs/Module/Admin/Site.php:170 ../../include/text.php:2915 +#: ../../Zotlabs/Module/Admin/Site.php:168 +#: ../../view/theme/redbasic/php/config.php:15 ../../include/text.php:2928 msgid "Default" msgstr "Predeterminado" -#: ../../Zotlabs/Module/Admin/Site.php:181 +#: ../../Zotlabs/Module/Admin/Site.php:179 #: ../../Zotlabs/Module/Settings/Display.php:137 #, php-format msgid "%s - (Incompatible)" msgstr "%s - (Incompatible)" -#: ../../Zotlabs/Module/Admin/Site.php:188 +#: ../../Zotlabs/Module/Admin/Site.php:186 #: ../../Zotlabs/Module/Settings/Display.php:151 msgid "mobile" msgstr "móvil" -#: ../../Zotlabs/Module/Admin/Site.php:190 +#: ../../Zotlabs/Module/Admin/Site.php:188 msgid "experimental" msgstr "experimental" -#: ../../Zotlabs/Module/Admin/Site.php:192 +#: ../../Zotlabs/Module/Admin/Site.php:190 msgid "unsupported" msgstr "no soportado" -#: ../../Zotlabs/Module/Admin/Site.php:238 +#: ../../Zotlabs/Module/Admin/Site.php:236 msgid "Yes - with approval" msgstr "Sí - con aprobación" -#: ../../Zotlabs/Module/Admin/Site.php:244 +#: ../../Zotlabs/Module/Admin/Site.php:242 msgid "My site is not a public server" msgstr "Mi sitio no es un servidor público" -#: ../../Zotlabs/Module/Admin/Site.php:245 +#: ../../Zotlabs/Module/Admin/Site.php:243 msgid "My site has paid access only" msgstr "Mi sitio es un servicio de pago" -#: ../../Zotlabs/Module/Admin/Site.php:246 +#: ../../Zotlabs/Module/Admin/Site.php:244 msgid "My site has free access only" msgstr "Mi sitio es un servicio gratuito" -#: ../../Zotlabs/Module/Admin/Site.php:247 +#: ../../Zotlabs/Module/Admin/Site.php:245 msgid "My site offers free accounts with optional paid upgrades" msgstr "Mi sitio ofrece cuentas gratuitas con opciones extra de pago" -#: ../../Zotlabs/Module/Admin/Site.php:264 ../../Zotlabs/Lib/Techlevels.php:10 +#: ../../Zotlabs/Module/Admin/Site.php:256 msgid "Beginner/Basic" msgstr "Principiante / Básico" -#: ../../Zotlabs/Module/Admin/Site.php:265 ../../Zotlabs/Lib/Techlevels.php:11 +#: ../../Zotlabs/Module/Admin/Site.php:257 msgid "Novice - not skilled but willing to learn" msgstr "Novato: no cualificado, pero dispuesto a aprender" -#: ../../Zotlabs/Module/Admin/Site.php:266 ../../Zotlabs/Lib/Techlevels.php:12 +#: ../../Zotlabs/Module/Admin/Site.php:258 msgid "Intermediate - somewhat comfortable" msgstr "Intermedio: bastante cómodo" -#: ../../Zotlabs/Module/Admin/Site.php:267 ../../Zotlabs/Lib/Techlevels.php:13 +#: ../../Zotlabs/Module/Admin/Site.php:259 msgid "Advanced - very comfortable" msgstr "Avanzado: muy cómodo" -#: ../../Zotlabs/Module/Admin/Site.php:268 ../../Zotlabs/Lib/Techlevels.php:14 +#: ../../Zotlabs/Module/Admin/Site.php:260 msgid "Expert - I can write computer code" msgstr "Experto: puedo escribir código informático" -#: ../../Zotlabs/Module/Admin/Site.php:269 ../../Zotlabs/Lib/Techlevels.php:15 +#: ../../Zotlabs/Module/Admin/Site.php:261 msgid "Wizard - I probably know more than you do" msgstr "Asistente: probablemente sé más que tú" -#: ../../Zotlabs/Module/Admin/Site.php:278 ../../Zotlabs/Widget/Admin.php:22 +#: ../../Zotlabs/Module/Admin/Site.php:270 ../../Zotlabs/Widget/Admin.php:22 msgid "Site" msgstr "Sitio" -#: ../../Zotlabs/Module/Admin/Site.php:280 -#: ../../Zotlabs/Module/Register.php:253 +#: ../../Zotlabs/Module/Admin/Site.php:272 +#: ../../Zotlabs/Module/Register.php:251 msgid "Registration" msgstr "Registro" -#: ../../Zotlabs/Module/Admin/Site.php:281 +#: ../../Zotlabs/Module/Admin/Site.php:273 msgid "File upload" msgstr "Subir fichero" -#: ../../Zotlabs/Module/Admin/Site.php:282 +#: ../../Zotlabs/Module/Admin/Site.php:274 msgid "Policies" msgstr "Políticas" -#: ../../Zotlabs/Module/Admin/Site.php:283 +#: ../../Zotlabs/Module/Admin/Site.php:275 #: ../../include/contact_widgets.php:16 msgid "Advanced" msgstr "Avanzado" -#: ../../Zotlabs/Module/Admin/Site.php:287 +#: ../../Zotlabs/Module/Admin/Site.php:279 #: ../../addon/statusnet/statusnet.php:890 msgid "Site name" msgstr "Nombre del sitio" -#: ../../Zotlabs/Module/Admin/Site.php:291 +#: ../../Zotlabs/Module/Admin/Site.php:281 msgid "Site default technical skill level" msgstr "Nivel de habilidad técnica predeterminado del sitio" -#: ../../Zotlabs/Module/Admin/Site.php:291 +#: ../../Zotlabs/Module/Admin/Site.php:281 msgid "Used to provide a member experience matched to technical comfort level" msgstr "Se utiliza para proporcionar una experiencia a los miembros adaptada a su nivel de comodidad técnica" -#: ../../Zotlabs/Module/Admin/Site.php:293 +#: ../../Zotlabs/Module/Admin/Site.php:283 msgid "Lock the technical skill level setting" msgstr "Bloquear el ajuste del nivel de habilidad técnica" -#: ../../Zotlabs/Module/Admin/Site.php:293 +#: ../../Zotlabs/Module/Admin/Site.php:283 msgid "Members can set their own technical comfort level by default" msgstr "Los miembros pueden configurar su nivel de comodidad técnica por defecto" -#: ../../Zotlabs/Module/Admin/Site.php:295 +#: ../../Zotlabs/Module/Admin/Site.php:285 msgid "Banner/Logo" msgstr "Banner/Logo" -#: ../../Zotlabs/Module/Admin/Site.php:296 +#: ../../Zotlabs/Module/Admin/Site.php:286 msgid "Administrator Information" msgstr "Información del Administrador" -#: ../../Zotlabs/Module/Admin/Site.php:296 +#: ../../Zotlabs/Module/Admin/Site.php:286 msgid "" "Contact information for site administrators. Displayed on siteinfo page. " "BBCode can be used here" msgstr "Información de contacto de los administradores del sitio. Visible en la página \"siteinfo\". Se puede usar BBCode" -#: ../../Zotlabs/Module/Admin/Site.php:297 -#: ../../Zotlabs/Module/Siteinfo.php:23 +#: ../../Zotlabs/Module/Admin/Site.php:287 +#: ../../Zotlabs/Module/Siteinfo.php:22 msgid "Site Information" msgstr "Información sobre el sitio" -#: ../../Zotlabs/Module/Admin/Site.php:297 +#: ../../Zotlabs/Module/Admin/Site.php:287 msgid "" "Publicly visible description of this site. Displayed on siteinfo page. " "BBCode can be used here" msgstr "Descripción pública de este sitio. Visible en la página \"siteinfo\". Se puede usar BBCode" -#: ../../Zotlabs/Module/Admin/Site.php:298 +#: ../../Zotlabs/Module/Admin/Site.php:288 msgid "System language" msgstr "Idioma del sistema" -#: ../../Zotlabs/Module/Admin/Site.php:299 +#: ../../Zotlabs/Module/Admin/Site.php:289 msgid "System theme" msgstr "Tema gráfico del sistema" -#: ../../Zotlabs/Module/Admin/Site.php:299 +#: ../../Zotlabs/Module/Admin/Site.php:289 msgid "" "Default system theme - may be over-ridden by user profiles - change theme settings" msgstr "Tema del sistema por defecto - se puede cambiar por cada perfil de usuario - modificar los ajustes del tema" -#: ../../Zotlabs/Module/Admin/Site.php:300 +#: ../../Zotlabs/Module/Admin/Site.php:290 msgid "Mobile system theme" msgstr "Tema del sistema para móviles" -#: ../../Zotlabs/Module/Admin/Site.php:300 +#: ../../Zotlabs/Module/Admin/Site.php:290 msgid "Theme for mobile devices" msgstr "Tema para dispositivos móviles" -#: ../../Zotlabs/Module/Admin/Site.php:302 +#: ../../Zotlabs/Module/Admin/Site.php:292 msgid "Allow Feeds as Connections" msgstr "Permitir contenidos RSS como conexiones" -#: ../../Zotlabs/Module/Admin/Site.php:302 +#: ../../Zotlabs/Module/Admin/Site.php:292 msgid "(Heavy system resource usage)" msgstr "(Uso intenso de los recursos del sistema)" -#: ../../Zotlabs/Module/Admin/Site.php:303 +#: ../../Zotlabs/Module/Admin/Site.php:293 msgid "Maximum image size" msgstr "Tamaño máximo de la imagen" -#: ../../Zotlabs/Module/Admin/Site.php:303 +#: ../../Zotlabs/Module/Admin/Site.php:293 msgid "" "Maximum size in bytes of uploaded images. Default is 0, which means no " "limits." msgstr "Tamaño máximo en bytes de la imagen subida. Por defecto, es 0, lo que significa que no hay límites." -#: ../../Zotlabs/Module/Admin/Site.php:304 +#: ../../Zotlabs/Module/Admin/Site.php:294 msgid "Does this site allow new member registration?" msgstr "¿Debe este sitio permitir el registro de nuevos miembros?" -#: ../../Zotlabs/Module/Admin/Site.php:305 +#: ../../Zotlabs/Module/Admin/Site.php:295 msgid "Invitation only" msgstr "Solo con una invitación" -#: ../../Zotlabs/Module/Admin/Site.php:305 +#: ../../Zotlabs/Module/Admin/Site.php:295 msgid "" "Only allow new member registrations with an invitation code. Above register " "policy must be set to Yes." msgstr "Solo se permiten inscripciones de nuevos miembros con un código de invitación. Además, deben aceptarse los términos del registro marcando \"Sí\"." -#: ../../Zotlabs/Module/Admin/Site.php:306 +#: ../../Zotlabs/Module/Admin/Site.php:296 msgid "Which best describes the types of account offered by this hub?" msgstr "¿Cómo describiría el tipo de servicio ofrecido por este servidor?" -#: ../../Zotlabs/Module/Admin/Site.php:307 +#: ../../Zotlabs/Module/Admin/Site.php:297 msgid "Register text" msgstr "Texto del registro" -#: ../../Zotlabs/Module/Admin/Site.php:307 +#: ../../Zotlabs/Module/Admin/Site.php:297 msgid "Will be displayed prominently on the registration page." msgstr "Se mostrará de forma destacada en la página de registro." -#: ../../Zotlabs/Module/Admin/Site.php:308 +#: ../../Zotlabs/Module/Admin/Site.php:298 msgid "Site homepage to show visitors (default: login box)" msgstr "Página personal que se mostrará a los visitantes (por defecto: la página de identificación)" -#: ../../Zotlabs/Module/Admin/Site.php:308 +#: ../../Zotlabs/Module/Admin/Site.php:298 msgid "" "example: 'public' to show public stream, 'page/sys/home' to show a system " "webpage called 'home' or 'include:home.html' to include a file." msgstr "ejemplo: 'public' para mostrar contenido público, 'page/sys/home' para mostrar la página web definida como \"home\" o 'include:home.html' para mostrar el contenido de un fichero." -#: ../../Zotlabs/Module/Admin/Site.php:309 +#: ../../Zotlabs/Module/Admin/Site.php:299 msgid "Preserve site homepage URL" msgstr "Preservar la dirección de la página personal" -#: ../../Zotlabs/Module/Admin/Site.php:309 +#: ../../Zotlabs/Module/Admin/Site.php:299 msgid "" "Present the site homepage in a frame at the original location instead of " "redirecting" msgstr "Presenta la página personal del sitio en un marco en la ubicación original, en vez de redirigirla." -#: ../../Zotlabs/Module/Admin/Site.php:310 +#: ../../Zotlabs/Module/Admin/Site.php:300 msgid "Accounts abandoned after x days" msgstr "Cuentas abandonadas después de x días" -#: ../../Zotlabs/Module/Admin/Site.php:310 +#: ../../Zotlabs/Module/Admin/Site.php:300 msgid "" "Will not waste system resources polling external sites for abandonded " "accounts. Enter 0 for no time limit." msgstr "Para evitar consumir recursos del sistema intentando poner al día las cuentas abandonadas. Introduzca 0 para no tener límite de tiempo." -#: ../../Zotlabs/Module/Admin/Site.php:311 +#: ../../Zotlabs/Module/Admin/Site.php:301 msgid "Allowed friend domains" msgstr "Dominios amigos permitidos" -#: ../../Zotlabs/Module/Admin/Site.php:311 +#: ../../Zotlabs/Module/Admin/Site.php:301 msgid "" "Comma separated list of domains which are allowed to establish friendships " "with this site. Wildcards are accepted. Empty to allow any domains" msgstr "Lista separada por comas de dominios a los que está permitido establecer relaciones de amistad con este sitio. Se permiten comodines. Dejar en claro para aceptar cualquier dominio." -#: ../../Zotlabs/Module/Admin/Site.php:312 +#: ../../Zotlabs/Module/Admin/Site.php:302 msgid "Verify Email Addresses" msgstr "Verificar las direcciones de correo electrónico" -#: ../../Zotlabs/Module/Admin/Site.php:312 +#: ../../Zotlabs/Module/Admin/Site.php:302 msgid "" "Check to verify email addresses used in account registration (recommended)." msgstr "Activar para la verificación de la dirección de correo electrónico en el registro de una cuenta (recomendado)." -#: ../../Zotlabs/Module/Admin/Site.php:313 +#: ../../Zotlabs/Module/Admin/Site.php:303 msgid "Force publish" msgstr "Forzar la publicación" -#: ../../Zotlabs/Module/Admin/Site.php:313 +#: ../../Zotlabs/Module/Admin/Site.php:303 msgid "" "Check to force all profiles on this site to be listed in the site directory." msgstr "Intentar forzar todos los perfiles para que sean listados en el directorio de este sitio." -#: ../../Zotlabs/Module/Admin/Site.php:314 +#: ../../Zotlabs/Module/Admin/Site.php:304 msgid "Import Public Streams" msgstr "Importar contenido público" -#: ../../Zotlabs/Module/Admin/Site.php:314 +#: ../../Zotlabs/Module/Admin/Site.php:304 msgid "" "Import and allow access to public content pulled from other sites. Warning: " "this content is unmoderated." msgstr "Importar y permitir acceso al contenido público sacado de otros sitios. Advertencia: este contenido no está moderado, por lo que podría encontrar cosas inapropiadas u ofensivas." -#: ../../Zotlabs/Module/Admin/Site.php:315 +#: ../../Zotlabs/Module/Admin/Site.php:305 msgid "Login on Homepage" msgstr "Iniciar sesión en la página personal" -#: ../../Zotlabs/Module/Admin/Site.php:315 +#: ../../Zotlabs/Module/Admin/Site.php:305 msgid "" "Present a login box to visitors on the home page if no other content has " "been configured." msgstr "Presentar a los visitantes una casilla de identificación en la página de inicio, si no se ha configurado otro tipo de contenido." -#: ../../Zotlabs/Module/Admin/Site.php:316 +#: ../../Zotlabs/Module/Admin/Site.php:306 msgid "Enable context help" msgstr "Habilitar la ayuda contextual" -#: ../../Zotlabs/Module/Admin/Site.php:316 +#: ../../Zotlabs/Module/Admin/Site.php:306 msgid "" "Display contextual help for the current page when the help button is " "pressed." msgstr "Ver la ayuda contextual para la página actual cuando se pulse el botón de Ayuda." -#: ../../Zotlabs/Module/Admin/Site.php:318 +#: ../../Zotlabs/Module/Admin/Site.php:308 msgid "Reply-to email address for system generated email." msgstr "Dirección de respuesta para el correo electrónico generado por el sistema." -#: ../../Zotlabs/Module/Admin/Site.php:319 +#: ../../Zotlabs/Module/Admin/Site.php:309 msgid "Sender (From) email address for system generated email." msgstr "Dirección del remitente (From) para el correo electrónico generado por el sistema." -#: ../../Zotlabs/Module/Admin/Site.php:320 +#: ../../Zotlabs/Module/Admin/Site.php:310 msgid "Name of email sender for system generated email." msgstr "Nombre del remitente del correo electrónico generado por el sistema." -#: ../../Zotlabs/Module/Admin/Site.php:322 +#: ../../Zotlabs/Module/Admin/Site.php:312 msgid "Directory Server URL" msgstr "URL del servidor de directorio" -#: ../../Zotlabs/Module/Admin/Site.php:322 +#: ../../Zotlabs/Module/Admin/Site.php:312 msgid "Default directory server" msgstr "Servidor de directorio predeterminado" -#: ../../Zotlabs/Module/Admin/Site.php:324 +#: ../../Zotlabs/Module/Admin/Site.php:314 msgid "Proxy user" msgstr "Usuario del proxy" -#: ../../Zotlabs/Module/Admin/Site.php:325 +#: ../../Zotlabs/Module/Admin/Site.php:315 msgid "Proxy URL" msgstr "Dirección del proxy" -#: ../../Zotlabs/Module/Admin/Site.php:326 +#: ../../Zotlabs/Module/Admin/Site.php:316 msgid "Network timeout" msgstr "Tiempo de espera de la red" -#: ../../Zotlabs/Module/Admin/Site.php:326 +#: ../../Zotlabs/Module/Admin/Site.php:316 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)." msgstr "Valor en segundos. Poner a 0 para que no haya tiempo límite (no recomendado)" -#: ../../Zotlabs/Module/Admin/Site.php:327 +#: ../../Zotlabs/Module/Admin/Site.php:317 msgid "Delivery interval" msgstr "Intervalo de entrega" -#: ../../Zotlabs/Module/Admin/Site.php:327 +#: ../../Zotlabs/Module/Admin/Site.php:317 msgid "" "Delay background delivery processes by this many seconds to reduce system " "load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 " "for large dedicated servers." msgstr "Retrasar los procesos de transmisión en segundo plano por esta cantidad de segundos para reducir la carga del sistema. Recomendado: 4-5 para sitios compartidos, 2-3 para servidores virtuales privados, 0-1 para grandes servidores dedicados." -#: ../../Zotlabs/Module/Admin/Site.php:328 +#: ../../Zotlabs/Module/Admin/Site.php:318 msgid "Deliveries per process" msgstr "Intentos de envío por proceso" -#: ../../Zotlabs/Module/Admin/Site.php:328 +#: ../../Zotlabs/Module/Admin/Site.php:318 msgid "" "Number of deliveries to attempt in a single operating system process. Adjust" " if necessary to tune system performance. Recommend: 1-5." msgstr "Numero de envíos a intentar en un único proceso del sistema operativo. Ajustar si es necesario mejorar el rendimiento. Se recomienda: 1-5." -#: ../../Zotlabs/Module/Admin/Site.php:329 +#: ../../Zotlabs/Module/Admin/Site.php:319 msgid "Poll interval" msgstr "Intervalo máximo de tiempo entre dos mensajes sucesivos" -#: ../../Zotlabs/Module/Admin/Site.php:329 +#: ../../Zotlabs/Module/Admin/Site.php:319 msgid "" "Delay background polling processes by this many seconds to reduce system " "load. If 0, use delivery interval." msgstr "Retrasar el intervalo de envío en segundo plano, en esta cantidad de segundos, para reducir la carga del sistema. Si es 0, usar el intervalo de entrega." -#: ../../Zotlabs/Module/Admin/Site.php:330 +#: ../../Zotlabs/Module/Admin/Site.php:320 msgid "Maximum Load Average" msgstr "Carga media máxima" -#: ../../Zotlabs/Module/Admin/Site.php:330 +#: ../../Zotlabs/Module/Admin/Site.php:320 msgid "" "Maximum system load before delivery and poll processes are deferred - " "default 50." msgstr "Carga máxima del sistema antes de que los procesos de entrega y envío se hayan retardado - por defecto, 50." -#: ../../Zotlabs/Module/Admin/Site.php:331 +#: ../../Zotlabs/Module/Admin/Site.php:321 msgid "Expiration period in days for imported (grid/network) content" msgstr "Caducidad del contenido importado de otros sitios (en días)" -#: ../../Zotlabs/Module/Admin/Site.php:331 +#: ../../Zotlabs/Module/Admin/Site.php:321 msgid "0 for no expiration of imported content" msgstr "0 para que no caduque el contenido importado" @@ -2829,8 +3013,8 @@ msgstr "Información adicional (opcional)" #: ../../Zotlabs/Module/Admin/Profs.php:74 #: ../../Zotlabs/Module/Admin/Profs.php:94 ../../Zotlabs/Module/Rbmark.php:32 #: ../../Zotlabs/Module/Rbmark.php:104 ../../Zotlabs/Module/Filer.php:53 -#: ../../Zotlabs/Widget/Notes.php:18 ../../include/text.php:1028 -#: ../../include/text.php:1040 +#: ../../Zotlabs/Widget/Notes.php:18 ../../include/text.php:1022 +#: ../../include/text.php:1034 msgid "Save" msgstr "Guardar" @@ -3034,6 +3218,14 @@ msgctxt "acl" msgid "Profile" msgstr "Perfil" +#: ../../Zotlabs/Module/Moderate.php:37 +msgid "Comment approved" +msgstr "El comentario ha sido aprobado" + +#: ../../Zotlabs/Module/Moderate.php:41 +msgid "Comment deleted" +msgstr "Se ha eliminado el comentario" + #: ../../Zotlabs/Module/Settings/Permcats.php:37 msgid "Permission category saved." msgstr "Se ha guardado la categoría del permiso." @@ -3054,25 +3246,25 @@ msgstr "Nombre de la autorización" #: ../../Zotlabs/Module/Settings/Permcats.php:103 #: ../../Zotlabs/Module/Settings/Tokens.php:161 -#: ../../Zotlabs/Module/Connedit.php:886 +#: ../../Zotlabs/Module/Connedit.php:904 msgid "My Settings" msgstr "Mis ajustes" #: ../../Zotlabs/Module/Settings/Permcats.php:105 #: ../../Zotlabs/Module/Settings/Tokens.php:163 -#: ../../Zotlabs/Module/Connedit.php:881 +#: ../../Zotlabs/Module/Connedit.php:899 msgid "inherited" msgstr "heredado" #: ../../Zotlabs/Module/Settings/Permcats.php:108 #: ../../Zotlabs/Module/Settings/Tokens.php:166 -#: ../../Zotlabs/Module/Connedit.php:888 +#: ../../Zotlabs/Module/Connedit.php:906 msgid "Individual Permissions" msgstr "Permisos individuales" #: ../../Zotlabs/Module/Settings/Permcats.php:109 #: ../../Zotlabs/Module/Settings/Tokens.php:167 -#: ../../Zotlabs/Module/Connedit.php:889 +#: ../../Zotlabs/Module/Connedit.php:907 msgid "" "Some permissions may be inherited from your channel's privacy settings, which have higher " @@ -3086,12 +3278,12 @@ msgstr "Algunos permisos pueden ser heredados de los extremely permissive (should be used with caution)" msgstr "Muy Público - extremadamente permisivo (debería ser usado con precaución)" -#: ../../Zotlabs/Module/Settings/Channel.php:499 +#: ../../Zotlabs/Module/Settings/Channel.php:502 msgid "" "Typical - default public, privacy when desired (similar to social " "network permissions but with improved privacy)" msgstr "Típico - por defecto público, privado cuando se desee (similar a los permisos de una red social pero con privacidad mejorada)" -#: ../../Zotlabs/Module/Settings/Channel.php:500 +#: ../../Zotlabs/Module/Settings/Channel.php:503 msgid "Private - default private, never open or public" msgstr "Privado - por defecto, privado, nunca abierto o público" -#: ../../Zotlabs/Module/Settings/Channel.php:501 +#: ../../Zotlabs/Module/Settings/Channel.php:504 msgid "Blocked - default blocked to/from everybody" msgstr "Bloqueado - por defecto, bloqueado/a para cualquiera" -#: ../../Zotlabs/Module/Settings/Channel.php:503 +#: ../../Zotlabs/Module/Settings/Channel.php:506 msgid "Allow others to tag your posts" msgstr "Permitir a otros etiquetar sus publicaciones" -#: ../../Zotlabs/Module/Settings/Channel.php:503 +#: ../../Zotlabs/Module/Settings/Channel.php:506 msgid "" "Often used by the community to retro-actively flag inappropriate content" msgstr "A menudo usado por la comunidad para marcar contenido inapropiado de forma retroactiva." -#: ../../Zotlabs/Module/Settings/Channel.php:505 +#: ../../Zotlabs/Module/Settings/Channel.php:508 msgid "Channel Permission Limits" msgstr "Límites de los permisos del canal" -#: ../../Zotlabs/Module/Settings/Channel.php:507 +#: ../../Zotlabs/Module/Settings/Channel.php:510 msgid "Expire other channel content after this many days" msgstr "Caducar contenido de otros canales después de este número de días" -#: ../../Zotlabs/Module/Settings/Channel.php:507 +#: ../../Zotlabs/Module/Settings/Channel.php:510 msgid "0 or blank to use the website limit." msgstr "0 o en blanco para usar el límite del sitio web." -#: ../../Zotlabs/Module/Settings/Channel.php:507 +#: ../../Zotlabs/Module/Settings/Channel.php:510 #, php-format msgid "This website expires after %d days." msgstr "Este sitio web caduca después de %d días." -#: ../../Zotlabs/Module/Settings/Channel.php:507 +#: ../../Zotlabs/Module/Settings/Channel.php:510 msgid "This website does not expire imported content." msgstr "Este sitio web no caduca el contenido importado." -#: ../../Zotlabs/Module/Settings/Channel.php:507 +#: ../../Zotlabs/Module/Settings/Channel.php:510 msgid "The website limit takes precedence if lower than your limit." msgstr "El límite del sitio web tiene prioridad si es inferior a su propio límite." -#: ../../Zotlabs/Module/Settings/Channel.php:508 +#: ../../Zotlabs/Module/Settings/Channel.php:511 msgid "Maximum Friend Requests/Day:" msgstr "Máximo de solicitudes de amistad por día:" -#: ../../Zotlabs/Module/Settings/Channel.php:508 +#: ../../Zotlabs/Module/Settings/Channel.php:511 msgid "May reduce spam activity" msgstr "Podría reducir la actividad de spam" -#: ../../Zotlabs/Module/Settings/Channel.php:509 +#: ../../Zotlabs/Module/Settings/Channel.php:512 msgid "Default Access Control List (ACL)" msgstr "Lista de control de acceso (ACL) por defecto" -#: ../../Zotlabs/Module/Settings/Channel.php:511 +#: ../../Zotlabs/Module/Settings/Channel.php:514 msgid "Use my default audience setting for the type of object published" msgstr "Usar los ajustes de mi audiencia predeterminada para el tipo de publicación" -#: ../../Zotlabs/Module/Settings/Channel.php:518 +#: ../../Zotlabs/Module/Settings/Channel.php:521 msgid "Channel permissions category:" msgstr "Categoría de los permisos del canal:" -#: ../../Zotlabs/Module/Settings/Channel.php:519 +#: ../../Zotlabs/Module/Settings/Channel.php:522 msgid "Default Permissions Group" msgstr "Grupo de permisos predeterminado" -#: ../../Zotlabs/Module/Settings/Channel.php:525 +#: ../../Zotlabs/Module/Settings/Channel.php:528 msgid "Maximum private messages per day from unknown people:" msgstr "Máximo de mensajes privados por día de gente desconocida:" -#: ../../Zotlabs/Module/Settings/Channel.php:525 +#: ../../Zotlabs/Module/Settings/Channel.php:528 msgid "Useful to reduce spamming" msgstr "Útil para reducir el envío de correo no deseado" -#: ../../Zotlabs/Module/Settings/Channel.php:528 +#: ../../Zotlabs/Module/Settings/Channel.php:531 msgid "Notification Settings" msgstr "Configuración de las notificaciones" -#: ../../Zotlabs/Module/Settings/Channel.php:529 +#: ../../Zotlabs/Module/Settings/Channel.php:532 msgid "By default post a status message when:" msgstr "Por defecto, enviar un mensaje de estado cuando:" -#: ../../Zotlabs/Module/Settings/Channel.php:530 +#: ../../Zotlabs/Module/Settings/Channel.php:533 msgid "accepting a friend request" msgstr "Acepte una solicitud de amistad" -#: ../../Zotlabs/Module/Settings/Channel.php:531 +#: ../../Zotlabs/Module/Settings/Channel.php:534 msgid "joining a forum/community" msgstr "al unirse a un foro o comunidad" -#: ../../Zotlabs/Module/Settings/Channel.php:532 +#: ../../Zotlabs/Module/Settings/Channel.php:535 msgid "making an interesting profile change" msgstr "Realice un cambio interesante en su perfil" -#: ../../Zotlabs/Module/Settings/Channel.php:533 +#: ../../Zotlabs/Module/Settings/Channel.php:536 msgid "Send a notification email when:" msgstr "Enviar una notificación por correo electrónico cuando:" -#: ../../Zotlabs/Module/Settings/Channel.php:534 +#: ../../Zotlabs/Module/Settings/Channel.php:537 msgid "You receive a connection request" msgstr "Reciba una solicitud de conexión" -#: ../../Zotlabs/Module/Settings/Channel.php:535 +#: ../../Zotlabs/Module/Settings/Channel.php:538 msgid "Your connections are confirmed" msgstr "Sus conexiones hayan sido confirmadas" -#: ../../Zotlabs/Module/Settings/Channel.php:536 +#: ../../Zotlabs/Module/Settings/Channel.php:539 msgid "Someone writes on your profile wall" msgstr "Alguien escriba en la página de su perfil (\"muro\")" -#: ../../Zotlabs/Module/Settings/Channel.php:537 +#: ../../Zotlabs/Module/Settings/Channel.php:540 msgid "Someone writes a followup comment" msgstr "Alguien escriba un comentario sobre sus publicaciones" -#: ../../Zotlabs/Module/Settings/Channel.php:538 +#: ../../Zotlabs/Module/Settings/Channel.php:541 msgid "You receive a private message" msgstr "Reciba un mensaje privado" -#: ../../Zotlabs/Module/Settings/Channel.php:539 +#: ../../Zotlabs/Module/Settings/Channel.php:542 msgid "You receive a friend suggestion" msgstr "Reciba una sugerencia de amistad" -#: ../../Zotlabs/Module/Settings/Channel.php:540 +#: ../../Zotlabs/Module/Settings/Channel.php:543 msgid "You are tagged in a post" msgstr "Usted sea etiquetado en una publicación" -#: ../../Zotlabs/Module/Settings/Channel.php:541 +#: ../../Zotlabs/Module/Settings/Channel.php:544 msgid "You are poked/prodded/etc. in a post" msgstr "Reciba un toque o incitación en una publicación" -#: ../../Zotlabs/Module/Settings/Channel.php:543 +#: ../../Zotlabs/Module/Settings/Channel.php:546 msgid "Someone likes your post/comment" msgstr "Alguien muestre agrado por su entrada o comentario" -#: ../../Zotlabs/Module/Settings/Channel.php:546 +#: ../../Zotlabs/Module/Settings/Channel.php:549 msgid "Show visual notifications including:" msgstr "Mostrar notificaciones visuales que incluyan:" -#: ../../Zotlabs/Module/Settings/Channel.php:548 +#: ../../Zotlabs/Module/Settings/Channel.php:551 msgid "Unseen grid activity" msgstr "Nueva actividad en la red" -#: ../../Zotlabs/Module/Settings/Channel.php:549 +#: ../../Zotlabs/Module/Settings/Channel.php:552 msgid "Unseen channel activity" msgstr "Actividad no vista en el canal" -#: ../../Zotlabs/Module/Settings/Channel.php:550 +#: ../../Zotlabs/Module/Settings/Channel.php:553 msgid "Unseen private messages" msgstr "Mensajes privados no leídos" -#: ../../Zotlabs/Module/Settings/Channel.php:550 -#: ../../Zotlabs/Module/Settings/Channel.php:555 -#: ../../Zotlabs/Module/Settings/Channel.php:556 -#: ../../Zotlabs/Module/Settings/Channel.php:557 +#: ../../Zotlabs/Module/Settings/Channel.php:553 +#: ../../Zotlabs/Module/Settings/Channel.php:558 +#: ../../Zotlabs/Module/Settings/Channel.php:559 +#: ../../Zotlabs/Module/Settings/Channel.php:560 #: ../../addon/jappixmini/jappixmini.php:343 msgid "Recommended" msgstr "Recomendado" -#: ../../Zotlabs/Module/Settings/Channel.php:551 +#: ../../Zotlabs/Module/Settings/Channel.php:554 msgid "Upcoming events" msgstr "Próximos eventos" -#: ../../Zotlabs/Module/Settings/Channel.php:552 +#: ../../Zotlabs/Module/Settings/Channel.php:555 msgid "Events today" msgstr "Eventos de hoy" -#: ../../Zotlabs/Module/Settings/Channel.php:553 +#: ../../Zotlabs/Module/Settings/Channel.php:556 msgid "Upcoming birthdays" msgstr "Próximos cumpleaños" -#: ../../Zotlabs/Module/Settings/Channel.php:553 +#: ../../Zotlabs/Module/Settings/Channel.php:556 msgid "Not available in all themes" msgstr "No disponible en todos los temas" -#: ../../Zotlabs/Module/Settings/Channel.php:554 +#: ../../Zotlabs/Module/Settings/Channel.php:557 msgid "System (personal) notifications" msgstr "Notificaciones del sistema (personales)" -#: ../../Zotlabs/Module/Settings/Channel.php:555 +#: ../../Zotlabs/Module/Settings/Channel.php:558 msgid "System info messages" msgstr "Mensajes de información del sistema" -#: ../../Zotlabs/Module/Settings/Channel.php:556 +#: ../../Zotlabs/Module/Settings/Channel.php:559 msgid "System critical alerts" msgstr "Alertas críticas del sistema" -#: ../../Zotlabs/Module/Settings/Channel.php:557 +#: ../../Zotlabs/Module/Settings/Channel.php:560 msgid "New connections" msgstr "Nuevas conexiones" -#: ../../Zotlabs/Module/Settings/Channel.php:558 +#: ../../Zotlabs/Module/Settings/Channel.php:561 msgid "System Registrations" msgstr "Registros del sistema" -#: ../../Zotlabs/Module/Settings/Channel.php:559 +#: ../../Zotlabs/Module/Settings/Channel.php:562 +msgid "Unseen shared files" +msgstr "Ficheros compartidos no vistos" + +#: ../../Zotlabs/Module/Settings/Channel.php:563 +msgid "Unseen public activity" +msgstr "Actividad pública no vista" + +#: ../../Zotlabs/Module/Settings/Channel.php:564 msgid "" "Also show new wall posts, private messages and connections under Notices" msgstr "Mostrar también en Avisos las nuevas publicaciones, los mensajes privados y las conexiones" -#: ../../Zotlabs/Module/Settings/Channel.php:561 +#: ../../Zotlabs/Module/Settings/Channel.php:566 msgid "Notify me of events this many days in advance" msgstr "Avisarme de los eventos con algunos días de antelación" -#: ../../Zotlabs/Module/Settings/Channel.php:561 +#: ../../Zotlabs/Module/Settings/Channel.php:566 msgid "Must be greater than 0" msgstr "Debe ser mayor que 0" -#: ../../Zotlabs/Module/Settings/Channel.php:567 +#: ../../Zotlabs/Module/Settings/Channel.php:572 msgid "Advanced Account/Page Type Settings" msgstr "Ajustes avanzados de la cuenta y de los tipos de página" -#: ../../Zotlabs/Module/Settings/Channel.php:568 +#: ../../Zotlabs/Module/Settings/Channel.php:573 msgid "Change the behaviour of this account for special situations" msgstr "Cambiar el comportamiento de esta cuenta en situaciones especiales" -#: ../../Zotlabs/Module/Settings/Channel.php:570 +#: ../../Zotlabs/Module/Settings/Channel.php:575 msgid "Miscellaneous Settings" msgstr "Ajustes diversos" -#: ../../Zotlabs/Module/Settings/Channel.php:571 +#: ../../Zotlabs/Module/Settings/Channel.php:576 msgid "Default photo upload folder" msgstr "Carpeta por defecto de las fotos subidas" -#: ../../Zotlabs/Module/Settings/Channel.php:571 -#: ../../Zotlabs/Module/Settings/Channel.php:572 +#: ../../Zotlabs/Module/Settings/Channel.php:576 +#: ../../Zotlabs/Module/Settings/Channel.php:577 msgid "%Y - current year, %m - current month" msgstr "%Y - año en curso, %m - mes actual" -#: ../../Zotlabs/Module/Settings/Channel.php:572 +#: ../../Zotlabs/Module/Settings/Channel.php:577 msgid "Default file upload folder" msgstr "Carpeta por defecto de los ficheros subidos" -#: ../../Zotlabs/Module/Settings/Channel.php:574 +#: ../../Zotlabs/Module/Settings/Channel.php:579 msgid "Personal menu to display in your channel pages" msgstr "Menú personal que debe mostrarse en las páginas de su canal" -#: ../../Zotlabs/Module/Settings/Channel.php:576 +#: ../../Zotlabs/Module/Settings/Channel.php:581 msgid "Remove this channel." msgstr "Eliminar este canal." -#: ../../Zotlabs/Module/Settings/Channel.php:577 +#: ../../Zotlabs/Module/Settings/Channel.php:582 msgid "Firefox Share $Projectname provider" msgstr "Servicio de compartición de Firefox: proveedor $Projectname" -#: ../../Zotlabs/Module/Settings/Channel.php:578 +#: ../../Zotlabs/Module/Settings/Channel.php:583 msgid "Start calendar week on Monday" msgstr "Comenzar el calendario semanal por el lunes" @@ -3509,7 +3709,7 @@ msgid "" msgstr "También puede proporcionar, con el estilo dropbox, enlaces de acceso a sus amigos y asociados añadiendo la contraseña de inicio de sesión a cualquier dirección URL, como se muestra. Ejemplos: " #: ../../Zotlabs/Module/Settings/Tokens.php:150 -#: ../../Zotlabs/Widget/Settings_menu.php:90 +#: ../../Zotlabs/Widget/Settings_menu.php:92 msgid "Guest Access Tokens" msgstr "Tokens de acceso para invitados" @@ -3526,7 +3726,7 @@ msgid "Expires (yyyy-mm-dd)" msgstr "Expira (aaaa-mm-dd)" #: ../../Zotlabs/Module/Settings/Tokens.php:160 -#: ../../Zotlabs/Module/Connedit.php:885 +#: ../../Zotlabs/Module/Connedit.php:903 msgid "Their Settings" msgstr "Sus ajustes" @@ -3603,27 +3803,27 @@ msgstr "Eliminar cuenta" msgid "Remove this account including all its channels" msgstr "Eliminar esta cuenta incluyendo todos sus canales" -#: ../../Zotlabs/Module/Settings/Featured.php:20 +#: ../../Zotlabs/Module/Settings/Featured.php:21 msgid "Affinity Slider settings updated." msgstr "Se han actualizado los ajustes del controlador de afinidad." -#: ../../Zotlabs/Module/Settings/Featured.php:34 +#: ../../Zotlabs/Module/Settings/Featured.php:36 msgid "No feature settings configured" msgstr "No se ha establecido la configuración de los complementos" -#: ../../Zotlabs/Module/Settings/Featured.php:41 +#: ../../Zotlabs/Module/Settings/Featured.php:43 msgid "Default maximum affinity level" msgstr "Nivel máximo de afinidad por defecto" -#: ../../Zotlabs/Module/Settings/Featured.php:46 +#: ../../Zotlabs/Module/Settings/Featured.php:48 msgid "Default minimum affinity level" msgstr "Nivel mínimo de afinidad por defecto" -#: ../../Zotlabs/Module/Settings/Featured.php:50 +#: ../../Zotlabs/Module/Settings/Featured.php:52 msgid "Affinity Slider Settings" msgstr "Ajustes del controlador de afinidad" -#: ../../Zotlabs/Module/Settings/Featured.php:60 +#: ../../Zotlabs/Module/Settings/Featured.php:62 msgid "Feature/Addon Settings" msgstr "Ajustes de los complementos" @@ -3817,32 +4017,24 @@ msgid "Remove authorization" msgstr "Eliminar autorización" #: ../../Zotlabs/Module/Embedphotos.php:140 -#: ../../Zotlabs/Module/Photos.php:751 ../../Zotlabs/Module/Photos.php:1290 -#: ../../Zotlabs/Widget/Album.php:78 +#: ../../Zotlabs/Module/Photos.php:753 ../../Zotlabs/Module/Photos.php:1292 +#: ../../Zotlabs/Widget/Portfolio.php:78 ../../Zotlabs/Widget/Album.php:78 msgid "View Photo" msgstr "Ver foto" -#: ../../Zotlabs/Module/Embedphotos.php:146 -#: ../../Zotlabs/Module/Photos.php:757 ../../Zotlabs/Module/Photos.php:1213 -#: ../../Zotlabs/Lib/Apps.php:571 ../../Zotlabs/Lib/Apps.php:649 -#: ../../Zotlabs/Storage/Browser.php:163 ../../Zotlabs/Widget/Album.php:84 -#: ../../addon/cdav/Mod_Cdav.php:745 ../../addon/cdav/Mod_Cdav.php:746 -#: ../../addon/cdav/Mod_Cdav.php:753 ../../include/conversation.php:1110 -msgid "Unknown" -msgstr "Desconocido" - #: ../../Zotlabs/Module/Embedphotos.php:156 -#: ../../Zotlabs/Module/Photos.php:782 ../../Zotlabs/Widget/Album.php:95 +#: ../../Zotlabs/Module/Photos.php:784 ../../Zotlabs/Widget/Portfolio.php:97 +#: ../../Zotlabs/Widget/Album.php:95 msgid "Edit Album" msgstr "Editar álbum" #: ../../Zotlabs/Module/Embedphotos.php:158 -#: ../../Zotlabs/Module/Photos.php:784 ../../Zotlabs/Module/Photos.php:1321 +#: ../../Zotlabs/Module/Photos.php:786 ../../Zotlabs/Module/Photos.php:1323 #: ../../Zotlabs/Module/Profile_photo.php:423 #: ../../Zotlabs/Module/Cover_photo.php:361 -#: ../../Zotlabs/Storage/Browser.php:229 ../../Zotlabs/Storage/Browser.php:334 -#: ../../Zotlabs/Widget/Album.php:97 ../../addon/cdav/include/widgets.php:132 -#: ../../addon/cdav/include/widgets.php:168 +#: ../../Zotlabs/Storage/Browser.php:230 ../../Zotlabs/Storage/Browser.php:337 +#: ../../Zotlabs/Widget/Cdav.php:132 ../../Zotlabs/Widget/Cdav.php:168 +#: ../../Zotlabs/Widget/Portfolio.php:99 ../../Zotlabs/Widget/Album.php:97 msgid "Upload" msgstr "Subir" @@ -3904,9 +4096,9 @@ msgid "URL for photo of thing (optional)" msgstr "Dirección para la foto o elemento (opcional)" #: ../../Zotlabs/Module/Thing.php:313 ../../Zotlabs/Module/Thing.php:363 -#: ../../Zotlabs/Module/Photos.php:647 ../../Zotlabs/Module/Photos.php:1011 -#: ../../Zotlabs/Module/Connedit.php:672 ../../Zotlabs/Module/Chat.php:233 -#: ../../Zotlabs/Module/Filestorage.php:152 +#: ../../Zotlabs/Module/Photos.php:649 ../../Zotlabs/Module/Photos.php:1013 +#: ../../Zotlabs/Module/Connedit.php:672 ../../Zotlabs/Module/Chat.php:235 +#: ../../Zotlabs/Module/Filestorage.php:142 #: ../../include/acl_selectors.php:218 msgid "Permissions" msgstr "Permisos" @@ -3929,52 +4121,52 @@ msgstr "Notificaciones del sistema" msgid "Channel added." msgstr "Canal añadido." -#: ../../Zotlabs/Module/Import.php:144 +#: ../../Zotlabs/Module/Import.php:143 #, php-format msgid "Your service plan only allows %d channels." msgstr "Su paquete de servicios solo permite %d canales." -#: ../../Zotlabs/Module/Import.php:158 +#: ../../Zotlabs/Module/Import.php:157 msgid "No channel. Import failed." msgstr "No hay canal. La importación ha fallado" -#: ../../Zotlabs/Module/Import.php:466 +#: ../../Zotlabs/Module/Import.php:470 #: ../../addon/diaspora/import_diaspora.php:142 msgid "Import completed." msgstr "Importación completada." -#: ../../Zotlabs/Module/Import.php:494 +#: ../../Zotlabs/Module/Import.php:498 msgid "You must be logged in to use this feature." msgstr "Debe estar registrado para poder usar esta funcionalidad." -#: ../../Zotlabs/Module/Import.php:499 +#: ../../Zotlabs/Module/Import.php:503 msgid "Import Channel" msgstr "Importar canal" -#: ../../Zotlabs/Module/Import.php:500 +#: ../../Zotlabs/Module/Import.php:504 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 "Emplee este formulario para importar un canal desde un servidor/hub diferente. Puede recuperar el canal desde el antiguo servidor/hub a través de la red o proporcionando un fichero de exportación." -#: ../../Zotlabs/Module/Import.php:502 +#: ../../Zotlabs/Module/Import.php:506 msgid "Or provide the old server/hub details" msgstr "O proporcione los detalles de su antiguo servidor/hub" -#: ../../Zotlabs/Module/Import.php:503 +#: ../../Zotlabs/Module/Import.php:507 msgid "Your old identity address (xyz@example.com)" msgstr "Su identidad en el antiguo servidor (canal@ejemplo.com)" -#: ../../Zotlabs/Module/Import.php:504 +#: ../../Zotlabs/Module/Import.php:508 msgid "Your old login email address" msgstr "Su antigua dirección de correo electrónico" -#: ../../Zotlabs/Module/Import.php:505 +#: ../../Zotlabs/Module/Import.php:509 msgid "Your old login password" msgstr "Su antigua contraseña" -#: ../../Zotlabs/Module/Import.php:506 +#: ../../Zotlabs/Module/Import.php:510 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" @@ -3982,19 +4174,19 @@ msgid "" "primary location for files, photos, and media." msgstr "Para cualquiera de las opciones, elija si hacer de este servidor su nueva dirección primaria, o si su antigua dirección debe continuar con este papel. Usted podrá publicar desde cualquier ubicación, pero sólo una puede estar marcada como la ubicación principal para los ficheros, fotos y otras imágenes o vídeos." -#: ../../Zotlabs/Module/Import.php:507 +#: ../../Zotlabs/Module/Import.php:511 msgid "Make this hub my primary location" msgstr "Convertir este servidor en mi ubicación primaria" -#: ../../Zotlabs/Module/Import.php:508 +#: ../../Zotlabs/Module/Import.php:512 msgid "Move this channel (disable all previous locations)" msgstr "Mover este canal (desactivar todas las ubicaciones anteriores)" -#: ../../Zotlabs/Module/Import.php:509 +#: ../../Zotlabs/Module/Import.php:513 msgid "Import a few months of posts if possible (limited by available memory" msgstr "Importar unos meses de mensajes si es posible (limitado por la memoria disponible" -#: ../../Zotlabs/Module/Import.php:510 +#: ../../Zotlabs/Module/Import.php:514 msgid "" "This process may take several minutes to complete. Please submit the form " "only once and leave this page open until finished." @@ -4004,21 +4196,21 @@ msgstr "Este proceso puede tardar varios minutos en completarse. Por favor enví msgid "Authentication failed." msgstr "Falló la autenticación." -#: ../../Zotlabs/Module/Rmagic.php:75 ../../include/channel.php:1984 +#: ../../Zotlabs/Module/Rmagic.php:75 ../../include/channel.php:2102 msgid "Remote Authentication" msgstr "Acceso desde su servidor" -#: ../../Zotlabs/Module/Rmagic.php:76 ../../include/channel.php:1985 +#: ../../Zotlabs/Module/Rmagic.php:76 ../../include/channel.php:2103 msgid "Enter your channel address (e.g. channel@example.com)" msgstr "Introduzca la dirección del canal (p.ej. canal@ejemplo.com)" -#: ../../Zotlabs/Module/Rmagic.php:77 ../../include/channel.php:1986 +#: ../../Zotlabs/Module/Rmagic.php:77 ../../include/channel.php:2104 msgid "Authenticate" msgstr "Acceder" #: ../../Zotlabs/Module/Cal.php:62 ../../Zotlabs/Module/Chanview.php:96 -#: ../../Zotlabs/Module/Page.php:56 ../../Zotlabs/Module/Wall_upload.php:31 -#: ../../Zotlabs/Module/Block.php:43 +#: ../../Zotlabs/Module/Page.php:75 ../../Zotlabs/Module/Wall_upload.php:31 +#: ../../Zotlabs/Module/Block.php:41 msgid "Channel not found." msgstr "Canal no encontrado." @@ -4026,7 +4218,7 @@ msgstr "Canal no encontrado." msgid "Permissions denied." msgstr "Permisos denegados." -#: ../../Zotlabs/Module/Cal.php:342 ../../include/text.php:2291 +#: ../../Zotlabs/Module/Cal.php:342 ../../include/text.php:2304 msgid "Import" msgstr "Importar" @@ -4052,13 +4244,13 @@ msgstr "¿Desea autorizar a esta aplicación a acceder a sus publicaciones y con msgid "Item not available." msgstr "Elemento no disponible" -#: ../../Zotlabs/Module/Editblock.php:116 ../../Zotlabs/Module/Chat.php:205 -#: ../../Zotlabs/Module/Editwebpage.php:143 ../../Zotlabs/Module/Mail.php:306 -#: ../../Zotlabs/Module/Mail.php:448 ../../include/conversation.php:1228 +#: ../../Zotlabs/Module/Editblock.php:116 ../../Zotlabs/Module/Chat.php:207 +#: ../../Zotlabs/Module/Editwebpage.php:143 ../../Zotlabs/Module/Mail.php:288 +#: ../../Zotlabs/Module/Mail.php:430 ../../include/conversation.php:1225 msgid "Insert web link" msgstr "Insertar enlace web" -#: ../../Zotlabs/Module/Editblock.php:129 ../../include/conversation.php:1339 +#: ../../Zotlabs/Module/Editblock.php:129 ../../include/conversation.php:1336 msgid "Title (optional)" msgstr "Título (opcional)" @@ -4066,11 +4258,11 @@ msgstr "Título (opcional)" msgid "Edit Block" msgstr "Modificar este bloque" -#: ../../Zotlabs/Module/Profile.php:91 +#: ../../Zotlabs/Module/Profile.php:93 msgid "vcard" msgstr "vcard" -#: ../../Zotlabs/Module/Apps.php:45 +#: ../../Zotlabs/Module/Apps.php:45 ../../Zotlabs/Lib/Apps.php:224 msgid "Apps" msgstr "Aplicaciones (apps)" @@ -4088,7 +4280,8 @@ msgctxt "mood" msgid "%1$s is %2$s" msgstr "%1$s está %2$s" -#: ../../Zotlabs/Module/Mood.php:135 ../../Zotlabs/Lib/Apps.php:234 +#: ../../Zotlabs/Module/Mood.php:120 ../../Zotlabs/Module/Mood.php:135 +#: ../../Zotlabs/Lib/Apps.php:247 msgid "Mood" msgstr "Estado de ánimo" @@ -4096,74 +4289,87 @@ msgstr "Estado de ánimo" msgid "Set your current mood and tell your friends" msgstr "Describir su estado de ánimo para comunicárselo a sus amigos" -#: ../../Zotlabs/Module/Connections.php:52 -#: ../../Zotlabs/Module/Connections.php:157 -#: ../../Zotlabs/Module/Connections.php:246 +#: ../../Zotlabs/Module/Connections.php:33 +#: ../../Zotlabs/Module/Connections.php:309 ../../Zotlabs/Lib/Apps.php:229 +#: ../../include/text.php:951 ../../include/nav.php:180 +msgid "Connections" +msgstr "Conexiones" + +#: ../../Zotlabs/Module/Connections.php:54 +#: ../../Zotlabs/Module/Connections.php:156 +#: ../../Zotlabs/Module/Connections.php:245 msgid "Blocked" msgstr "Bloqueadas" -#: ../../Zotlabs/Module/Connections.php:57 -#: ../../Zotlabs/Module/Connections.php:164 -#: ../../Zotlabs/Module/Connections.php:245 +#: ../../Zotlabs/Module/Connections.php:59 +#: ../../Zotlabs/Module/Connections.php:163 +#: ../../Zotlabs/Module/Connections.php:244 msgid "Ignored" msgstr "Ignoradas" -#: ../../Zotlabs/Module/Connections.php:62 -#: ../../Zotlabs/Module/Connections.php:178 -#: ../../Zotlabs/Module/Connections.php:244 +#: ../../Zotlabs/Module/Connections.php:64 +#: ../../Zotlabs/Module/Connections.php:177 +#: ../../Zotlabs/Module/Connections.php:243 msgid "Hidden" msgstr "Ocultas" -#: ../../Zotlabs/Module/Connections.php:67 -#: ../../Zotlabs/Module/Connections.php:171 -#: ../../Zotlabs/Module/Connections.php:243 -msgid "Archived" -msgstr "Archivadas" +#: ../../Zotlabs/Module/Connections.php:69 +#: ../../Zotlabs/Module/Connections.php:170 +msgid "Archived/Unreachable" +msgstr "Archivada o inaccesible" -#: ../../Zotlabs/Module/Connections.php:72 -#: ../../Zotlabs/Module/Connections.php:82 ../../Zotlabs/Module/Menu.php:116 -#: ../../include/conversation.php:1666 +#: ../../Zotlabs/Module/Connections.php:74 +#: ../../Zotlabs/Module/Connections.php:83 ../../Zotlabs/Module/Menu.php:116 +#: ../../include/conversation.php:1663 msgid "New" msgstr "Nuevas" #: ../../Zotlabs/Module/Connections.php:88 -#: ../../Zotlabs/Module/Connections.php:103 +#: ../../Zotlabs/Module/Connections.php:102 #: ../../Zotlabs/Module/Connedit.php:709 ../../Zotlabs/Widget/Affinity.php:30 msgid "All" msgstr "Todos/as" -#: ../../Zotlabs/Module/Connections.php:134 +#: ../../Zotlabs/Module/Connections.php:133 msgid "New Connections" msgstr "Nuevas conexiones" -#: ../../Zotlabs/Module/Connections.php:137 +#: ../../Zotlabs/Module/Connections.php:136 msgid "Show pending (new) connections" msgstr "Mostrar conexiones (nuevas) pendientes" -#: ../../Zotlabs/Module/Connections.php:144 +#: ../../Zotlabs/Module/Connections.php:143 msgid "Show all connections" msgstr "Mostrar todas las conexiones" -#: ../../Zotlabs/Module/Connections.php:160 +#: ../../Zotlabs/Module/Connections.php:159 msgid "Only show blocked connections" msgstr "Mostrar solo las conexiones bloqueadas" -#: ../../Zotlabs/Module/Connections.php:167 +#: ../../Zotlabs/Module/Connections.php:166 msgid "Only show ignored connections" msgstr "Mostrar solo conexiones ignoradas" -#: ../../Zotlabs/Module/Connections.php:174 -msgid "Only show archived connections" -msgstr "Mostrar solo las conexiones archivadas" +#: ../../Zotlabs/Module/Connections.php:173 +msgid "Only show archived/unreachable connections" +msgstr "Mostrar solo las conexiones archivadas o inaccesibles" -#: ../../Zotlabs/Module/Connections.php:181 +#: ../../Zotlabs/Module/Connections.php:180 msgid "Only show hidden connections" msgstr "Mostrar solo las conexiones ocultas" -#: ../../Zotlabs/Module/Connections.php:242 +#: ../../Zotlabs/Module/Connections.php:241 msgid "Pending approval" msgstr "Pendiente de aprobación" +#: ../../Zotlabs/Module/Connections.php:242 +msgid "Archived" +msgstr "Archivadas" + +#: ../../Zotlabs/Module/Connections.php:246 +msgid "Not connected at this location" +msgstr "No está conectado/a en esta ubicación" + #: ../../Zotlabs/Module/Connections.php:258 #, php-format msgid "%1$s [%2$s]" @@ -4173,61 +4379,56 @@ msgstr "%1$s [%2$s]" msgid "Edit connection" msgstr "Editar conexión" -#: ../../Zotlabs/Module/Connections.php:260 +#: ../../Zotlabs/Module/Connections.php:261 msgid "Delete connection" msgstr "Eliminar conexión" -#: ../../Zotlabs/Module/Connections.php:269 +#: ../../Zotlabs/Module/Connections.php:270 msgid "Channel address" msgstr "Dirección del canal" -#: ../../Zotlabs/Module/Connections.php:271 +#: ../../Zotlabs/Module/Connections.php:272 msgid "Network" msgstr "Red" -#: ../../Zotlabs/Module/Connections.php:274 +#: ../../Zotlabs/Module/Connections.php:275 msgid "Call" msgstr "Llamar" -#: ../../Zotlabs/Module/Connections.php:276 +#: ../../Zotlabs/Module/Connections.php:277 msgid "Status" msgstr "Estado" -#: ../../Zotlabs/Module/Connections.php:278 +#: ../../Zotlabs/Module/Connections.php:279 msgid "Connected" msgstr "Conectado/a" -#: ../../Zotlabs/Module/Connections.php:280 +#: ../../Zotlabs/Module/Connections.php:281 msgid "Approve connection" msgstr "Aprobar esta conexión" -#: ../../Zotlabs/Module/Connections.php:282 +#: ../../Zotlabs/Module/Connections.php:283 msgid "Ignore connection" msgstr "Ignorar esta conexión" -#: ../../Zotlabs/Module/Connections.php:283 +#: ../../Zotlabs/Module/Connections.php:284 #: ../../Zotlabs/Module/Connedit.php:626 msgid "Ignore" msgstr "Ignorar" -#: ../../Zotlabs/Module/Connections.php:284 +#: ../../Zotlabs/Module/Connections.php:285 msgid "Recent activity" msgstr "Actividad reciente" -#: ../../Zotlabs/Module/Connections.php:308 ../../Zotlabs/Lib/Apps.php:216 -#: ../../include/text.php:957 ../../include/nav.php:185 -msgid "Connections" -msgstr "Conexiones" - -#: ../../Zotlabs/Module/Connections.php:313 +#: ../../Zotlabs/Module/Connections.php:314 msgid "Search your connections" msgstr "Buscar sus conexiones" -#: ../../Zotlabs/Module/Connections.php:314 +#: ../../Zotlabs/Module/Connections.php:315 msgid "Connections search" msgstr "Buscar conexiones" -#: ../../Zotlabs/Module/Connections.php:315 +#: ../../Zotlabs/Module/Connections.php:316 #: ../../Zotlabs/Module/Directory.php:391 #: ../../Zotlabs/Module/Directory.php:396 ../../include/contact_widgets.php:23 msgid "Find" @@ -4241,15 +4442,19 @@ msgstr "elemento" msgid "Source of Item" msgstr "Origen del elemento" -#: ../../Zotlabs/Module/Bookmarks.php:53 +#: ../../Zotlabs/Module/Bookmarks.php:11 ../../Zotlabs/Lib/Apps.php:227 +msgid "View Bookmarks" +msgstr "Ver los marcadores" + +#: ../../Zotlabs/Module/Bookmarks.php:56 msgid "Bookmark added" msgstr "Marcador añadido" -#: ../../Zotlabs/Module/Bookmarks.php:76 +#: ../../Zotlabs/Module/Bookmarks.php:79 msgid "My Bookmarks" msgstr "Mis marcadores" -#: ../../Zotlabs/Module/Bookmarks.php:87 +#: ../../Zotlabs/Module/Bookmarks.php:90 msgid "My Connections Bookmarks" msgstr "Marcadores de mis conexiones" @@ -4293,7 +4498,7 @@ msgstr "Álbum no encontrado." msgid "Delete Album" msgstr "Borrar álbum" -#: ../../Zotlabs/Module/Photos.php:174 ../../Zotlabs/Module/Photos.php:1023 +#: ../../Zotlabs/Module/Photos.php:174 ../../Zotlabs/Module/Photos.php:1025 msgid "Delete Photo" msgstr "Borrar foto" @@ -4305,226 +4510,232 @@ msgstr "No hay fotos seleccionadas" msgid "Access to this item is restricted." msgstr "El acceso a este elemento está restringido." -#: ../../Zotlabs/Module/Photos.php:591 +#: ../../Zotlabs/Module/Photos.php:558 ../../Zotlabs/Module/Fbrowser.php:29 +#: ../../Zotlabs/Lib/Apps.php:242 ../../include/conversation.php:1780 +#: ../../include/nav.php:378 +msgid "Photos" +msgstr "Fotos" + +#: ../../Zotlabs/Module/Photos.php:593 #, php-format msgid "%1$.2f MB of %2$.2f MB photo storage used." msgstr "%1$.2f MB de %2$.2f MB de almacenamiento de fotos utilizado." -#: ../../Zotlabs/Module/Photos.php:594 +#: ../../Zotlabs/Module/Photos.php:596 #, php-format msgid "%1$.2f MB photo storage used." msgstr "%1$.2f MB de almacenamiento de fotos utilizado." -#: ../../Zotlabs/Module/Photos.php:636 +#: ../../Zotlabs/Module/Photos.php:638 msgid "Upload Photos" msgstr "Subir fotos" -#: ../../Zotlabs/Module/Photos.php:640 +#: ../../Zotlabs/Module/Photos.php:642 msgid "Enter an album name" msgstr "Introducir un nombre de álbum" -#: ../../Zotlabs/Module/Photos.php:641 +#: ../../Zotlabs/Module/Photos.php:643 msgid "or select an existing album (doubleclick)" msgstr "o seleccionar uno existente (doble click)" -#: ../../Zotlabs/Module/Photos.php:642 +#: ../../Zotlabs/Module/Photos.php:644 msgid "Create a status post for this upload" msgstr "Crear un mensaje de estado para esta subida" -#: ../../Zotlabs/Module/Photos.php:643 +#: ../../Zotlabs/Module/Photos.php:645 msgid "Caption (optional):" msgstr "Título (opcional):" -#: ../../Zotlabs/Module/Photos.php:644 +#: ../../Zotlabs/Module/Photos.php:646 msgid "Description (optional):" msgstr "Descripción (opcional):" -#: ../../Zotlabs/Module/Photos.php:725 +#: ../../Zotlabs/Module/Photos.php:727 msgid "Show Newest First" msgstr "Mostrar lo más reciente primero" -#: ../../Zotlabs/Module/Photos.php:727 +#: ../../Zotlabs/Module/Photos.php:729 msgid "Show Oldest First" msgstr "Mostrar lo más antiguo primero" -#: ../../Zotlabs/Module/Photos.php:832 +#: ../../Zotlabs/Module/Photos.php:834 msgid "Permission denied. Access to this item may be restricted." msgstr "Permiso denegado. El acceso a este elemento puede estar restringido." -#: ../../Zotlabs/Module/Photos.php:834 +#: ../../Zotlabs/Module/Photos.php:836 msgid "Photo not available" msgstr "Foto no disponible" -#: ../../Zotlabs/Module/Photos.php:892 +#: ../../Zotlabs/Module/Photos.php:894 msgid "Use as profile photo" msgstr "Usar como foto del perfil" -#: ../../Zotlabs/Module/Photos.php:893 +#: ../../Zotlabs/Module/Photos.php:895 msgid "Use as cover photo" msgstr "Usar como imagen de portada del perfil" -#: ../../Zotlabs/Module/Photos.php:900 +#: ../../Zotlabs/Module/Photos.php:902 msgid "Private Photo" msgstr "Foto privada" -#: ../../Zotlabs/Module/Photos.php:915 +#: ../../Zotlabs/Module/Photos.php:917 msgid "View Full Size" msgstr "Ver tamaño completo" -#: ../../Zotlabs/Module/Photos.php:997 +#: ../../Zotlabs/Module/Photos.php:999 msgid "Edit photo" msgstr "Editar foto" -#: ../../Zotlabs/Module/Photos.php:999 +#: ../../Zotlabs/Module/Photos.php:1001 msgid "Rotate CW (right)" msgstr "Girar CW (a la derecha)" -#: ../../Zotlabs/Module/Photos.php:1000 +#: ../../Zotlabs/Module/Photos.php:1002 msgid "Rotate CCW (left)" msgstr "Girar CCW (a la izquierda)" -#: ../../Zotlabs/Module/Photos.php:1003 +#: ../../Zotlabs/Module/Photos.php:1005 msgid "Move photo to album" msgstr "Mover la foto a un álbum" -#: ../../Zotlabs/Module/Photos.php:1004 +#: ../../Zotlabs/Module/Photos.php:1006 msgid "Enter a new album name" msgstr "Introducir un nuevo nombre de álbum" -#: ../../Zotlabs/Module/Photos.php:1005 +#: ../../Zotlabs/Module/Photos.php:1007 msgid "or select an existing one (doubleclick)" msgstr "o seleccionar uno (doble click) existente" -#: ../../Zotlabs/Module/Photos.php:1008 +#: ../../Zotlabs/Module/Photos.php:1010 msgid "Caption" msgstr "Título" -#: ../../Zotlabs/Module/Photos.php:1010 +#: ../../Zotlabs/Module/Photos.php:1012 msgid "Add a Tag" msgstr "Añadir una etiqueta" -#: ../../Zotlabs/Module/Photos.php:1018 +#: ../../Zotlabs/Module/Photos.php:1020 msgid "Example: @bob, @Barbara_Jensen, @jim@example.com" msgstr "Ejemplos: @eva, @Carmen_Osuna, @jaime@ejemplo.com" -#: ../../Zotlabs/Module/Photos.php:1021 +#: ../../Zotlabs/Module/Photos.php:1023 msgid "Flag as adult in album view" msgstr "Marcar como \"solo para adultos\" en el álbum" -#: ../../Zotlabs/Module/Photos.php:1040 ../../Zotlabs/Lib/ThreadItem.php:269 +#: ../../Zotlabs/Module/Photos.php:1042 ../../Zotlabs/Lib/ThreadItem.php:267 msgid "I like this (toggle)" msgstr "Me gusta (cambiar)" -#: ../../Zotlabs/Module/Photos.php:1041 ../../Zotlabs/Lib/ThreadItem.php:270 +#: ../../Zotlabs/Module/Photos.php:1043 ../../Zotlabs/Lib/ThreadItem.php:268 msgid "I don't like this (toggle)" msgstr "No me gusta esto (cambiar)" -#: ../../Zotlabs/Module/Photos.php:1043 ../../Zotlabs/Lib/ThreadItem.php:412 -#: ../../include/conversation.php:739 +#: ../../Zotlabs/Module/Photos.php:1045 ../../Zotlabs/Lib/ThreadItem.php:410 +#: ../../include/conversation.php:736 msgid "Please wait" msgstr "Espere por favor" -#: ../../Zotlabs/Module/Photos.php:1059 ../../Zotlabs/Module/Photos.php:1177 -#: ../../Zotlabs/Lib/ThreadItem.php:729 +#: ../../Zotlabs/Module/Photos.php:1061 ../../Zotlabs/Module/Photos.php:1179 +#: ../../Zotlabs/Lib/ThreadItem.php:727 msgid "This is you" msgstr "Este es usted" -#: ../../Zotlabs/Module/Photos.php:1061 ../../Zotlabs/Module/Photos.php:1179 -#: ../../Zotlabs/Lib/ThreadItem.php:731 ../../include/js_strings.php:6 +#: ../../Zotlabs/Module/Photos.php:1063 ../../Zotlabs/Module/Photos.php:1181 +#: ../../Zotlabs/Lib/ThreadItem.php:729 ../../include/js_strings.php:6 msgid "Comment" msgstr "Comentar" -#: ../../Zotlabs/Module/Photos.php:1077 ../../include/conversation.php:574 +#: ../../Zotlabs/Module/Photos.php:1079 ../../include/conversation.php:569 msgctxt "title" msgid "Likes" msgstr "Me gusta" -#: ../../Zotlabs/Module/Photos.php:1077 ../../include/conversation.php:574 +#: ../../Zotlabs/Module/Photos.php:1079 ../../include/conversation.php:569 msgctxt "title" msgid "Dislikes" msgstr "No me gusta" -#: ../../Zotlabs/Module/Photos.php:1078 ../../include/conversation.php:575 +#: ../../Zotlabs/Module/Photos.php:1080 ../../include/conversation.php:570 msgctxt "title" msgid "Agree" msgstr "De acuerdo" -#: ../../Zotlabs/Module/Photos.php:1078 ../../include/conversation.php:575 +#: ../../Zotlabs/Module/Photos.php:1080 ../../include/conversation.php:570 msgctxt "title" msgid "Disagree" msgstr "En desacuerdo" -#: ../../Zotlabs/Module/Photos.php:1078 ../../include/conversation.php:575 +#: ../../Zotlabs/Module/Photos.php:1080 ../../include/conversation.php:570 msgctxt "title" msgid "Abstain" msgstr "Abstención" -#: ../../Zotlabs/Module/Photos.php:1079 ../../include/conversation.php:576 +#: ../../Zotlabs/Module/Photos.php:1081 ../../include/conversation.php:571 msgctxt "title" msgid "Attending" msgstr "Participaré" -#: ../../Zotlabs/Module/Photos.php:1079 ../../include/conversation.php:576 +#: ../../Zotlabs/Module/Photos.php:1081 ../../include/conversation.php:571 msgctxt "title" msgid "Not attending" msgstr "No participaré" -#: ../../Zotlabs/Module/Photos.php:1079 ../../include/conversation.php:576 +#: ../../Zotlabs/Module/Photos.php:1081 ../../include/conversation.php:571 msgctxt "title" msgid "Might attend" msgstr "Quizá participe" -#: ../../Zotlabs/Module/Photos.php:1096 ../../Zotlabs/Module/Photos.php:1108 +#: ../../Zotlabs/Module/Photos.php:1098 ../../Zotlabs/Module/Photos.php:1110 #: ../../Zotlabs/Lib/ThreadItem.php:187 ../../Zotlabs/Lib/ThreadItem.php:199 msgid "View all" msgstr "Ver todo" -#: ../../Zotlabs/Module/Photos.php:1100 ../../Zotlabs/Lib/ThreadItem.php:191 -#: ../../include/conversation.php:1907 ../../include/channel.php:1268 -#: ../../include/taxonomy.php:403 +#: ../../Zotlabs/Module/Photos.php:1102 ../../Zotlabs/Lib/ThreadItem.php:191 +#: ../../include/conversation.php:1904 ../../include/channel.php:1391 +#: ../../include/taxonomy.php:442 msgctxt "noun" msgid "Like" msgid_plural "Likes" msgstr[0] "Me gusta" msgstr[1] "Me gusta" -#: ../../Zotlabs/Module/Photos.php:1105 ../../Zotlabs/Lib/ThreadItem.php:196 -#: ../../include/conversation.php:1910 +#: ../../Zotlabs/Module/Photos.php:1107 ../../Zotlabs/Lib/ThreadItem.php:196 +#: ../../include/conversation.php:1907 msgctxt "noun" msgid "Dislike" msgid_plural "Dislikes" msgstr[0] "No me gusta" msgstr[1] "No me gusta" -#: ../../Zotlabs/Module/Photos.php:1205 +#: ../../Zotlabs/Module/Photos.php:1207 msgid "Photo Tools" msgstr "Gestión de las fotos" -#: ../../Zotlabs/Module/Photos.php:1214 +#: ../../Zotlabs/Module/Photos.php:1216 msgid "In This Photo:" msgstr "En esta foto:" -#: ../../Zotlabs/Module/Photos.php:1219 +#: ../../Zotlabs/Module/Photos.php:1221 msgid "Map" msgstr "Mapa" -#: ../../Zotlabs/Module/Photos.php:1227 ../../Zotlabs/Lib/ThreadItem.php:401 +#: ../../Zotlabs/Module/Photos.php:1229 ../../Zotlabs/Lib/ThreadItem.php:399 msgctxt "noun" msgid "Likes" msgstr "Me gusta" -#: ../../Zotlabs/Module/Photos.php:1228 ../../Zotlabs/Lib/ThreadItem.php:402 +#: ../../Zotlabs/Module/Photos.php:1230 ../../Zotlabs/Lib/ThreadItem.php:400 msgctxt "noun" msgid "Dislikes" msgstr "No me gusta" -#: ../../Zotlabs/Module/Photos.php:1233 ../../Zotlabs/Lib/ThreadItem.php:407 +#: ../../Zotlabs/Module/Photos.php:1235 ../../Zotlabs/Lib/ThreadItem.php:405 #: ../../include/acl_selectors.php:220 msgid "Close" msgstr "Cerrar" -#: ../../Zotlabs/Module/Photos.php:1305 ../../Zotlabs/Module/Photos.php:1318 -#: ../../Zotlabs/Module/Photos.php:1319 ../../include/photos.php:529 +#: ../../Zotlabs/Module/Photos.php:1307 ../../Zotlabs/Module/Photos.php:1320 +#: ../../Zotlabs/Module/Photos.php:1321 ../../include/photos.php:526 msgid "Recent Photos" msgstr "Fotos recientes" @@ -4540,163 +4751,169 @@ msgstr "No encontrado" msgid "Invalid channel" msgstr "Canal no válido" -#: ../../Zotlabs/Module/Wiki.php:160 ../../addon/gitwiki/Mod_Gitwiki.php:146 -#: ../../include/conversation.php:1854 ../../include/nav.php:462 +#: ../../Zotlabs/Module/Wiki.php:79 ../../Zotlabs/Lib/Apps.php:239 +#: ../../include/conversation.php:1854 ../../include/features.php:95 +#: ../../include/nav.php:451 +msgid "Wiki" +msgstr "Wiki" + +#: ../../Zotlabs/Module/Wiki.php:162 ../../addon/gitwiki/Mod_Gitwiki.php:146 +#: ../../include/conversation.php:1851 ../../include/nav.php:448 msgid "Wikis" msgstr "Wikis" -#: ../../Zotlabs/Module/Wiki.php:166 ../../addon/gitwiki/Mod_Gitwiki.php:152 +#: ../../Zotlabs/Module/Wiki.php:168 ../../addon/gitwiki/Mod_Gitwiki.php:152 msgid "Download" msgstr "Descargar" -#: ../../Zotlabs/Module/Wiki.php:168 ../../Zotlabs/Module/Chat.php:254 -#: ../../Zotlabs/Module/Profiles.php:834 ../../Zotlabs/Module/Manage.php:143 +#: ../../Zotlabs/Module/Wiki.php:170 ../../Zotlabs/Module/Chat.php:256 +#: ../../Zotlabs/Module/Profiles.php:834 ../../Zotlabs/Module/Manage.php:145 #: ../../addon/gitwiki/Mod_Gitwiki.php:154 msgid "Create New" msgstr "Crear" -#: ../../Zotlabs/Module/Wiki.php:170 ../../addon/gitwiki/Mod_Gitwiki.php:156 +#: ../../Zotlabs/Module/Wiki.php:172 ../../addon/gitwiki/Mod_Gitwiki.php:156 msgid "Wiki name" msgstr "Nombre del wiki" -#: ../../Zotlabs/Module/Wiki.php:171 ../../addon/gitwiki/Mod_Gitwiki.php:157 +#: ../../Zotlabs/Module/Wiki.php:173 ../../addon/gitwiki/Mod_Gitwiki.php:157 msgid "Content type" msgstr "Tipo de contenido" -#: ../../Zotlabs/Module/Wiki.php:173 ../../Zotlabs/Storage/Browser.php:234 +#: ../../Zotlabs/Module/Wiki.php:175 ../../Zotlabs/Storage/Browser.php:235 #: ../../addon/gitwiki/Mod_Gitwiki.php:159 msgid "Type" msgstr "Tipo" -#: ../../Zotlabs/Module/Wiki.php:180 ../../addon/gitwiki/Mod_Gitwiki.php:166 +#: ../../Zotlabs/Module/Wiki.php:182 ../../addon/gitwiki/Mod_Gitwiki.php:166 msgid "Create a status post for this wiki" msgstr "Crear un mensaje de estado para este wiki" -#: ../../Zotlabs/Module/Wiki.php:205 ../../addon/gitwiki/Mod_Gitwiki.php:185 +#: ../../Zotlabs/Module/Wiki.php:224 ../../addon/gitwiki/Mod_Gitwiki.php:185 msgid "Wiki not found" msgstr "Wiki no encontrado" -#: ../../Zotlabs/Module/Wiki.php:229 ../../addon/gitwiki/Mod_Gitwiki.php:210 +#: ../../Zotlabs/Module/Wiki.php:248 ../../addon/gitwiki/Mod_Gitwiki.php:210 msgid "Rename page" msgstr "Renombrar la página" -#: ../../Zotlabs/Module/Wiki.php:233 ../../addon/gitwiki/Mod_Gitwiki.php:214 +#: ../../Zotlabs/Module/Wiki.php:258 ../../addon/gitwiki/Mod_Gitwiki.php:214 msgid "Error retrieving page content" msgstr "Error al recuperar el contenido de la página" -#: ../../Zotlabs/Module/Wiki.php:239 +#: ../../Zotlabs/Module/Wiki.php:264 msgid "New page" msgstr "Nueva página" -#: ../../Zotlabs/Module/Wiki.php:263 ../../addon/gitwiki/Mod_Gitwiki.php:242 +#: ../../Zotlabs/Module/Wiki.php:288 ../../addon/gitwiki/Mod_Gitwiki.php:242 msgid "Revision Comparison" msgstr "Comparación de revisiones" -#: ../../Zotlabs/Module/Wiki.php:264 ../../addon/gitwiki/Mod_Gitwiki.php:243 +#: ../../Zotlabs/Module/Wiki.php:289 ../../addon/gitwiki/Mod_Gitwiki.php:243 msgid "Revert" msgstr "Revertir" -#: ../../Zotlabs/Module/Wiki.php:268 +#: ../../Zotlabs/Module/Wiki.php:293 msgid "Short description of your changes (optional)" msgstr "Breve descripción de sus cambios (opcional)" -#: ../../Zotlabs/Module/Wiki.php:275 ../../addon/gitwiki/Mod_Gitwiki.php:252 +#: ../../Zotlabs/Module/Wiki.php:300 ../../addon/gitwiki/Mod_Gitwiki.php:252 msgid "Source" msgstr "Fuente" -#: ../../Zotlabs/Module/Wiki.php:283 ../../addon/gitwiki/Mod_Gitwiki.php:260 +#: ../../Zotlabs/Module/Wiki.php:309 ../../addon/gitwiki/Mod_Gitwiki.php:260 msgid "New page name" msgstr "Nombre de la nueva página" -#: ../../Zotlabs/Module/Wiki.php:288 ../../addon/gitwiki/Mod_Gitwiki.php:265 -#: ../../include/conversation.php:1232 +#: ../../Zotlabs/Module/Wiki.php:314 ../../addon/gitwiki/Mod_Gitwiki.php:265 +#: ../../include/conversation.php:1229 msgid "Embed image from photo albums" msgstr "Incluir una imagen de los álbumes de fotos" -#: ../../Zotlabs/Module/Wiki.php:289 ../../addon/gitwiki/Mod_Gitwiki.php:266 -#: ../../include/conversation.php:1326 +#: ../../Zotlabs/Module/Wiki.php:315 ../../addon/gitwiki/Mod_Gitwiki.php:266 +#: ../../include/conversation.php:1323 msgid "Embed an image from your albums" msgstr "Incluir una imagen de sus álbumes" -#: ../../Zotlabs/Module/Wiki.php:291 ../../addon/gitwiki/Mod_Gitwiki.php:268 -#: ../../include/conversation.php:1328 ../../include/conversation.php:1375 +#: ../../Zotlabs/Module/Wiki.php:317 ../../addon/gitwiki/Mod_Gitwiki.php:268 +#: ../../include/conversation.php:1325 ../../include/conversation.php:1372 msgid "OK" msgstr "OK" -#: ../../Zotlabs/Module/Wiki.php:292 ../../addon/gitwiki/Mod_Gitwiki.php:269 -#: ../../include/conversation.php:1268 +#: ../../Zotlabs/Module/Wiki.php:318 ../../addon/gitwiki/Mod_Gitwiki.php:269 +#: ../../include/conversation.php:1265 msgid "Choose images to embed" msgstr "Elegir imágenes para incluir" -#: ../../Zotlabs/Module/Wiki.php:293 ../../addon/gitwiki/Mod_Gitwiki.php:270 -#: ../../include/conversation.php:1269 +#: ../../Zotlabs/Module/Wiki.php:319 ../../addon/gitwiki/Mod_Gitwiki.php:270 +#: ../../include/conversation.php:1266 msgid "Choose an album" msgstr "Elegir un álbum" -#: ../../Zotlabs/Module/Wiki.php:294 ../../addon/gitwiki/Mod_Gitwiki.php:271 +#: ../../Zotlabs/Module/Wiki.php:320 ../../addon/gitwiki/Mod_Gitwiki.php:271 msgid "Choose a different album" msgstr "Elegir un álbum diferente..." -#: ../../Zotlabs/Module/Wiki.php:295 ../../addon/gitwiki/Mod_Gitwiki.php:272 -#: ../../include/conversation.php:1271 +#: ../../Zotlabs/Module/Wiki.php:321 ../../addon/gitwiki/Mod_Gitwiki.php:272 +#: ../../include/conversation.php:1268 msgid "Error getting album list" msgstr "Error al obtener la lista de álbumes" -#: ../../Zotlabs/Module/Wiki.php:296 ../../addon/gitwiki/Mod_Gitwiki.php:273 -#: ../../include/conversation.php:1272 +#: ../../Zotlabs/Module/Wiki.php:322 ../../addon/gitwiki/Mod_Gitwiki.php:273 +#: ../../include/conversation.php:1269 msgid "Error getting photo link" msgstr "Error al obtener el enlace de la foto" -#: ../../Zotlabs/Module/Wiki.php:297 ../../addon/gitwiki/Mod_Gitwiki.php:274 -#: ../../include/conversation.php:1273 +#: ../../Zotlabs/Module/Wiki.php:323 ../../addon/gitwiki/Mod_Gitwiki.php:274 +#: ../../include/conversation.php:1270 msgid "Error getting album" msgstr "Error al obtener el álbum" -#: ../../Zotlabs/Module/Wiki.php:364 ../../addon/gitwiki/Mod_Gitwiki.php:337 +#: ../../Zotlabs/Module/Wiki.php:391 ../../addon/gitwiki/Mod_Gitwiki.php:337 msgid "Error creating wiki. Invalid name." msgstr "Error al crear el wiki: el nombre no es válido." -#: ../../Zotlabs/Module/Wiki.php:371 +#: ../../Zotlabs/Module/Wiki.php:398 msgid "A wiki with this name already exists." msgstr "Ya hay un wiki con este nombre." -#: ../../Zotlabs/Module/Wiki.php:384 ../../addon/gitwiki/Mod_Gitwiki.php:348 +#: ../../Zotlabs/Module/Wiki.php:411 ../../addon/gitwiki/Mod_Gitwiki.php:348 msgid "Wiki created, but error creating Home page." msgstr "Se ha creado el wiki, pero se ha producido un error al crear la página de inicio." -#: ../../Zotlabs/Module/Wiki.php:391 ../../addon/gitwiki/Mod_Gitwiki.php:353 +#: ../../Zotlabs/Module/Wiki.php:418 ../../addon/gitwiki/Mod_Gitwiki.php:353 msgid "Error creating wiki" msgstr "Error al crear el wiki" -#: ../../Zotlabs/Module/Wiki.php:403 +#: ../../Zotlabs/Module/Wiki.php:430 msgid "Wiki delete permission denied." msgstr "Se ha denegado el permiso para eliminar el wiki." -#: ../../Zotlabs/Module/Wiki.php:413 +#: ../../Zotlabs/Module/Wiki.php:440 msgid "Error deleting wiki" msgstr "Se ha producido un error al eliminar el wiki" -#: ../../Zotlabs/Module/Wiki.php:439 ../../addon/gitwiki/Mod_Gitwiki.php:400 +#: ../../Zotlabs/Module/Wiki.php:466 ../../addon/gitwiki/Mod_Gitwiki.php:400 msgid "New page created" msgstr "Se ha creado la nueva página" -#: ../../Zotlabs/Module/Wiki.php:558 +#: ../../Zotlabs/Module/Wiki.php:587 msgid "Cannot delete Home" msgstr "No se puede eliminar la página principal" -#: ../../Zotlabs/Module/Wiki.php:622 +#: ../../Zotlabs/Module/Wiki.php:651 msgid "Current Revision" msgstr "Revisión actual" -#: ../../Zotlabs/Module/Wiki.php:622 +#: ../../Zotlabs/Module/Wiki.php:651 msgid "Selected Revision" msgstr "Revisión seleccionada" -#: ../../Zotlabs/Module/Wiki.php:672 +#: ../../Zotlabs/Module/Wiki.php:701 msgid "You must be authenticated." msgstr "Debe estar autenticado." -#: ../../Zotlabs/Module/Chanview.php:134 +#: ../../Zotlabs/Module/Chanview.php:139 msgid "toggle full screen mode" msgstr "cambiar al modo de pantalla completa" @@ -4704,7 +4921,7 @@ msgstr "cambiar al modo de pantalla completa" msgid "Layout updated." msgstr "Plantilla actualizada." -#: ../../Zotlabs/Module/Pdledit.php:34 ../../Zotlabs/Module/Chat.php:217 +#: ../../Zotlabs/Module/Pdledit.php:34 ../../Zotlabs/Module/Chat.php:219 msgid "Feature disabled." msgstr "Funcionalidad deshabilitada." @@ -4724,32 +4941,32 @@ msgstr "Nombre del módulo:" msgid "Layout Help" msgstr "Ayuda para el diseño de plantillas de página" -#: ../../Zotlabs/Module/Poke.php:168 ../../Zotlabs/Lib/Apps.php:235 -#: ../../include/conversation.php:1042 +#: ../../Zotlabs/Module/Poke.php:153 ../../Zotlabs/Module/Poke.php:182 +#: ../../Zotlabs/Lib/Apps.php:248 ../../include/conversation.php:1039 msgid "Poke" msgstr "Toques y otras cosas" -#: ../../Zotlabs/Module/Poke.php:169 +#: ../../Zotlabs/Module/Poke.php:183 msgid "Poke somebody" msgstr "Dar un toque a alguien" -#: ../../Zotlabs/Module/Poke.php:172 +#: ../../Zotlabs/Module/Poke.php:186 msgid "Poke/Prod" msgstr "Toque/Incitación" -#: ../../Zotlabs/Module/Poke.php:173 +#: ../../Zotlabs/Module/Poke.php:187 msgid "Poke, prod or do other things to somebody" msgstr "Dar un toque, incitar o hacer otras cosas a alguien" -#: ../../Zotlabs/Module/Poke.php:180 +#: ../../Zotlabs/Module/Poke.php:194 msgid "Recipient" msgstr "Destinatario" -#: ../../Zotlabs/Module/Poke.php:181 +#: ../../Zotlabs/Module/Poke.php:195 msgid "Choose what you wish to do to recipient" msgstr "Elegir qué desea enviar al destinatario" -#: ../../Zotlabs/Module/Poke.php:184 ../../Zotlabs/Module/Poke.php:185 +#: ../../Zotlabs/Module/Poke.php:198 ../../Zotlabs/Module/Poke.php:199 msgid "Make this post private" msgstr "Convertir en privado este envío" @@ -4760,7 +4977,7 @@ msgstr "Imagen actualizada, pero el recorte de la imagen ha fallado. " #: ../../Zotlabs/Module/Profile_photo.php:115 #: ../../Zotlabs/Module/Profile_photo.php:226 -#: ../../include/photo/photo_driver.php:647 +#: ../../include/photo/photo_driver.php:658 msgid "Profile Photos" msgstr "Fotos del perfil" @@ -4777,7 +4994,7 @@ msgid "" msgstr "Recargue la página o limpie el caché del navegador si la nueva foto no se muestra inmediatamente." #: ../../Zotlabs/Module/Profile_photo.php:203 -#: ../../Zotlabs/Module/Cover_photo.php:173 ../../include/photos.php:149 +#: ../../Zotlabs/Module/Cover_photo.php:173 ../../include/photos.php:145 msgid "Unable to process image" msgstr "No ha sido posible procesar la imagen" @@ -4859,64 +5076,68 @@ msgstr "Conectado/a" msgid "Unable to locate original post." msgstr "No ha sido posible encontrar la entrada original." -#: ../../Zotlabs/Module/Item.php:451 +#: ../../Zotlabs/Module/Item.php:470 msgid "Empty post discarded." msgstr "La entrada vacía ha sido desechada." -#: ../../Zotlabs/Module/Item.php:825 +#: ../../Zotlabs/Module/Item.php:844 msgid "Duplicate post suppressed." msgstr "Se ha suprimido la entrada duplicada." -#: ../../Zotlabs/Module/Item.php:955 +#: ../../Zotlabs/Module/Item.php:989 msgid "System error. Post not saved." msgstr "Error del sistema. La entrada no se ha podido salvar." -#: ../../Zotlabs/Module/Item.php:1085 +#: ../../Zotlabs/Module/Item.php:1025 +msgid "Your comment is awaiting approval." +msgstr "Su comentario está pendiente de aprobación." + +#: ../../Zotlabs/Module/Item.php:1123 msgid "Unable to obtain post information from database." msgstr "No ha sido posible obtener información de la entrada en la base de datos." -#: ../../Zotlabs/Module/Item.php:1092 +#: ../../Zotlabs/Module/Item.php:1130 #, php-format msgid "You have reached your limit of %1$.0f top level posts." msgstr "Ha alcanzado su límite de %1$.0f entradas en la página principal." -#: ../../Zotlabs/Module/Item.php:1099 +#: ../../Zotlabs/Module/Item.php:1137 #, php-format msgid "You have reached your limit of %1$.0f webpages." msgstr "Ha alcanzado su límite de %1$.0f páginas web." -#: ../../Zotlabs/Module/Ping.php:254 +#: ../../Zotlabs/Module/Ping.php:280 msgid "sent you a private message" msgstr "le ha enviado un mensaje privado" -#: ../../Zotlabs/Module/Ping.php:302 +#: ../../Zotlabs/Module/Ping.php:331 msgid "added your channel" msgstr "añadió este canal a sus conexiones" -#: ../../Zotlabs/Module/Ping.php:312 +#: ../../Zotlabs/Module/Ping.php:341 msgid "g A l F d" msgstr "g A l d F" -#: ../../Zotlabs/Module/Ping.php:330 +#: ../../Zotlabs/Module/Ping.php:359 msgid "[today]" msgstr "[hoy]" -#: ../../Zotlabs/Module/Ping.php:339 +#: ../../Zotlabs/Module/Ping.php:368 msgid "posted an event" msgstr "publicó un evento" -#: ../../Zotlabs/Module/Page.php:40 ../../Zotlabs/Module/Block.php:31 +#: ../../Zotlabs/Module/Page.php:39 ../../Zotlabs/Module/Block.php:29 msgid "Invalid item." msgstr "Elemento no válido." -#: ../../Zotlabs/Module/Page.php:94 ../../Zotlabs/Module/Block.php:79 +#: ../../Zotlabs/Module/Page.php:128 ../../Zotlabs/Module/Block.php:77 #: ../../Zotlabs/Module/Display.php:122 #: ../../Zotlabs/Lib/NativeWikiPage.php:500 ../../Zotlabs/Web/Router.php:146 #: ../../include/help.php:68 msgid "Page not found." msgstr "Página no encontrada." -#: ../../Zotlabs/Module/Page.php:131 +#: ../../Zotlabs/Module/Page.php:165 msgid "" "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod " "tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam," @@ -4964,9 +5185,9 @@ msgstr "No ha sido posible establecer los parámetros de la libreta de direccion msgid "Connection has been removed." msgstr "La conexión ha sido eliminada." -#: ../../Zotlabs/Module/Connedit.php:590 ../../Zotlabs/Lib/Apps.php:228 +#: ../../Zotlabs/Module/Connedit.php:590 ../../Zotlabs/Lib/Apps.php:241 #: ../../addon/openclipatar/openclipatar.php:57 -#: ../../include/conversation.php:982 ../../include/nav.php:106 +#: ../../include/conversation.php:979 ../../include/nav.php:102 msgid "View Profile" msgstr "Ver el perfil" @@ -5116,105 +5337,119 @@ msgstr "Ajustar el perfil" msgid "Set Affinity & Profile" msgstr "Ajustar la afinidad y el perfil" -#: ../../Zotlabs/Module/Connedit.php:844 -msgid "none" -msgstr "-" +#: ../../Zotlabs/Module/Connedit.php:851 +msgid "This connection is unreachable from this location." +msgstr "No se puede acceder a la conexión desde este sitio." -#: ../../Zotlabs/Module/Connedit.php:847 -#: ../../Zotlabs/Widget/Settings_menu.php:107 +#: ../../Zotlabs/Module/Connedit.php:852 +msgid "This connection may be unreachable from other channel locations." +msgstr "Esta conexión puede ser inaccesible desde otras ubicaciones del canal." + +#: ../../Zotlabs/Module/Connedit.php:854 +msgid "Location independence is not supported by their network." +msgstr "La independencia de ubicación no es compatible con su red." + +#: ../../Zotlabs/Module/Connedit.php:860 +msgid "" +"This connection is unreachable from this location. Location independence is " +"not supported by their network." +msgstr "Esta conexión no es accesible desde este sitio. La independencia de ubicación no es compatible con su red." + +#: ../../Zotlabs/Module/Connedit.php:863 +#: ../../Zotlabs/Widget/Settings_menu.php:109 msgid "Connection Default Permissions" msgstr "Permisos predeterminados de conexión" -#: ../../Zotlabs/Module/Connedit.php:847 ../../include/items.php:3955 +#: ../../Zotlabs/Module/Connedit.php:863 ../../include/items.php:3925 #, php-format msgid "Connection: %s" msgstr "Conexión: %s" -#: ../../Zotlabs/Module/Connedit.php:848 +#: ../../Zotlabs/Module/Connedit.php:864 msgid "Apply these permissions automatically" msgstr "Aplicar estos permisos automaticamente" -#: ../../Zotlabs/Module/Connedit.php:848 +#: ../../Zotlabs/Module/Connedit.php:864 msgid "Connection requests will be approved without your interaction" msgstr "Las solicitudes de conexión serán aprobadas sin su intervención" -#: ../../Zotlabs/Module/Connedit.php:849 +#: ../../Zotlabs/Module/Connedit.php:865 msgid "Permission role" msgstr "Rol de acceso" -#: ../../Zotlabs/Module/Connedit.php:850 +#: ../../Zotlabs/Module/Connedit.php:866 msgid "Add permission role" msgstr "Añadir un rol de acceso" -#: ../../Zotlabs/Module/Connedit.php:856 +#: ../../Zotlabs/Module/Connedit.php:873 msgid "This connection's primary address is" msgstr "La dirección primaria de esta conexión es" -#: ../../Zotlabs/Module/Connedit.php:857 +#: ../../Zotlabs/Module/Connedit.php:874 msgid "Available locations:" msgstr "Ubicaciones disponibles:" -#: ../../Zotlabs/Module/Connedit.php:861 +#: ../../Zotlabs/Module/Connedit.php:879 msgid "" "The permissions indicated on this page will be applied to all new " "connections." msgstr "Los permisos indicados en esta página serán aplicados en todas las nuevas conexiones." -#: ../../Zotlabs/Module/Connedit.php:862 +#: ../../Zotlabs/Module/Connedit.php:880 msgid "Connection Tools" msgstr "Gestión de las conexiones" -#: ../../Zotlabs/Module/Connedit.php:864 +#: ../../Zotlabs/Module/Connedit.php:882 msgid "Slide to adjust your degree of friendship" msgstr "Deslizar para ajustar el grado de amistad" -#: ../../Zotlabs/Module/Connedit.php:865 ../../Zotlabs/Module/Rate.php:155 +#: ../../Zotlabs/Module/Connedit.php:883 ../../Zotlabs/Module/Rate.php:155 #: ../../include/js_strings.php:20 msgid "Rating" msgstr "Valoración" -#: ../../Zotlabs/Module/Connedit.php:866 +#: ../../Zotlabs/Module/Connedit.php:884 msgid "Slide to adjust your rating" msgstr "Deslizar para ajustar su valoración" -#: ../../Zotlabs/Module/Connedit.php:867 ../../Zotlabs/Module/Connedit.php:872 +#: ../../Zotlabs/Module/Connedit.php:885 ../../Zotlabs/Module/Connedit.php:890 msgid "Optionally explain your rating" msgstr "Opcionalmente, puede explicar su valoración" -#: ../../Zotlabs/Module/Connedit.php:869 +#: ../../Zotlabs/Module/Connedit.php:887 msgid "Custom Filter" msgstr "Filtro personalizado" -#: ../../Zotlabs/Module/Connedit.php:870 +#: ../../Zotlabs/Module/Connedit.php:888 msgid "Only import posts with this text" msgstr "Importar solo entradas que contengan este texto" -#: ../../Zotlabs/Module/Connedit.php:870 ../../Zotlabs/Module/Connedit.php:871 +#: ../../Zotlabs/Module/Connedit.php:888 ../../Zotlabs/Module/Connedit.php:889 msgid "" "words one per line or #tags or /patterns/ or lang=xx, leave blank to import " "all posts" msgstr "Una sola opción por línea: palabras, #etiquetas, /patrones/ o lang=xx. Dejar en blanco para importarlo todo" -#: ../../Zotlabs/Module/Connedit.php:871 +#: ../../Zotlabs/Module/Connedit.php:889 msgid "Do not import posts with this text" msgstr "No importar entradas que contengan este texto" -#: ../../Zotlabs/Module/Connedit.php:873 +#: ../../Zotlabs/Module/Connedit.php:891 msgid "This information is public!" msgstr "¡Esta información es pública!" -#: ../../Zotlabs/Module/Connedit.php:878 +#: ../../Zotlabs/Module/Connedit.php:896 msgid "Connection Pending Approval" msgstr "Conexión pendiente de aprobación" -#: ../../Zotlabs/Module/Connedit.php:883 +#: ../../Zotlabs/Module/Connedit.php:901 #, php-format msgid "" "Please choose the profile you would like to display to %s when viewing your " "profile securely." msgstr "Por favor, escoja el perfil que quiere mostrar a %s cuando esté viendo su perfil de forma segura." -#: ../../Zotlabs/Module/Connedit.php:890 +#: ../../Zotlabs/Module/Connedit.php:908 msgid "" "Some permissions may be inherited from your channel's privacy settings, which have higher " @@ -5222,173 +5457,85 @@ msgid "" "they wont have any impact unless the inherited setting changes." msgstr "Algunos permisos pueden ser heredados de los ajustes de privacidad de sus canales, los cuales tienen una prioridad más alta que los ajustes individuales. Puede cambiar estos ajustes aquí, pero no tendrán ningún consecuencia hasta que cambie los ajustes heredados." -#: ../../Zotlabs/Module/Connedit.php:891 +#: ../../Zotlabs/Module/Connedit.php:909 msgid "Last update:" msgstr "Última actualización:" -#: ../../Zotlabs/Module/Connedit.php:900 +#: ../../Zotlabs/Module/Connedit.php:918 msgid "Details" msgstr "Detalles" -#: ../../Zotlabs/Module/Connedit.php:903 ../../addon/cdav/Mod_Cdav.php:1137 -msgid "Organisation" -msgstr "Organización" +#: ../../Zotlabs/Module/Chat.php:94 ../../Zotlabs/Lib/Apps.php:228 +msgid "My Chatrooms" +msgstr "Mis salas de chat" -#: ../../Zotlabs/Module/Connedit.php:904 ../../addon/cdav/Mod_Cdav.php:1138 -#: ../../include/page_widgets.php:46 -msgid "Title" -msgstr "Título" - -#: ../../Zotlabs/Module/Connedit.php:905 ../../Zotlabs/Module/Profiles.php:789 -#: ../../addon/cdav/Mod_Cdav.php:1139 -msgid "Phone" -msgstr "Teléfono" - -#: ../../Zotlabs/Module/Connedit.php:907 ../../Zotlabs/Module/Profiles.php:791 -#: ../../addon/cdav/Mod_Cdav.php:1141 -msgid "Instant messenger" -msgstr "Mensajería instantánea" - -#: ../../Zotlabs/Module/Connedit.php:908 ../../Zotlabs/Module/Profiles.php:792 -#: ../../addon/cdav/Mod_Cdav.php:1142 -msgid "Website" -msgstr "Sitio web" - -#: ../../Zotlabs/Module/Connedit.php:910 ../../Zotlabs/Module/Profiles.php:794 -#: ../../addon/cdav/Mod_Cdav.php:1144 -msgid "Note" -msgstr "Nota" - -#: ../../Zotlabs/Module/Connedit.php:911 ../../Zotlabs/Module/Profiles.php:795 -#: ../../addon/cdav/Mod_Cdav.php:1145 ../../addon/cdav/cdav.php:270 -#: ../../include/connections.php:668 -msgid "Mobile" -msgstr "Móvil" - -#: ../../Zotlabs/Module/Connedit.php:912 ../../Zotlabs/Module/Profiles.php:796 -#: ../../addon/cdav/Mod_Cdav.php:1146 ../../addon/cdav/cdav.php:271 -#: ../../include/connections.php:669 -msgid "Home" -msgstr "Inicio" - -#: ../../Zotlabs/Module/Connedit.php:913 ../../Zotlabs/Module/Profiles.php:797 -#: ../../addon/cdav/Mod_Cdav.php:1147 ../../addon/cdav/cdav.php:274 -#: ../../include/connections.php:672 -msgid "Work" -msgstr "Trabajo" - -#: ../../Zotlabs/Module/Connedit.php:915 ../../Zotlabs/Module/Profiles.php:799 -#: ../../addon/cdav/Mod_Cdav.php:1149 -#: ../../addon/jappixmini/jappixmini.php:368 -msgid "Add Contact" -msgstr "Añadir un contacto" - -#: ../../Zotlabs/Module/Connedit.php:916 ../../Zotlabs/Module/Profiles.php:800 -#: ../../addon/cdav/Mod_Cdav.php:1150 -msgid "Add Field" -msgstr "Añadir un campo" - -#: ../../Zotlabs/Module/Connedit.php:921 ../../addon/cdav/Mod_Cdav.php:1155 -msgid "P.O. Box" -msgstr "Buzón de correos" - -#: ../../Zotlabs/Module/Connedit.php:922 ../../addon/cdav/Mod_Cdav.php:1156 -msgid "Additional" -msgstr "Adicional" - -#: ../../Zotlabs/Module/Connedit.php:923 ../../addon/cdav/Mod_Cdav.php:1157 -msgid "Street" -msgstr "Calle" - -#: ../../Zotlabs/Module/Connedit.php:924 ../../addon/cdav/Mod_Cdav.php:1158 -msgid "Locality" -msgstr "Localidad" - -#: ../../Zotlabs/Module/Connedit.php:925 ../../addon/cdav/Mod_Cdav.php:1159 -msgid "Region" -msgstr "Provincia, región o estado" - -#: ../../Zotlabs/Module/Connedit.php:926 ../../addon/cdav/Mod_Cdav.php:1160 -msgid "ZIP Code" -msgstr "Código postal" - -#: ../../Zotlabs/Module/Connedit.php:927 ../../Zotlabs/Module/Profiles.php:760 -#: ../../addon/cdav/Mod_Cdav.php:1161 -msgid "Country" -msgstr "País" - -#: ../../Zotlabs/Module/Chat.php:179 +#: ../../Zotlabs/Module/Chat.php:181 msgid "Room not found" msgstr "Sala no encontrada" -#: ../../Zotlabs/Module/Chat.php:195 +#: ../../Zotlabs/Module/Chat.php:197 msgid "Leave Room" msgstr "Abandonar la sala" -#: ../../Zotlabs/Module/Chat.php:196 +#: ../../Zotlabs/Module/Chat.php:198 msgid "Delete Room" msgstr "Eliminar esta sala" -#: ../../Zotlabs/Module/Chat.php:197 +#: ../../Zotlabs/Module/Chat.php:199 msgid "I am away right now" msgstr "Estoy ausente momentáneamente" -#: ../../Zotlabs/Module/Chat.php:198 +#: ../../Zotlabs/Module/Chat.php:200 msgid "I am online" msgstr "Estoy conectado/a" -#: ../../Zotlabs/Module/Chat.php:200 +#: ../../Zotlabs/Module/Chat.php:202 msgid "Bookmark this room" msgstr "Añadir esta sala a Marcadores" -#: ../../Zotlabs/Module/Chat.php:203 ../../Zotlabs/Module/Mail.php:259 -#: ../../Zotlabs/Module/Mail.php:380 ../../include/conversation.php:1263 +#: ../../Zotlabs/Module/Chat.php:205 ../../Zotlabs/Module/Mail.php:241 +#: ../../Zotlabs/Module/Mail.php:362 ../../include/conversation.php:1260 msgid "Please enter a link URL:" msgstr "Por favor, introduzca la dirección del enlace:" -#: ../../Zotlabs/Module/Chat.php:204 ../../Zotlabs/Module/Mail.php:312 -#: ../../Zotlabs/Module/Mail.php:454 ../../Zotlabs/Lib/ThreadItem.php:744 -#: ../../include/conversation.php:1373 +#: ../../Zotlabs/Module/Chat.php:206 ../../Zotlabs/Module/Mail.php:294 +#: ../../Zotlabs/Module/Mail.php:436 ../../Zotlabs/Lib/ThreadItem.php:742 +#: ../../include/conversation.php:1370 msgid "Encrypt text" msgstr "Cifrar texto" -#: ../../Zotlabs/Module/Chat.php:230 +#: ../../Zotlabs/Module/Chat.php:232 msgid "New Chatroom" msgstr "Nueva sala de chat" -#: ../../Zotlabs/Module/Chat.php:231 +#: ../../Zotlabs/Module/Chat.php:233 msgid "Chatroom name" msgstr "Nombre de la sala de chat" -#: ../../Zotlabs/Module/Chat.php:232 +#: ../../Zotlabs/Module/Chat.php:234 msgid "Expiration of chats (minutes)" msgstr "Caducidad de los mensajes en los chats (en minutos)" -#: ../../Zotlabs/Module/Chat.php:248 +#: ../../Zotlabs/Module/Chat.php:250 #, php-format msgid "%1$s's Chatrooms" msgstr "Salas de chat de %1$s" -#: ../../Zotlabs/Module/Chat.php:253 +#: ../../Zotlabs/Module/Chat.php:255 msgid "No chatrooms available" msgstr "No hay salas de chat disponibles" -#: ../../Zotlabs/Module/Chat.php:257 +#: ../../Zotlabs/Module/Chat.php:259 msgid "Expiration" msgstr "Caducidad" -#: ../../Zotlabs/Module/Chat.php:258 +#: ../../Zotlabs/Module/Chat.php:260 msgid "min" msgstr "min" -#: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:229 -#: ../../include/conversation.php:1783 ../../include/nav.php:392 -msgid "Photos" -msgstr "Fotos" - -#: ../../Zotlabs/Module/Fbrowser.php:85 ../../Zotlabs/Lib/Apps.php:224 -#: ../../Zotlabs/Storage/Browser.php:224 ../../include/conversation.php:1791 -#: ../../include/nav.php:400 +#: ../../Zotlabs/Module/Fbrowser.php:85 ../../Zotlabs/Lib/Apps.php:237 +#: ../../Zotlabs/Storage/Browser.php:225 ../../Zotlabs/Storage/Browser.php:247 +#: ../../include/conversation.php:1788 ../../include/nav.php:386 msgid "Files" msgstr "Ficheros" @@ -5428,7 +5575,7 @@ msgstr "El menú se puede usar para guardar marcadores" msgid "Submit and proceed" msgstr "Enviar y proceder" -#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2268 +#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2281 msgid "Menus" msgstr "Menús" @@ -5480,13 +5627,14 @@ msgstr "El título del menú tal como será visto por los demás" msgid "Allow bookmarks" msgstr "Permitir marcadores" -#: ../../Zotlabs/Module/Layouts.php:184 ../../include/text.php:2269 +#: ../../Zotlabs/Module/Layouts.php:184 ../../include/text.php:2282 msgid "Layouts" msgstr "Plantillas" -#: ../../Zotlabs/Module/Layouts.php:186 ../../Zotlabs/Lib/Apps.php:232 -#: ../../include/nav.php:161 ../../include/nav.php:268 -#: ../../include/help.php:55 ../../include/help.php:61 +#: ../../Zotlabs/Module/Layouts.php:186 ../../Zotlabs/Module/Help.php:18 +#: ../../Zotlabs/Lib/Apps.php:245 ../../include/nav.php:157 +#: ../../include/nav.php:264 ../../include/help.php:55 +#: ../../include/help.php:61 msgid "Help" msgstr "Ayuda" @@ -5502,12 +5650,13 @@ msgstr "Descripción de la plantilla" msgid "Download PDL file" msgstr "Descargar el fichero PDL" -#: ../../Zotlabs/Module/Tagger.php:55 ../../include/bbcode.php:274 +#: ../../Zotlabs/Module/Tagger.php:55 ../../include/markdown.php:141 +#: ../../include/bbcode.php:334 msgid "post" msgstr "la entrada" #: ../../Zotlabs/Module/Tagger.php:57 ../../include/conversation.php:146 -#: ../../include/text.php:1945 +#: ../../include/text.php:1938 msgid "comment" msgstr "el comentario" @@ -5539,8 +5688,8 @@ msgstr "El grupo de canales ha sido creado." msgid "Could not create privacy group." msgstr "No se puede crear el grupo de canales" -#: ../../Zotlabs/Module/Group.php:42 ../../Zotlabs/Module/Group.php:141 -#: ../../include/items.php:3922 +#: ../../Zotlabs/Module/Group.php:42 ../../Zotlabs/Module/Group.php:143 +#: ../../include/items.php:3892 msgid "Privacy group not found." msgstr "Grupo de canales no encontrado." @@ -5548,39 +5697,39 @@ msgstr "Grupo de canales no encontrado." msgid "Privacy group updated." msgstr "Grupo de canales actualizado." -#: ../../Zotlabs/Module/Group.php:90 +#: ../../Zotlabs/Module/Group.php:92 msgid "Create a group of channels." msgstr "Crear un grupo de canales." -#: ../../Zotlabs/Module/Group.php:91 ../../Zotlabs/Module/Group.php:184 +#: ../../Zotlabs/Module/Group.php:93 ../../Zotlabs/Module/Group.php:186 msgid "Privacy group name: " msgstr "Nombre del grupo de canales:" -#: ../../Zotlabs/Module/Group.php:93 ../../Zotlabs/Module/Group.php:187 +#: ../../Zotlabs/Module/Group.php:95 ../../Zotlabs/Module/Group.php:189 msgid "Members are visible to other channels" msgstr "Los miembros son visibles para otros canales" -#: ../../Zotlabs/Module/Group.php:111 +#: ../../Zotlabs/Module/Group.php:113 msgid "Privacy group removed." msgstr "Grupo de canales eliminado." -#: ../../Zotlabs/Module/Group.php:113 +#: ../../Zotlabs/Module/Group.php:115 msgid "Unable to remove privacy group." msgstr "No se puede eliminar el grupo de canales." -#: ../../Zotlabs/Module/Group.php:183 +#: ../../Zotlabs/Module/Group.php:185 msgid "Privacy group editor" msgstr "Editor de grupos de canales" -#: ../../Zotlabs/Module/Group.php:197 ../../Zotlabs/Module/Help.php:81 +#: ../../Zotlabs/Module/Group.php:199 ../../Zotlabs/Module/Help.php:81 msgid "Members" msgstr "Miembros" -#: ../../Zotlabs/Module/Group.php:199 +#: ../../Zotlabs/Module/Group.php:201 msgid "All Connected Channels" msgstr "Todos los canales conectados" -#: ../../Zotlabs/Module/Group.php:231 +#: ../../Zotlabs/Module/Group.php:233 msgid "Click on a channel to add or remove." msgstr "Haga clic en un canal para agregarlo o quitarlo." @@ -5675,7 +5824,7 @@ msgid "View this profile" msgstr "Ver este perfil" #: ../../Zotlabs/Module/Profiles.php:728 ../../Zotlabs/Module/Profiles.php:827 -#: ../../include/channel.php:1066 +#: ../../include/channel.php:1183 msgid "Edit visibility" msgstr "Editar visibilidad" @@ -5687,7 +5836,7 @@ msgstr "Gestión del perfil" msgid "Change cover photo" msgstr "Cambiar la imagen de portada del perfil" -#: ../../Zotlabs/Module/Profiles.php:731 ../../include/channel.php:1037 +#: ../../Zotlabs/Module/Profiles.php:731 ../../include/channel.php:1154 msgid "Change profile photo" msgstr "Cambiar la foto del perfil" @@ -5707,7 +5856,7 @@ msgstr "Eliminar este perfil" msgid "Add profile things" msgstr "Añadir cosas al perfil" -#: ../../Zotlabs/Module/Profiles.php:736 ../../include/conversation.php:1657 +#: ../../Zotlabs/Module/Profiles.php:736 ../../include/conversation.php:1654 msgid "Personal" msgstr "Personales" @@ -5852,12 +6001,12 @@ msgstr "Mis otros canales" msgid "Communications" msgstr "Comunicaciones" -#: ../../Zotlabs/Module/Profiles.php:823 ../../include/channel.php:1062 +#: ../../Zotlabs/Module/Profiles.php:823 ../../include/channel.php:1179 msgid "Profile Image" msgstr "Imagen del perfil" -#: ../../Zotlabs/Module/Profiles.php:833 ../../include/channel.php:1044 -#: ../../include/nav.php:109 +#: ../../Zotlabs/Module/Profiles.php:833 ../../include/channel.php:1161 +#: ../../include/nav.php:105 msgid "Edit Profiles" msgstr "Editar perfiles" @@ -5869,42 +6018,42 @@ msgstr "Enlace de la página" msgid "Edit Webpage" msgstr "Editar la página web" -#: ../../Zotlabs/Module/Manage.php:143 +#: ../../Zotlabs/Module/Manage.php:145 msgid "Create a new channel" msgstr "Crear un nuevo canal" -#: ../../Zotlabs/Module/Manage.php:168 ../../Zotlabs/Lib/Apps.php:221 -#: ../../include/nav.php:205 +#: ../../Zotlabs/Module/Manage.php:170 ../../Zotlabs/Lib/Apps.php:234 +#: ../../include/nav.php:199 msgid "Channel Manager" msgstr "Administración de canales" -#: ../../Zotlabs/Module/Manage.php:169 +#: ../../Zotlabs/Module/Manage.php:171 msgid "Current Channel" msgstr "Canal actual" -#: ../../Zotlabs/Module/Manage.php:171 +#: ../../Zotlabs/Module/Manage.php:173 msgid "Switch to one of your channels by selecting it." msgstr "Cambiar a uno de sus canales seleccionándolo." -#: ../../Zotlabs/Module/Manage.php:172 +#: ../../Zotlabs/Module/Manage.php:174 msgid "Default Channel" msgstr "Canal principal" -#: ../../Zotlabs/Module/Manage.php:173 +#: ../../Zotlabs/Module/Manage.php:175 msgid "Make Default" msgstr "Convertir en predeterminado" -#: ../../Zotlabs/Module/Manage.php:176 +#: ../../Zotlabs/Module/Manage.php:178 #, php-format msgid "%d new messages" msgstr "%d mensajes nuevos" -#: ../../Zotlabs/Module/Manage.php:177 +#: ../../Zotlabs/Module/Manage.php:179 #, php-format msgid "%d new introductions" msgstr "%d nuevas solicitudes de conexión" -#: ../../Zotlabs/Module/Manage.php:179 +#: ../../Zotlabs/Module/Manage.php:181 msgid "Delegated Channel" msgstr "Canal delegado" @@ -5912,45 +6061,45 @@ msgstr "Canal delegado" msgid "This directory server requires an access token" msgstr "El servidor de este directorio necesita un \"token\" de acceso" -#: ../../Zotlabs/Module/Siteinfo.php:20 +#: ../../Zotlabs/Module/Siteinfo.php:19 msgid "About this site" msgstr "Acerca de este sitio" -#: ../../Zotlabs/Module/Siteinfo.php:21 +#: ../../Zotlabs/Module/Siteinfo.php:20 msgid "Site Name" msgstr "Nombre del sitio" -#: ../../Zotlabs/Module/Siteinfo.php:25 ../../include/network.php:2025 +#: ../../Zotlabs/Module/Siteinfo.php:24 msgid "Administrator" msgstr "Administrador" -#: ../../Zotlabs/Module/Siteinfo.php:27 ../../Zotlabs/Module/Register.php:221 +#: ../../Zotlabs/Module/Siteinfo.php:26 ../../Zotlabs/Module/Register.php:221 msgid "Terms of Service" msgstr "Términos del servicio" -#: ../../Zotlabs/Module/Siteinfo.php:28 +#: ../../Zotlabs/Module/Siteinfo.php:27 msgid "Software and Project information" msgstr "Información sobre el software y el proyecto" -#: ../../Zotlabs/Module/Siteinfo.php:29 +#: ../../Zotlabs/Module/Siteinfo.php:28 msgid "This site is powered by $Projectname" msgstr "Este sitio funciona con $Projectname" -#: ../../Zotlabs/Module/Siteinfo.php:30 +#: ../../Zotlabs/Module/Siteinfo.php:29 msgid "" "Federated and decentralised networking and identity services provided by Zot" msgstr "Servicios federados y descentralizados de identidad y redes proporcionados por Zot" -#: ../../Zotlabs/Module/Siteinfo.php:32 +#: ../../Zotlabs/Module/Siteinfo.php:31 #, php-format msgid "Version %s" msgstr "Versión %s" -#: ../../Zotlabs/Module/Siteinfo.php:33 +#: ../../Zotlabs/Module/Siteinfo.php:32 msgid "Project homepage" msgstr "Página principal del proyecto" -#: ../../Zotlabs/Module/Siteinfo.php:34 +#: ../../Zotlabs/Module/Siteinfo.php:33 msgid "Developer homepage" msgstr "Página principal del desarrollador" @@ -5959,7 +6108,7 @@ msgid "No ratings" msgstr "Ninguna valoración" #: ../../Zotlabs/Module/Ratings.php:97 ../../Zotlabs/Module/Pubsites.php:35 -#: ../../include/conversation.php:1032 +#: ../../include/conversation.php:1029 msgid "Ratings" msgstr "Valoraciones" @@ -5975,64 +6124,65 @@ msgstr "Sitio web:" msgid "Description: " msgstr "Descripción:" -#: ../../Zotlabs/Module/Webpages.php:52 -msgid "Import Webpage Elements" -msgstr "Importar elementos de una página web" - -#: ../../Zotlabs/Module/Webpages.php:53 -msgid "Import selected" -msgstr "Importar elementos seleccionados" - -#: ../../Zotlabs/Module/Webpages.php:76 -msgid "Export Webpage Elements" -msgstr "Exportar elementos de una página web" - -#: ../../Zotlabs/Module/Webpages.php:77 -msgid "Export selected" -msgstr "Exportar los elementos seleccionados" - -#: ../../Zotlabs/Module/Webpages.php:242 ../../Zotlabs/Lib/Apps.php:225 -#: ../../include/conversation.php:1841 ../../include/nav.php:449 +#: ../../Zotlabs/Module/Webpages.php:38 ../../Zotlabs/Module/Webpages.php:237 +#: ../../Zotlabs/Lib/Apps.php:238 ../../include/conversation.php:1838 +#: ../../include/nav.php:435 msgid "Webpages" msgstr "Páginas web" -#: ../../Zotlabs/Module/Webpages.php:253 ../../include/page_widgets.php:44 +#: ../../Zotlabs/Module/Webpages.php:54 +msgid "Import Webpage Elements" +msgstr "Importar elementos de una página web" + +#: ../../Zotlabs/Module/Webpages.php:55 +msgid "Import selected" +msgstr "Importar elementos seleccionados" + +#: ../../Zotlabs/Module/Webpages.php:78 +msgid "Export Webpage Elements" +msgstr "Exportar elementos de una página web" + +#: ../../Zotlabs/Module/Webpages.php:79 +msgid "Export selected" +msgstr "Exportar los elementos seleccionados" + +#: ../../Zotlabs/Module/Webpages.php:248 msgid "Actions" msgstr "Acciones" -#: ../../Zotlabs/Module/Webpages.php:254 ../../include/page_widgets.php:45 +#: ../../Zotlabs/Module/Webpages.php:249 msgid "Page Link" msgstr "Vínculo de la página" -#: ../../Zotlabs/Module/Webpages.php:255 +#: ../../Zotlabs/Module/Webpages.php:250 msgid "Page Title" msgstr "Título de página" -#: ../../Zotlabs/Module/Webpages.php:285 +#: ../../Zotlabs/Module/Webpages.php:280 msgid "Invalid file type." msgstr "Tipo de fichero no válido." -#: ../../Zotlabs/Module/Webpages.php:297 +#: ../../Zotlabs/Module/Webpages.php:292 msgid "Error opening zip file" msgstr "Error al abrir el fichero comprimido zip" -#: ../../Zotlabs/Module/Webpages.php:308 +#: ../../Zotlabs/Module/Webpages.php:303 msgid "Invalid folder path." msgstr "La ruta de la carpeta no es válida." -#: ../../Zotlabs/Module/Webpages.php:335 +#: ../../Zotlabs/Module/Webpages.php:330 msgid "No webpage elements detected." msgstr "No se han detectado elementos de ninguna página web." -#: ../../Zotlabs/Module/Webpages.php:410 +#: ../../Zotlabs/Module/Webpages.php:405 msgid "Import complete." msgstr "Importación completada." -#: ../../Zotlabs/Module/Editpost.php:38 +#: ../../Zotlabs/Module/Editpost.php:38 ../../Zotlabs/Module/Editpost.php:43 msgid "Item is not editable" msgstr "El elemento no es editable" -#: ../../Zotlabs/Module/Editpost.php:103 ../../Zotlabs/Module/Rpost.php:138 +#: ../../Zotlabs/Module/Editpost.php:108 ../../Zotlabs/Module/Rpost.php:140 msgid "Edit post" msgstr "Editar la entrada" @@ -6118,7 +6268,7 @@ msgid "*" msgstr "*" #: ../../Zotlabs/Module/Sources.php:96 -#: ../../Zotlabs/Widget/Settings_menu.php:123 ../../include/features.php:213 +#: ../../Zotlabs/Widget/Settings_menu.php:125 ../../include/features.php:209 msgid "Channel Sources" msgstr "Orígenes de los contenidos del canal" @@ -6174,6 +6324,10 @@ msgstr "Fuente eliminada" msgid "Unable to remove source." msgstr "No se puede eliminar la fuente." +#: ../../Zotlabs/Module/Rpost.php:63 ../../Zotlabs/Lib/Apps.php:257 +msgid "Post" +msgstr "Publicación" + #: ../../Zotlabs/Module/Like.php:19 msgid "Like/Dislike" msgstr "Me gusta/No me gusta" @@ -6209,55 +6363,59 @@ msgstr "Canal no disponible." msgid "Previous action reversed." msgstr "Acción anterior revocada." -#: ../../Zotlabs/Module/Like.php:419 ../../addon/diaspora/inbound.php:1812 +#: ../../Zotlabs/Module/Like.php:423 ../../addon/diaspora/Receiver.php:1399 #: ../../include/conversation.php:160 #, php-format msgid "%1$s likes %2$s's %3$s" msgstr "A %1$s le gusta %3$s de %2$s" -#: ../../Zotlabs/Module/Like.php:421 ../../include/conversation.php:163 +#: ../../Zotlabs/Module/Like.php:425 ../../include/conversation.php:163 #, php-format msgid "%1$s doesn't like %2$s's %3$s" msgstr "A %1$s no le gusta %3$s de %2$s" -#: ../../Zotlabs/Module/Like.php:423 +#: ../../Zotlabs/Module/Like.php:427 #, php-format msgid "%1$s agrees with %2$s's %3$s" msgstr "%3$s de %2$s: %1$s está de acuerdo" -#: ../../Zotlabs/Module/Like.php:425 +#: ../../Zotlabs/Module/Like.php:429 #, php-format msgid "%1$s doesn't agree with %2$s's %3$s" msgstr "%3$s de %2$s: %1$s no está de acuerdo" -#: ../../Zotlabs/Module/Like.php:427 +#: ../../Zotlabs/Module/Like.php:431 #, php-format msgid "%1$s abstains from a decision on %2$s's %3$s" msgstr "%3$s de %2$s: %1$s se abstiene" -#: ../../Zotlabs/Module/Like.php:429 +#: ../../Zotlabs/Module/Like.php:433 #, php-format msgid "%1$s is attending %2$s's %3$s" msgstr "%3$s de %2$s: %1$s participa" -#: ../../Zotlabs/Module/Like.php:431 +#: ../../Zotlabs/Module/Like.php:435 #, php-format msgid "%1$s is not attending %2$s's %3$s" msgstr "%3$s de %2$s: %1$s no participa" -#: ../../Zotlabs/Module/Like.php:433 +#: ../../Zotlabs/Module/Like.php:437 #, php-format msgid "%1$s may attend %2$s's %3$s" msgstr "%3$s de %2$s: %1$s quizá participe" -#: ../../Zotlabs/Module/Like.php:538 +#: ../../Zotlabs/Module/Like.php:547 msgid "Action completed." msgstr "Acción completada." -#: ../../Zotlabs/Module/Like.php:539 +#: ../../Zotlabs/Module/Like.php:548 msgid "Thank you." msgstr "Gracias." +#: ../../Zotlabs/Module/Directory.php:80 ../../Zotlabs/Lib/Apps.php:244 +msgid "Directory" +msgstr "Directorio" + #: ../../Zotlabs/Module/Directory.php:245 #, php-format msgid "%d rating" @@ -6277,13 +6435,12 @@ msgstr "Estado:" msgid "Homepage: " msgstr "Página personal:" -#: ../../Zotlabs/Module/Directory.php:309 ../../include/channel.php:1293 +#: ../../Zotlabs/Module/Directory.php:309 ../../include/channel.php:1416 msgid "Age:" msgstr "Edad:" -#: ../../Zotlabs/Module/Directory.php:314 ../../include/markdown.php:560 -#: ../../include/channel.php:1134 ../../include/event.php:52 -#: ../../include/event.php:84 +#: ../../Zotlabs/Module/Directory.php:314 ../../include/channel.php:1251 +#: ../../include/event.php:52 ../../include/event.php:84 msgid "Location:" msgstr "Ubicación:" @@ -6291,18 +6448,18 @@ msgstr "Ubicación:" msgid "Description:" msgstr "Descripción:" -#: ../../Zotlabs/Module/Directory.php:325 ../../include/channel.php:1309 +#: ../../Zotlabs/Module/Directory.php:325 ../../include/channel.php:1432 msgid "Hometown:" msgstr "Lugar de nacimiento:" -#: ../../Zotlabs/Module/Directory.php:327 ../../include/channel.php:1317 +#: ../../Zotlabs/Module/Directory.php:327 ../../include/channel.php:1440 msgid "About:" msgstr "Sobre mí:" -#: ../../Zotlabs/Module/Directory.php:328 ../../Zotlabs/Module/Suggest.php:54 +#: ../../Zotlabs/Module/Directory.php:328 ../../Zotlabs/Module/Suggest.php:56 #: ../../Zotlabs/Widget/Follow.php:32 ../../Zotlabs/Widget/Suggestions.php:44 -#: ../../include/conversation.php:1002 ../../include/channel.php:1119 -#: ../../include/connections.php:110 +#: ../../include/conversation.php:999 ../../include/channel.php:1236 +#: ../../include/connections.php:111 msgid "Connect" msgstr "Conectar" @@ -6334,7 +6491,7 @@ msgstr "Directorio local:" msgid "Finding:" msgstr "Encontrar:" -#: ../../Zotlabs/Module/Directory.php:395 ../../Zotlabs/Module/Suggest.php:62 +#: ../../Zotlabs/Module/Directory.php:395 ../../Zotlabs/Module/Suggest.php:64 #: ../../include/contact_widgets.php:24 msgid "Channel Suggestions" msgstr "Sugerencias de canales" @@ -6379,13 +6536,18 @@ msgstr "Búsqueda de canales" msgid "Lookup xchan beginning with (or webbie): " msgstr "Buscar un canal (o un \"webbie\") que comience por:" -#: ../../Zotlabs/Module/Suggest.php:37 +#: ../../Zotlabs/Module/Suggest.php:32 ../../Zotlabs/Lib/Apps.php:232 +#: ../../include/features.php:333 +msgid "Suggest Channels" +msgstr "Sugerir canales" + +#: ../../Zotlabs/Module/Suggest.php:39 msgid "" "No suggestions available. If this is a new site, please try again in 24 " "hours." msgstr "No hay sugerencias disponibles. Si es un sitio nuevo, espere 24 horas y pruebe de nuevo." -#: ../../Zotlabs/Module/Suggest.php:56 ../../Zotlabs/Widget/Suggestions.php:46 +#: ../../Zotlabs/Module/Suggest.php:58 ../../Zotlabs/Widget/Suggestions.php:46 msgid "Ignore/Hide" msgstr "Ignorar/Ocultar" @@ -6397,103 +6559,108 @@ msgstr "No se puede encontrar su servidor." msgid "Post successful." msgstr "Enviado con éxito." -#: ../../Zotlabs/Module/Mail.php:65 +#: ../../Zotlabs/Module/Mail.php:73 msgid "Unable to lookup recipient." msgstr "No se puede asociar a un destinatario." -#: ../../Zotlabs/Module/Mail.php:72 +#: ../../Zotlabs/Module/Mail.php:80 msgid "Unable to communicate with requested channel." msgstr "No se puede establecer la comunicación con el canal solicitado." -#: ../../Zotlabs/Module/Mail.php:79 +#: ../../Zotlabs/Module/Mail.php:87 msgid "Cannot verify requested channel." msgstr "No se puede verificar el canal solicitado." -#: ../../Zotlabs/Module/Mail.php:97 +#: ../../Zotlabs/Module/Mail.php:105 msgid "Selected channel has private message restrictions. Send failed." msgstr "El canal seleccionado tiene restricciones sobre los mensajes privados. El envío falló." -#: ../../Zotlabs/Module/Mail.php:178 +#: ../../Zotlabs/Module/Mail.php:143 ../../Zotlabs/Lib/Apps.php:246 +#: ../../include/nav.php:187 +msgid "Mail" +msgstr "Correo" + +#: ../../Zotlabs/Module/Mail.php:160 msgid "Messages" msgstr "Mensajes" -#: ../../Zotlabs/Module/Mail.php:191 +#: ../../Zotlabs/Module/Mail.php:173 msgid "message" msgstr "mensaje" -#: ../../Zotlabs/Module/Mail.php:232 +#: ../../Zotlabs/Module/Mail.php:214 msgid "Message recalled." msgstr "Mensaje revocado." -#: ../../Zotlabs/Module/Mail.php:245 +#: ../../Zotlabs/Module/Mail.php:227 msgid "Conversation removed." msgstr "Conversación eliminada." -#: ../../Zotlabs/Module/Mail.php:260 ../../Zotlabs/Module/Mail.php:381 +#: ../../Zotlabs/Module/Mail.php:242 ../../Zotlabs/Module/Mail.php:363 msgid "Expires YYYY-MM-DD HH:MM" msgstr "Caduca YYYY-MM-DD HH:MM" -#: ../../Zotlabs/Module/Mail.php:288 +#: ../../Zotlabs/Module/Mail.php:270 msgid "Requested channel is not in this network" msgstr "El canal solicitado no existe en esta red" -#: ../../Zotlabs/Module/Mail.php:296 +#: ../../Zotlabs/Module/Mail.php:278 msgid "Send Private Message" msgstr "Enviar un mensaje privado" -#: ../../Zotlabs/Module/Mail.php:297 ../../Zotlabs/Module/Mail.php:439 +#: ../../Zotlabs/Module/Mail.php:279 ../../Zotlabs/Module/Mail.php:421 msgid "To:" msgstr "Para:" -#: ../../Zotlabs/Module/Mail.php:300 ../../Zotlabs/Module/Mail.php:441 +#: ../../Zotlabs/Module/Mail.php:282 ../../Zotlabs/Module/Mail.php:423 msgid "Subject:" msgstr "Asunto:" -#: ../../Zotlabs/Module/Mail.php:305 ../../Zotlabs/Module/Mail.php:447 -#: ../../include/conversation.php:1323 +#: ../../Zotlabs/Module/Mail.php:287 ../../Zotlabs/Module/Mail.php:429 +#: ../../include/conversation.php:1320 msgid "Attach file" msgstr "Adjuntar fichero" -#: ../../Zotlabs/Module/Mail.php:307 +#: ../../Zotlabs/Module/Mail.php:289 msgid "Send" msgstr "Enviar" -#: ../../Zotlabs/Module/Mail.php:310 ../../Zotlabs/Module/Mail.php:452 -#: ../../include/conversation.php:1368 +#: ../../Zotlabs/Module/Mail.php:292 ../../Zotlabs/Module/Mail.php:434 +#: ../../include/conversation.php:1365 msgid "Set expiration date" msgstr "Configurar fecha de caducidad" -#: ../../Zotlabs/Module/Mail.php:411 +#: ../../Zotlabs/Module/Mail.php:393 msgid "Delete message" msgstr "Borrar mensaje" -#: ../../Zotlabs/Module/Mail.php:412 +#: ../../Zotlabs/Module/Mail.php:394 msgid "Delivery report" msgstr "Informe de transmisión" -#: ../../Zotlabs/Module/Mail.php:413 +#: ../../Zotlabs/Module/Mail.php:395 msgid "Recall message" msgstr "Revocar el mensaje" -#: ../../Zotlabs/Module/Mail.php:415 +#: ../../Zotlabs/Module/Mail.php:397 msgid "Message has been recalled." msgstr "El mensaje ha sido revocado." -#: ../../Zotlabs/Module/Mail.php:432 +#: ../../Zotlabs/Module/Mail.php:414 msgid "Delete Conversation" msgstr "Eliminar conversación" -#: ../../Zotlabs/Module/Mail.php:434 +#: ../../Zotlabs/Module/Mail.php:416 msgid "" "No secure communications available. You may be able to " "respond from the sender's profile page." msgstr "Comunicación segura no disponible. Pero puede responder desde la página del perfil del remitente." -#: ../../Zotlabs/Module/Mail.php:438 +#: ../../Zotlabs/Module/Mail.php:420 msgid "Send Reply" msgstr "Responder" -#: ../../Zotlabs/Module/Mail.php:443 +#: ../../Zotlabs/Module/Mail.php:425 #, php-format msgid "Your message for %s (%s):" msgstr "Su mensaje para %s (%s):" @@ -6535,19 +6702,19 @@ msgstr "Software" msgid "Rate" msgstr "Valorar" -#: ../../Zotlabs/Module/Impel.php:41 ../../include/bbcode.php:203 +#: ../../Zotlabs/Module/Impel.php:41 ../../include/bbcode.php:263 msgid "webpage" msgstr "página web" -#: ../../Zotlabs/Module/Impel.php:46 ../../include/bbcode.php:209 +#: ../../Zotlabs/Module/Impel.php:46 ../../include/bbcode.php:269 msgid "block" msgstr "bloque" -#: ../../Zotlabs/Module/Impel.php:51 ../../include/bbcode.php:206 +#: ../../Zotlabs/Module/Impel.php:51 ../../include/bbcode.php:266 msgid "layout" msgstr "plantilla" -#: ../../Zotlabs/Module/Impel.php:58 ../../include/bbcode.php:212 +#: ../../Zotlabs/Module/Impel.php:58 ../../include/bbcode.php:272 msgid "menu" msgstr "menú" @@ -6589,7 +6756,11 @@ msgstr "o seleccione una (con un doble click)" msgid "Save to Folder" msgstr "Guardar en carpeta" -#: ../../Zotlabs/Module/Probe.php:28 ../../Zotlabs/Module/Probe.php:32 +#: ../../Zotlabs/Module/Probe.php:11 ../../Zotlabs/Lib/Apps.php:231 +msgid "Remote Diagnostics" +msgstr "Diagnóstico remoto" + +#: ../../Zotlabs/Module/Probe.php:30 ../../Zotlabs/Module/Probe.php:34 #, php-format msgid "Fetching URL returns error: %1$s" msgstr "Al intentar obtener la dirección, retorna el error: %1$s" @@ -6673,16 +6844,16 @@ msgstr "no" msgid "yes" msgstr "sí" -#: ../../Zotlabs/Module/Register.php:258 +#: ../../Zotlabs/Module/Register.php:256 msgid "Membership on this site is by invitation only." msgstr "Para registrarse en este sitio es necesaria una invitación." -#: ../../Zotlabs/Module/Register.php:270 ../../boot.php:1610 -#: ../../include/nav.php:149 +#: ../../Zotlabs/Module/Register.php:268 ../../boot.php:1582 +#: ../../include/nav.php:145 msgid "Register" msgstr "Registrarse" -#: ../../Zotlabs/Module/Register.php:271 +#: ../../Zotlabs/Module/Register.php:269 msgid "" "This site may require email verification after submitting this form. If you " "are returned to a login page, please check your email for instructions." @@ -6693,30 +6864,30 @@ msgstr "Este sitio puede requerir una verificación de correo electrónico despu msgid "Cover Photos" msgstr "Imágenes de portada del perfil" -#: ../../Zotlabs/Module/Cover_photo.php:237 ../../include/items.php:4303 +#: ../../Zotlabs/Module/Cover_photo.php:237 ../../include/items.php:4273 msgid "female" msgstr "mujer" -#: ../../Zotlabs/Module/Cover_photo.php:238 ../../include/items.php:4304 +#: ../../Zotlabs/Module/Cover_photo.php:238 ../../include/items.php:4274 #, php-format msgid "%1$s updated her %2$s" msgstr "%1$s ha actualizado su %2$s" -#: ../../Zotlabs/Module/Cover_photo.php:239 ../../include/items.php:4305 +#: ../../Zotlabs/Module/Cover_photo.php:239 ../../include/items.php:4275 msgid "male" msgstr "hombre" -#: ../../Zotlabs/Module/Cover_photo.php:240 ../../include/items.php:4306 +#: ../../Zotlabs/Module/Cover_photo.php:240 ../../include/items.php:4276 #, php-format msgid "%1$s updated his %2$s" msgstr "%1$s ha actualizado su %2$s" -#: ../../Zotlabs/Module/Cover_photo.php:242 ../../include/items.php:4308 +#: ../../Zotlabs/Module/Cover_photo.php:242 ../../include/items.php:4278 #, php-format msgid "%1$s updated their %2$s" msgstr "%1$s ha actualizado su %2$s" -#: ../../Zotlabs/Module/Cover_photo.php:244 ../../include/channel.php:1759 +#: ../../Zotlabs/Module/Cover_photo.php:244 ../../include/channel.php:1878 msgid "cover photo" msgstr "Imagen de portada del perfil" @@ -6728,8 +6899,8 @@ msgstr "Subir imagen de portada del perfil" msgid "Documentation Search" msgstr "Búsqueda de Documentación" -#: ../../Zotlabs/Module/Help.php:80 ../../include/conversation.php:1773 -#: ../../include/nav.php:382 +#: ../../Zotlabs/Module/Help.php:80 ../../include/conversation.php:1770 +#: ../../include/nav.php:368 msgid "About" msgstr "Mi perfil" @@ -6781,6 +6952,10 @@ msgstr "foro" msgid "Search Results For:" msgstr "Buscar resultados para:" +#: ../../Zotlabs/Module/Network.php:157 ../../Zotlabs/Lib/Apps.php:235 +msgid "Activity" +msgstr "Actividad" + #: ../../Zotlabs/Module/Network.php:221 msgid "Privacy group is empty" msgstr "El grupo de canales está vacío" @@ -6815,49 +6990,50 @@ msgstr "$Projectname" msgid "Welcome to %s" msgstr "Bienvenido a %s" -#: ../../Zotlabs/Module/Filestorage.php:87 +#: ../../Zotlabs/Module/Filestorage.php:79 msgid "Permission Denied." msgstr "Permiso denegado" -#: ../../Zotlabs/Module/Filestorage.php:103 +#: ../../Zotlabs/Module/Filestorage.php:95 msgid "File not found." msgstr "Fichero no encontrado." -#: ../../Zotlabs/Module/Filestorage.php:146 +#: ../../Zotlabs/Module/Filestorage.php:137 msgid "Edit file permissions" msgstr "Modificar los permisos del fichero" -#: ../../Zotlabs/Module/Filestorage.php:159 +#: ../../Zotlabs/Module/Filestorage.php:149 msgid "Set/edit permissions" msgstr "Establecer/editar los permisos" -#: ../../Zotlabs/Module/Filestorage.php:160 +#: ../../Zotlabs/Module/Filestorage.php:150 msgid "Include all files and sub folders" msgstr "Incluir todos los ficheros y subcarpetas" -#: ../../Zotlabs/Module/Filestorage.php:161 +#: ../../Zotlabs/Module/Filestorage.php:151 msgid "Return to file list" msgstr "Volver a la lista de ficheros" -#: ../../Zotlabs/Module/Filestorage.php:163 +#: ../../Zotlabs/Module/Filestorage.php:153 msgid "Copy/paste this code to attach file to a post" msgstr "Copiar/pegar este código para adjuntar el fichero al envío" -#: ../../Zotlabs/Module/Filestorage.php:164 +#: ../../Zotlabs/Module/Filestorage.php:154 msgid "Copy/paste this URL to link file from a web page" msgstr "Copiar/pegar esta dirección para enlazar el fichero desde una página web" -#: ../../Zotlabs/Module/Filestorage.php:166 +#: ../../Zotlabs/Module/Filestorage.php:156 msgid "Share this file" msgstr "Compartir este fichero" -#: ../../Zotlabs/Module/Filestorage.php:167 +#: ../../Zotlabs/Module/Filestorage.php:157 msgid "Show URL to this file" msgstr "Mostrar la dirección de este fichero" -#: ../../Zotlabs/Module/Filestorage.php:168 -msgid "Notify your contacts about this file" -msgstr "Avisar a sus contactos sobre este fichero" +#: ../../Zotlabs/Module/Filestorage.php:158 +#: ../../Zotlabs/Storage/Browser.php:351 +msgid "Show in your contacts shared folder" +msgstr "Mostrar en la carpeta compartida con sus contactos" #: ../../Zotlabs/Module/Common.php:14 msgid "No channel." @@ -6884,71 +7060,59 @@ msgstr "Visitar el perfil de %s [%s]" msgid "View Connections" msgstr "Ver conexiones" -#: ../../Zotlabs/Module/Admin.php:94 -msgid "# Accounts" -msgstr "# Cuentas" - -#: ../../Zotlabs/Module/Admin.php:95 -msgid "# blocked accounts" -msgstr "# cuentas bloqueadas" - -#: ../../Zotlabs/Module/Admin.php:96 -msgid "# expired accounts" -msgstr "# cuentas caducadas" - #: ../../Zotlabs/Module/Admin.php:97 -msgid "# expiring accounts" -msgstr "# cuentas que caducan" +msgid "Blocked accounts" +msgstr "Cuentas bloqueadas" -#: ../../Zotlabs/Module/Admin.php:108 -msgid "# Channels" -msgstr "# Canales" +#: ../../Zotlabs/Module/Admin.php:98 +msgid "Expired accounts" +msgstr "Cuentas caducadas" -#: ../../Zotlabs/Module/Admin.php:109 -msgid "# primary" -msgstr "# primario" +#: ../../Zotlabs/Module/Admin.php:99 +msgid "Expiring accounts" +msgstr "Cuentas que caducan" -#: ../../Zotlabs/Module/Admin.php:110 -msgid "# clones" -msgstr "# clones" +#: ../../Zotlabs/Module/Admin.php:112 +msgid "Clones" +msgstr "Clones" -#: ../../Zotlabs/Module/Admin.php:116 +#: ../../Zotlabs/Module/Admin.php:118 msgid "Message queues" msgstr "Mensajes en cola" -#: ../../Zotlabs/Module/Admin.php:133 +#: ../../Zotlabs/Module/Admin.php:132 msgid "Your software should be updated" msgstr "Debe actualizar su software" -#: ../../Zotlabs/Module/Admin.php:138 +#: ../../Zotlabs/Module/Admin.php:137 msgid "Summary" msgstr "Sumario" -#: ../../Zotlabs/Module/Admin.php:141 +#: ../../Zotlabs/Module/Admin.php:140 msgid "Registered accounts" msgstr "Cuentas registradas" -#: ../../Zotlabs/Module/Admin.php:142 +#: ../../Zotlabs/Module/Admin.php:141 msgid "Pending registrations" msgstr "Registros pendientes" -#: ../../Zotlabs/Module/Admin.php:143 +#: ../../Zotlabs/Module/Admin.php:142 msgid "Registered channels" msgstr "Canales registrados" -#: ../../Zotlabs/Module/Admin.php:144 +#: ../../Zotlabs/Module/Admin.php:143 msgid "Active plugins" msgstr "Extensiones (plugins) activas" -#: ../../Zotlabs/Module/Admin.php:145 +#: ../../Zotlabs/Module/Admin.php:144 msgid "Version" msgstr "Versión" -#: ../../Zotlabs/Module/Admin.php:146 +#: ../../Zotlabs/Module/Admin.php:145 msgid "Repository version (master)" msgstr "Versión del repositorio (master)" -#: ../../Zotlabs/Module/Admin.php:147 +#: ../../Zotlabs/Module/Admin.php:146 msgid "Repository version (dev)" msgstr "Versión del repositorio (dev)" @@ -6997,7 +7161,7 @@ msgid "" "Password reset failed." msgstr "La solicitud no ha podido ser verificada. (Puede que la haya enviado con anterioridad) El restablecimiento de la contraseña ha fallado." -#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1637 +#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1609 msgid "Password Reset" msgstr "Restablecer la contraseña" @@ -7046,121 +7210,91 @@ msgstr "Dirección de correo electrónico" msgid "Reset" msgstr "Reiniciar" -#: ../../Zotlabs/Module/Notifications.php:43 ../../include/nav.php:190 -msgid "Mark all system notifications seen" -msgstr "Marcar todas las notificaciones del sistema como leídas" +#: ../../Zotlabs/Module/Notifications.php:43 +#: ../../Zotlabs/Lib/ThreadItem.php:392 +msgid "Mark all seen" +msgstr "Marcar todo como visto" -#: ../../Zotlabs/Lib/Apps.php:212 +#: ../../Zotlabs/Lib/Techlevels.php:10 +msgid "0. Beginner/Basic" +msgstr "0. Principiante/Básico" + +#: ../../Zotlabs/Lib/Techlevels.php:11 +msgid "1. Novice - not skilled but willing to learn" +msgstr "1. Novicio - no está preparado pero está dispuestos a aprender" + +#: ../../Zotlabs/Lib/Techlevels.php:12 +msgid "2. Intermediate - somewhat comfortable" +msgstr "2. Intermedio - algo cómodo" + +#: ../../Zotlabs/Lib/Techlevels.php:13 +msgid "3. Advanced - very comfortable" +msgstr "3. Avanzado - muy cómodo" + +#: ../../Zotlabs/Lib/Techlevels.php:14 +msgid "4. Expert - I can write computer code" +msgstr "4. Experto - Puedo escribir código informático" + +#: ../../Zotlabs/Lib/Techlevels.php:15 +msgid "5. Wizard - I probably know more than you do" +msgstr "5. Asistente - probablemente sé más que tú" + +#: ../../Zotlabs/Lib/Apps.php:225 msgid "Site Admin" msgstr "Administrador del sitio" -#: ../../Zotlabs/Lib/Apps.php:213 ../../addon/buglink/buglink.php:16 +#: ../../Zotlabs/Lib/Apps.php:226 ../../addon/buglink/buglink.php:16 msgid "Report Bug" msgstr "Informe de errores" -#: ../../Zotlabs/Lib/Apps.php:214 -msgid "View Bookmarks" -msgstr "Ver los marcadores" - -#: ../../Zotlabs/Lib/Apps.php:215 -msgid "My Chatrooms" -msgstr "Mis salas de chat" - -#: ../../Zotlabs/Lib/Apps.php:217 +#: ../../Zotlabs/Lib/Apps.php:230 msgid "Firefox Share" msgstr "Servicio de compartición de Firefox" -#: ../../Zotlabs/Lib/Apps.php:218 -msgid "Remote Diagnostics" -msgstr "Diagnóstico remoto" - -#: ../../Zotlabs/Lib/Apps.php:219 ../../include/features.php:337 -msgid "Suggest Channels" -msgstr "Sugerir canales" - -#: ../../Zotlabs/Lib/Apps.php:220 ../../boot.php:1629 -#: ../../include/nav.php:117 +#: ../../Zotlabs/Lib/Apps.php:233 ../../boot.php:1601 +#: ../../include/nav.php:113 msgid "Login" msgstr "Iniciar sesión" -#: ../../Zotlabs/Lib/Apps.php:222 -msgid "Activity" -msgstr "Actividad" - -#: ../../Zotlabs/Lib/Apps.php:226 ../../include/conversation.php:1857 -#: ../../include/features.php:99 ../../include/nav.php:465 -msgid "Wiki" -msgstr "Wiki" - -#: ../../Zotlabs/Lib/Apps.php:227 ../../include/nav.php:180 -msgid "Channel Home" -msgstr "Mi canal" - -#: ../../Zotlabs/Lib/Apps.php:230 ../../include/conversation.php:1802 -#: ../../include/conversation.php:1805 ../../include/nav.php:200 -#: ../../include/nav.php:411 ../../include/nav.php:414 -msgid "Events" -msgstr "Eventos" - -#: ../../Zotlabs/Lib/Apps.php:231 -msgid "Directory" -msgstr "Directorio" - -#: ../../Zotlabs/Lib/Apps.php:233 ../../include/nav.php:192 -msgid "Mail" -msgstr "Correo" - -#: ../../Zotlabs/Lib/Apps.php:236 +#: ../../Zotlabs/Lib/Apps.php:249 msgid "Chat" msgstr "Chat" -#: ../../Zotlabs/Lib/Apps.php:238 +#: ../../Zotlabs/Lib/Apps.php:251 msgid "Probe" msgstr "Probar" -#: ../../Zotlabs/Lib/Apps.php:239 +#: ../../Zotlabs/Lib/Apps.php:252 msgid "Suggest" msgstr "Sugerir" -#: ../../Zotlabs/Lib/Apps.php:240 +#: ../../Zotlabs/Lib/Apps.php:253 msgid "Random Channel" msgstr "Canal aleatorio" -#: ../../Zotlabs/Lib/Apps.php:241 -msgid "Invite" -msgstr "Invitar" - -#: ../../Zotlabs/Lib/Apps.php:242 ../../Zotlabs/Widget/Admin.php:26 +#: ../../Zotlabs/Lib/Apps.php:255 ../../Zotlabs/Widget/Admin.php:26 msgid "Features" msgstr "Funcionalidades" -#: ../../Zotlabs/Lib/Apps.php:243 ../../addon/openid/MysqlProvider.php:69 -msgid "Language" -msgstr "Idioma" - -#: ../../Zotlabs/Lib/Apps.php:244 -msgid "Post" -msgstr "Publicación" - -#: ../../Zotlabs/Lib/Apps.php:245 ../../addon/openid/MysqlProvider.php:58 +#: ../../Zotlabs/Lib/Apps.php:258 ../../addon/openid/MysqlProvider.php:58 #: ../../addon/openid/MysqlProvider.php:59 #: ../../addon/openid/MysqlProvider.php:60 msgid "Profile Photo" msgstr "Foto del perfil" -#: ../../Zotlabs/Lib/Apps.php:365 +#: ../../Zotlabs/Lib/Apps.php:391 msgid "Purchase" msgstr "Comprar" -#: ../../Zotlabs/Lib/Apps.php:369 +#: ../../Zotlabs/Lib/Apps.php:395 msgid "Undelete" msgstr "Recuperar" -#: ../../Zotlabs/Lib/Apps.php:374 +#: ../../Zotlabs/Lib/Apps.php:401 msgid "Add to app-tray" msgstr "Añadir a la bandeja de aplicaciones" -#: ../../Zotlabs/Lib/Apps.php:375 +#: ../../Zotlabs/Lib/Apps.php:402 msgid "Remove from app-tray" msgstr "Quitar de la bandeja de aplicaciones" @@ -7248,8 +7382,8 @@ msgid "Message" msgstr "Mensaje" #: ../../Zotlabs/Lib/NativeWikiPage.php:578 -#: ../../addon/gitwiki/gitwiki_backend.php:579 ../../include/bbcode.php:610 -#: ../../include/bbcode.php:756 +#: ../../addon/gitwiki/gitwiki_backend.php:579 ../../include/bbcode.php:667 +#: ../../include/bbcode.php:813 msgid "Different viewers will see this text differently" msgstr "Visitantes diferentes verán este texto de forma distinta" @@ -7336,21 +7470,20 @@ msgstr "Sala no encontrada." msgid "Room is full" msgstr "La sala está llena." -#: ../../Zotlabs/Lib/Enotify.php:60 ../../include/network.php:1977 +#: ../../Zotlabs/Lib/Enotify.php:60 msgid "$Projectname Notification" msgstr "Notificación de $Projectname" -#: ../../Zotlabs/Lib/Enotify.php:61 ../../addon/diaspora/util.php:218 -#: ../../addon/diaspora/util.php:231 ../../addon/diaspora/p.php:46 -#: ../../include/network.php:1978 +#: ../../Zotlabs/Lib/Enotify.php:61 ../../addon/diaspora/util.php:283 +#: ../../addon/diaspora/util.php:296 ../../addon/diaspora/p.php:46 msgid "$projectname" msgstr "$projectname" -#: ../../Zotlabs/Lib/Enotify.php:63 ../../include/network.php:1980 +#: ../../Zotlabs/Lib/Enotify.php:63 msgid "Thank You," msgstr "Gracias," -#: ../../Zotlabs/Lib/Enotify.php:65 ../../include/network.php:1982 +#: ../../Zotlabs/Lib/Enotify.php:65 #, php-format msgid "%s Administrator" msgstr "%s Administrador" @@ -7384,176 +7517,186 @@ msgstr "un mensaje privado" msgid "Please visit %s to view and/or reply to your private messages." msgstr "Por favor visite %s para ver y/o responder a su mensaje privado." -#: ../../Zotlabs/Lib/Enotify.php:183 +#: ../../Zotlabs/Lib/Enotify.php:184 #, php-format msgid "%1$s, %2$s commented on [zrl=%3$s]a %4$s[/zrl]" msgstr "%1$s, %2$s ha comentado [zrl=%3$s]%4$s[/zrl]" -#: ../../Zotlabs/Lib/Enotify.php:191 +#: ../../Zotlabs/Lib/Enotify.php:192 #, php-format msgid "%1$s, %2$s commented on [zrl=%3$s]%4$s's %5$s[/zrl]" msgstr "%1$s, %2$s ha comentado [zrl=%3$s]%5$s de %4$s[/zrl] " -#: ../../Zotlabs/Lib/Enotify.php:200 +#: ../../Zotlabs/Lib/Enotify.php:201 #, php-format msgid "%1$s, %2$s commented on [zrl=%3$s]your %4$s[/zrl]" msgstr "%1$s, %2$s ha comentado [zrl=%3$s]%4$s creado por usted[/zrl]" -#: ../../Zotlabs/Lib/Enotify.php:211 +#: ../../Zotlabs/Lib/Enotify.php:213 +#, php-format +msgid "[$Projectname:Notify] Moderated Comment to conversation #%1$d by %2$s" +msgstr "[$Projectname:Aviso] Comentario moderado en la conversación #%1$d por %2$s" + +#: ../../Zotlabs/Lib/Enotify.php:215 #, php-format msgid "[$Projectname:Notify] Comment to conversation #%1$d by %2$s" msgstr "[$Projectname:Aviso] Nuevo comentario de %2$s en la conversación #%1$d" -#: ../../Zotlabs/Lib/Enotify.php:212 +#: ../../Zotlabs/Lib/Enotify.php:216 #, php-format msgid "%1$s, %2$s commented on an item/conversation you have been following." msgstr "%1$s, %2$s ha comentado un elemento/conversación que ha estado siguiendo." -#: ../../Zotlabs/Lib/Enotify.php:215 ../../Zotlabs/Lib/Enotify.php:292 -#: ../../Zotlabs/Lib/Enotify.php:309 ../../Zotlabs/Lib/Enotify.php:335 -#: ../../Zotlabs/Lib/Enotify.php:353 ../../Zotlabs/Lib/Enotify.php:367 +#: ../../Zotlabs/Lib/Enotify.php:219 ../../Zotlabs/Lib/Enotify.php:301 +#: ../../Zotlabs/Lib/Enotify.php:318 ../../Zotlabs/Lib/Enotify.php:344 +#: ../../Zotlabs/Lib/Enotify.php:362 ../../Zotlabs/Lib/Enotify.php:376 #, php-format msgid "Please visit %s to view and/or reply to the conversation." msgstr "Para ver o comentar la conversación, visite %s" -#: ../../Zotlabs/Lib/Enotify.php:273 +#: ../../Zotlabs/Lib/Enotify.php:223 ../../Zotlabs/Lib/Enotify.php:224 +#, php-format +msgid "Please visit %s to approve or reject this comment." +msgstr "Por favor, visite %spara aprobar o rechazar este comentario." + +#: ../../Zotlabs/Lib/Enotify.php:282 #, php-format msgid "%1$s, %2$s liked [zrl=%3$s]your %4$s[/zrl]" msgstr "%1$s, %2$s ha mostrado su agrado por [zrl=%3$s]%4$s creado por usted[/zrl]" -#: ../../Zotlabs/Lib/Enotify.php:288 +#: ../../Zotlabs/Lib/Enotify.php:297 #, php-format msgid "[$Projectname:Notify] Like received to conversation #%1$d by %2$s" msgstr "[$Projectname:Aviso] \"Me gusta\" de %2$s en la conversación #%1$d" -#: ../../Zotlabs/Lib/Enotify.php:289 +#: ../../Zotlabs/Lib/Enotify.php:298 #, php-format msgid "%1$s, %2$s liked an item/conversation you created." msgstr "%1$s, %2$s ha mostrado su agrado por un elemento o conversación que ha creado usted." -#: ../../Zotlabs/Lib/Enotify.php:300 +#: ../../Zotlabs/Lib/Enotify.php:309 #, php-format msgid "[$Projectname:Notify] %s posted to your profile wall" msgstr "[$Projectname:Aviso] %s ha publicado una entrada en su página de inicio del perfil (\"muro\")" -#: ../../Zotlabs/Lib/Enotify.php:302 +#: ../../Zotlabs/Lib/Enotify.php:311 #, php-format msgid "%1$s, %2$s posted to your profile wall at %3$s" msgstr "%1$s, %2$s ha publicado en su página del perfil en %3$s" -#: ../../Zotlabs/Lib/Enotify.php:304 +#: ../../Zotlabs/Lib/Enotify.php:313 #, php-format msgid "%1$s, %2$s posted to [zrl=%3$s]your wall[/zrl]" msgstr "%1$s, %2$s ha publicado en [zrl=%3$s]su página del perfil[/zrl]" -#: ../../Zotlabs/Lib/Enotify.php:328 +#: ../../Zotlabs/Lib/Enotify.php:337 #, php-format msgid "[$Projectname:Notify] %s tagged you" msgstr "[$Projectname:Aviso] %s le ha etiquetado" -#: ../../Zotlabs/Lib/Enotify.php:329 +#: ../../Zotlabs/Lib/Enotify.php:338 #, php-format msgid "%1$s, %2$s tagged you at %3$s" msgstr "%1$s, %2$s le ha etiquetado en %3$s" -#: ../../Zotlabs/Lib/Enotify.php:330 +#: ../../Zotlabs/Lib/Enotify.php:339 #, php-format msgid "%1$s, %2$s [zrl=%3$s]tagged you[/zrl]." msgstr "%1$s, %2$s [zrl=%3$s]le etiquetó[/zrl]." -#: ../../Zotlabs/Lib/Enotify.php:342 +#: ../../Zotlabs/Lib/Enotify.php:351 #, php-format msgid "[$Projectname:Notify] %1$s poked you" msgstr "[$Projectname:Aviso] %1$s le ha dado un toque" -#: ../../Zotlabs/Lib/Enotify.php:343 +#: ../../Zotlabs/Lib/Enotify.php:352 #, php-format msgid "%1$s, %2$s poked you at %3$s" msgstr "%1$s, %2$s le ha dado un toque en %3$s" -#: ../../Zotlabs/Lib/Enotify.php:344 +#: ../../Zotlabs/Lib/Enotify.php:353 #, php-format msgid "%1$s, %2$s [zrl=%2$s]poked you[/zrl]." msgstr "%1$s, %2$s [zrl=%2$s]le ha dado un toque[/zrl]." -#: ../../Zotlabs/Lib/Enotify.php:360 +#: ../../Zotlabs/Lib/Enotify.php:369 #, php-format msgid "[$Projectname:Notify] %s tagged your post" msgstr "[$Projectname:Aviso] %s ha etiquetado su entrada" -#: ../../Zotlabs/Lib/Enotify.php:361 +#: ../../Zotlabs/Lib/Enotify.php:370 #, php-format msgid "%1$s, %2$s tagged your post at %3$s" msgstr "%1$s, %2$s ha etiquetado su publicación en %3$s" -#: ../../Zotlabs/Lib/Enotify.php:362 +#: ../../Zotlabs/Lib/Enotify.php:371 #, php-format msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]" msgstr "%1$s, %2$s ha etiquetado [zrl=%3$s]su publicación[/zrl]" -#: ../../Zotlabs/Lib/Enotify.php:374 +#: ../../Zotlabs/Lib/Enotify.php:383 msgid "[$Projectname:Notify] Introduction received" msgstr "[$Projectname:Aviso] Ha recibido una solicitud de conexión" -#: ../../Zotlabs/Lib/Enotify.php:375 +#: ../../Zotlabs/Lib/Enotify.php:384 #, php-format msgid "%1$s, you've received an new connection request from '%2$s' at %3$s" msgstr "%1$s, ha recibido una nueva solicitud de conexión de '%2$s' en %3$s" -#: ../../Zotlabs/Lib/Enotify.php:376 +#: ../../Zotlabs/Lib/Enotify.php:385 #, php-format msgid "" "%1$s, you've received [zrl=%2$s]a new connection request[/zrl] from %3$s." msgstr "%1$s, ha recibido [zrl=%2$s]una nueva solicitud de conexión[/zrl] de %3$s." -#: ../../Zotlabs/Lib/Enotify.php:380 ../../Zotlabs/Lib/Enotify.php:399 +#: ../../Zotlabs/Lib/Enotify.php:389 ../../Zotlabs/Lib/Enotify.php:408 #, php-format msgid "You may visit their profile at %s" msgstr "Puede visitar su perfil en %s" -#: ../../Zotlabs/Lib/Enotify.php:382 +#: ../../Zotlabs/Lib/Enotify.php:391 #, php-format msgid "Please visit %s to approve or reject the connection request." msgstr "Por favor, visite %s para permitir o rechazar la solicitad de conexión." -#: ../../Zotlabs/Lib/Enotify.php:389 +#: ../../Zotlabs/Lib/Enotify.php:398 msgid "[$Projectname:Notify] Friend suggestion received" msgstr "[$Projectname:Aviso] Ha recibido una sugerencia de conexión" -#: ../../Zotlabs/Lib/Enotify.php:390 +#: ../../Zotlabs/Lib/Enotify.php:399 #, php-format msgid "%1$s, you've received a friend suggestion from '%2$s' at %3$s" msgstr "%1$s, ha recibido una sugerencia de conexión de '%2$s' en %3$s" -#: ../../Zotlabs/Lib/Enotify.php:391 +#: ../../Zotlabs/Lib/Enotify.php:400 #, php-format msgid "" "%1$s, you've received [zrl=%2$s]a friend suggestion[/zrl] for %3$s from " "%4$s." msgstr "%1$s, ha recibido [zrl=%2$s]una sugerencia de conexión[/zrl] para %3$s de %4$s." -#: ../../Zotlabs/Lib/Enotify.php:397 +#: ../../Zotlabs/Lib/Enotify.php:406 msgid "Name:" msgstr "Nombre:" -#: ../../Zotlabs/Lib/Enotify.php:398 +#: ../../Zotlabs/Lib/Enotify.php:407 msgid "Photo:" msgstr "Foto:" -#: ../../Zotlabs/Lib/Enotify.php:401 +#: ../../Zotlabs/Lib/Enotify.php:410 #, php-format msgid "Please visit %s to approve or reject the suggestion." msgstr "Por favor, visite %s para aprobar o rechazar la sugerencia." -#: ../../Zotlabs/Lib/Enotify.php:620 +#: ../../Zotlabs/Lib/Enotify.php:629 msgid "[$Projectname:Notify]" msgstr "[$Projectname:Aviso]" -#: ../../Zotlabs/Lib/Enotify.php:780 +#: ../../Zotlabs/Lib/Enotify.php:789 msgid "created a new post" msgstr "ha creado una nueva entrada" -#: ../../Zotlabs/Lib/Enotify.php:781 +#: ../../Zotlabs/Lib/Enotify.php:790 #, php-format msgid "commented on %s's post" msgstr "ha comentado la entrada de %s" @@ -7562,21 +7705,21 @@ msgstr "ha comentado la entrada de %s" msgid "Wiki files deleted successfully" msgstr "Se han borrado con éxito los ficheros del wiki" -#: ../../Zotlabs/Lib/DB_Upgrade.php:93 +#: ../../Zotlabs/Lib/DB_Upgrade.php:95 #, php-format msgid "Update Error at %s" msgstr "Error de actualización en %s" -#: ../../Zotlabs/Lib/DB_Upgrade.php:99 +#: ../../Zotlabs/Lib/DB_Upgrade.php:101 #, php-format msgid "Update %s failed. See error logs." msgstr "La actualización %s ha fallado. Mire el informe de errores." -#: ../../Zotlabs/Lib/ThreadItem.php:96 ../../include/conversation.php:661 +#: ../../Zotlabs/Lib/ThreadItem.php:96 ../../include/conversation.php:656 msgid "Private Message" msgstr "Mensaje Privado" -#: ../../Zotlabs/Lib/ThreadItem.php:133 ../../include/conversation.php:653 +#: ../../Zotlabs/Lib/ThreadItem.php:133 ../../include/conversation.php:648 msgid "Select" msgstr "Seleccionar" @@ -7620,11 +7763,11 @@ msgstr "Activar o desactivar el estado de entrada preferida" msgid "starred" msgstr "preferidas" -#: ../../Zotlabs/Lib/ThreadItem.php:240 ../../include/conversation.php:668 +#: ../../Zotlabs/Lib/ThreadItem.php:240 ../../include/conversation.php:663 msgid "Message signature validated" msgstr "Firma de mensaje validada" -#: ../../Zotlabs/Lib/ThreadItem.php:241 ../../include/conversation.php:669 +#: ../../Zotlabs/Lib/ThreadItem.php:241 ../../include/conversation.php:664 msgid "Message signature incorrect" msgstr "Firma de mensaje incorrecta" @@ -7632,135 +7775,143 @@ msgstr "Firma de mensaje incorrecta" msgid "Add Tag" msgstr "Añadir etiqueta" -#: ../../Zotlabs/Lib/ThreadItem.php:269 ../../include/taxonomy.php:316 +#: ../../Zotlabs/Lib/ThreadItem.php:267 ../../include/taxonomy.php:355 msgid "like" msgstr "me gusta" -#: ../../Zotlabs/Lib/ThreadItem.php:270 ../../include/taxonomy.php:317 +#: ../../Zotlabs/Lib/ThreadItem.php:268 ../../include/taxonomy.php:356 msgid "dislike" msgstr "no me gusta" -#: ../../Zotlabs/Lib/ThreadItem.php:274 +#: ../../Zotlabs/Lib/ThreadItem.php:272 msgid "Share This" msgstr "Compartir esto" -#: ../../Zotlabs/Lib/ThreadItem.php:274 +#: ../../Zotlabs/Lib/ThreadItem.php:272 msgid "share" msgstr "compartir" -#: ../../Zotlabs/Lib/ThreadItem.php:283 +#: ../../Zotlabs/Lib/ThreadItem.php:281 msgid "Delivery Report" msgstr "Informe de transmisión" -#: ../../Zotlabs/Lib/ThreadItem.php:301 +#: ../../Zotlabs/Lib/ThreadItem.php:299 #, php-format msgid "%d comment" msgid_plural "%d comments" msgstr[0] "%d comentario" msgstr[1] "%d comentarios" -#: ../../Zotlabs/Lib/ThreadItem.php:330 ../../Zotlabs/Lib/ThreadItem.php:331 +#: ../../Zotlabs/Lib/ThreadItem.php:328 ../../Zotlabs/Lib/ThreadItem.php:329 #, php-format msgid "View %s's profile - %s" msgstr "Ver el perfil de %s - %s" -#: ../../Zotlabs/Lib/ThreadItem.php:334 +#: ../../Zotlabs/Lib/ThreadItem.php:332 msgid "to" msgstr "a" -#: ../../Zotlabs/Lib/ThreadItem.php:335 +#: ../../Zotlabs/Lib/ThreadItem.php:333 msgid "via" msgstr "mediante" -#: ../../Zotlabs/Lib/ThreadItem.php:336 +#: ../../Zotlabs/Lib/ThreadItem.php:334 msgid "Wall-to-Wall" msgstr "De página del perfil a página del perfil (de \"muro\" a \"muro\")" -#: ../../Zotlabs/Lib/ThreadItem.php:337 +#: ../../Zotlabs/Lib/ThreadItem.php:335 msgid "via Wall-To-Wall:" msgstr "Mediante el procedimiento página del perfil a página del perfil (de \"muro\" a \"muro\")" -#: ../../Zotlabs/Lib/ThreadItem.php:350 ../../include/conversation.php:718 +#: ../../Zotlabs/Lib/ThreadItem.php:348 ../../include/conversation.php:715 #, php-format msgid "from %s" msgstr "desde %s" -#: ../../Zotlabs/Lib/ThreadItem.php:353 ../../include/conversation.php:721 +#: ../../Zotlabs/Lib/ThreadItem.php:351 ../../include/conversation.php:718 #, php-format msgid "last edited: %s" msgstr "último cambio: %s" -#: ../../Zotlabs/Lib/ThreadItem.php:354 ../../include/conversation.php:722 +#: ../../Zotlabs/Lib/ThreadItem.php:352 ../../include/conversation.php:719 #, php-format msgid "Expires: %s" msgstr "Caduca: %s" -#: ../../Zotlabs/Lib/ThreadItem.php:360 +#: ../../Zotlabs/Lib/ThreadItem.php:358 msgid "Attend" msgstr "Participar o asistir" -#: ../../Zotlabs/Lib/ThreadItem.php:361 +#: ../../Zotlabs/Lib/ThreadItem.php:359 msgid "Attendance Options" msgstr "Opciones de participación o asistencia" -#: ../../Zotlabs/Lib/ThreadItem.php:362 +#: ../../Zotlabs/Lib/ThreadItem.php:360 msgid "Vote" msgstr "Votar" -#: ../../Zotlabs/Lib/ThreadItem.php:363 +#: ../../Zotlabs/Lib/ThreadItem.php:361 msgid "Voting Options" msgstr "Opciones de votación" -#: ../../Zotlabs/Lib/ThreadItem.php:384 +#: ../../Zotlabs/Lib/ThreadItem.php:382 #: ../../addon/bookmarker/bookmarker.php:38 msgid "Save Bookmarks" msgstr "Guardar en Marcadores" -#: ../../Zotlabs/Lib/ThreadItem.php:385 +#: ../../Zotlabs/Lib/ThreadItem.php:383 msgid "Add to Calendar" msgstr "Añadir al calendario" -#: ../../Zotlabs/Lib/ThreadItem.php:394 -msgid "Mark all seen" -msgstr "Marcar todo como visto" - -#: ../../Zotlabs/Lib/ThreadItem.php:443 ../../include/js_strings.php:7 +#: ../../Zotlabs/Lib/ThreadItem.php:441 ../../include/js_strings.php:7 #, php-format msgid "%s show all" msgstr "%s mostrar todo" -#: ../../Zotlabs/Lib/ThreadItem.php:733 ../../include/conversation.php:1318 +#: ../../Zotlabs/Lib/ThreadItem.php:731 ../../include/conversation.php:1315 msgid "Bold" msgstr "Negrita" -#: ../../Zotlabs/Lib/ThreadItem.php:734 ../../include/conversation.php:1319 +#: ../../Zotlabs/Lib/ThreadItem.php:732 ../../include/conversation.php:1316 msgid "Italic" msgstr "Itálico " -#: ../../Zotlabs/Lib/ThreadItem.php:735 ../../include/conversation.php:1320 +#: ../../Zotlabs/Lib/ThreadItem.php:733 ../../include/conversation.php:1317 msgid "Underline" msgstr "Subrayar" -#: ../../Zotlabs/Lib/ThreadItem.php:736 ../../include/conversation.php:1321 +#: ../../Zotlabs/Lib/ThreadItem.php:734 ../../include/conversation.php:1318 msgid "Quote" msgstr "Citar" -#: ../../Zotlabs/Lib/ThreadItem.php:737 ../../include/conversation.php:1322 +#: ../../Zotlabs/Lib/ThreadItem.php:735 ../../include/conversation.php:1319 msgid "Code" msgstr "Código" -#: ../../Zotlabs/Lib/ThreadItem.php:738 +#: ../../Zotlabs/Lib/ThreadItem.php:736 msgid "Image" msgstr "Imagen" -#: ../../Zotlabs/Lib/ThreadItem.php:739 +#: ../../Zotlabs/Lib/ThreadItem.php:737 msgid "Insert Link" msgstr "Insertar enlace" -#: ../../Zotlabs/Lib/ThreadItem.php:740 +#: ../../Zotlabs/Lib/ThreadItem.php:738 msgid "Video" msgstr "Vídeo" +#: ../../Zotlabs/Lib/ThreadItem.php:747 +msgid "Your full name (required)" +msgstr "Su nombre completo (requerido)" + +#: ../../Zotlabs/Lib/ThreadItem.php:748 +msgid "Your email address (required)" +msgstr "Su dirección de correo electrónico (requerido)" + +#: ../../Zotlabs/Lib/ThreadItem.php:749 +msgid "Your website URL (optional)" +msgstr "La URL de su sitio web (opcional)" + #: ../../Zotlabs/Zot/Auth.php:138 msgid "" "Remote authentication blocked. You are logged into this site locally. Please" @@ -7773,72 +7924,72 @@ msgstr "La autenticación desde su servidor está bloqueada. Ha iniciado sesión msgid "Welcome %s. Remote authentication successful." msgstr "Bienvenido %s. La identificación desde su servidor se ha llevado a cabo correctamente." -#: ../../Zotlabs/Storage/Browser.php:106 ../../Zotlabs/Storage/Browser.php:237 +#: ../../Zotlabs/Storage/Browser.php:107 ../../Zotlabs/Storage/Browser.php:238 msgid "parent" msgstr "padre" -#: ../../Zotlabs/Storage/Browser.php:130 ../../include/text.php:2679 +#: ../../Zotlabs/Storage/Browser.php:131 ../../include/text.php:2692 msgid "Collection" msgstr "Colección" -#: ../../Zotlabs/Storage/Browser.php:133 +#: ../../Zotlabs/Storage/Browser.php:134 msgid "Principal" msgstr "Principal" -#: ../../Zotlabs/Storage/Browser.php:136 +#: ../../Zotlabs/Storage/Browser.php:137 msgid "Addressbook" msgstr "Libreta de direcciones" -#: ../../Zotlabs/Storage/Browser.php:139 +#: ../../Zotlabs/Storage/Browser.php:140 msgid "Calendar" msgstr "Calendario" -#: ../../Zotlabs/Storage/Browser.php:142 +#: ../../Zotlabs/Storage/Browser.php:143 msgid "Schedule Inbox" msgstr "Programar bandeja de entrada" -#: ../../Zotlabs/Storage/Browser.php:145 +#: ../../Zotlabs/Storage/Browser.php:146 msgid "Schedule Outbox" msgstr "Programar bandeja de salida" -#: ../../Zotlabs/Storage/Browser.php:225 +#: ../../Zotlabs/Storage/Browser.php:226 msgid "Total" msgstr "Total" -#: ../../Zotlabs/Storage/Browser.php:227 +#: ../../Zotlabs/Storage/Browser.php:228 msgid "Shared" msgstr "Compartido" -#: ../../Zotlabs/Storage/Browser.php:301 +#: ../../Zotlabs/Storage/Browser.php:304 #, php-format msgid "You are using %1$s of your available file storage." msgstr "Está usando %1$s de su espacio disponible para ficheros." -#: ../../Zotlabs/Storage/Browser.php:306 +#: ../../Zotlabs/Storage/Browser.php:309 #, php-format msgid "You are using %1$s of %2$s available file storage. (%3$s%)" msgstr "Está usando %1$s de %2$s que tiene a su disposición para ficheros. (%3$s%)" -#: ../../Zotlabs/Storage/Browser.php:317 +#: ../../Zotlabs/Storage/Browser.php:320 msgid "WARNING:" msgstr "ATENCIÓN: " -#: ../../Zotlabs/Storage/Browser.php:327 +#: ../../Zotlabs/Storage/Browser.php:330 msgid "" "Please use DAV to upload large (video, audio) files.
See Cloud Desktop " "Clients" msgstr "Por favor, use DAV para subir ficheros de gran tamaño (vídeo, audio).
Mire en Cloud Desktop Clients" -#: ../../Zotlabs/Storage/Browser.php:331 +#: ../../Zotlabs/Storage/Browser.php:334 msgid "Create new folder" msgstr "Crear nueva carpeta" -#: ../../Zotlabs/Storage/Browser.php:333 +#: ../../Zotlabs/Storage/Browser.php:336 msgid "Upload file" msgstr "Subir fichero" -#: ../../Zotlabs/Storage/Browser.php:347 +#: ../../Zotlabs/Storage/Browser.php:350 msgid "Drop files here to immediately upload" msgstr "Arrastre los ficheros aquí para subirlos de forma inmediata" @@ -7846,9 +7997,85 @@ msgstr "Arrastre los ficheros aquí para subirlos de forma inmediata" msgid "Forums" msgstr "Foros" +#: ../../Zotlabs/Widget/Cdav.php:37 +msgid "Select Channel" +msgstr "Seleccionar un canal" + +#: ../../Zotlabs/Widget/Cdav.php:42 +msgid "Read-write" +msgstr "Lectura y escritura" + +#: ../../Zotlabs/Widget/Cdav.php:43 +msgid "Read-only" +msgstr "Sólo lectura" + +#: ../../Zotlabs/Widget/Cdav.php:116 +msgid "My Calendars" +msgstr "Mis calendarios" + +#: ../../Zotlabs/Widget/Cdav.php:118 +msgid "Shared Calendars" +msgstr "Calendarios compartidos" + +#: ../../Zotlabs/Widget/Cdav.php:122 +msgid "Share this calendar" +msgstr "Compartir este calendario" + +#: ../../Zotlabs/Widget/Cdav.php:124 +msgid "Calendar name and color" +msgstr "Nombre y color del calendario" + +#: ../../Zotlabs/Widget/Cdav.php:126 +msgid "Create new calendar" +msgstr "Crear un nuevo calendario" + +#: ../../Zotlabs/Widget/Cdav.php:128 +msgid "Calendar Name" +msgstr "Nombre del calendario" + +#: ../../Zotlabs/Widget/Cdav.php:129 +msgid "Calendar Tools" +msgstr "Gestión de calendarios" + +#: ../../Zotlabs/Widget/Cdav.php:130 +msgid "Import calendar" +msgstr "Importar un calendario" + +#: ../../Zotlabs/Widget/Cdav.php:131 +msgid "Select a calendar to import to" +msgstr "Seleccionar un calendario para importarlo" + +#: ../../Zotlabs/Widget/Cdav.php:158 +msgid "Addressbooks" +msgstr "Agenda de direcciones" + +#: ../../Zotlabs/Widget/Cdav.php:160 +msgid "Addressbook name" +msgstr "Nombre de la agenda" + +#: ../../Zotlabs/Widget/Cdav.php:162 +msgid "Create new addressbook" +msgstr "Crear una nueva agenda de direcciones" + +#: ../../Zotlabs/Widget/Cdav.php:163 +msgid "Addressbook Name" +msgstr "Nombre de la agenda" + +#: ../../Zotlabs/Widget/Cdav.php:165 +msgid "Addressbook Tools" +msgstr "Gestión de agendas de direcciones" + +#: ../../Zotlabs/Widget/Cdav.php:166 +msgid "Import addressbook" +msgstr "Importar una agenda de direcciones" + +#: ../../Zotlabs/Widget/Cdav.php:167 +msgid "Select an addressbook to import to" +msgstr "Seleccionar una agenda para importarla" + #: ../../Zotlabs/Widget/Appcategories.php:39 #: ../../Zotlabs/Widget/Tagcloud.php:25 ../../include/contact_widgets.php:91 -#: ../../include/taxonomy.php:188 ../../include/taxonomy.php:270 +#: ../../include/taxonomy.php:227 ../../include/taxonomy.php:309 msgid "Categories" msgstr "Temas" @@ -7881,21 +8108,21 @@ msgstr "Menú de correo privado" msgid "Combined View" msgstr "Vista combinada" -#: ../../Zotlabs/Widget/Mailmenu.php:20 ../../include/nav.php:195 +#: ../../Zotlabs/Widget/Mailmenu.php:20 ../../include/nav.php:190 msgid "Inbox" msgstr "Bandeja de entrada" -#: ../../Zotlabs/Widget/Mailmenu.php:25 ../../include/nav.php:196 +#: ../../Zotlabs/Widget/Mailmenu.php:25 ../../include/nav.php:191 msgid "Outbox" msgstr "Bandeja de salida" -#: ../../Zotlabs/Widget/Mailmenu.php:30 ../../include/nav.php:197 +#: ../../Zotlabs/Widget/Mailmenu.php:30 ../../include/nav.php:192 msgid "New Message" msgstr "Nuevo mensaje" #: ../../Zotlabs/Widget/Chatroom_list.php:16 -#: ../../include/conversation.php:1816 ../../include/conversation.php:1819 -#: ../../include/nav.php:425 ../../include/nav.php:428 +#: ../../include/conversation.php:1813 ../../include/conversation.php:1816 +#: ../../include/nav.php:411 ../../include/nav.php:414 msgid "Chatrooms" msgstr "Salas de chat" @@ -7946,23 +8173,22 @@ msgid "Archives" msgstr "Hemeroteca" #: ../../Zotlabs/Widget/Conversations.php:17 -#: ../../Zotlabs/Widget/Conversations.php:29 -msgid "Conversations" -msgstr "Conversaciones" - -#: ../../Zotlabs/Widget/Conversations.php:21 msgid "Received Messages" msgstr "Mensajes recibidos" -#: ../../Zotlabs/Widget/Conversations.php:25 +#: ../../Zotlabs/Widget/Conversations.php:21 msgid "Sent Messages" msgstr "Enviar mensajes" -#: ../../Zotlabs/Widget/Conversations.php:39 +#: ../../Zotlabs/Widget/Conversations.php:25 +msgid "Conversations" +msgstr "Conversaciones" + +#: ../../Zotlabs/Widget/Conversations.php:35 msgid "No messages." msgstr "Sin mensajes." -#: ../../Zotlabs/Widget/Conversations.php:57 +#: ../../Zotlabs/Widget/Conversations.php:55 msgid "Delete conversation" msgstr "Eliminar conversación" @@ -7978,11 +8204,11 @@ msgstr "foto/imagen" msgid "Remove term" msgstr "Eliminar término" -#: ../../Zotlabs/Widget/Savedsearch.php:83 ../../include/features.php:301 +#: ../../Zotlabs/Widget/Savedsearch.php:83 ../../include/features.php:297 msgid "Saved Searches" msgstr "Búsquedas guardadas" -#: ../../Zotlabs/Widget/Savedsearch.php:84 ../../include/group.php:336 +#: ../../Zotlabs/Widget/Savedsearch.php:84 ../../include/group.php:337 msgid "add" msgstr "añadir" @@ -7990,15 +8216,15 @@ msgstr "añadir" msgid "Notes" msgstr "Notas" -#: ../../Zotlabs/Widget/Wiki_pages.php:54 ../../addon/gitwiki/gitwiki.php:76 +#: ../../Zotlabs/Widget/Wiki_pages.php:52 ../../addon/gitwiki/gitwiki.php:76 msgid "Wiki Pages" msgstr "Páginas del wiki" -#: ../../Zotlabs/Widget/Wiki_pages.php:60 ../../addon/gitwiki/gitwiki.php:81 +#: ../../Zotlabs/Widget/Wiki_pages.php:58 ../../addon/gitwiki/gitwiki.php:81 msgid "Add new page" msgstr "Añadir una nueva página" -#: ../../Zotlabs/Widget/Wiki_pages.php:61 ../../addon/gitwiki/gitwiki.php:82 +#: ../../Zotlabs/Widget/Wiki_pages.php:59 ../../addon/gitwiki/gitwiki.php:82 msgid "Page name" msgstr "Nombre de la página" @@ -8019,7 +8245,7 @@ msgid "See more..." msgstr "Ver más..." #: ../../Zotlabs/Widget/Filer.php:28 ../../include/contact_widgets.php:53 -#: ../../include/features.php:390 +#: ../../include/features.php:386 msgid "Saved Folders" msgstr "Carpetas guardadas" @@ -8075,15 +8301,15 @@ msgstr "Gestión de ubicaciones (clones) del canal" msgid "Export channel" msgstr "Exportar canal" -#: ../../Zotlabs/Widget/Settings_menu.php:83 +#: ../../Zotlabs/Widget/Settings_menu.php:84 msgid "Connected apps" msgstr "Aplicaciones (apps) conectadas" -#: ../../Zotlabs/Widget/Settings_menu.php:98 ../../include/features.php:153 +#: ../../Zotlabs/Widget/Settings_menu.php:100 ../../include/features.php:149 msgid "Permission Groups" msgstr "Grupos de permisos" -#: ../../Zotlabs/Widget/Settings_menu.php:115 +#: ../../Zotlabs/Widget/Settings_menu.php:117 msgid "Premium Channel Settings" msgstr "Configuración del canal premium" @@ -8095,156 +8321,147 @@ msgstr "Salas de chat preferidas" msgid "Source channel not found." msgstr "No se ha encontrado el canal de origen." -#: ../../boot.php:1162 ../../addon/opensearch/opensearch.php:26 -#, php-format -msgctxt "opensearch" -msgid "Search %1$s (%2$s)" -msgstr "Buscar %1$s (%2$s)" - -#: ../../boot.php:1162 ../../addon/opensearch/opensearch.php:28 -msgctxt "opensearch" -msgid "$Projectname" -msgstr "$Projectname" - -#: ../../boot.php:1609 +#: ../../boot.php:1581 msgid "Create an account to access services and applications" msgstr "Crear una cuenta para acceder a los servicios y aplicaciones" -#: ../../boot.php:1628 ../../include/nav.php:103 ../../include/nav.php:127 +#: ../../boot.php:1600 ../../include/nav.php:99 ../../include/nav.php:123 +#: ../../include/nav.php:140 msgid "Logout" msgstr "Finalizar sesión" -#: ../../boot.php:1631 +#: ../../boot.php:1603 msgid "Login/Email" msgstr "Inicio de sesión / Correo electrónico" -#: ../../boot.php:1632 +#: ../../boot.php:1604 msgid "Password" msgstr "Contraseña" -#: ../../boot.php:1633 +#: ../../boot.php:1605 msgid "Remember me" msgstr "Recordarme" -#: ../../boot.php:1636 +#: ../../boot.php:1608 msgid "Forgot your password?" msgstr "¿Olvidó su contraseña?" -#: ../../boot.php:2174 +#: ../../boot.php:2146 msgid "toggle mobile" msgstr "cambiar a modo móvil" -#: ../../boot.php:2327 +#: ../../boot.php:2299 #, php-format msgid "[$Projectname] Website SSL error for %s" msgstr "[$Projectname] Error SSL del sitio web en %s" -#: ../../boot.php:2332 +#: ../../boot.php:2304 msgid "Website SSL certificate is not valid. Please correct." msgstr "El certificado SSL del sitio web no es válido. Por favor, solucione el problema." -#: ../../boot.php:2450 +#: ../../boot.php:2423 #, php-format msgid "[$Projectname] Cron tasks not running on %s" msgstr "[$Projectname] Las tareas de Cron no están funcionando en %s" -#: ../../boot.php:2455 +#: ../../boot.php:2428 msgid "Cron/Scheduled tasks not running." msgstr "Las tareas del Planificador/Cron no están funcionando." -#: ../../boot.php:2456 ../../include/datetime.php:286 +#: ../../boot.php:2429 ../../include/datetime.php:286 msgid "never" msgstr "nunca" -#: ../../view/theme/redbasic/php/config.php:9 +#: ../../view/theme/redbasic/php/config.php:16 +#: ../../view/theme/redbasic/php/config.php:19 msgid "Focus (Hubzilla default)" msgstr "Focus (predefinido)" -#: ../../view/theme/redbasic/php/config.php:88 +#: ../../view/theme/redbasic/php/config.php:99 msgid "Theme settings" msgstr "Ajustes del tema" -#: ../../view/theme/redbasic/php/config.php:89 +#: ../../view/theme/redbasic/php/config.php:100 msgid "Narrow navbar" msgstr "Estrechar la barra de navegación" -#: ../../view/theme/redbasic/php/config.php:90 +#: ../../view/theme/redbasic/php/config.php:101 msgid "Navigation bar background color" msgstr "Color de fondo de la barra de navegación" -#: ../../view/theme/redbasic/php/config.php:91 +#: ../../view/theme/redbasic/php/config.php:102 msgid "Navigation bar icon color " msgstr "Color del icono de la barra de navegación" -#: ../../view/theme/redbasic/php/config.php:92 +#: ../../view/theme/redbasic/php/config.php:103 msgid "Navigation bar active icon color " msgstr "Color del icono activo de la barra de navegación" -#: ../../view/theme/redbasic/php/config.php:93 +#: ../../view/theme/redbasic/php/config.php:104 msgid "Link color" msgstr "Color del enlace" -#: ../../view/theme/redbasic/php/config.php:94 +#: ../../view/theme/redbasic/php/config.php:105 msgid "Set font-color for banner" msgstr "Ajustar el color del tipo de letra para el \"banner\"" -#: ../../view/theme/redbasic/php/config.php:95 +#: ../../view/theme/redbasic/php/config.php:106 msgid "Set the background color" msgstr "Ajustar el color de fondo" -#: ../../view/theme/redbasic/php/config.php:96 +#: ../../view/theme/redbasic/php/config.php:107 msgid "Set the background image" msgstr "Ajustar la imagen de fondo" -#: ../../view/theme/redbasic/php/config.php:97 +#: ../../view/theme/redbasic/php/config.php:108 msgid "Set the background color of items" msgstr "Ajustar el color de los elementos de fondo" -#: ../../view/theme/redbasic/php/config.php:98 +#: ../../view/theme/redbasic/php/config.php:109 msgid "Set the background color of comments" msgstr "Ajustar el color de fondo de los comentarios" -#: ../../view/theme/redbasic/php/config.php:99 +#: ../../view/theme/redbasic/php/config.php:110 msgid "Set font-size for the entire application" msgstr "Ajustar el tamaño de letra para toda la aplicación" -#: ../../view/theme/redbasic/php/config.php:99 +#: ../../view/theme/redbasic/php/config.php:110 msgid "Examples: 1rem, 100%, 16px" msgstr "Ejemplos: 1rem, 100%, 16px" -#: ../../view/theme/redbasic/php/config.php:100 +#: ../../view/theme/redbasic/php/config.php:111 msgid "Set font-color for posts and comments" msgstr "Establecer el color de la letra para publicaciones y comentarios" -#: ../../view/theme/redbasic/php/config.php:101 +#: ../../view/theme/redbasic/php/config.php:112 msgid "Set radius of corners" msgstr "Establecer el radio de curvatura de las esquinas" -#: ../../view/theme/redbasic/php/config.php:101 +#: ../../view/theme/redbasic/php/config.php:112 msgid "Example: 4px" msgstr "Ejemplo: 4px" -#: ../../view/theme/redbasic/php/config.php:102 +#: ../../view/theme/redbasic/php/config.php:113 msgid "Set shadow depth of photos" msgstr "Ajustar la profundidad de sombras de las fotos" -#: ../../view/theme/redbasic/php/config.php:103 +#: ../../view/theme/redbasic/php/config.php:114 msgid "Set maximum width of content region in pixel" msgstr "Ajustar la anchura máxima de la región de contenido, en pixels" -#: ../../view/theme/redbasic/php/config.php:103 +#: ../../view/theme/redbasic/php/config.php:114 msgid "Leave empty for default width" msgstr "Dejar en blanco para la anchura predeterminada" -#: ../../view/theme/redbasic/php/config.php:104 +#: ../../view/theme/redbasic/php/config.php:115 msgid "Left align page content" msgstr "Alinear a la izquierda el contenido de la página" -#: ../../view/theme/redbasic/php/config.php:105 +#: ../../view/theme/redbasic/php/config.php:116 msgid "Set size of conversation author photo" msgstr "Ajustar el tamaño de la foto del autor de la conversación" -#: ../../view/theme/redbasic/php/config.php:106 +#: ../../view/theme/redbasic/php/config.php:117 msgid "Set size of followup author photos" msgstr "Ajustar el tamaño de foto de los seguidores del autor" @@ -8386,232 +8603,43 @@ msgstr "Un ajuste" msgid "Skeleton Settings" msgstr "Ajustes de Skeleton" -#: ../../addon/gnusoc/gnusoc.php:119 +#: ../../addon/gnusoc/gnusoc.php:200 msgid "GNU-Social Protocol Settings updated." msgstr "Se han actualizado los ajustes del protocolo de GNU-Social." -#: ../../addon/gnusoc/gnusoc.php:130 +#: ../../addon/gnusoc/gnusoc.php:219 +msgid "" +"The GNU-Social protocol does not support location independence. Connections " +"you make within that network may be unreachable from alternate channel " +"locations." +msgstr "El protocolo de GNU-Social no admite la independencia de la ubicación. Las\n conexiones que realice dentro de esa red pueden ser inaccesibles desde \nubicaciones de canales alternativos." + +#: ../../addon/gnusoc/gnusoc.php:222 msgid "Enable the GNU-Social protocol for this channel" msgstr "Activar el protocolo de GNU-Social para este canal" -#: ../../addon/gnusoc/gnusoc.php:134 +#: ../../addon/gnusoc/gnusoc.php:226 msgid "GNU-Social Protocol Settings" msgstr "Ajustes del protocolo de GNU-Social" -#: ../../addon/gnusoc/gnusoc.php:324 +#: ../../addon/gnusoc/gnusoc.php:417 msgid "Follow" msgstr "Seguir" -#: ../../addon/gnusoc/gnusoc.php:327 +#: ../../addon/gnusoc/gnusoc.php:420 #, php-format msgid "%1$s is now following %2$s" msgstr "%1$s está siguiendo ahora a %2$s" -#: ../../addon/cdav/Mod_Cdav.php:744 -msgid "INVALID EVENT DISMISSED!" -msgstr "¡EVENTO NO VÁLIDO RECHAZADO!" - -#: ../../addon/cdav/Mod_Cdav.php:745 -msgid "Summary: " -msgstr "Resumen: " - -#: ../../addon/cdav/Mod_Cdav.php:746 -msgid "Date: " -msgstr "Fecha: " - -#: ../../addon/cdav/Mod_Cdav.php:747 ../../addon/cdav/Mod_Cdav.php:754 -msgid "Reason: " -msgstr "Razón: " - -#: ../../addon/cdav/Mod_Cdav.php:752 -msgid "INVALID CARD DISMISSED!" -msgstr "¡TARJETA NO VÁLIDA RECHAZADA!" - -#: ../../addon/cdav/Mod_Cdav.php:753 -msgid "Name: " -msgstr "Nombre: " - -#: ../../addon/cdav/Mod_Cdav.php:770 -msgid "" -"You have to enable this plugin in Feature/Addon Settings > CalDAV/CardDAV " -"Settings before you can use it." -msgstr "Debe habilitar este complemento en Ajustes/Complementos>Configuración de CalDAV/CardDAV antes de poder utilizarlo." - -#: ../../addon/cdav/Mod_Cdav.php:836 ../../addon/cdav/Mod_Cdav.php:837 -msgid "Example: YYYY-MM-DD HH:mm" -msgstr "Ejemplo: YYYY-MM-DD HH:mm" - -#: ../../addon/cdav/Mod_Cdav.php:837 -msgid "End date and time" -msgstr "Fecha y hora de finalización" - -#: ../../addon/cdav/Mod_Cdav.php:852 -msgid "List month" -msgstr "Lista mensual" - -#: ../../addon/cdav/Mod_Cdav.php:853 -msgid "List week" -msgstr "Lista semanal" - -#: ../../addon/cdav/Mod_Cdav.php:854 -msgid "List day" -msgstr "Lista diaria" - -#: ../../addon/cdav/Mod_Cdav.php:861 -msgid "More" -msgstr "Más" - -#: ../../addon/cdav/Mod_Cdav.php:862 -msgid "Less" -msgstr "Menos" - -#: ../../addon/cdav/Mod_Cdav.php:863 -msgid "Select calendar" -msgstr "Seleccionar un calendario" - -#: ../../addon/cdav/Mod_Cdav.php:865 -msgid "Delete all" -msgstr "Eliminar todos" - -#: ../../addon/cdav/Mod_Cdav.php:867 -msgid "Sorry! Editing of recurrent events is not yet implemented." -msgstr "¡Disculpas! La edición de eventos recurrentes aún no se ha implementado." - -#: ../../addon/cdav/cdav.php:36 -msgid "Errors encountered creating database table: " -msgstr "Errores encontrados al crear la tabla de la base de datos: " - -#: ../../addon/cdav/cdav.php:197 -msgid "Default Calendar" -msgstr "Calendario por defecto" - -#: ../../addon/cdav/cdav.php:206 -msgid "Default Addressbook" -msgstr "Agenda de direcciones por defecto" - -#: ../../addon/cdav/cdav.php:215 -msgid "CalDAV/CardDAV Settings saved." -msgstr "Se ha guardado la configuración de CalDAV/CardDAV." - -#: ../../addon/cdav/cdav.php:234 -msgid "Enable CalDAV/CardDAV Server for this channel" -msgstr "Habilitar el servidor CalDAV/CardDAV para este canal" - -#: ../../addon/cdav/cdav.php:237 -#, php-format -msgid "Your CalDAV resources are located at %s " -msgstr "Los recursos de CalDAV se encuentran en %s" - -#: ../../addon/cdav/cdav.php:240 -#, php-format -msgid "Your CardDAV resources are located at %s " -msgstr "Sus recursos de CalDAV están localizados en %s " - -#: ../../addon/cdav/cdav.php:246 -msgid "CalDAV/CardDAV Settings" -msgstr "Configuración de CalDAV/CardDAV" - -#: ../../addon/cdav/cdav.php:272 ../../include/connections.php:670 -msgid "Home, Voice" -msgstr "Llamadas particulares" - -#: ../../addon/cdav/cdav.php:273 ../../include/connections.php:671 -msgid "Home, Fax" -msgstr "Fax particular" - -#: ../../addon/cdav/cdav.php:275 ../../include/connections.php:673 -msgid "Work, Voice" -msgstr "Llamadas de trabajo" - -#: ../../addon/cdav/cdav.php:276 ../../include/connections.php:674 -msgid "Work, Fax" -msgstr "Fax de trabajo" - -#: ../../addon/cdav/include/widgets.php:37 -msgid "Select Channel" -msgstr "Seleccionar un canal" - -#: ../../addon/cdav/include/widgets.php:42 -msgid "Read-write" -msgstr "Lectura y escritura" - -#: ../../addon/cdav/include/widgets.php:43 -msgid "Read-only" -msgstr "Sólo lectura" - -#: ../../addon/cdav/include/widgets.php:116 -msgid "My Calendars" -msgstr "Mis calendarios" - -#: ../../addon/cdav/include/widgets.php:118 -msgid "Shared Calendars" -msgstr "Calendarios compartidos" - -#: ../../addon/cdav/include/widgets.php:122 -msgid "Share this calendar" -msgstr "Compartir este calendario" - -#: ../../addon/cdav/include/widgets.php:124 -msgid "Calendar name and color" -msgstr "Nombre y color del calendario" - -#: ../../addon/cdav/include/widgets.php:126 -msgid "Create new calendar" -msgstr "Crear un nuevo calendario" - -#: ../../addon/cdav/include/widgets.php:128 -msgid "Calendar Name" -msgstr "Nombre del calendario" - -#: ../../addon/cdav/include/widgets.php:129 -msgid "Calendar Tools" -msgstr "Gestión de calendarios" - -#: ../../addon/cdav/include/widgets.php:130 -msgid "Import calendar" -msgstr "Importar un calendario" - -#: ../../addon/cdav/include/widgets.php:131 -msgid "Select a calendar to import to" -msgstr "Seleccionar un calendario para importarlo" - -#: ../../addon/cdav/include/widgets.php:158 -msgid "Addressbooks" -msgstr "Agenda de direcciones" - -#: ../../addon/cdav/include/widgets.php:160 -msgid "Addressbook name" -msgstr "Nombre de la agenda" - -#: ../../addon/cdav/include/widgets.php:162 -msgid "Create new addressbook" -msgstr "Crear una nueva agenda de direcciones" - -#: ../../addon/cdav/include/widgets.php:163 -msgid "Addressbook Name" -msgstr "Nombre de la agenda" - -#: ../../addon/cdav/include/widgets.php:165 -msgid "Addressbook Tools" -msgstr "Gestión de agendas de direcciones" - -#: ../../addon/cdav/include/widgets.php:166 -msgid "Import addressbook" -msgstr "Importar una agenda de direcciones" - -#: ../../addon/cdav/include/widgets.php:167 -msgid "Select an addressbook to import to" -msgstr "Seleccionar una agenda para importarla" - #: ../../addon/planets/planets.php:121 msgid "Planets Settings updated." msgstr "Se han guardado los ajustes de Planets." -#: ../../addon/planets/planets.php:153 +#: ../../addon/planets/planets.php:149 msgid "Enable Planets Plugin" msgstr "Habilitar el plugin Planets" -#: ../../addon/planets/planets.php:157 +#: ../../addon/planets/planets.php:153 msgid "Planets Settings" msgstr "Ajustes de Planets" @@ -8644,8 +8672,8 @@ msgstr "Regresar después" msgid "Page to load after image selection." msgstr "Página para cargar después de la selección de imágenes." -#: ../../addon/openclipatar/openclipatar.php:58 ../../include/channel.php:1048 -#: ../../include/nav.php:111 +#: ../../addon/openclipatar/openclipatar.php:58 ../../include/channel.php:1165 +#: ../../include/nav.php:107 msgid "Edit Profile" msgstr "Editar el perfil" @@ -9184,12 +9212,12 @@ msgid "Login failed." msgstr "El acceso ha fallado." #: ../../addon/openid/Mod_Id.php:85 ../../include/selectors.php:49 -#: ../../include/selectors.php:66 +#: ../../include/selectors.php:66 ../../include/channel.php:1332 msgid "Male" msgstr "Hombre" #: ../../addon/openid/Mod_Id.php:87 ../../include/selectors.php:49 -#: ../../include/selectors.php:66 +#: ../../include/selectors.php:66 ../../include/channel.php:1330 msgid "Female" msgstr "Mujer" @@ -9376,27 +9404,39 @@ msgstr "una declaración de amor eterno" msgid "declared undying love for" msgstr "ha declarado amor eterno a" -#: ../../addon/diaspora/diaspora.php:675 +#: ../../addon/diaspora/diaspora.php:715 msgid "Diaspora Protocol Settings updated." msgstr "Los ajustes del protocolo de Diaspora se han actualizado." -#: ../../addon/diaspora/diaspora.php:694 +#: ../../addon/diaspora/diaspora.php:734 +msgid "" +"The Diaspora protocol does not support location independence. Connections " +"you make within that network may be unreachable from alternate channel " +"locations." +msgstr "El protocolo de Diaspora no admite la independencia de la ubicación. Las conexiones que realice dentro de esa red pueden ser inaccesibles desde ubicaciones de canales alternativos." + +#: ../../addon/diaspora/diaspora.php:737 msgid "Enable the Diaspora protocol for this channel" msgstr "Activar el protocolo de Diaspora para este canal" -#: ../../addon/diaspora/diaspora.php:698 +#: ../../addon/diaspora/diaspora.php:741 msgid "Allow any Diaspora member to comment on your public posts" msgstr "Permitir a cualquier miembro de Diaspora comentar sus entradas públicas" -#: ../../addon/diaspora/diaspora.php:702 +#: ../../addon/diaspora/diaspora.php:745 msgid "Prevent your hashtags from being redirected to other sites" msgstr "Impedir que sus \"hashtags\" sean redirigidos a otros sitios " -#: ../../addon/diaspora/diaspora.php:707 +#: ../../addon/diaspora/diaspora.php:749 +msgid "" +"Sign and forward posts and comments with no existing Diaspora signature" +msgstr "Firmar y enviar entradas y comentarios sin firma de Diaspora" + +#: ../../addon/diaspora/diaspora.php:754 msgid "Followed hashtags (comma separated, do not include the #)" msgstr "\"Hashtags\" seguidos (separados por comas, sin incluir #)" -#: ../../addon/diaspora/diaspora.php:712 +#: ../../addon/diaspora/diaspora.php:759 msgid "Diaspora Protocol Settings" msgstr "Ajustes del protocolo de Diaspora" @@ -9522,25 +9562,6 @@ msgstr "Prueba de correo" msgid "Message subject" msgstr "Asunto del mensaje" -#: ../../addon/diaspora_reconnect/diaspora_reconnect.php:44 -#, php-format -msgid "Reconnecting %d connections" -msgstr "Reconectando %d conexiones" - -#: ../../addon/diaspora_reconnect/diaspora_reconnect.php:63 -msgid "Diaspora Reconnect" -msgstr "Reconectar con Diaspora" - -#: ../../addon/diaspora_reconnect/diaspora_reconnect.php:65 -msgid "" -"Use this form to re-establish Diaspora connections which were initially made" -" from a different hub." -msgstr "Utilice este formulario para restablecer las conexiones de diáspora que se hicieron inicialmente desde un hub diferente." - -#: ../../addon/diaspora_reconnect/diaspora_reconnect.php:70 -msgid "Reconnect" -msgstr "Reconectar" - #: ../../addon/openstreetmap/openstreetmap.php:146 msgid "View Larger" msgstr "Ver más grande" @@ -9626,8 +9647,8 @@ msgstr "Contraseña de Friendica" msgid "Hubzilla to Friendica Post Settings" msgstr "Ajustes de publicación de Hubzilla a Friendica" -#: ../../addon/jappixmini/jappixmini.php:305 ../../include/channel.php:1139 -#: ../../include/channel.php:1296 +#: ../../addon/jappixmini/jappixmini.php:305 ../../include/channel.php:1256 +#: ../../include/channel.php:1419 msgid "Status:" msgstr "Estado:" @@ -10182,7 +10203,7 @@ msgstr "Debe elegir blancas o negras." msgid "Error creating new game." msgstr "Error al crear un nuevo juego." -#: ../../addon/chess/chess.php:381 ../../include/channel.php:899 +#: ../../addon/chess/chess.php:381 ../../include/channel.php:1016 msgid "Requested channel is not available." msgstr "El canal solicitado no está disponible." @@ -10257,15 +10278,15 @@ msgstr "Si está activado, sus entradas públicas se publicarán en la cuenta de msgid "Twitter Post Settings" msgstr "Ajustes de publicación en Twitter" -#: ../../addon/smileybutton/smileybutton.php:273 +#: ../../addon/smileybutton/smileybutton.php:211 msgid "Deactivate the feature" msgstr "Desactivar la funcionalidad" -#: ../../addon/smileybutton/smileybutton.php:277 +#: ../../addon/smileybutton/smileybutton.php:215 msgid "Hide the button and show the smilies directly." msgstr "Ocultar el botón y mostrar los smilies directamente." -#: ../../addon/smileybutton/smileybutton.php:281 +#: ../../addon/smileybutton/smileybutton.php:219 msgid "Smileybutton Settings" msgstr "Ajustes de Smileybutton" @@ -10546,6 +10567,22 @@ msgstr "Ajustes del encabezado de página" msgid "pageheader Settings saved." msgstr "Se han guardado los ajustes del encabezado de página." +#: ../../addon/authchoose/authchoose.php:67 +msgid "Only authenticate automatically to sites of your friends" +msgstr "Autenticación automática solo en los sitios de sus amigos" + +#: ../../addon/authchoose/authchoose.php:67 +msgid "By default you are automatically authenticated anywhere in the network" +msgstr "De forma predeterminada, se autenticará automáticamente en cualquier parte de la red" + +#: ../../addon/authchoose/authchoose.php:71 +msgid "Authchoose Settings" +msgstr "Ajustes de Authchoose" + +#: ../../addon/authchoose/authchoose.php:85 +msgid "Atuhchoose Settings updated." +msgstr "Se han actualizado los ajustes de Atuhchoose." + #: ../../addon/moremoods/moremoods.php:19 msgid "lonely" msgstr "Solo/a" @@ -10741,6 +10778,17 @@ msgstr "Se ha creado una cuenta para usted." msgid "Authentication successful but rejected: account creation is disabled." msgstr "Autenticación correcta pero rechazada: la creación de cuentas está deshabilitada." +#: ../../addon/opensearch/opensearch.php:26 +#, php-format +msgctxt "opensearch" +msgid "Search %1$s (%2$s)" +msgstr "Buscar %1$s (%2$s)" + +#: ../../addon/opensearch/opensearch.php:28 +msgctxt "opensearch" +msgid "$Projectname" +msgstr "$Projectname" + #: ../../addon/opensearch/opensearch.php:43 msgid "Search $Projectname" msgstr "Buscar $Projectname" @@ -10839,11 +10887,11 @@ msgstr "Transexual" msgid "Hermaphrodite" msgstr "Hermafrodita" -#: ../../include/selectors.php:49 +#: ../../include/selectors.php:49 ../../include/channel.php:1336 msgid "Neuter" msgstr "Neutral" -#: ../../include/selectors.php:49 +#: ../../include/selectors.php:49 ../../include/channel.php:1338 msgid "Non-specific" msgstr "No especificado" @@ -11033,341 +11081,288 @@ msgstr "%1$s ahora está conectado/a con %2$s" msgid "%1$s poked %2$s" msgstr "%1$s ha dado un toque a %2$s" -#: ../../include/conversation.php:239 ../../include/text.php:1115 -#: ../../include/text.php:1120 +#: ../../include/conversation.php:239 ../../include/text.php:1096 +#: ../../include/text.php:1101 msgid "poked" msgstr "ha dado un toque a" -#: ../../include/conversation.php:691 +#: ../../include/conversation.php:688 #, php-format msgid "View %s's profile @ %s" msgstr "Ver el perfil @ %s de %s" -#: ../../include/conversation.php:711 +#: ../../include/conversation.php:708 msgid "Categories:" msgstr "Temas:" -#: ../../include/conversation.php:712 +#: ../../include/conversation.php:709 msgid "Filed under:" msgstr "Archivado bajo:" -#: ../../include/conversation.php:737 +#: ../../include/conversation.php:734 msgid "View in context" msgstr "Mostrar en su contexto" -#: ../../include/conversation.php:834 +#: ../../include/conversation.php:831 msgid "remove" msgstr "eliminar" -#: ../../include/conversation.php:838 ../../include/nav.php:272 +#: ../../include/conversation.php:835 ../../include/nav.php:268 msgid "Loading..." msgstr "Cargando..." -#: ../../include/conversation.php:839 +#: ../../include/conversation.php:836 msgid "Delete Selected Items" msgstr "Eliminar elementos seleccionados" -#: ../../include/conversation.php:882 +#: ../../include/conversation.php:879 msgid "View Source" msgstr "Ver el código fuente de la entrada" -#: ../../include/conversation.php:892 +#: ../../include/conversation.php:889 msgid "Follow Thread" msgstr "Seguir este hilo" -#: ../../include/conversation.php:901 +#: ../../include/conversation.php:898 msgid "Unfollow Thread" msgstr "Dejar de seguir este hilo" -#: ../../include/conversation.php:992 +#: ../../include/conversation.php:989 msgid "Activity/Posts" msgstr "Actividad y publicaciones" -#: ../../include/conversation.php:1012 +#: ../../include/conversation.php:1009 msgid "Edit Connection" msgstr "Editar conexión" -#: ../../include/conversation.php:1022 +#: ../../include/conversation.php:1019 msgid "Message" msgstr "Mensaje" -#: ../../include/conversation.php:1156 +#: ../../include/conversation.php:1153 #, php-format msgid "%s likes this." msgstr "A %s le gusta esto." -#: ../../include/conversation.php:1156 +#: ../../include/conversation.php:1153 #, php-format msgid "%s doesn't like this." msgstr "A %s no le gusta esto." -#: ../../include/conversation.php:1160 +#: ../../include/conversation.php:1157 #, php-format msgid "%2$d people like this." msgid_plural "%2$d people like this." msgstr[0] "a %2$d personas le gusta esto." msgstr[1] "A %2$d personas les gusta esto." -#: ../../include/conversation.php:1162 +#: ../../include/conversation.php:1159 #, php-format msgid "%2$d people don't like this." msgid_plural "%2$d people don't like this." msgstr[0] "a %2$d personas no les gusta esto." msgstr[1] "A %2$d personas no les gusta esto." -#: ../../include/conversation.php:1168 +#: ../../include/conversation.php:1165 msgid "and" msgstr "y" -#: ../../include/conversation.php:1171 +#: ../../include/conversation.php:1168 #, php-format msgid ", and %d other people" msgid_plural ", and %d other people" msgstr[0] ", y %d persona más" msgstr[1] ", y %d personas más" -#: ../../include/conversation.php:1172 +#: ../../include/conversation.php:1169 #, php-format msgid "%s like this." msgstr "A %s le gusta esto." -#: ../../include/conversation.php:1172 +#: ../../include/conversation.php:1169 #, php-format msgid "%s don't like this." msgstr "A %s no le gusta esto." -#: ../../include/conversation.php:1215 +#: ../../include/conversation.php:1212 msgid "Set your location" msgstr "Establecer su ubicación" -#: ../../include/conversation.php:1216 +#: ../../include/conversation.php:1213 msgid "Clear browser location" msgstr "Eliminar los datos de localización geográfica del navegador" -#: ../../include/conversation.php:1264 +#: ../../include/conversation.php:1261 msgid "Tag term:" msgstr "Término de la etiqueta:" -#: ../../include/conversation.php:1265 +#: ../../include/conversation.php:1262 msgid "Where are you right now?" msgstr "¿Donde está ahora?" -#: ../../include/conversation.php:1270 +#: ../../include/conversation.php:1267 msgid "Choose a different album..." msgstr "Elegir un álbum diferente..." -#: ../../include/conversation.php:1274 +#: ../../include/conversation.php:1271 msgid "Comments enabled" msgstr "Comentarios habilitados" -#: ../../include/conversation.php:1275 +#: ../../include/conversation.php:1272 msgid "Comments disabled" msgstr "Comentarios deshabilitados" -#: ../../include/conversation.php:1313 +#: ../../include/conversation.php:1310 msgid "Page link name" msgstr "Nombre del enlace de la página" -#: ../../include/conversation.php:1316 +#: ../../include/conversation.php:1313 msgid "Post as" msgstr "Publicar como" -#: ../../include/conversation.php:1330 +#: ../../include/conversation.php:1327 msgid "Toggle voting" msgstr "Cambiar votación" -#: ../../include/conversation.php:1333 +#: ../../include/conversation.php:1330 msgid "Disable comments" msgstr "Dehabilitar los comentarios" -#: ../../include/conversation.php:1334 +#: ../../include/conversation.php:1331 msgid "Toggle comments" msgstr "Activar o desactivar los comentarios" -#: ../../include/conversation.php:1342 +#: ../../include/conversation.php:1339 msgid "Categories (optional, comma-separated list)" msgstr "Temas (opcional, lista separada por comas)" -#: ../../include/conversation.php:1365 +#: ../../include/conversation.php:1362 msgid "Other networks and post services" msgstr "Otras redes y servicios de publicación" -#: ../../include/conversation.php:1371 +#: ../../include/conversation.php:1368 msgid "Set publish date" msgstr "Establecer la fecha de publicación" -#: ../../include/conversation.php:1634 +#: ../../include/conversation.php:1631 msgid "Discover" msgstr "Descubrir" -#: ../../include/conversation.php:1637 +#: ../../include/conversation.php:1634 msgid "Imported public streams" msgstr "Contenidos públicos importados" -#: ../../include/conversation.php:1642 +#: ../../include/conversation.php:1639 msgid "Commented Order" msgstr "Comentarios recientes" -#: ../../include/conversation.php:1645 +#: ../../include/conversation.php:1642 msgid "Sort by Comment Date" msgstr "Ordenar por fecha de comentario" -#: ../../include/conversation.php:1649 +#: ../../include/conversation.php:1646 msgid "Posted Order" msgstr "Publicaciones recientes" -#: ../../include/conversation.php:1652 +#: ../../include/conversation.php:1649 msgid "Sort by Post Date" msgstr "Ordenar por fecha de publicación" -#: ../../include/conversation.php:1660 +#: ../../include/conversation.php:1657 msgid "Posts that mention or involve you" msgstr "Publicaciones que le mencionan o involucran" -#: ../../include/conversation.php:1669 +#: ../../include/conversation.php:1666 msgid "Activity Stream - by date" msgstr "Contenido - por fecha" -#: ../../include/conversation.php:1675 +#: ../../include/conversation.php:1672 msgid "Starred" msgstr "Preferidas" -#: ../../include/conversation.php:1678 +#: ../../include/conversation.php:1675 msgid "Favourite Posts" msgstr "Publicaciones favoritas" -#: ../../include/conversation.php:1685 +#: ../../include/conversation.php:1682 msgid "Spam" msgstr "Correo basura" -#: ../../include/conversation.php:1688 +#: ../../include/conversation.php:1685 msgid "Posts flagged as SPAM" msgstr "Publicaciones marcadas como basura" -#: ../../include/conversation.php:1763 ../../include/nav.php:372 +#: ../../include/conversation.php:1760 ../../include/nav.php:358 msgid "Status Messages and Posts" msgstr "Mensajes de estado y publicaciones" -#: ../../include/conversation.php:1776 ../../include/nav.php:385 +#: ../../include/conversation.php:1773 ../../include/nav.php:371 msgid "Profile Details" msgstr "Detalles del perfil" -#: ../../include/conversation.php:1786 ../../include/nav.php:395 -#: ../../include/photos.php:528 +#: ../../include/conversation.php:1783 ../../include/nav.php:381 +#: ../../include/photos.php:525 msgid "Photo Albums" msgstr "Álbumes de fotos" -#: ../../include/conversation.php:1794 ../../include/nav.php:403 +#: ../../include/conversation.php:1791 ../../include/nav.php:389 msgid "Files and Storage" msgstr "Ficheros y repositorio" -#: ../../include/conversation.php:1830 ../../include/nav.php:438 +#: ../../include/conversation.php:1827 ../../include/nav.php:424 msgid "Bookmarks" msgstr "Marcadores" -#: ../../include/conversation.php:1833 ../../include/nav.php:441 +#: ../../include/conversation.php:1830 ../../include/nav.php:427 msgid "Saved Bookmarks" msgstr "Marcadores guardados" -#: ../../include/conversation.php:1844 ../../include/nav.php:452 +#: ../../include/conversation.php:1841 ../../include/nav.php:438 msgid "View Webpages" msgstr "Ver páginas web" -#: ../../include/conversation.php:1913 +#: ../../include/conversation.php:1910 msgctxt "noun" msgid "Attending" msgid_plural "Attending" msgstr[0] "Participaré" msgstr[1] "Participaré" -#: ../../include/conversation.php:1916 +#: ../../include/conversation.php:1913 msgctxt "noun" msgid "Not Attending" msgid_plural "Not Attending" msgstr[0] "No participaré" msgstr[1] "No participaré" -#: ../../include/conversation.php:1919 +#: ../../include/conversation.php:1916 msgctxt "noun" msgid "Undecided" msgid_plural "Undecided" msgstr[0] "Indeciso/a" msgstr[1] "Indecisos/as" -#: ../../include/conversation.php:1922 +#: ../../include/conversation.php:1919 msgctxt "noun" msgid "Agree" msgid_plural "Agrees" msgstr[0] "De acuerdo" msgstr[1] "De acuerdo" -#: ../../include/conversation.php:1925 +#: ../../include/conversation.php:1922 msgctxt "noun" msgid "Disagree" msgid_plural "Disagrees" msgstr[0] "En desacuerdo" msgstr[1] "En desacuerdo" -#: ../../include/conversation.php:1928 +#: ../../include/conversation.php:1925 msgctxt "noun" msgid "Abstain" msgid_plural "Abstains" msgstr[0] "se abstiene" msgstr[1] "Se abstienen" -#: ../../include/permissions.php:35 -msgid "Can view my normal stream and posts" -msgstr "Pueden verse mi actividad y publicaciones normales" - -#: ../../include/permissions.php:39 -msgid "Can view my webpages" -msgstr "Pueden verse mis páginas web" - -#: ../../include/permissions.php:43 -msgid "Can post on my channel page (\"wall\")" -msgstr "Pueden crearse entradas en mi página de inicio del canal (“muro”)" - -#: ../../include/permissions.php:46 -msgid "Can like/dislike stuff" -msgstr "Puede marcarse contenido como me gusta/no me gusta" - -#: ../../include/permissions.php:46 -msgid "Profiles and things other than posts/comments" -msgstr "Perfiles y otras cosas aparte de publicaciones/comentarios" - -#: ../../include/permissions.php:48 -msgid "Can forward to all my channel contacts via post @mentions" -msgstr "Puede enviarse una entrada a todos mis contactos del canal mediante una @mención" - -#: ../../include/permissions.php:48 -msgid "Advanced - useful for creating group forum channels" -msgstr "Avanzado - útil para crear canales de foros de discusión o grupos" - -#: ../../include/permissions.php:49 -msgid "Can chat with me (when available)" -msgstr "Se puede charlar conmigo (cuando esté disponible)" - -#: ../../include/permissions.php:50 -msgid "Can write to my file storage and photos" -msgstr "Puede escribirse en mi repositorio de ficheros y fotos" - -#: ../../include/permissions.php:51 -msgid "Can edit my webpages" -msgstr "Pueden editarse mis páginas web" - -#: ../../include/permissions.php:53 -msgid "Somewhat advanced - very useful in open communities" -msgstr "Algo avanzado - muy útil en comunidades abiertas" - -#: ../../include/permissions.php:55 -msgid "Can administer my channel resources" -msgstr "Pueden administrarse mis recursos del canal" - -#: ../../include/permissions.php:55 -msgid "" -"Extremely advanced. Leave this alone unless you know what you are doing" -msgstr "Muy avanzado. Déjelo a no ser que sepa bien lo que está haciendo." - #: ../../include/dir_fns.php:141 msgid "Directory Options" msgstr "Opciones del directorio" @@ -11422,320 +11417,328 @@ msgstr "más antiguas" msgid "newer" msgstr "más recientes" -#: ../../include/text.php:945 +#: ../../include/text.php:939 msgid "No connections" msgstr "Sin conexiones" -#: ../../include/text.php:970 +#: ../../include/text.php:964 #, php-format msgid "View all %s connections" msgstr "Ver todas las %s conexiones" -#: ../../include/text.php:1115 ../../include/text.php:1120 +#: ../../include/text.php:1096 ../../include/text.php:1101 msgid "poke" msgstr "un toque" -#: ../../include/text.php:1121 +#: ../../include/text.php:1102 msgid "ping" msgstr "un \"ping\"" -#: ../../include/text.php:1121 +#: ../../include/text.php:1102 msgid "pinged" msgstr "ha enviado un \"ping\" a" -#: ../../include/text.php:1122 +#: ../../include/text.php:1103 msgid "prod" msgstr "una incitación " -#: ../../include/text.php:1122 +#: ../../include/text.php:1103 msgid "prodded" msgstr "ha incitado a " -#: ../../include/text.php:1123 +#: ../../include/text.php:1104 msgid "slap" msgstr "una bofetada " -#: ../../include/text.php:1123 +#: ../../include/text.php:1104 msgid "slapped" msgstr "ha abofeteado a " -#: ../../include/text.php:1124 +#: ../../include/text.php:1105 msgid "finger" msgstr "un \"finger\" " -#: ../../include/text.php:1124 +#: ../../include/text.php:1105 msgid "fingered" msgstr "envió un \"finger\" a" -#: ../../include/text.php:1125 +#: ../../include/text.php:1106 msgid "rebuff" msgstr "un reproche" -#: ../../include/text.php:1125 +#: ../../include/text.php:1106 msgid "rebuffed" msgstr "ha hecho un reproche a " -#: ../../include/text.php:1137 +#: ../../include/text.php:1118 msgid "happy" msgstr "feliz " -#: ../../include/text.php:1138 +#: ../../include/text.php:1119 msgid "sad" msgstr "triste " -#: ../../include/text.php:1139 +#: ../../include/text.php:1120 msgid "mellow" msgstr "tranquilo/a" -#: ../../include/text.php:1140 +#: ../../include/text.php:1121 msgid "tired" msgstr "cansado/a " -#: ../../include/text.php:1141 +#: ../../include/text.php:1122 msgid "perky" msgstr "vivaz" -#: ../../include/text.php:1142 +#: ../../include/text.php:1123 msgid "angry" msgstr "enfadado/a" -#: ../../include/text.php:1143 +#: ../../include/text.php:1124 msgid "stupefied" msgstr "asombrado/a" -#: ../../include/text.php:1144 +#: ../../include/text.php:1125 msgid "puzzled" msgstr "perplejo/a" -#: ../../include/text.php:1145 +#: ../../include/text.php:1126 msgid "interested" msgstr "interesado/a" -#: ../../include/text.php:1146 +#: ../../include/text.php:1127 msgid "bitter" msgstr "amargado/a" -#: ../../include/text.php:1147 +#: ../../include/text.php:1128 msgid "cheerful" msgstr "alegre" -#: ../../include/text.php:1148 +#: ../../include/text.php:1129 msgid "alive" msgstr "animado/a" -#: ../../include/text.php:1149 +#: ../../include/text.php:1130 msgid "annoyed" msgstr "molesto/a" -#: ../../include/text.php:1150 +#: ../../include/text.php:1131 msgid "anxious" msgstr "ansioso/a" -#: ../../include/text.php:1151 +#: ../../include/text.php:1132 msgid "cranky" msgstr "de mal humor" -#: ../../include/text.php:1152 +#: ../../include/text.php:1133 msgid "disturbed" msgstr "perturbado/a" -#: ../../include/text.php:1153 +#: ../../include/text.php:1134 msgid "frustrated" msgstr "frustrado/a" -#: ../../include/text.php:1154 +#: ../../include/text.php:1135 msgid "depressed" msgstr "deprimido/a" -#: ../../include/text.php:1155 +#: ../../include/text.php:1136 msgid "motivated" msgstr "motivado/a" -#: ../../include/text.php:1156 +#: ../../include/text.php:1137 msgid "relaxed" msgstr "relajado/a" -#: ../../include/text.php:1157 +#: ../../include/text.php:1138 msgid "surprised" msgstr "sorprendido/a" -#: ../../include/text.php:1335 ../../include/js_strings.php:70 +#: ../../include/text.php:1312 ../../include/js_strings.php:70 msgid "Monday" msgstr "lunes" -#: ../../include/text.php:1335 ../../include/js_strings.php:71 +#: ../../include/text.php:1312 ../../include/js_strings.php:71 msgid "Tuesday" msgstr "martes" -#: ../../include/text.php:1335 ../../include/js_strings.php:72 +#: ../../include/text.php:1312 ../../include/js_strings.php:72 msgid "Wednesday" msgstr "miércoles" -#: ../../include/text.php:1335 ../../include/js_strings.php:73 +#: ../../include/text.php:1312 ../../include/js_strings.php:73 msgid "Thursday" msgstr "jueves" -#: ../../include/text.php:1335 ../../include/js_strings.php:74 +#: ../../include/text.php:1312 ../../include/js_strings.php:74 msgid "Friday" msgstr "viernes" -#: ../../include/text.php:1335 ../../include/js_strings.php:75 +#: ../../include/text.php:1312 ../../include/js_strings.php:75 msgid "Saturday" msgstr "sábado" -#: ../../include/text.php:1335 ../../include/js_strings.php:69 +#: ../../include/text.php:1312 ../../include/js_strings.php:69 msgid "Sunday" msgstr "domingo" -#: ../../include/text.php:1339 ../../include/js_strings.php:45 +#: ../../include/text.php:1316 ../../include/js_strings.php:45 msgid "January" msgstr "enero" -#: ../../include/text.php:1339 ../../include/js_strings.php:46 +#: ../../include/text.php:1316 ../../include/js_strings.php:46 msgid "February" msgstr "febrero" -#: ../../include/text.php:1339 ../../include/js_strings.php:47 +#: ../../include/text.php:1316 ../../include/js_strings.php:47 msgid "March" msgstr "marzo" -#: ../../include/text.php:1339 ../../include/js_strings.php:48 +#: ../../include/text.php:1316 ../../include/js_strings.php:48 msgid "April" msgstr "abril" -#: ../../include/text.php:1339 +#: ../../include/text.php:1316 msgid "May" msgstr "mayo" -#: ../../include/text.php:1339 ../../include/js_strings.php:50 +#: ../../include/text.php:1316 ../../include/js_strings.php:50 msgid "June" msgstr "junio" -#: ../../include/text.php:1339 ../../include/js_strings.php:51 +#: ../../include/text.php:1316 ../../include/js_strings.php:51 msgid "July" msgstr "julio" -#: ../../include/text.php:1339 ../../include/js_strings.php:52 +#: ../../include/text.php:1316 ../../include/js_strings.php:52 msgid "August" msgstr "agosto" -#: ../../include/text.php:1339 ../../include/js_strings.php:53 +#: ../../include/text.php:1316 ../../include/js_strings.php:53 msgid "September" msgstr "septiembre" -#: ../../include/text.php:1339 ../../include/js_strings.php:54 +#: ../../include/text.php:1316 ../../include/js_strings.php:54 msgid "October" msgstr "octubre" -#: ../../include/text.php:1339 ../../include/js_strings.php:55 +#: ../../include/text.php:1316 ../../include/js_strings.php:55 msgid "November" msgstr "noviembre" -#: ../../include/text.php:1339 ../../include/js_strings.php:56 +#: ../../include/text.php:1316 ../../include/js_strings.php:56 msgid "December" msgstr "diciembre" -#: ../../include/text.php:1403 ../../include/text.php:1407 +#: ../../include/text.php:1380 ../../include/text.php:1384 msgid "Unknown Attachment" msgstr "Adjunto no reconocido" -#: ../../include/text.php:1409 +#: ../../include/text.php:1386 ../../include/feedutils.php:780 msgid "unknown" msgstr "desconocido" -#: ../../include/text.php:1445 +#: ../../include/text.php:1422 msgid "remove category" msgstr "eliminar el tema" -#: ../../include/text.php:1519 +#: ../../include/text.php:1496 msgid "remove from file" msgstr "eliminar del fichero" -#: ../../include/text.php:1781 ../../include/language.php:367 +#: ../../include/text.php:1615 ../../include/message.php:12 +msgid "Download binary/encrypted content" +msgstr "Descargar contenido binario o cifrado" + +#: ../../include/text.php:1774 ../../include/language.php:367 msgid "default" msgstr "por defecto" -#: ../../include/text.php:1789 +#: ../../include/text.php:1782 msgid "Page layout" msgstr "Plantilla de la página" -#: ../../include/text.php:1789 +#: ../../include/text.php:1782 msgid "You can create your own with the layouts tool" msgstr "Puede crear su propia disposición gráfica con la herramienta de plantillas" -#: ../../include/text.php:1817 +#: ../../include/text.php:1810 msgid "Page content type" msgstr "Tipo de contenido de la página" -#: ../../include/text.php:1950 +#: ../../include/text.php:1943 msgid "activity" msgstr "la actividad" -#: ../../include/text.php:2264 +#: ../../include/text.php:2006 +msgid "a-z, 0-9, -, _, and . only" +msgstr "a-z, 0-9, -, _, and . only" + +#: ../../include/text.php:2277 msgid "Design Tools" msgstr "Herramientas de diseño web" -#: ../../include/text.php:2270 +#: ../../include/text.php:2283 msgid "Pages" msgstr "Páginas" -#: ../../include/text.php:2292 +#: ../../include/text.php:2305 msgid "Import website..." msgstr "Importar un sitio web..." -#: ../../include/text.php:2293 +#: ../../include/text.php:2306 msgid "Select folder to import" msgstr "Seleccionar la carpeta que se va a importar" -#: ../../include/text.php:2294 +#: ../../include/text.php:2307 msgid "Import from a zipped folder:" msgstr "Importar desde una carpeta comprimida: " -#: ../../include/text.php:2295 +#: ../../include/text.php:2308 msgid "Import from cloud files:" msgstr "Importar desde los ficheros en la nube: " -#: ../../include/text.php:2296 +#: ../../include/text.php:2309 msgid "/cloud/channel/path/to/folder" msgstr "/cloud/canal/ruta/a la/carpeta" -#: ../../include/text.php:2297 +#: ../../include/text.php:2310 msgid "Enter path to website files" msgstr "Ruta a los ficheros del sitio web" -#: ../../include/text.php:2298 +#: ../../include/text.php:2311 msgid "Select folder" msgstr "Seleccionar la carpeta" -#: ../../include/text.php:2299 +#: ../../include/text.php:2312 msgid "Export website..." msgstr "Exportar un sitio web..." -#: ../../include/text.php:2300 +#: ../../include/text.php:2313 msgid "Export to a zip file" msgstr "Exportar a un fichero comprimido .zip" -#: ../../include/text.php:2301 +#: ../../include/text.php:2314 msgid "website.zip" msgstr "sitio_web.zip" -#: ../../include/text.php:2302 +#: ../../include/text.php:2315 msgid "Enter a name for the zip file." msgstr "Escriba un nombre para el fichero zip." -#: ../../include/text.php:2303 +#: ../../include/text.php:2316 msgid "Export to cloud files" msgstr "Exportar a la nube de ficheros" -#: ../../include/text.php:2304 +#: ../../include/text.php:2317 msgid "/path/to/export/folder" msgstr "/ruta/para/exportar/carpeta" -#: ../../include/text.php:2305 +#: ../../include/text.php:2318 msgid "Enter a path to a cloud files destination." msgstr "Escriba una ruta de destino a la nube de ficheros." -#: ../../include/text.php:2306 +#: ../../include/text.php:2319 msgid "Specify folder" msgstr "Especificar una carpeta" @@ -11785,28 +11788,10 @@ msgstr[1] "%d conexiones en común" msgid "show more" msgstr "mostrar más" -#: ../../include/markdown.php:444 -msgid "Attachments:" -msgstr "Ficheros adjuntos: " - -#: ../../include/markdown.php:538 ../../include/event.php:22 -#: ../../include/event.php:69 -msgid "l F d, Y \\@ g:i A" -msgstr "l d de F, Y \\@ G:i" - -#: ../../include/markdown.php:540 -msgid "$Projectname event notification:" -msgstr "Notificación de eventos de $Projectname: " - -#: ../../include/markdown.php:544 ../../include/event.php:30 -#: ../../include/event.php:73 -msgid "Starts:" -msgstr "Comienza:" - -#: ../../include/markdown.php:552 ../../include/event.php:40 -#: ../../include/event.php:77 -msgid "Finishes:" -msgstr "Finaliza:" +#: ../../include/markdown.php:139 ../../include/bbcode.php:332 +#, php-format +msgid "%1$s wrote the following %2$s %3$s" +msgstr "%1$s escribió %2$s siguiente %3$s" #: ../../include/follow.php:26 msgid "Channel is blocked on this site." @@ -11832,7 +11817,7 @@ msgstr "Protocolo deshabilitado." msgid "Channel discovery failed." msgstr "El intento de acceder al canal ha fallado." -#: ../../include/follow.php:202 +#: ../../include/follow.php:186 msgid "Cannot connect to yourself." msgstr "No puede conectarse consigo mismo." @@ -12083,19 +12068,19 @@ msgctxt "calendar" msgid "All day" msgstr "Todos los días" -#: ../../include/message.php:30 +#: ../../include/message.php:40 msgid "Unable to determine sender." msgstr "No ha sido posible determinar el remitente. " -#: ../../include/message.php:69 +#: ../../include/message.php:79 msgid "No recipient provided." msgstr "No se ha especificado ningún destinatario." -#: ../../include/message.php:74 +#: ../../include/message.php:84 msgid "[no subject]" msgstr "[sin asunto]" -#: ../../include/message.php:227 +#: ../../include/message.php:214 msgid "Stored post could not be verified." msgstr "No se han podido verificar las publicaciones guardadas." @@ -12126,61 +12111,61 @@ msgstr "%1$s ha actualizado %2$s, cambiando %3$s." msgid "Item was not found." msgstr "Elemento no encontrado." -#: ../../include/attach.php:500 +#: ../../include/attach.php:501 msgid "No source file." msgstr "Ningún fichero de origen" -#: ../../include/attach.php:522 +#: ../../include/attach.php:523 msgid "Cannot locate file to replace" msgstr "No se puede localizar el fichero que va a ser sustituido." -#: ../../include/attach.php:540 +#: ../../include/attach.php:541 msgid "Cannot locate file to revise/update" msgstr "No se puede localizar el fichero para revisar/actualizar" -#: ../../include/attach.php:671 +#: ../../include/attach.php:674 #, php-format msgid "File exceeds size limit of %d" msgstr "El fichero supera el limite de tamaño de %d" -#: ../../include/attach.php:685 +#: ../../include/attach.php:688 #, php-format msgid "You have reached your limit of %1$.0f Mbytes attachment storage." msgstr "Ha alcanzado su límite de %1$.0f Mbytes de almacenamiento de adjuntos." -#: ../../include/attach.php:855 +#: ../../include/attach.php:858 msgid "File upload failed. Possible system limit or action terminated." msgstr "Error de carga, posiblemente por limite del sistema o porque la acción ha finalizado." -#: ../../include/attach.php:868 +#: ../../include/attach.php:871 msgid "Stored file could not be verified. Upload failed." msgstr "El fichero almacenado no ha podido ser verificado. El envío ha fallado." -#: ../../include/attach.php:923 ../../include/attach.php:939 +#: ../../include/attach.php:932 ../../include/attach.php:948 msgid "Path not available." msgstr "Ruta no disponible." -#: ../../include/attach.php:988 ../../include/attach.php:1153 +#: ../../include/attach.php:997 ../../include/attach.php:1162 msgid "Empty pathname" msgstr "Ruta vacía" -#: ../../include/attach.php:1014 +#: ../../include/attach.php:1023 msgid "duplicate filename or path" msgstr "Nombre duplicado de ruta o fichero" -#: ../../include/attach.php:1039 +#: ../../include/attach.php:1048 msgid "Path not found." msgstr "Ruta no encontrada" -#: ../../include/attach.php:1107 +#: ../../include/attach.php:1116 msgid "mkdir failed." msgstr "mkdir ha fallado." -#: ../../include/attach.php:1111 +#: ../../include/attach.php:1120 msgid "database storage failed." msgstr "el almacenamiento en la base de datos ha fallado." -#: ../../include/attach.php:1159 +#: ../../include/attach.php:1168 msgid "Empty path" msgstr "Ruta vacía" @@ -12188,77 +12173,77 @@ msgstr "Ruta vacía" msgid "guest:" msgstr "invitado: " -#: ../../include/security.php:532 +#: ../../include/security.php:531 msgid "" "The form security token was not correct. This probably happened because the " "form has been opened for too long (>3 hours) before submitting it." msgstr "El \"token\" de seguridad del formulario no es correcto. Esto ha ocurrido probablemente porque el formulario ha estado abierto demasiado tiempo (>3 horas) antes de ser enviado" -#: ../../include/items.php:869 ../../include/items.php:916 +#: ../../include/items.php:851 ../../include/items.php:903 msgid "(Unknown)" msgstr "(Desconocido)" -#: ../../include/items.php:1110 +#: ../../include/items.php:1087 msgid "Visible to anybody on the internet." msgstr "Visible para cualquiera en internet." -#: ../../include/items.php:1112 +#: ../../include/items.php:1089 msgid "Visible to you only." msgstr "Visible sólo para usted." -#: ../../include/items.php:1114 +#: ../../include/items.php:1091 msgid "Visible to anybody in this network." msgstr "Visible para cualquiera en esta red." -#: ../../include/items.php:1116 +#: ../../include/items.php:1093 msgid "Visible to anybody authenticated." msgstr "Visible para cualquiera que esté autenticado." -#: ../../include/items.php:1118 +#: ../../include/items.php:1095 #, php-format msgid "Visible to anybody on %s." msgstr "Visible para cualquiera en %s." -#: ../../include/items.php:1120 +#: ../../include/items.php:1097 msgid "Visible to all connections." msgstr "Visible para todas las conexiones." -#: ../../include/items.php:1122 +#: ../../include/items.php:1099 msgid "Visible to approved connections." msgstr "Visible para las conexiones permitidas." -#: ../../include/items.php:1124 +#: ../../include/items.php:1101 msgid "Visible to specific connections." msgstr "Visible para conexiones específicas." -#: ../../include/items.php:3938 +#: ../../include/items.php:3908 msgid "Privacy group is empty." msgstr "El grupo de canales está vacío." -#: ../../include/items.php:3945 +#: ../../include/items.php:3915 #, php-format msgid "Privacy group: %s" msgstr "Grupo de canales: %s" -#: ../../include/items.php:3957 +#: ../../include/items.php:3927 msgid "Connection not found." msgstr "Conexión no encontrada" -#: ../../include/items.php:4310 +#: ../../include/items.php:4280 msgid "profile photo" msgstr "foto del perfil" -#: ../../include/items.php:4506 +#: ../../include/items.php:4473 #, php-format msgid "[Edited %s]" msgstr "[se ha editado %s]" -#: ../../include/items.php:4506 +#: ../../include/items.php:4473 msgctxt "edit_activity" msgid "Post" msgstr "Publicar" -#: ../../include/items.php:4506 +#: ../../include/items.php:4473 msgctxt "edit_activity" msgid "Comment" msgstr "Comentar" @@ -12267,229 +12252,261 @@ msgstr "Comentar" msgid "Unable to obtain identity information from database" msgstr "No ha sido posible obtener información sobre la identidad desde la base de datos" -#: ../../include/channel.php:67 +#: ../../include/channel.php:68 msgid "Empty name" msgstr "Nombre vacío" -#: ../../include/channel.php:70 +#: ../../include/channel.php:71 msgid "Name too long" msgstr "Nombre demasiado largo" -#: ../../include/channel.php:181 +#: ../../include/channel.php:182 msgid "No account identifier" msgstr "Ningún identificador de la cuenta" -#: ../../include/channel.php:193 +#: ../../include/channel.php:194 msgid "Nickname is required." msgstr "Se requiere un sobrenombre (alias)." -#: ../../include/channel.php:207 +#: ../../include/channel.php:208 msgid "Reserved nickname. Please choose another." msgstr "Sobrenombre en uso. Por favor, elija otro." -#: ../../include/channel.php:212 +#: ../../include/channel.php:213 msgid "" "Nickname has unsupported characters or is already being used on this site." msgstr "El alias contiene caracteres no admitidos o está ya en uso por otros miembros de este sitio." -#: ../../include/channel.php:270 +#: ../../include/channel.php:272 msgid "Unable to retrieve created identity" msgstr "No ha sido posible recuperar la identidad creada" -#: ../../include/channel.php:342 +#: ../../include/channel.php:344 msgid "Default Profile" msgstr "Perfil principal" -#: ../../include/channel.php:1045 +#: ../../include/channel.php:497 +msgid "Unable to retrieve modified identity" +msgstr "No se puede recuperar la identidad modficada" + +#: ../../include/channel.php:1162 msgid "Create New Profile" msgstr "Crear un nuevo perfil" -#: ../../include/channel.php:1065 +#: ../../include/channel.php:1182 msgid "Visible to everybody" msgstr "Visible para todos" -#: ../../include/channel.php:1138 ../../include/channel.php:1252 +#: ../../include/channel.php:1255 ../../include/channel.php:1375 msgid "Gender:" msgstr "Género:" -#: ../../include/channel.php:1140 ../../include/channel.php:1307 +#: ../../include/channel.php:1257 ../../include/channel.php:1430 msgid "Homepage:" msgstr "Página personal:" -#: ../../include/channel.php:1141 +#: ../../include/channel.php:1258 msgid "Online Now" msgstr "Ahora en línea" -#: ../../include/channel.php:1257 +#: ../../include/channel.php:1334 +msgid "Trans" +msgstr "Trans" + +#: ../../include/channel.php:1380 msgid "Like this channel" msgstr "Me gusta este canal" -#: ../../include/channel.php:1281 +#: ../../include/channel.php:1404 msgid "j F, Y" msgstr "j F Y" -#: ../../include/channel.php:1282 +#: ../../include/channel.php:1405 msgid "j F" msgstr "j F" -#: ../../include/channel.php:1289 +#: ../../include/channel.php:1412 msgid "Birthday:" msgstr "Cumpleaños:" -#: ../../include/channel.php:1302 +#: ../../include/channel.php:1425 #, php-format msgid "for %1$d %2$s" msgstr "por %1$d %2$s" -#: ../../include/channel.php:1305 +#: ../../include/channel.php:1428 msgid "Sexual Preference:" msgstr "Orientación sexual:" -#: ../../include/channel.php:1311 +#: ../../include/channel.php:1434 msgid "Tags:" msgstr "Etiquetas:" -#: ../../include/channel.php:1313 +#: ../../include/channel.php:1436 msgid "Political Views:" msgstr "Posición política:" -#: ../../include/channel.php:1315 +#: ../../include/channel.php:1438 msgid "Religion:" msgstr "Religión:" -#: ../../include/channel.php:1319 +#: ../../include/channel.php:1442 msgid "Hobbies/Interests:" msgstr "Aficciones o intereses:" -#: ../../include/channel.php:1321 +#: ../../include/channel.php:1444 msgid "Likes:" msgstr "Me gusta:" -#: ../../include/channel.php:1323 +#: ../../include/channel.php:1446 msgid "Dislikes:" msgstr "No me gusta:" -#: ../../include/channel.php:1325 +#: ../../include/channel.php:1448 msgid "Contact information and Social Networks:" msgstr "Información de contacto y redes sociales:" -#: ../../include/channel.php:1327 +#: ../../include/channel.php:1450 msgid "My other channels:" msgstr "Mis otros canales:" -#: ../../include/channel.php:1329 +#: ../../include/channel.php:1452 msgid "Musical interests:" msgstr "Preferencias musicales:" -#: ../../include/channel.php:1331 +#: ../../include/channel.php:1454 msgid "Books, literature:" msgstr "Libros, literatura:" -#: ../../include/channel.php:1333 +#: ../../include/channel.php:1456 msgid "Television:" msgstr "Televisión:" -#: ../../include/channel.php:1335 +#: ../../include/channel.php:1458 msgid "Film/dance/culture/entertainment:" msgstr "Cine, danza, cultura, entretenimiento:" -#: ../../include/channel.php:1337 +#: ../../include/channel.php:1460 msgid "Love/Romance:" msgstr "Vida sentimental o amorosa:" -#: ../../include/channel.php:1339 +#: ../../include/channel.php:1462 msgid "Work/employment:" msgstr "Trabajo:" -#: ../../include/channel.php:1341 +#: ../../include/channel.php:1464 msgid "School/education:" msgstr "Estudios:" -#: ../../include/channel.php:1364 +#: ../../include/channel.php:1487 msgid "Like this thing" msgstr "Me gusta esto" -#: ../../include/channel.php:2139 +#: ../../include/channel.php:2256 #, php-format msgid "User '%s' deleted" msgstr "El usuario '%s' ha sido eliminado" -#: ../../include/event.php:1004 +#: ../../include/event.php:22 ../../include/event.php:69 +msgid "l F d, Y \\@ g:i A" +msgstr "l d de F, Y \\@ G:i" + +#: ../../include/event.php:30 ../../include/event.php:73 +msgid "Starts:" +msgstr "Comienza:" + +#: ../../include/event.php:40 ../../include/event.php:77 +msgid "Finishes:" +msgstr "Finaliza:" + +#: ../../include/event.php:1008 msgid "This event has been added to your calendar." msgstr "Este evento ha sido añadido a su calendario." -#: ../../include/event.php:1204 +#: ../../include/event.php:1208 msgid "Not specified" msgstr "Sin especificar" -#: ../../include/event.php:1205 +#: ../../include/event.php:1209 msgid "Needs Action" msgstr "Necesita de una intervención" -#: ../../include/event.php:1206 +#: ../../include/event.php:1210 msgid "Completed" msgstr "Completado/a" -#: ../../include/event.php:1207 +#: ../../include/event.php:1211 msgid "In Process" msgstr "En proceso" -#: ../../include/event.php:1208 +#: ../../include/event.php:1212 msgid "Cancelled" msgstr "Cancelado/a" -#: ../../include/network.php:776 +#: ../../include/event.php:1292 ../../include/connections.php:676 +msgid "Home, Voice" +msgstr "Llamadas particulares" + +#: ../../include/event.php:1293 ../../include/connections.php:677 +msgid "Home, Fax" +msgstr "Fax particular" + +#: ../../include/event.php:1295 ../../include/connections.php:679 +msgid "Work, Voice" +msgstr "Llamadas de trabajo" + +#: ../../include/event.php:1296 ../../include/connections.php:680 +msgid "Work, Fax" +msgstr "Fax de trabajo" + +#: ../../include/network.php:751 msgid "view full size" msgstr "Ver en el tamaño original" -#: ../../include/network.php:2042 -msgid "No Subject" -msgstr "Sin asunto" - -#: ../../include/network.php:2310 ../../include/network.php:2311 +#: ../../include/network.php:1691 ../../include/network.php:1692 msgid "Friendica" msgstr "Friendica" -#: ../../include/network.php:2312 +#: ../../include/network.php:1693 msgid "OStatus" msgstr "OStatus" -#: ../../include/network.php:2313 +#: ../../include/network.php:1694 msgid "GNU-Social" msgstr "GNU Social" -#: ../../include/network.php:2314 +#: ../../include/network.php:1695 msgid "RSS/Atom" msgstr "RSS/Atom" -#: ../../include/network.php:2316 +#: ../../include/network.php:1696 +msgid "ActivityPub" +msgstr "ActivityPub" + +#: ../../include/network.php:1698 msgid "Diaspora" msgstr "Diaspora" -#: ../../include/network.php:2317 +#: ../../include/network.php:1699 msgid "Facebook" msgstr "Facebook" -#: ../../include/network.php:2318 +#: ../../include/network.php:1700 msgid "Zot" msgstr "Zot" -#: ../../include/network.php:2319 +#: ../../include/network.php:1701 msgid "LinkedIn" msgstr "LinkedIn" -#: ../../include/network.php:2320 +#: ../../include/network.php:1702 msgid "XMPP/IM" msgstr "XMPP/IM" -#: ../../include/network.php:2321 +#: ../../include/network.php:1703 msgid "MySpace" msgstr "MySpace" -#: ../../include/page_widgets.php:7 -msgid "New Page" -msgstr "Nueva página" - #: ../../include/language.php:380 msgid "Select an alternate language" msgstr "Seleccionar un idioma alternativo" @@ -12523,404 +12540,399 @@ msgid "" " permissions set who is allowed to view the post." msgstr "Los permisos de la entrada %s no se pueden cambiar %s una vez que se ha compartido.
Estos permisos establecen quién está autorizado para ver el mensaje." -#: ../../include/dba/dba_driver.php:189 +#: ../../include/dba/dba_driver.php:190 #, php-format msgid "Cannot locate DNS info for database server '%s'" msgstr "No se ha podido localizar información de DNS para el servidor de base de datos “%s”" -#: ../../include/bbcode.php:134 ../../include/bbcode.php:1040 -#: ../../include/bbcode.php:1043 ../../include/bbcode.php:1048 -#: ../../include/bbcode.php:1051 ../../include/bbcode.php:1054 -#: ../../include/bbcode.php:1057 ../../include/bbcode.php:1062 -#: ../../include/bbcode.php:1065 ../../include/bbcode.php:1070 -#: ../../include/bbcode.php:1073 ../../include/bbcode.php:1076 -#: ../../include/bbcode.php:1079 +#: ../../include/bbcode.php:194 ../../include/bbcode.php:1097 +#: ../../include/bbcode.php:1100 ../../include/bbcode.php:1105 +#: ../../include/bbcode.php:1108 ../../include/bbcode.php:1111 +#: ../../include/bbcode.php:1114 ../../include/bbcode.php:1119 +#: ../../include/bbcode.php:1122 ../../include/bbcode.php:1127 +#: ../../include/bbcode.php:1130 ../../include/bbcode.php:1133 +#: ../../include/bbcode.php:1136 msgid "Image/photo" msgstr "Imagen/foto" -#: ../../include/bbcode.php:173 ../../include/bbcode.php:1090 +#: ../../include/bbcode.php:233 ../../include/bbcode.php:1147 msgid "Encrypted content" msgstr "Contenido cifrado" -#: ../../include/bbcode.php:189 +#: ../../include/bbcode.php:249 #, php-format msgid "Install %s element: " msgstr "Instalar el elemento %s:" -#: ../../include/bbcode.php:193 +#: ../../include/bbcode.php:253 #, php-format msgid "" "This post contains an installable %s element, however you lack permissions " "to install it on this site." msgstr "Esta entrada contiene el elemento instalable %s, sin embargo le faltan permisos para instalarlo en este sitio." -#: ../../include/bbcode.php:272 -#, php-format -msgid "%1$s wrote the following %2$s %3$s" -msgstr "%1$s escribió %2$s siguiente %3$s" - -#: ../../include/bbcode.php:349 ../../include/bbcode.php:357 +#: ../../include/bbcode.php:409 ../../include/bbcode.php:417 msgid "Click to open/close" msgstr "Pulsar para abrir/cerrar" -#: ../../include/bbcode.php:357 +#: ../../include/bbcode.php:417 msgid "spoiler" msgstr "spoiler" -#: ../../include/bbcode.php:1028 +#: ../../include/bbcode.php:1085 msgid "$1 wrote:" msgstr "$1 escribió:" -#: ../../include/oembed.php:315 +#: ../../include/oembed.php:317 msgid " by " msgstr "por" -#: ../../include/oembed.php:316 +#: ../../include/oembed.php:318 msgid " on " msgstr "en" -#: ../../include/oembed.php:345 +#: ../../include/oembed.php:347 msgid "Embedded content" msgstr "Contenido incorporado" -#: ../../include/oembed.php:354 +#: ../../include/oembed.php:356 msgid "Embedding disabled" msgstr "Incrustación deshabilitada" -#: ../../include/features.php:58 +#: ../../include/features.php:54 msgid "General Features" msgstr "Funcionalidades básicas" -#: ../../include/features.php:63 +#: ../../include/features.php:59 msgid "Multiple Profiles" msgstr "Múltiples perfiles" -#: ../../include/features.php:64 +#: ../../include/features.php:60 msgid "Ability to create multiple profiles" msgstr "Capacidad de crear múltiples perfiles" -#: ../../include/features.php:72 +#: ../../include/features.php:68 msgid "Advanced Profiles" msgstr "Perfiles avanzados" -#: ../../include/features.php:73 +#: ../../include/features.php:69 msgid "Additional profile sections and selections" msgstr "Secciones y selecciones de perfil adicionales" -#: ../../include/features.php:81 +#: ../../include/features.php:77 msgid "Profile Import/Export" msgstr "Importar/Exportar perfil" -#: ../../include/features.php:82 +#: ../../include/features.php:78 msgid "Save and load profile details across sites/channels" msgstr "Guardar y cargar detalles del perfil a través de sitios/canales" -#: ../../include/features.php:90 +#: ../../include/features.php:86 msgid "Web Pages" msgstr "Páginas web" -#: ../../include/features.php:91 +#: ../../include/features.php:87 msgid "Provide managed web pages on your channel" msgstr "Proveer páginas web gestionadas en su canal" -#: ../../include/features.php:100 +#: ../../include/features.php:96 msgid "Provide a wiki for your channel" msgstr "Proporcionar un wiki para su canal" -#: ../../include/features.php:117 +#: ../../include/features.php:113 msgid "Private Notes" msgstr "Notas privadas" -#: ../../include/features.php:118 +#: ../../include/features.php:114 msgid "Enables a tool to store notes and reminders (note: not encrypted)" msgstr "Habilita una herramienta para guardar notas y recordatorios (advertencia: las notas no estarán cifradas)" -#: ../../include/features.php:126 +#: ../../include/features.php:122 msgid "Navigation Channel Select" msgstr "Navegación por el selector de canales" -#: ../../include/features.php:127 +#: ../../include/features.php:123 msgid "Change channels directly from within the navigation dropdown menu" msgstr "Cambiar de canales directamente desde el menú de navegación desplegable" -#: ../../include/features.php:135 +#: ../../include/features.php:131 msgid "Photo Location" msgstr "Ubicación de las fotos" -#: ../../include/features.php:136 +#: ../../include/features.php:132 msgid "If location data is available on uploaded photos, link this to a map." msgstr "Si los datos de ubicación están disponibles en las fotos subidas, enlazar estas a un mapa." -#: ../../include/features.php:144 +#: ../../include/features.php:140 msgid "Access Controlled Chatrooms" msgstr "Salas de chat moderadas" -#: ../../include/features.php:145 +#: ../../include/features.php:141 msgid "Provide chatrooms and chat services with access control." msgstr "Proporcionar salas y servicios de chat moderados." -#: ../../include/features.php:154 +#: ../../include/features.php:150 msgid "Provide alternate connection permission roles." msgstr "Proporcionar roles de acceso alternativos para esta conexión." -#: ../../include/features.php:162 +#: ../../include/features.php:158 msgid "Smart Birthdays" msgstr "Cumpleaños inteligentes" -#: ../../include/features.php:163 +#: ../../include/features.php:159 msgid "" "Make birthday events timezone aware in case your friends are scattered " "across the planet." msgstr "Enlazar los eventos de cumpleaños con el huso horario en el caso de que sus amigos estén dispersos por el mundo." -#: ../../include/features.php:171 +#: ../../include/features.php:167 msgid "Event Timezone Selection" msgstr "Selección del huso horario del evento" -#: ../../include/features.php:172 +#: ../../include/features.php:168 msgid "Allow event creation in timezones other than your own." msgstr "Permitir la creación de eventos en husos horarios distintos del suyo." -#: ../../include/features.php:180 +#: ../../include/features.php:176 msgid "Advanced Directory Search" msgstr "Búsqueda avanzada en el directorio" -#: ../../include/features.php:181 +#: ../../include/features.php:177 msgid "Allows creation of complex directory search queries" msgstr "Permitir la creación de consultas complejas en las búsquedas en el directorio" -#: ../../include/features.php:189 +#: ../../include/features.php:185 msgid "Advanced Theme and Layout Settings" msgstr "Ajustes avanzados de temas y esquemas" -#: ../../include/features.php:190 +#: ../../include/features.php:186 msgid "Allows fine tuning of themes and page layouts" msgstr "Permitir el ajuste fino de temas y esquemas de páginas" -#: ../../include/features.php:200 +#: ../../include/features.php:196 msgid "Post Composition Features" msgstr "Opciones para la redacción de entradas" -#: ../../include/features.php:204 +#: ../../include/features.php:200 msgid "Large Photos" msgstr "Fotos de gran tamaño" -#: ../../include/features.php:205 +#: ../../include/features.php:201 msgid "" "Include large (1024px) photo thumbnails in posts. If not enabled, use small " "(640px) photo thumbnails" msgstr "Incluir miniaturas de fotos grandes (1024px) en publicaciones. Si no está habilitado, usar miniaturas pequeñas (640px)" -#: ../../include/features.php:214 +#: ../../include/features.php:210 msgid "Automatically import channel content from other channels or feeds" msgstr "Importar automáticamente contenido de otros canales o \"feeds\"" -#: ../../include/features.php:222 +#: ../../include/features.php:218 msgid "Even More Encryption" msgstr "Más cifrado todavía" -#: ../../include/features.php:223 +#: ../../include/features.php:219 msgid "" "Allow optional encryption of content end-to-end with a shared secret key" msgstr "Permitir cifrado adicional de contenido \"punto-a-punto\" con una clave secreta compartida." -#: ../../include/features.php:231 +#: ../../include/features.php:227 msgid "Enable Voting Tools" msgstr "Permitir entradas con votación" -#: ../../include/features.php:232 +#: ../../include/features.php:228 msgid "Provide a class of post which others can vote on" msgstr "Proveer una clase de publicación en la que otros puedan votar" -#: ../../include/features.php:240 +#: ../../include/features.php:236 msgid "Disable Comments" msgstr "Deshabilitar comentarios" -#: ../../include/features.php:241 +#: ../../include/features.php:237 msgid "Provide the option to disable comments for a post" msgstr "Proporcionar la opción de desactivar los comentarios para una entrada" -#: ../../include/features.php:249 +#: ../../include/features.php:245 msgid "Delayed Posting" msgstr "Publicación aplazada" -#: ../../include/features.php:250 +#: ../../include/features.php:246 msgid "Allow posts to be published at a later date" msgstr "Permitir mensajes que se publicarán en una fecha posterior" -#: ../../include/features.php:258 +#: ../../include/features.php:254 msgid "Content Expiration" msgstr "Caducidad del contenido" -#: ../../include/features.php:259 +#: ../../include/features.php:255 msgid "Remove posts/comments and/or private messages at a future time" msgstr "Eliminar publicaciones/comentarios y/o mensajes privados más adelante" -#: ../../include/features.php:267 +#: ../../include/features.php:263 msgid "Suppress Duplicate Posts/Comments" msgstr "Prevenir entradas o comentarios duplicados" -#: ../../include/features.php:268 +#: ../../include/features.php:264 msgid "" "Prevent posts with identical content to be published with less than two " "minutes in between submissions." msgstr "Prevenir que entradas con contenido idéntico se publiquen con menos de dos minutos de intervalo." -#: ../../include/features.php:279 +#: ../../include/features.php:275 msgid "Network and Stream Filtering" msgstr "Filtrado del contenido" -#: ../../include/features.php:283 +#: ../../include/features.php:279 msgid "Search by Date" msgstr "Buscar por fecha" -#: ../../include/features.php:284 +#: ../../include/features.php:280 msgid "Ability to select posts by date ranges" msgstr "Capacidad de seleccionar entradas por rango de fechas" -#: ../../include/features.php:292 ../../include/group.php:331 +#: ../../include/features.php:288 ../../include/group.php:332 msgid "Privacy Groups" msgstr "Grupos de canales" -#: ../../include/features.php:293 +#: ../../include/features.php:289 msgid "Enable management and selection of privacy groups" msgstr "Activar la gestión y selección de grupos de canales" -#: ../../include/features.php:302 +#: ../../include/features.php:298 msgid "Save search terms for re-use" msgstr "Guardar términos de búsqueda para su reutilización" -#: ../../include/features.php:310 +#: ../../include/features.php:306 msgid "Network Personal Tab" msgstr "Actividad personal" -#: ../../include/features.php:311 +#: ../../include/features.php:307 msgid "Enable tab to display only Network posts that you've interacted on" msgstr "Habilitar una pestaña en la cual se muestren solo las entradas en las que ha participado." -#: ../../include/features.php:319 +#: ../../include/features.php:315 msgid "Network New Tab" msgstr "Contenido nuevo" -#: ../../include/features.php:320 +#: ../../include/features.php:316 msgid "Enable tab to display all new Network activity" msgstr "Habilitar una pestaña en la que se muestre solo el contenido nuevo" -#: ../../include/features.php:328 +#: ../../include/features.php:324 msgid "Affinity Tool" msgstr "Herramienta de afinidad" -#: ../../include/features.php:329 +#: ../../include/features.php:325 msgid "Filter stream activity by depth of relationships" msgstr "Filtrar el contenido según la profundidad de las relaciones" -#: ../../include/features.php:338 +#: ../../include/features.php:334 msgid "Show friend and connection suggestions" msgstr "Mostrar sugerencias de amigos y conexiones" -#: ../../include/features.php:346 +#: ../../include/features.php:342 msgid "Connection Filtering" msgstr "Filtrado de conexiones" -#: ../../include/features.php:347 +#: ../../include/features.php:343 msgid "Filter incoming posts from connections based on keywords/content" msgstr "Filtrar publicaciones entrantes de conexiones por palabras clave o contenido" -#: ../../include/features.php:359 +#: ../../include/features.php:355 msgid "Post/Comment Tools" msgstr "Gestión de entradas y comentarios" -#: ../../include/features.php:363 +#: ../../include/features.php:359 msgid "Community Tagging" msgstr "Etiquetas de la comunidad" -#: ../../include/features.php:364 +#: ../../include/features.php:360 msgid "Ability to tag existing posts" msgstr "Capacidad de etiquetar entradas existentes" -#: ../../include/features.php:372 +#: ../../include/features.php:368 msgid "Post Categories" msgstr "Temas de las entradas" -#: ../../include/features.php:373 +#: ../../include/features.php:369 msgid "Add categories to your posts" msgstr "Añadir temas a sus publicaciones" -#: ../../include/features.php:381 +#: ../../include/features.php:377 msgid "Emoji Reactions" msgstr "Emoticonos \"emoji\"" -#: ../../include/features.php:382 +#: ../../include/features.php:378 msgid "Add emoji reaction ability to posts" msgstr "Activar la capacidad de añadir un emoticono \"emoji\" a las entradas" -#: ../../include/features.php:391 +#: ../../include/features.php:387 msgid "Ability to file posts under folders" msgstr "Capacidad de archivar entradas en carpetas" -#: ../../include/features.php:399 +#: ../../include/features.php:395 msgid "Dislike Posts" msgstr "Desagrado de publicaciones" -#: ../../include/features.php:400 +#: ../../include/features.php:396 msgid "Ability to dislike posts/comments" msgstr "Capacidad de mostrar desacuerdo con el contenido de entradas y comentarios" -#: ../../include/features.php:408 +#: ../../include/features.php:404 msgid "Star Posts" msgstr "Entradas destacadas" -#: ../../include/features.php:409 +#: ../../include/features.php:405 msgid "Ability to mark special posts with a star indicator" msgstr "Capacidad de marcar entradas destacadas con un indicador de estrella" -#: ../../include/features.php:417 +#: ../../include/features.php:413 msgid "Tag Cloud" msgstr "Nube de etiquetas" -#: ../../include/features.php:418 +#: ../../include/features.php:414 msgid "Provide a personal tag cloud on your channel page" msgstr "Proveer nube de etiquetas personal en su página de canal" -#: ../../include/features.php:430 +#: ../../include/features.php:425 msgid "Premium Channel" msgstr "Canal premium" -#: ../../include/features.php:431 +#: ../../include/features.php:426 msgid "" "Allows you to set restrictions and terms on those that connect with your " "channel" msgstr "Le permite configurar restricciones y normas de uso a aquellos que conectan con su canal" -#: ../../include/taxonomy.php:228 ../../include/taxonomy.php:249 +#: ../../include/taxonomy.php:267 ../../include/taxonomy.php:288 msgid "Tags" msgstr "Etiquetas" -#: ../../include/taxonomy.php:293 +#: ../../include/taxonomy.php:332 msgid "Keywords" msgstr "Palabras clave" -#: ../../include/taxonomy.php:314 +#: ../../include/taxonomy.php:353 msgid "have" msgstr "tener" -#: ../../include/taxonomy.php:314 +#: ../../include/taxonomy.php:353 msgid "has" msgstr "tiene" -#: ../../include/taxonomy.php:315 +#: ../../include/taxonomy.php:354 msgid "want" msgstr "quiero" -#: ../../include/taxonomy.php:315 +#: ../../include/taxonomy.php:354 msgid "wants" msgstr "quiere" -#: ../../include/taxonomy.php:316 +#: ../../include/taxonomy.php:355 msgid "likes" msgstr "gusta de" -#: ../../include/taxonomy.php:317 +#: ../../include/taxonomy.php:356 msgid "dislikes" msgstr "no gusta de" @@ -12944,51 +12956,51 @@ msgstr "Es obligatorio que le inviten." msgid "Invitation could not be verified." msgstr "No se ha podido verificar su invitación." -#: ../../include/account.php:130 +#: ../../include/account.php:157 msgid "Please enter the required information." msgstr "Por favor introduzca la información requerida." -#: ../../include/account.php:198 +#: ../../include/account.php:224 msgid "Failed to store account information." msgstr "La información de la cuenta no se ha podido guardar." -#: ../../include/account.php:263 +#: ../../include/account.php:291 #, php-format msgid "Registration confirmation for %s" msgstr "Confirmación de registro para %s" -#: ../../include/account.php:330 +#: ../../include/account.php:360 #, php-format msgid "Registration request at %s" msgstr "Solicitud de registro en %s" -#: ../../include/account.php:352 +#: ../../include/account.php:382 msgid "your registration password" msgstr "su contraseña de registro" -#: ../../include/account.php:358 ../../include/account.php:420 +#: ../../include/account.php:388 ../../include/account.php:450 #, php-format msgid "Registration details for %s" msgstr "Detalles del registro de %s" -#: ../../include/account.php:431 +#: ../../include/account.php:461 msgid "Account approved." msgstr "Cuenta aprobada." -#: ../../include/account.php:471 +#: ../../include/account.php:501 #, php-format msgid "Registration revoked for %s" msgstr "Registro revocado para %s" -#: ../../include/account.php:756 ../../include/account.php:758 +#: ../../include/account.php:780 ../../include/account.php:782 msgid "Click here to upgrade." msgstr "Pulse aquí para actualizar" -#: ../../include/account.php:764 +#: ../../include/account.php:788 msgid "This action exceeds the limits set by your subscription plan." msgstr "Esta acción supera los límites establecidos por su plan de suscripción " -#: ../../include/account.php:769 +#: ../../include/account.php:793 msgid "This action is not available under your subscription plan." msgstr "Esta acción no está disponible en su plan de suscripción." @@ -13073,183 +13085,211 @@ msgstr "Cumpleaños de %1$s" msgid "Happy Birthday %1$s" msgstr "Feliz cumpleaños %1$s" -#: ../../include/nav.php:92 +#: ../../include/nav.php:90 msgid "Remote authentication" msgstr "Acceder desde su servidor" -#: ../../include/nav.php:92 +#: ../../include/nav.php:90 msgid "Click to authenticate to your home hub" msgstr "Pulsar para identificarse en su servidor de inicio" -#: ../../include/nav.php:103 ../../include/nav.php:127 +#: ../../include/nav.php:99 ../../include/nav.php:123 msgid "End this session" msgstr "Finalizar esta sesión" -#: ../../include/nav.php:106 +#: ../../include/nav.php:102 msgid "Your profile page" msgstr "Su página del perfil" -#: ../../include/nav.php:109 +#: ../../include/nav.php:105 msgid "Manage/Edit profiles" msgstr "Administrar/editar perfiles" -#: ../../include/nav.php:111 +#: ../../include/nav.php:107 msgid "Edit your profile" msgstr "Editar su perfil" -#: ../../include/nav.php:117 +#: ../../include/nav.php:113 msgid "Sign in" msgstr "Acceder" -#: ../../include/nav.php:142 +#: ../../include/nav.php:138 msgid "Take me home" msgstr "Volver a la página principal" -#: ../../include/nav.php:144 +#: ../../include/nav.php:140 msgid "Log me out of this site" msgstr "Salir de este sitio" -#: ../../include/nav.php:149 +#: ../../include/nav.php:145 msgid "Create an account" msgstr "Crear una cuenta" -#: ../../include/nav.php:161 +#: ../../include/nav.php:157 msgid "Help and documentation" msgstr "Ayuda y documentación" -#: ../../include/nav.php:164 +#: ../../include/nav.php:160 msgid "Search site @name, #tag, ?docs, content" msgstr "Buscar en el sitio por @nombre, #etiqueta, ?ayuda o contenido" -#: ../../include/nav.php:176 +#: ../../include/nav.php:171 msgid "Grid" msgstr "Red" -#: ../../include/nav.php:176 +#: ../../include/nav.php:171 msgid "Your grid" msgstr "Mi red" -#: ../../include/nav.php:177 +#: ../../include/nav.php:172 msgid "View your network/grid" msgstr "Ver su red" -#: ../../include/nav.php:178 +#: ../../include/nav.php:173 msgid "Mark all grid notifications seen" msgstr "Marcar todas las notificaciones de la red como vistas" -#: ../../include/nav.php:180 +#: ../../include/nav.php:175 msgid "Channel home" msgstr "Mi canal" -#: ../../include/nav.php:181 +#: ../../include/nav.php:176 msgid "View your channel home" msgstr "Ver su página principal del canal" -#: ../../include/nav.php:182 +#: ../../include/nav.php:177 msgid "Mark all channel notifications seen" msgstr "Marcar todas las notificaciones del canal como leídas" -#: ../../include/nav.php:188 +#: ../../include/nav.php:183 msgid "Notices" msgstr "Avisos" -#: ../../include/nav.php:188 +#: ../../include/nav.php:183 msgid "Notifications" msgstr "Notificaciones" -#: ../../include/nav.php:189 +#: ../../include/nav.php:184 msgid "View all notifications" msgstr "Ver todas las notificaciones" -#: ../../include/nav.php:192 +#: ../../include/nav.php:185 +msgid "Mark all system notifications seen" +msgstr "Marcar todas las notificaciones del sistema como leídas" + +#: ../../include/nav.php:187 msgid "Private mail" msgstr "Correo privado" -#: ../../include/nav.php:193 +#: ../../include/nav.php:188 msgid "View your private messages" msgstr "Ver sus mensajes privados" -#: ../../include/nav.php:194 +#: ../../include/nav.php:189 msgid "Mark all private messages seen" msgstr "Marcar todos los mensajes privados como leídos" -#: ../../include/nav.php:200 +#: ../../include/nav.php:195 msgid "Event Calendar" msgstr "Calendario de eventos" -#: ../../include/nav.php:201 +#: ../../include/nav.php:196 msgid "View events" msgstr "Ver los eventos" -#: ../../include/nav.php:202 +#: ../../include/nav.php:197 msgid "Mark all events seen" msgstr "Marcar todos los eventos como leidos" -#: ../../include/nav.php:205 +#: ../../include/nav.php:199 msgid "Manage Your Channels" msgstr "Gestionar sus canales" -#: ../../include/nav.php:207 +#: ../../include/nav.php:201 msgid "Account/Channel Settings" msgstr "Ajustes de cuenta/canales" +#: ../../include/nav.php:203 +msgid "Shared Files" +msgstr "Ficheros compartidos" + +#: ../../include/nav.php:203 +msgid "New files shared with me" +msgstr "Nuevos ficheros compartidos conmigo" + +#: ../../include/nav.php:208 +msgid "Public stream" +msgstr "\"Stream\" público" + +#: ../../include/nav.php:208 +msgid "Public stream activities" +msgstr "Actividades del \"stream\" público" + #: ../../include/nav.php:215 msgid "Site Setup and Configuration" msgstr "Ajustes y configuración del sitio" -#: ../../include/nav.php:277 +#: ../../include/nav.php:274 msgid "@name, #tag, ?doc, content" msgstr "@nombre, #etiqueta, ?ayuda, contenido" -#: ../../include/nav.php:278 +#: ../../include/nav.php:275 msgid "Please wait..." msgstr "Espere por favor…" -#: ../../include/nav.php:280 +#: ../../include/nav.php:278 msgid "Add Apps" msgstr "Añadir aplicaciones" -#: ../../include/photos.php:115 +#: ../../include/nav.php:279 +msgid "Arrange Apps" +msgstr "Organizar aplicaciones" + +#: ../../include/nav.php:280 +msgid "Toggle System Apps" +msgstr "Alternar aplicaciones de sistema" + +#: ../../include/photos.php:111 #, php-format msgid "Image exceeds website size limit of %lu bytes" msgstr "La imagen excede el límite de %lu bytes del sitio" -#: ../../include/photos.php:122 +#: ../../include/photos.php:118 msgid "Image file is empty." msgstr "El fichero de imagen está vacío. " -#: ../../include/photos.php:261 +#: ../../include/photos.php:257 msgid "Photo storage failed." msgstr "La foto no ha podido ser guardada." -#: ../../include/photos.php:301 +#: ../../include/photos.php:297 msgid "a new photo" msgstr "una nueva foto" -#: ../../include/photos.php:305 +#: ../../include/photos.php:301 #, php-format msgctxt "photo_upload" msgid "%1$s posted %2$s to %3$s" msgstr "%1$s ha publicado %2$s en %3$s" -#: ../../include/photos.php:533 +#: ../../include/photos.php:530 msgid "Upload New Photos" msgstr "Subir nuevas fotos" -#: ../../include/zot.php:646 +#: ../../include/zot.php:653 msgid "Invalid data packet" msgstr "Paquete de datos no válido" -#: ../../include/zot.php:662 +#: ../../include/zot.php:680 msgid "Unable to verify channel signature" msgstr "No ha sido posible de verificar la firma del canal" -#: ../../include/zot.php:2313 +#: ../../include/zot.php:2338 #, php-format msgid "Unable to verify site signature for %s" msgstr "No ha sido posible de verificar la firma del sitio para %s" -#: ../../include/zot.php:3764 +#: ../../include/zot.php:3946 msgid "invalid target signature" msgstr "La firma recibida no es válida" @@ -13264,27 +13304,27 @@ msgstr "Un grupo suprimido con este nombre ha sido restablecido. Es posi msgid "Add new connections to this privacy group" msgstr "Añadir conexiones nuevas a este grupo de canales" -#: ../../include/group.php:309 +#: ../../include/group.php:310 msgid "edit" msgstr "editar" -#: ../../include/group.php:332 +#: ../../include/group.php:333 msgid "Edit group" msgstr "Editar grupo" -#: ../../include/group.php:333 +#: ../../include/group.php:334 msgid "Add privacy group" msgstr "Añadir un grupo de canales" -#: ../../include/group.php:334 +#: ../../include/group.php:335 msgid "Channels not in any privacy group" msgstr "Sin canales en ningún grupo" -#: ../../include/connections.php:127 +#: ../../include/connections.php:128 msgid "New window" msgstr "Nueva ventana" -#: ../../include/connections.php:128 +#: ../../include/connections.php:129 msgid "Open the selected location in a different window or browser tab" msgstr "Abrir la dirección seleccionada en una ventana o pestaña aparte" diff --git a/view/es-es/hstrings.php b/view/es-es/hstrings.php index ae1164cdb..ca809cb74 100644 --- a/view/es-es/hstrings.php +++ b/view/es-es/hstrings.php @@ -60,6 +60,7 @@ App::$strings["%d message sent."] = array( 0 => "%d mensajes enviados.", 1 => "%d mensajes enviados.", ); +App::$strings["Invite"] = "Invitar"; App::$strings["You have no more invitations available"] = "No tiene más invitaciones disponibles"; App::$strings["Send invitations"] = "Enviar invitaciones"; App::$strings["Enter email addresses, one per line:"] = "Introduzca las direcciones de correo electrónico, una por línea:"; @@ -82,11 +83,67 @@ App::$strings["Profile"] = "Perfil"; App::$strings["Click on a contact to add or remove."] = "Pulsar en un contacto para añadirlo o eliminarlo."; App::$strings["Visible To"] = "Visible para"; App::$strings["All Connections"] = "Todas las conexiones"; +App::$strings["INVALID EVENT DISMISSED!"] = "¡EVENTO NO VÁLIDO RECHAZADO!"; +App::$strings["Summary: "] = "Resumen: "; +App::$strings["Unknown"] = "Desconocido"; +App::$strings["Date: "] = "Fecha: "; +App::$strings["Reason: "] = "Razón: "; +App::$strings["INVALID CARD DISMISSED!"] = "¡TARJETA NO VÁLIDA RECHAZADA!"; +App::$strings["Name: "] = "Nombre: "; +App::$strings["CalDAV"] = "CalDAV"; +App::$strings["Event title"] = "Título del evento"; +App::$strings["Start date and time"] = "Fecha y hora de comienzo"; +App::$strings["Example: YYYY-MM-DD HH:mm"] = "Ejemplo: YYYY-MM-DD HH:mm"; +App::$strings["End date and time"] = "Fecha y hora de finalización"; +App::$strings["Description"] = "Descripción"; +App::$strings["Location"] = "Ubicación"; +App::$strings["Previous"] = "Anterior"; +App::$strings["Next"] = "Siguiente"; +App::$strings["Today"] = "Hoy"; +App::$strings["Month"] = "Mes"; +App::$strings["Week"] = "Semana"; +App::$strings["Day"] = "Día"; +App::$strings["List month"] = "Lista mensual"; +App::$strings["List week"] = "Lista semanal"; +App::$strings["List day"] = "Lista diaria"; +App::$strings["More"] = "Más"; +App::$strings["Less"] = "Menos"; +App::$strings["Select calendar"] = "Seleccionar un calendario"; +App::$strings["Delete all"] = "Eliminar todos"; +App::$strings["Cancel"] = "Cancelar"; +App::$strings["Sorry! Editing of recurrent events is not yet implemented."] = "¡Disculpas! La edición de eventos recurrentes aún no se ha implementado."; +App::$strings["CardDAV"] = "CardDAV"; +App::$strings["Name"] = "Nombre"; +App::$strings["Organisation"] = "Organización"; +App::$strings["Title"] = "Título"; +App::$strings["Phone"] = "Teléfono"; +App::$strings["Email"] = "Correo electrónico"; +App::$strings["Instant messenger"] = "Mensajería instantánea"; +App::$strings["Website"] = "Sitio web"; +App::$strings["Address"] = "Dirección"; +App::$strings["Note"] = "Nota"; +App::$strings["Mobile"] = "Móvil"; +App::$strings["Home"] = "Inicio"; +App::$strings["Work"] = "Trabajo"; +App::$strings["Add Contact"] = "Añadir un contacto"; +App::$strings["Add Field"] = "Añadir un campo"; +App::$strings["Update"] = "Actualizar"; +App::$strings["P.O. Box"] = "Buzón de correos"; +App::$strings["Additional"] = "Adicional"; +App::$strings["Street"] = "Calle"; +App::$strings["Locality"] = "Localidad"; +App::$strings["Region"] = "Provincia, región o estado"; +App::$strings["ZIP Code"] = "Código postal"; +App::$strings["Country"] = "País"; +App::$strings["Default Calendar"] = "Calendario por defecto"; +App::$strings["Default Addressbook"] = "Agenda de direcciones por defecto"; App::$strings["This site is not a directory server"] = "Este sitio no es un servidor de directorio"; App::$strings["You must be logged in to see this page."] = "Debe haber iniciado sesión para poder ver esta página."; App::$strings["Posts and comments"] = "Publicaciones y comentarios"; App::$strings["Only posts"] = "Solo publicaciones"; +App::$strings["Channel Home"] = "Mi canal"; App::$strings["Insufficient permissions. Request redirected to profile page."] = "Permisos insuficientes. Petición redirigida a la página del perfil."; +App::$strings["Language"] = "Idioma"; App::$strings["Export Channel"] = "Exportar el canal"; App::$strings["Export your basic channel information to a file. This acts as a backup of your connections, permissions, profile and basic data, which can be used to import your data to a new server hub, but does not contain your content."] = "Exportar la información básica del canal a un fichero. Este equivale a una copia de seguridad de sus conexiones, el perfil y datos fundamentales, que puede usarse para importar sus datos a un nuevo servidor, pero no incluye su contenido."; App::$strings["Export Content"] = "Exportar contenidos"; @@ -106,14 +163,14 @@ App::$strings["Please select another location to become primary before removing App::$strings["Syncing locations"] = "Sincronizando ubicaciones"; App::$strings["No locations found."] = "No encontrada ninguna dirección."; App::$strings["Manage Channel Locations"] = "Gestionar las direcciones del canal"; -App::$strings["Location"] = "Ubicación"; -App::$strings["Address"] = "Dirección"; App::$strings["Primary"] = "Primario"; App::$strings["Drop"] = "Eliminar"; App::$strings["Sync Now"] = "Sincronizar ahora"; App::$strings["Please wait several minutes between consecutive operations."] = "Por favor, espere algunos minutos entre operaciones consecutivas."; App::$strings["When possible, drop a location by logging into that website/hub and removing your channel."] = "Cuando sea posible, elimine una ubicación iniciando sesión en el sitio web o \"hub\" y borrando su canal."; App::$strings["Use this form to drop the location if the hub is no longer operating."] = "Utilice este formulario para eliminar la dirección si el \"hub\" no está funcionando desde hace tiempo."; +App::$strings["Change Order of Navigation Apps"] = "Cambiar el orden de las aplicaciones en la barra de navegación"; +App::$strings["Use arrows to move the corresponding app up or down in the display list"] = "Utilizar las flechas para mover la aplicación correspondiente hacia arriba o hacia abajo en la lista de visualización"; App::$strings["Menu not found."] = "Menú no encontrado"; App::$strings["Unable to create element."] = "No se puede crear el elemento."; App::$strings["Unable to update menu element."] = "No es posible actualizar el elemento del menú."; @@ -154,21 +211,19 @@ App::$strings["Unable to generate preview."] = "No se puede crear la vista previ App::$strings["Event title and start time are required."] = "Se requieren el título del evento y su hora de inicio."; App::$strings["Event not found."] = "Evento no encontrado."; App::$strings["event"] = "evento"; +App::$strings["Events"] = "Eventos"; App::$strings["Edit event title"] = "Editar el título del evento"; -App::$strings["Event title"] = "Título del evento"; App::$strings["Required"] = "Obligatorio"; App::$strings["Categories (comma-separated list)"] = "Temas (lista separada por comas)"; App::$strings["Edit Category"] = "Modificar el tema"; App::$strings["Category"] = "Tema"; App::$strings["Edit start date and time"] = "Modificar la fecha y hora de comienzo"; -App::$strings["Start date and time"] = "Fecha y hora de comienzo"; App::$strings["Finish date and time are not known or not relevant"] = "La fecha y hora de terminación no se conocen o no son relevantes"; App::$strings["Edit finish date and time"] = "Modificar la fecha y hora de terminación"; App::$strings["Finish date and time"] = "Fecha y hora de terminación"; App::$strings["Adjust for viewer timezone"] = "Ajustar para obtener el visor de los husos horarios"; App::$strings["Important for events that happen in a particular place. Not practical for global holidays."] = "Importante para los eventos que suceden en un lugar determinado. No es práctico para los globales."; App::$strings["Edit Description"] = "Editar la descripción"; -App::$strings["Description"] = "Descripción"; App::$strings["Edit Location"] = "Modificar la dirección"; App::$strings["Preview"] = "Previsualizar"; App::$strings["Permission settings"] = "Configuración de permisos"; @@ -181,13 +236,7 @@ App::$strings["Link to Source"] = "Enlazar con la entrada en su ubicación origi App::$strings["calendar"] = "calendario"; App::$strings["Edit Event"] = "Editar el evento"; App::$strings["Create Event"] = "Crear un evento"; -App::$strings["Previous"] = "Anterior"; -App::$strings["Next"] = "Siguiente"; App::$strings["Export"] = "Exportar"; -App::$strings["Month"] = "Mes"; -App::$strings["Week"] = "Semana"; -App::$strings["Day"] = "Día"; -App::$strings["Today"] = "Hoy"; App::$strings["Event removed"] = "Evento borrado"; App::$strings["Failed to remove event"] = "Error al eliminar el evento"; App::$strings["App installed."] = "Aplicación instalada."; @@ -238,7 +287,6 @@ App::$strings["Remove this channel and all its clones from the network"] = "Elim App::$strings["By default only the instance of the channel located on this hub will be removed from the network"] = "Por defecto, solo la instancia del canal alojado en este servidor será eliminado de la red"; App::$strings["Remove Channel"] = "Eliminar el canal"; App::$strings["Files: shared with me"] = "Ficheros: compartidos conmigo"; -App::$strings["Name"] = "Nombre"; App::$strings["NEW"] = "NUEVO"; App::$strings["Size"] = "Tamaño"; App::$strings["Last Modified"] = "Última modificación"; @@ -270,11 +318,7 @@ App::$strings["Your account email address must match this in order to use the we App::$strings["Website URL"] = "Dirección del sitio web"; App::$strings["Please use SSL (https) URL if available."] = "Por favor, use SSL (https) si está disponible."; App::$strings["Please select a default timezone for your website"] = "Por favor, selecciones el huso horario por defecto de su sitio web"; -App::$strings["Basic/Minimal Social Networking"] = "Red social básica o mínima"; -App::$strings["Standard Configuration (default)"] = "Configuración estándar (por defecto)"; -App::$strings["Professional"] = "Profesional"; App::$strings["Site settings"] = "Ajustes del sitio"; -App::$strings["Server Configuration/Role"] = "Configuración del servidor"; App::$strings["PHP version 5.5 or greater is required."] = "Se requiere la versión 5.5, o superior, de PHP."; App::$strings["PHP version"] = "Versión de PHP"; App::$strings["Could not find a command line version of PHP in the web server PATH."] = "No se puede encontrar una versión en línea de comandos de PHP en la ruta del servidor web."; @@ -298,6 +342,7 @@ App::$strings["OpenSSL PHP module"] = "módulo PHP OpenSSL"; App::$strings["PDO database PHP module"] = "Módulo PHP de la base de datos PDO "; App::$strings["mb_string PHP module"] = "módulo PHP mb_string"; App::$strings["xml PHP module"] = "módulo PHP xml"; +App::$strings["zip PHP module"] = "Módulo zip PHP"; App::$strings["Apache mod_rewrite module"] = "módulo Apache mod_rewrite "; App::$strings["Error: Apache webserver mod-rewrite module is required but not installed."] = "Error: se necesita el módulo del servidor web Apache mod-rewrite pero no está instalado."; App::$strings["exec"] = "ejecutable"; @@ -310,6 +355,7 @@ App::$strings["Error: openssl PHP module required but not installed."] = "Error: App::$strings["Error: PDO database PHP module required but not installed."] = "Error: se necesita el módulo PHP de la base de datos PDO, pero no está instalado."; App::$strings["Error: mb_string PHP module required but not installed."] = "Error: el módulo PHP mb_string es necesario, pero no está instalado."; App::$strings["Error: xml PHP module required for DAV but not installed."] = "Error: el módulo PHP xml es necesario para DAV, pero no está instalado."; +App::$strings["Error: zip PHP module required but not installed."] = "Error: se requiere el módulo zip PHP pero no está instalado."; App::$strings["The web installer needs to be able to create a file called \".htconfig.php\" in the top folder of your web server and it is unable to do so."] = "El instalador web no ha podido crear un fichero llamado “.htconfig.php” en la carpeta base de su servidor."; App::$strings["This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can."] = "Esto está generalmente ligado a un problema de permisos, a causa del cual el servidor web tiene prohibido modificar ficheros en su carpeta - incluso si usted mismo tiene esos permisos."; App::$strings["At the end of this procedure, we will give you a text to save in a file named .htconfig.php in your Red top folder."] = "Al término de este procedimiento, podemos crear un fichero de texto para guardar con el nombre .htconfig.php en el directorio raíz de su instalación de Hubzilla."; @@ -334,7 +380,7 @@ App::$strings["Url rewrite in .htaccess is not working. Check your server config App::$strings["Url rewrite is working"] = "La reescritura de las direcciones funciona correctamente"; App::$strings["The database configuration file \".htconfig.php\" could not be written. Please use the enclosed text to create a configuration file in your web server root."] = "El fichero de configuración de la base de datos .htconfig.php no se ha podido modificar. Por favor, copie el texto generado en un fichero con ese nombre en el directorio raíz de su servidor."; App::$strings["Errors encountered creating database tables."] = "Se han encontrado errores al crear las tablas de la base de datos."; -App::$strings["

What next

"] = "

Siguiente paso

"; +App::$strings["

What next?

"] = "

¿Qué sigue?

"; App::$strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "IMPORTANTE: Debe crear [manualmente] una tarea programada para el \"poller\"."; App::$strings["Continue"] = "Continuar"; App::$strings["Premium Channel Setup"] = "Configuración del canal premium"; @@ -389,11 +435,9 @@ App::$strings["(optional)"] = "(opcional)"; App::$strings["Download Plugin Repo"] = "Descargar el repositorio"; App::$strings["Install new repo"] = "Instalar un nuevo repositorio"; App::$strings["Install"] = "Instalar"; -App::$strings["Cancel"] = "Cancelar"; App::$strings["Manage Repos"] = "Gestionar los repositorios"; App::$strings["Installed Plugin Repositories"] = "Repositorios de los plugins instalados"; App::$strings["Install a New Plugin Repository"] = "Instalar un nuevo repositorio de plugins"; -App::$strings["Update"] = "Actualizar"; App::$strings["Switch branch"] = "Cambiar la rama"; App::$strings["Remove"] = "Eliminar"; App::$strings["%s account blocked/unblocked"] = array( @@ -412,7 +456,6 @@ App::$strings["Accounts"] = "Cuentas"; App::$strings["select all"] = "seleccionar todo"; App::$strings["Registrations waiting for confirm"] = "Inscripciones en espera de confirmación"; App::$strings["Request date"] = "Fecha de solicitud"; -App::$strings["Email"] = "Correo electrónico"; App::$strings["No registrations."] = "Sin registros."; App::$strings["Approve"] = "Aprobar"; App::$strings["Deny"] = "Rechazar"; @@ -603,6 +646,8 @@ App::$strings["Block embedded HTML from these domains"] = "Bloquear contenido co App::$strings["Remote privacy information not available."] = "La información privada remota no está disponible."; App::$strings["Visible to:"] = "Visible para:"; App::$strings["__ctx:acl__ Profile"] = "Perfil"; +App::$strings["Comment approved"] = "El comentario ha sido aprobado"; +App::$strings["Comment deleted"] = "Se ha eliminado el comentario"; App::$strings["Permission category saved."] = "Se ha guardado la categoría del permiso."; App::$strings["Use this form to create permission rules for various classes of people or connections."] = "Utilice este formulario para crear reglas de permiso para varias clases de personas o conexiones."; App::$strings["Permission Categories"] = "Categorías de autorización"; @@ -690,6 +735,8 @@ App::$strings["System info messages"] = "Mensajes de información del sistema"; App::$strings["System critical alerts"] = "Alertas críticas del sistema"; App::$strings["New connections"] = "Nuevas conexiones"; App::$strings["System Registrations"] = "Registros del sistema"; +App::$strings["Unseen shared files"] = "Ficheros compartidos no vistos"; +App::$strings["Unseen public activity"] = "Actividad pública no vista"; App::$strings["Also show new wall posts, private messages and connections under Notices"] = "Mostrar también en Avisos las nuevas publicaciones, los mensajes privados y las conexiones"; App::$strings["Notify me of events this many days in advance"] = "Avisarme de los eventos con algunos días de antelación"; App::$strings["Must be greater than 0"] = "Debe ser mayor que 0"; @@ -782,7 +829,6 @@ App::$strings["Client key starts with"] = "La \"client key\" empieza por"; App::$strings["No name"] = "Sin nombre"; App::$strings["Remove authorization"] = "Eliminar autorización"; App::$strings["View Photo"] = "Ver foto"; -App::$strings["Unknown"] = "Desconocido"; App::$strings["Edit Album"] = "Editar álbum"; App::$strings["Upload"] = "Subir"; App::$strings["Some blurb about what to do when you're new here"] = "Algunas propuestas para el nuevo usuario sobre qué se puede hacer aquí"; @@ -841,10 +887,11 @@ App::$strings["Create new app"] = "Crear una nueva aplicación"; App::$strings["__ctx:mood__ %1\$s is %2\$s"] = "%1\$s está %2\$s"; App::$strings["Mood"] = "Estado de ánimo"; App::$strings["Set your current mood and tell your friends"] = "Describir su estado de ánimo para comunicárselo a sus amigos"; +App::$strings["Connections"] = "Conexiones"; App::$strings["Blocked"] = "Bloqueadas"; App::$strings["Ignored"] = "Ignoradas"; App::$strings["Hidden"] = "Ocultas"; -App::$strings["Archived"] = "Archivadas"; +App::$strings["Archived/Unreachable"] = "Archivada o inaccesible"; App::$strings["New"] = "Nuevas"; App::$strings["All"] = "Todos/as"; App::$strings["New Connections"] = "Nuevas conexiones"; @@ -852,9 +899,11 @@ App::$strings["Show pending (new) connections"] = "Mostrar conexiones (nuevas) p App::$strings["Show all connections"] = "Mostrar todas las conexiones"; App::$strings["Only show blocked connections"] = "Mostrar solo las conexiones bloqueadas"; App::$strings["Only show ignored connections"] = "Mostrar solo conexiones ignoradas"; -App::$strings["Only show archived connections"] = "Mostrar solo las conexiones archivadas"; +App::$strings["Only show archived/unreachable connections"] = "Mostrar solo las conexiones archivadas o inaccesibles"; App::$strings["Only show hidden connections"] = "Mostrar solo las conexiones ocultas"; App::$strings["Pending approval"] = "Pendiente de aprobación"; +App::$strings["Archived"] = "Archivadas"; +App::$strings["Not connected at this location"] = "No está conectado/a en esta ubicación"; App::$strings["%1\$s [%2\$s]"] = "%1\$s [%2\$s]"; App::$strings["Edit connection"] = "Editar conexión"; App::$strings["Delete connection"] = "Eliminar conexión"; @@ -867,12 +916,12 @@ App::$strings["Approve connection"] = "Aprobar esta conexión"; App::$strings["Ignore connection"] = "Ignorar esta conexión"; App::$strings["Ignore"] = "Ignorar"; App::$strings["Recent activity"] = "Actividad reciente"; -App::$strings["Connections"] = "Conexiones"; App::$strings["Search your connections"] = "Buscar sus conexiones"; App::$strings["Connections search"] = "Buscar conexiones"; App::$strings["Find"] = "Encontrar"; App::$strings["item"] = "elemento"; App::$strings["Source of Item"] = "Origen del elemento"; +App::$strings["View Bookmarks"] = "Ver los marcadores"; App::$strings["Bookmark added"] = "Marcador añadido"; App::$strings["My Bookmarks"] = "Mis marcadores"; App::$strings["My Connections Bookmarks"] = "Marcadores de mis conexiones"; @@ -887,6 +936,7 @@ App::$strings["Delete Album"] = "Borrar álbum"; App::$strings["Delete Photo"] = "Borrar foto"; App::$strings["No photos selected"] = "No hay fotos seleccionadas"; App::$strings["Access to this item is restricted."] = "El acceso a este elemento está restringido."; +App::$strings["Photos"] = "Fotos"; App::$strings["%1$.2f MB of %2$.2f MB photo storage used."] = "%1$.2f MB de %2$.2f MB de almacenamiento de fotos utilizado."; App::$strings["%1$.2f MB photo storage used."] = "%1$.2f MB de almacenamiento de fotos utilizado."; App::$strings["Upload Photos"] = "Subir fotos"; @@ -945,6 +995,7 @@ App::$strings["Recent Photos"] = "Fotos recientes"; App::$strings["Profile Unavailable."] = "Perfil no disponible"; App::$strings["Not found"] = "No encontrado"; App::$strings["Invalid channel"] = "Canal no válido"; +App::$strings["Wiki"] = "Wiki"; App::$strings["Wikis"] = "Wikis"; App::$strings["Download"] = "Descargar"; App::$strings["Create New"] = "Crear"; @@ -1019,6 +1070,7 @@ App::$strings["Unable to locate original post."] = "No ha sido posible encontrar App::$strings["Empty post discarded."] = "La entrada vacía ha sido desechada."; App::$strings["Duplicate post suppressed."] = "Se ha suprimido la entrada duplicada."; App::$strings["System error. Post not saved."] = "Error del sistema. La entrada no se ha podido salvar."; +App::$strings["Your comment is awaiting approval."] = "Su comentario está pendiente de aprobación."; App::$strings["Unable to obtain post information from database."] = "No ha sido posible obtener información de la entrada en la base de datos."; App::$strings["You have reached your limit of %1$.0f top level posts."] = "Ha alcanzado su límite de %1$.0f entradas en la página principal."; App::$strings["You have reached your limit of %1$.0f webpages."] = "Ha alcanzado su límite de %1$.0f páginas web."; @@ -1076,7 +1128,10 @@ App::$strings["Accept connection to allow communication"] = "Aceptar la conexió App::$strings["Set Affinity"] = "Ajustar la afinidad"; App::$strings["Set Profile"] = "Ajustar el perfil"; App::$strings["Set Affinity & Profile"] = "Ajustar la afinidad y el perfil"; -App::$strings["none"] = "-"; +App::$strings["This connection is unreachable from this location."] = "No se puede acceder a la conexión desde este sitio."; +App::$strings["This connection may be unreachable from other channel locations."] = "Esta conexión puede ser inaccesible desde otras ubicaciones del canal."; +App::$strings["Location independence is not supported by their network."] = "La independencia de ubicación no es compatible con su red."; +App::$strings["This connection is unreachable from this location. Location independence is not supported by their network."] = "Esta conexión no es accesible desde este sitio. La independencia de ubicación no es compatible con su red."; App::$strings["Connection Default Permissions"] = "Permisos predeterminados de conexión"; App::$strings["Connection: %s"] = "Conexión: %s"; App::$strings["Apply these permissions automatically"] = "Aplicar estos permisos automaticamente"; @@ -1101,24 +1156,7 @@ App::$strings["Please choose the profile you would like to display to %s when vi App::$strings["Some permissions may be inherited from your channel's privacy settings, which have higher priority than individual settings. You can change those settings here but they wont have any impact unless the inherited setting changes."] = "Algunos permisos pueden ser heredados de los ajustes de privacidad de sus canales, los cuales tienen una prioridad más alta que los ajustes individuales. Puede cambiar estos ajustes aquí, pero no tendrán ningún consecuencia hasta que cambie los ajustes heredados."; App::$strings["Last update:"] = "Última actualización:"; App::$strings["Details"] = "Detalles"; -App::$strings["Organisation"] = "Organización"; -App::$strings["Title"] = "Título"; -App::$strings["Phone"] = "Teléfono"; -App::$strings["Instant messenger"] = "Mensajería instantánea"; -App::$strings["Website"] = "Sitio web"; -App::$strings["Note"] = "Nota"; -App::$strings["Mobile"] = "Móvil"; -App::$strings["Home"] = "Inicio"; -App::$strings["Work"] = "Trabajo"; -App::$strings["Add Contact"] = "Añadir un contacto"; -App::$strings["Add Field"] = "Añadir un campo"; -App::$strings["P.O. Box"] = "Buzón de correos"; -App::$strings["Additional"] = "Adicional"; -App::$strings["Street"] = "Calle"; -App::$strings["Locality"] = "Localidad"; -App::$strings["Region"] = "Provincia, región o estado"; -App::$strings["ZIP Code"] = "Código postal"; -App::$strings["Country"] = "País"; +App::$strings["My Chatrooms"] = "Mis salas de chat"; App::$strings["Room not found"] = "Sala no encontrada"; App::$strings["Leave Room"] = "Abandonar la sala"; App::$strings["Delete Room"] = "Eliminar esta sala"; @@ -1134,7 +1172,6 @@ App::$strings["%1\$s's Chatrooms"] = "Salas de chat de %1\$s"; App::$strings["No chatrooms available"] = "No hay salas de chat disponibles"; App::$strings["Expiration"] = "Caducidad"; App::$strings["min"] = "min"; -App::$strings["Photos"] = "Fotos"; App::$strings["Files"] = "Ficheros"; App::$strings["Unable to update menu."] = "No se puede actualizar el menú."; App::$strings["Unable to create menu."] = "No se puede crear el menú."; @@ -1277,11 +1314,11 @@ App::$strings["Ratings"] = "Valoraciones"; App::$strings["Rating: "] = "Valoración:"; App::$strings["Website: "] = "Sitio web:"; App::$strings["Description: "] = "Descripción:"; +App::$strings["Webpages"] = "Páginas web"; App::$strings["Import Webpage Elements"] = "Importar elementos de una página web"; App::$strings["Import selected"] = "Importar elementos seleccionados"; App::$strings["Export Webpage Elements"] = "Exportar elementos de una página web"; App::$strings["Export selected"] = "Exportar los elementos seleccionados"; -App::$strings["Webpages"] = "Páginas web"; App::$strings["Actions"] = "Acciones"; App::$strings["Page Link"] = "Vínculo de la página"; App::$strings["Page Title"] = "Título de página"; @@ -1325,6 +1362,7 @@ App::$strings["Edit Source"] = "Editar fuente"; App::$strings["Delete Source"] = "Eliminar fuente"; App::$strings["Source removed"] = "Fuente eliminada"; App::$strings["Unable to remove source."] = "No se puede eliminar la fuente."; +App::$strings["Post"] = "Publicación"; App::$strings["Like/Dislike"] = "Me gusta/No me gusta"; App::$strings["This action is restricted to members."] = "Esta acción está restringida solo para miembros."; App::$strings["Please login with your \$Projectname ID or register as a new \$Projectname member to continue."] = "Por favor, identifíquese con su \$Projectname ID o rregístrese como un nuevo \$Projectname member para continuar."; @@ -1343,6 +1381,7 @@ App::$strings["%1\$s is not attending %2\$s's %3\$s"] = "%3\$s de %2\$s: %1\$s n App::$strings["%1\$s may attend %2\$s's %3\$s"] = "%3\$s de %2\$s: %1\$s quizá participe"; App::$strings["Action completed."] = "Acción completada."; App::$strings["Thank you."] = "Gracias."; +App::$strings["Directory"] = "Directorio"; App::$strings["%d rating"] = array( 0 => "%d valoración", 1 => "%d valoraciones", @@ -1374,6 +1413,7 @@ App::$strings["Oldest to Newest"] = "De más antiguo a más nuevo"; App::$strings["No entries (some entries may be hidden)."] = "Sin entradas (algunas entradas pueden estar ocultas)."; App::$strings["Xchan Lookup"] = "Búsqueda de canales"; App::$strings["Lookup xchan beginning with (or webbie): "] = "Buscar un canal (o un \"webbie\") que comience por:"; +App::$strings["Suggest Channels"] = "Sugerir canales"; App::$strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "No hay sugerencias disponibles. Si es un sitio nuevo, espere 24 horas y pruebe de nuevo."; App::$strings["Ignore/Hide"] = "Ignorar/Ocultar"; App::$strings["Unable to find your hub."] = "No se puede encontrar su servidor."; @@ -1382,6 +1422,7 @@ App::$strings["Unable to lookup recipient."] = "No se puede asociar a un destina App::$strings["Unable to communicate with requested channel."] = "No se puede establecer la comunicación con el canal solicitado."; App::$strings["Cannot verify requested channel."] = "No se puede verificar el canal solicitado."; App::$strings["Selected channel has private message restrictions. Send failed."] = "El canal seleccionado tiene restricciones sobre los mensajes privados. El envío falló."; +App::$strings["Mail"] = "Correo"; App::$strings["Messages"] = "Mensajes"; App::$strings["message"] = "mensaje"; App::$strings["Message recalled."] = "Mensaje revocado."; @@ -1423,6 +1464,7 @@ App::$strings["Or enter new bookmark folder name"] = "O introduzca un nuevo nomb App::$strings["Enter a folder name"] = "Escriba un nombre de carpeta"; App::$strings["or select an existing folder (doubleclick)"] = "o seleccione una (con un doble click)"; App::$strings["Save to Folder"] = "Guardar en carpeta"; +App::$strings["Remote Diagnostics"] = "Diagnóstico remoto"; App::$strings["Fetching URL returns error: %1\$s"] = "Al intentar obtener la dirección, retorna el error: %1\$s"; App::$strings["Maximum daily site registrations exceeded. Please try again tomorrow."] = "Se ha superado el límite máximo de inscripciones diarias de este sitio. Por favor, pruebe de nuevo mañana."; App::$strings["Please indicate acceptance of the Terms of Service. Registration failed."] = "Por favor, confirme que acepta los Términos del servicio. El registro ha fallado."; @@ -1467,6 +1509,7 @@ App::$strings["No such group"] = "No se encuentra el grupo"; App::$strings["No such channel"] = "No se encuentra el canal"; App::$strings["forum"] = "foro"; App::$strings["Search Results For:"] = "Buscar resultados para:"; +App::$strings["Activity"] = "Actividad"; App::$strings["Privacy group is empty"] = "El grupo de canales está vacío"; App::$strings["Privacy group: "] = "Grupo de canales: "; App::$strings["Invalid connection."] = "Conexión no válida."; @@ -1485,20 +1528,17 @@ App::$strings["Copy/paste this code to attach file to a post"] = "Copiar/pegar e App::$strings["Copy/paste this URL to link file from a web page"] = "Copiar/pegar esta dirección para enlazar el fichero desde una página web"; App::$strings["Share this file"] = "Compartir este fichero"; App::$strings["Show URL to this file"] = "Mostrar la dirección de este fichero"; -App::$strings["Notify your contacts about this file"] = "Avisar a sus contactos sobre este fichero"; +App::$strings["Show in your contacts shared folder"] = "Mostrar en la carpeta compartida con sus contactos"; App::$strings["No channel."] = "Ningún canal."; App::$strings["Common connections"] = "Conexiones comunes"; App::$strings["No connections in common."] = "Ninguna conexión en común."; App::$strings["No connections."] = "Sin conexiones."; App::$strings["Visit %s's profile [%s]"] = "Visitar el perfil de %s [%s]"; App::$strings["View Connections"] = "Ver conexiones"; -App::$strings["# Accounts"] = "# Cuentas"; -App::$strings["# blocked accounts"] = "# cuentas bloqueadas"; -App::$strings["# expired accounts"] = "# cuentas caducadas"; -App::$strings["# expiring accounts"] = "# cuentas que caducan"; -App::$strings["# Channels"] = "# Canales"; -App::$strings["# primary"] = "# primario"; -App::$strings["# clones"] = "# clones"; +App::$strings["Blocked accounts"] = "Cuentas bloqueadas"; +App::$strings["Expired accounts"] = "Cuentas caducadas"; +App::$strings["Expiring accounts"] = "Cuentas que caducan"; +App::$strings["Clones"] = "Clones"; App::$strings["Message queues"] = "Mensajes en cola"; App::$strings["Your software should be updated"] = "Debe actualizar su software"; App::$strings["Summary"] = "Sumario"; @@ -1530,29 +1570,22 @@ App::$strings["Forgot your Password?"] = "¿Ha olvidado su contraseña?"; App::$strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "Introduzca y envíe su dirección de correo electrónico para el restablecimiento de su contraseña. Luego revise su correo para obtener más instrucciones."; App::$strings["Email Address"] = "Dirección de correo electrónico"; App::$strings["Reset"] = "Reiniciar"; -App::$strings["Mark all system notifications seen"] = "Marcar todas las notificaciones del sistema como leídas"; +App::$strings["Mark all seen"] = "Marcar todo como visto"; +App::$strings["0. Beginner/Basic"] = "0. Principiante/Básico"; +App::$strings["1. Novice - not skilled but willing to learn"] = "1. Novicio - no está preparado pero está dispuestos a aprender"; +App::$strings["2. Intermediate - somewhat comfortable"] = "2. Intermedio - algo cómodo"; +App::$strings["3. Advanced - very comfortable"] = "3. Avanzado - muy cómodo"; +App::$strings["4. Expert - I can write computer code"] = "4. Experto - Puedo escribir código informático"; +App::$strings["5. Wizard - I probably know more than you do"] = "5. Asistente - probablemente sé más que tú"; App::$strings["Site Admin"] = "Administrador del sitio"; App::$strings["Report Bug"] = "Informe de errores"; -App::$strings["View Bookmarks"] = "Ver los marcadores"; -App::$strings["My Chatrooms"] = "Mis salas de chat"; App::$strings["Firefox Share"] = "Servicio de compartición de Firefox"; -App::$strings["Remote Diagnostics"] = "Diagnóstico remoto"; -App::$strings["Suggest Channels"] = "Sugerir canales"; App::$strings["Login"] = "Iniciar sesión"; -App::$strings["Activity"] = "Actividad"; -App::$strings["Wiki"] = "Wiki"; -App::$strings["Channel Home"] = "Mi canal"; -App::$strings["Events"] = "Eventos"; -App::$strings["Directory"] = "Directorio"; -App::$strings["Mail"] = "Correo"; App::$strings["Chat"] = "Chat"; App::$strings["Probe"] = "Probar"; App::$strings["Suggest"] = "Sugerir"; App::$strings["Random Channel"] = "Canal aleatorio"; -App::$strings["Invite"] = "Invitar"; App::$strings["Features"] = "Funcionalidades"; -App::$strings["Language"] = "Idioma"; -App::$strings["Post"] = "Publicación"; App::$strings["Profile Photo"] = "Foto del perfil"; App::$strings["Purchase"] = "Comprar"; App::$strings["Undelete"] = "Recuperar"; @@ -1609,9 +1642,11 @@ App::$strings["Please visit %s to view and/or reply to your private messages."] App::$strings["%1\$s, %2\$s commented on [zrl=%3\$s]a %4\$s[/zrl]"] = "%1\$s, %2\$s ha comentado [zrl=%3\$s]%4\$s[/zrl]"; App::$strings["%1\$s, %2\$s commented on [zrl=%3\$s]%4\$s's %5\$s[/zrl]"] = "%1\$s, %2\$s ha comentado [zrl=%3\$s]%5\$s de %4\$s[/zrl] "; App::$strings["%1\$s, %2\$s commented on [zrl=%3\$s]your %4\$s[/zrl]"] = "%1\$s, %2\$s ha comentado [zrl=%3\$s]%4\$s creado por usted[/zrl]"; +App::$strings["[\$Projectname:Notify] Moderated Comment to conversation #%1\$d by %2\$s"] = "[\$Projectname:Aviso] Comentario moderado en la conversación #%1\$d por %2\$s"; App::$strings["[\$Projectname:Notify] Comment to conversation #%1\$d by %2\$s"] = "[\$Projectname:Aviso] Nuevo comentario de %2\$s en la conversación #%1\$d"; App::$strings["%1\$s, %2\$s commented on an item/conversation you have been following."] = "%1\$s, %2\$s ha comentado un elemento/conversación que ha estado siguiendo."; App::$strings["Please visit %s to view and/or reply to the conversation."] = "Para ver o comentar la conversación, visite %s"; +App::$strings["Please visit %s to approve or reject this comment."] = "Por favor, visite %spara aprobar o rechazar este comentario."; App::$strings["%1\$s, %2\$s liked [zrl=%3\$s]your %4\$s[/zrl]"] = "%1\$s, %2\$s ha mostrado su agrado por [zrl=%3\$s]%4\$s creado por usted[/zrl]"; App::$strings["[\$Projectname:Notify] Like received to conversation #%1\$d by %2\$s"] = "[\$Projectname:Aviso] \"Me gusta\" de %2\$s en la conversación #%1\$d"; App::$strings["%1\$s, %2\$s liked an item/conversation you created."] = "%1\$s, %2\$s ha mostrado su agrado por un elemento o conversación que ha creado usted."; @@ -1682,7 +1717,6 @@ App::$strings["Vote"] = "Votar"; App::$strings["Voting Options"] = "Opciones de votación"; App::$strings["Save Bookmarks"] = "Guardar en Marcadores"; App::$strings["Add to Calendar"] = "Añadir al calendario"; -App::$strings["Mark all seen"] = "Marcar todo como visto"; App::$strings["%s show all"] = "%s mostrar todo"; App::$strings["Bold"] = "Negrita"; App::$strings["Italic"] = "Itálico "; @@ -1692,6 +1726,9 @@ App::$strings["Code"] = "Código"; App::$strings["Image"] = "Imagen"; App::$strings["Insert Link"] = "Insertar enlace"; App::$strings["Video"] = "Vídeo"; +App::$strings["Your full name (required)"] = "Su nombre completo (requerido)"; +App::$strings["Your email address (required)"] = "Su dirección de correo electrónico (requerido)"; +App::$strings["Your website URL (optional)"] = "La URL de su sitio web (opcional)"; App::$strings["Remote authentication blocked. You are logged into this site locally. Please logout and retry."] = "La autenticación desde su servidor está bloqueada. Ha iniciado sesión localmente. Por favor, salga de la sesión y vuelva a intentarlo."; App::$strings["Welcome %s. Remote authentication successful."] = "Bienvenido %s. La identificación desde su servidor se ha llevado a cabo correctamente."; App::$strings["parent"] = "padre"; @@ -1711,6 +1748,25 @@ App::$strings["Create new folder"] = "Crear nueva carpeta"; App::$strings["Upload file"] = "Subir fichero"; App::$strings["Drop files here to immediately upload"] = "Arrastre los ficheros aquí para subirlos de forma inmediata"; App::$strings["Forums"] = "Foros"; +App::$strings["Select Channel"] = "Seleccionar un canal"; +App::$strings["Read-write"] = "Lectura y escritura"; +App::$strings["Read-only"] = "Sólo lectura"; +App::$strings["My Calendars"] = "Mis calendarios"; +App::$strings["Shared Calendars"] = "Calendarios compartidos"; +App::$strings["Share this calendar"] = "Compartir este calendario"; +App::$strings["Calendar name and color"] = "Nombre y color del calendario"; +App::$strings["Create new calendar"] = "Crear un nuevo calendario"; +App::$strings["Calendar Name"] = "Nombre del calendario"; +App::$strings["Calendar Tools"] = "Gestión de calendarios"; +App::$strings["Import calendar"] = "Importar un calendario"; +App::$strings["Select a calendar to import to"] = "Seleccionar un calendario para importarlo"; +App::$strings["Addressbooks"] = "Agenda de direcciones"; +App::$strings["Addressbook name"] = "Nombre de la agenda"; +App::$strings["Create new addressbook"] = "Crear una nueva agenda de direcciones"; +App::$strings["Addressbook Name"] = "Nombre de la agenda"; +App::$strings["Addressbook Tools"] = "Gestión de agendas de direcciones"; +App::$strings["Import addressbook"] = "Importar una agenda de direcciones"; +App::$strings["Select an addressbook to import to"] = "Seleccionar una agenda para importarla"; App::$strings["Categories"] = "Temas"; App::$strings["Everything"] = "Todo"; App::$strings["Events Tools"] = "Gestión de eventos"; @@ -1734,9 +1790,9 @@ App::$strings["Enter channel address"] = "Dirección del canal"; App::$strings["Examples: bob@example.com, https://example.com/barbara"] = "Ejemplos: manuel@ejemplo.com, https://ejemplo.com/carmen"; App::$strings["Wiki List"] = "Lista de wikis"; App::$strings["Archives"] = "Hemeroteca"; -App::$strings["Conversations"] = "Conversaciones"; App::$strings["Received Messages"] = "Mensajes recibidos"; App::$strings["Sent Messages"] = "Enviar mensajes"; +App::$strings["Conversations"] = "Conversaciones"; App::$strings["No messages."] = "Sin mensajes."; App::$strings["Delete conversation"] = "Eliminar conversación"; App::$strings["Chat Members"] = "Miembros del chat"; @@ -1771,8 +1827,6 @@ App::$strings["Permission Groups"] = "Grupos de permisos"; App::$strings["Premium Channel Settings"] = "Configuración del canal premium"; App::$strings["Bookmarked Chatrooms"] = "Salas de chat preferidas"; App::$strings["Source channel not found."] = "No se ha encontrado el canal de origen."; -App::$strings["__ctx:opensearch__ Search %1\$s (%2\$s)"] = "Buscar %1\$s (%2\$s)"; -App::$strings["__ctx:opensearch__ \$Projectname"] = "\$Projectname"; App::$strings["Create an account to access services and applications"] = "Crear una cuenta para acceder a los servicios y aplicaciones"; App::$strings["Logout"] = "Finalizar sesión"; App::$strings["Login/Email"] = "Inicio de sesión / Correo electrónico"; @@ -1838,58 +1892,11 @@ App::$strings["Some setting"] = "Algunos ajustes"; App::$strings["A setting"] = "Un ajuste"; App::$strings["Skeleton Settings"] = "Ajustes de Skeleton"; App::$strings["GNU-Social Protocol Settings updated."] = "Se han actualizado los ajustes del protocolo de GNU-Social."; +App::$strings["The GNU-Social protocol does not support location independence. Connections you make within that network may be unreachable from alternate channel locations."] = "El protocolo de GNU-Social no admite la independencia de la ubicación. Las\n conexiones que realice dentro de esa red pueden ser inaccesibles desde \nubicaciones de canales alternativos."; App::$strings["Enable the GNU-Social protocol for this channel"] = "Activar el protocolo de GNU-Social para este canal"; App::$strings["GNU-Social Protocol Settings"] = "Ajustes del protocolo de GNU-Social"; App::$strings["Follow"] = "Seguir"; App::$strings["%1\$s is now following %2\$s"] = "%1\$s está siguiendo ahora a %2\$s"; -App::$strings["INVALID EVENT DISMISSED!"] = "¡EVENTO NO VÁLIDO RECHAZADO!"; -App::$strings["Summary: "] = "Resumen: "; -App::$strings["Date: "] = "Fecha: "; -App::$strings["Reason: "] = "Razón: "; -App::$strings["INVALID CARD DISMISSED!"] = "¡TARJETA NO VÁLIDA RECHAZADA!"; -App::$strings["Name: "] = "Nombre: "; -App::$strings["You have to enable this plugin in Feature/Addon Settings > CalDAV/CardDAV Settings before you can use it."] = "Debe habilitar este complemento en Ajustes/Complementos>Configuración de CalDAV/CardDAV antes de poder utilizarlo."; -App::$strings["Example: YYYY-MM-DD HH:mm"] = "Ejemplo: YYYY-MM-DD HH:mm"; -App::$strings["End date and time"] = "Fecha y hora de finalización"; -App::$strings["List month"] = "Lista mensual"; -App::$strings["List week"] = "Lista semanal"; -App::$strings["List day"] = "Lista diaria"; -App::$strings["More"] = "Más"; -App::$strings["Less"] = "Menos"; -App::$strings["Select calendar"] = "Seleccionar un calendario"; -App::$strings["Delete all"] = "Eliminar todos"; -App::$strings["Sorry! Editing of recurrent events is not yet implemented."] = "¡Disculpas! La edición de eventos recurrentes aún no se ha implementado."; -App::$strings["Errors encountered creating database table: "] = "Errores encontrados al crear la tabla de la base de datos: "; -App::$strings["Default Calendar"] = "Calendario por defecto"; -App::$strings["Default Addressbook"] = "Agenda de direcciones por defecto"; -App::$strings["CalDAV/CardDAV Settings saved."] = "Se ha guardado la configuración de CalDAV/CardDAV."; -App::$strings["Enable CalDAV/CardDAV Server for this channel"] = "Habilitar el servidor CalDAV/CardDAV para este canal"; -App::$strings["Your CalDAV resources are located at %s "] = "Los recursos de CalDAV se encuentran en %s"; -App::$strings["Your CardDAV resources are located at %s "] = "Sus recursos de CalDAV están localizados en %s "; -App::$strings["CalDAV/CardDAV Settings"] = "Configuración de CalDAV/CardDAV"; -App::$strings["Home, Voice"] = "Llamadas particulares"; -App::$strings["Home, Fax"] = "Fax particular"; -App::$strings["Work, Voice"] = "Llamadas de trabajo"; -App::$strings["Work, Fax"] = "Fax de trabajo"; -App::$strings["Select Channel"] = "Seleccionar un canal"; -App::$strings["Read-write"] = "Lectura y escritura"; -App::$strings["Read-only"] = "Sólo lectura"; -App::$strings["My Calendars"] = "Mis calendarios"; -App::$strings["Shared Calendars"] = "Calendarios compartidos"; -App::$strings["Share this calendar"] = "Compartir este calendario"; -App::$strings["Calendar name and color"] = "Nombre y color del calendario"; -App::$strings["Create new calendar"] = "Crear un nuevo calendario"; -App::$strings["Calendar Name"] = "Nombre del calendario"; -App::$strings["Calendar Tools"] = "Gestión de calendarios"; -App::$strings["Import calendar"] = "Importar un calendario"; -App::$strings["Select a calendar to import to"] = "Seleccionar un calendario para importarlo"; -App::$strings["Addressbooks"] = "Agenda de direcciones"; -App::$strings["Addressbook name"] = "Nombre de la agenda"; -App::$strings["Create new addressbook"] = "Crear una nueva agenda de direcciones"; -App::$strings["Addressbook Name"] = "Nombre de la agenda"; -App::$strings["Addressbook Tools"] = "Gestión de agendas de direcciones"; -App::$strings["Import addressbook"] = "Importar una agenda de direcciones"; -App::$strings["Select an addressbook to import to"] = "Seleccionar una agenda para importarla"; App::$strings["Planets Settings updated."] = "Se han guardado los ajustes de Planets."; App::$strings["Enable Planets Plugin"] = "Habilitar el plugin Planets"; App::$strings["Planets Settings"] = "Ajustes de Planets"; @@ -2078,9 +2085,11 @@ App::$strings["bonked"] = "ha golpeado a"; App::$strings["declare undying love for"] = "una declaración de amor eterno"; App::$strings["declared undying love for"] = "ha declarado amor eterno a"; App::$strings["Diaspora Protocol Settings updated."] = "Los ajustes del protocolo de Diaspora se han actualizado."; +App::$strings["The Diaspora protocol does not support location independence. Connections you make within that network may be unreachable from alternate channel locations."] = "El protocolo de Diaspora no admite la independencia de la ubicación. Las conexiones que realice dentro de esa red pueden ser inaccesibles desde ubicaciones de canales alternativos."; App::$strings["Enable the Diaspora protocol for this channel"] = "Activar el protocolo de Diaspora para este canal"; App::$strings["Allow any Diaspora member to comment on your public posts"] = "Permitir a cualquier miembro de Diaspora comentar sus entradas públicas"; App::$strings["Prevent your hashtags from being redirected to other sites"] = "Impedir que sus \"hashtags\" sean redirigidos a otros sitios "; +App::$strings["Sign and forward posts and comments with no existing Diaspora signature"] = "Firmar y enviar entradas y comentarios sin firma de Diaspora"; App::$strings["Followed hashtags (comma separated, do not include the #)"] = "\"Hashtags\" seguidos (separados por comas, sin incluir #)"; App::$strings["Diaspora Protocol Settings"] = "Ajustes del protocolo de Diaspora"; App::$strings["No username found in import file."] = "No se ha encontrado el nombre de usuario en el fichero de importación."; @@ -2113,10 +2122,6 @@ App::$strings["Mail sent."] = "El correo electrónico ha sido enviado."; App::$strings["Sending of mail failed."] = "No se pudo enviar el correo."; App::$strings["Mail Test"] = "Prueba de correo"; App::$strings["Message subject"] = "Asunto del mensaje"; -App::$strings["Reconnecting %d connections"] = "Reconectando %d conexiones"; -App::$strings["Diaspora Reconnect"] = "Reconectar con Diaspora"; -App::$strings["Use this form to re-establish Diaspora connections which were initially made from a different hub."] = "Utilice este formulario para restablecer las conexiones de diáspora que se hicieron inicialmente desde un hub diferente."; -App::$strings["Reconnect"] = "Reconectar"; App::$strings["View Larger"] = "Ver más grande"; App::$strings["Tile Server URL"] = "URL del servidor de mosaicos de imágenes "; App::$strings["A list of public tile servers"] = "Una lista de servidores públicos de mosaicos de imágenes"; @@ -2342,6 +2347,10 @@ App::$strings["I won!"] = "¡He ganado yo!"; App::$strings["Message to display on every page on this server"] = "Mensaje para mostrar en todas las páginas de este servidor"; App::$strings["Pageheader Settings"] = "Ajustes del encabezado de página"; App::$strings["pageheader Settings saved."] = "Se han guardado los ajustes del encabezado de página."; +App::$strings["Only authenticate automatically to sites of your friends"] = "Autenticación automática solo en los sitios de sus amigos"; +App::$strings["By default you are automatically authenticated anywhere in the network"] = "De forma predeterminada, se autenticará automáticamente en cualquier parte de la red"; +App::$strings["Authchoose Settings"] = "Ajustes de Authchoose"; +App::$strings["Atuhchoose Settings updated."] = "Se han actualizado los ajustes de Atuhchoose."; App::$strings["lonely"] = "Solo/a"; App::$strings["drunk"] = "ebrio/a"; App::$strings["horny"] = "caliente"; @@ -2390,6 +2399,8 @@ App::$strings["Pump.io Post Settings"] = "Ajustes de publicación en pump.io"; App::$strings["PumpIO Settings saved."] = "Se han guardado los ajustes de PumpIO."; App::$strings["An account has been created for you."] = "Se ha creado una cuenta para usted."; App::$strings["Authentication successful but rejected: account creation is disabled."] = "Autenticación correcta pero rechazada: la creación de cuentas está deshabilitada."; +App::$strings["__ctx:opensearch__ Search %1\$s (%2\$s)"] = "Buscar %1\$s (%2\$s)"; +App::$strings["__ctx:opensearch__ \$Projectname"] = "\$Projectname"; App::$strings["Search \$Projectname"] = "Buscar \$Projectname"; App::$strings["Redmatrix File Storage Import"] = "Importar repositorio de ficheros de Redmatrix"; App::$strings["This will import all your Redmatrix cloud files to this channel."] = "Esto importará todos sus ficheros de la nube de Redmatrix a este canal."; @@ -2551,19 +2562,6 @@ App::$strings["__ctx:noun__ Abstain"] = array( 0 => "se abstiene", 1 => "Se abstienen", ); -App::$strings["Can view my normal stream and posts"] = "Pueden verse mi actividad y publicaciones normales"; -App::$strings["Can view my webpages"] = "Pueden verse mis páginas web"; -App::$strings["Can post on my channel page (\"wall\")"] = "Pueden crearse entradas en mi página de inicio del canal (“muro”)"; -App::$strings["Can like/dislike stuff"] = "Puede marcarse contenido como me gusta/no me gusta"; -App::$strings["Profiles and things other than posts/comments"] = "Perfiles y otras cosas aparte de publicaciones/comentarios"; -App::$strings["Can forward to all my channel contacts via post @mentions"] = "Puede enviarse una entrada a todos mis contactos del canal mediante una @mención"; -App::$strings["Advanced - useful for creating group forum channels"] = "Avanzado - útil para crear canales de foros de discusión o grupos"; -App::$strings["Can chat with me (when available)"] = "Se puede charlar conmigo (cuando esté disponible)"; -App::$strings["Can write to my file storage and photos"] = "Puede escribirse en mi repositorio de ficheros y fotos"; -App::$strings["Can edit my webpages"] = "Pueden editarse mis páginas web"; -App::$strings["Somewhat advanced - very useful in open communities"] = "Algo avanzado - muy útil en comunidades abiertas"; -App::$strings["Can administer my channel resources"] = "Pueden administrarse mis recursos del canal"; -App::$strings["Extremely advanced. Leave this alone unless you know what you are doing"] = "Muy avanzado. Déjelo a no ser que sepa bien lo que está haciendo."; App::$strings["Directory Options"] = "Opciones del directorio"; App::$strings["Safe Mode"] = "Modo seguro"; App::$strings["Public Forums Only"] = "Solo foros públicos"; @@ -2634,11 +2632,13 @@ App::$strings["Unknown Attachment"] = "Adjunto no reconocido"; App::$strings["unknown"] = "desconocido"; App::$strings["remove category"] = "eliminar el tema"; App::$strings["remove from file"] = "eliminar del fichero"; +App::$strings["Download binary/encrypted content"] = "Descargar contenido binario o cifrado"; App::$strings["default"] = "por defecto"; App::$strings["Page layout"] = "Plantilla de la página"; App::$strings["You can create your own with the layouts tool"] = "Puede crear su propia disposición gráfica con la herramienta de plantillas"; App::$strings["Page content type"] = "Tipo de contenido de la página"; App::$strings["activity"] = "la actividad"; +App::$strings["a-z, 0-9, -, _, and . only"] = "a-z, 0-9, -, _, and . only"; App::$strings["Design Tools"] = "Herramientas de diseño web"; App::$strings["Pages"] = "Páginas"; App::$strings["Import website..."] = "Importar un sitio web..."; @@ -2672,11 +2672,7 @@ App::$strings["%d connection in common"] = array( 1 => "%d conexiones en común", ); App::$strings["show more"] = "mostrar más"; -App::$strings["Attachments:"] = "Ficheros adjuntos: "; -App::$strings["l F d, Y \\@ g:i A"] = "l d de F, Y \\@ G:i"; -App::$strings["\$Projectname event notification:"] = "Notificación de eventos de \$Projectname: "; -App::$strings["Starts:"] = "Comienza:"; -App::$strings["Finishes:"] = "Finaliza:"; +App::$strings["%1\$s wrote the following %2\$s %3\$s"] = "%1\$s escribió %2\$s siguiente %3\$s"; App::$strings["Channel is blocked on this site."] = "El canal está bloqueado en este sitio."; App::$strings["Channel location missing."] = "Falta la dirección del canal."; App::$strings["Response from remote channel was incomplete."] = "Respuesta incompleta del canal."; @@ -2793,11 +2789,13 @@ App::$strings["Reserved nickname. Please choose another."] = "Sobrenombre en uso App::$strings["Nickname has unsupported characters or is already being used on this site."] = "El alias contiene caracteres no admitidos o está ya en uso por otros miembros de este sitio."; App::$strings["Unable to retrieve created identity"] = "No ha sido posible recuperar la identidad creada"; App::$strings["Default Profile"] = "Perfil principal"; +App::$strings["Unable to retrieve modified identity"] = "No se puede recuperar la identidad modficada"; App::$strings["Create New Profile"] = "Crear un nuevo perfil"; App::$strings["Visible to everybody"] = "Visible para todos"; App::$strings["Gender:"] = "Género:"; App::$strings["Homepage:"] = "Página personal:"; App::$strings["Online Now"] = "Ahora en línea"; +App::$strings["Trans"] = "Trans"; App::$strings["Like this channel"] = "Me gusta este canal"; App::$strings["j F, Y"] = "j F Y"; App::$strings["j F"] = "j F"; @@ -2821,25 +2819,31 @@ App::$strings["Work/employment:"] = "Trabajo:"; App::$strings["School/education:"] = "Estudios:"; App::$strings["Like this thing"] = "Me gusta esto"; App::$strings["User '%s' deleted"] = "El usuario '%s' ha sido eliminado"; +App::$strings["l F d, Y \\@ g:i A"] = "l d de F, Y \\@ G:i"; +App::$strings["Starts:"] = "Comienza:"; +App::$strings["Finishes:"] = "Finaliza:"; App::$strings["This event has been added to your calendar."] = "Este evento ha sido añadido a su calendario."; App::$strings["Not specified"] = "Sin especificar"; App::$strings["Needs Action"] = "Necesita de una intervención"; App::$strings["Completed"] = "Completado/a"; App::$strings["In Process"] = "En proceso"; App::$strings["Cancelled"] = "Cancelado/a"; +App::$strings["Home, Voice"] = "Llamadas particulares"; +App::$strings["Home, Fax"] = "Fax particular"; +App::$strings["Work, Voice"] = "Llamadas de trabajo"; +App::$strings["Work, Fax"] = "Fax de trabajo"; App::$strings["view full size"] = "Ver en el tamaño original"; -App::$strings["No Subject"] = "Sin asunto"; App::$strings["Friendica"] = "Friendica"; App::$strings["OStatus"] = "OStatus"; App::$strings["GNU-Social"] = "GNU Social"; App::$strings["RSS/Atom"] = "RSS/Atom"; +App::$strings["ActivityPub"] = "ActivityPub"; App::$strings["Diaspora"] = "Diaspora"; App::$strings["Facebook"] = "Facebook"; App::$strings["Zot"] = "Zot"; App::$strings["LinkedIn"] = "LinkedIn"; App::$strings["XMPP/IM"] = "XMPP/IM"; App::$strings["MySpace"] = "MySpace"; -App::$strings["New Page"] = "Nueva página"; App::$strings["Select an alternate language"] = "Seleccionar un idioma alternativo"; App::$strings["Who can see this?"] = "¿Quién puede ver esto?"; App::$strings["Custom selection"] = "Selección personalizada"; @@ -2852,7 +2856,6 @@ App::$strings["Image/photo"] = "Imagen/foto"; App::$strings["Encrypted content"] = "Contenido cifrado"; App::$strings["Install %s element: "] = "Instalar el elemento %s:"; App::$strings["This post contains an installable %s element, however you lack permissions to install it on this site."] = "Esta entrada contiene el elemento instalable %s, sin embargo le faltan permisos para instalarlo en este sitio."; -App::$strings["%1\$s wrote the following %2\$s %3\$s"] = "%1\$s escribió %2\$s siguiente %3\$s"; App::$strings["Click to open/close"] = "Pulsar para abrir/cerrar"; App::$strings["spoiler"] = "spoiler"; App::$strings["$1 wrote:"] = "$1 escribió:"; @@ -3015,6 +3018,7 @@ App::$strings["Mark all channel notifications seen"] = "Marcar todas las notific App::$strings["Notices"] = "Avisos"; App::$strings["Notifications"] = "Notificaciones"; App::$strings["View all notifications"] = "Ver todas las notificaciones"; +App::$strings["Mark all system notifications seen"] = "Marcar todas las notificaciones del sistema como leídas"; App::$strings["Private mail"] = "Correo privado"; App::$strings["View your private messages"] = "Ver sus mensajes privados"; App::$strings["Mark all private messages seen"] = "Marcar todos los mensajes privados como leídos"; @@ -3023,10 +3027,16 @@ App::$strings["View events"] = "Ver los eventos"; App::$strings["Mark all events seen"] = "Marcar todos los eventos como leidos"; App::$strings["Manage Your Channels"] = "Gestionar sus canales"; App::$strings["Account/Channel Settings"] = "Ajustes de cuenta/canales"; +App::$strings["Shared Files"] = "Ficheros compartidos"; +App::$strings["New files shared with me"] = "Nuevos ficheros compartidos conmigo"; +App::$strings["Public stream"] = "\"Stream\" público"; +App::$strings["Public stream activities"] = "Actividades del \"stream\" público"; App::$strings["Site Setup and Configuration"] = "Ajustes y configuración del sitio"; App::$strings["@name, #tag, ?doc, content"] = "@nombre, #etiqueta, ?ayuda, contenido"; App::$strings["Please wait..."] = "Espere por favor…"; App::$strings["Add Apps"] = "Añadir aplicaciones"; +App::$strings["Arrange Apps"] = "Organizar aplicaciones"; +App::$strings["Toggle System Apps"] = "Alternar aplicaciones de sistema"; App::$strings["Image exceeds website size limit of %lu bytes"] = "La imagen excede el límite de %lu bytes del sitio"; App::$strings["Image file is empty."] = "El fichero de imagen está vacío. "; App::$strings["Photo storage failed."] = "La foto no ha podido ser guardada."; From ba62f144823fd2ee31e3c19eb2c1cb10782c9184 Mon Sep 17 00:00:00 2001 From: www-data Date: Thu, 3 Aug 2017 01:52:43 +0000 Subject: [PATCH 052/441] Fix CSS for help page content list in sidebar. --- doc/toc.html | 1 + view/css/mod_help.css | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/doc/toc.html b/doc/toc.html index 9e34fc8d9..4da01d55d 100644 --- a/doc/toc.html +++ b/doc/toc.html @@ -85,6 +85,7 @@ tocUl.removeClass(); // Classes are automatically added to
    elements by something else tocUl.toc({content: "#doco-content", headings: "h3"}); tocUl.addClass('toc-content'); + tocUl.addClass('list-unstyled'); tocUl.attr('id', 'doco-side-toc'); } diff --git a/view/css/mod_help.css b/view/css/mod_help.css index c0b0bafa3..643885c99 100644 --- a/view/css/mod_help.css +++ b/view/css/mod_help.css @@ -19,3 +19,11 @@ #doco-top-toc li { padding: 3px 0px; } + +#doco-side-toc li { + padding-left: 10px; +} + +#doco-side-toc { + padding-top: 10px; +} \ No newline at end of file From bee09a6d8bbfd0da650aeeb5081648aa1e6c45f6 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Wed, 2 Aug 2017 22:11:46 -0700 Subject: [PATCH 053/441] minor activitypub rendering stuff --- Zotlabs/Module/Ap_probe.php | 2 +- include/bbcode.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Zotlabs/Module/Ap_probe.php b/Zotlabs/Module/Ap_probe.php index f788fa73a..769cd4c4e 100644 --- a/Zotlabs/Module/Ap_probe.php +++ b/Zotlabs/Module/Ap_probe.php @@ -30,7 +30,7 @@ class Ap_probe extends \Zotlabs\Web\Controller { $redirects = 0; $x = z_fetch_url($addr,true,$redirects, [ 'headers' => [ $headers ]]); if($x['success']) - $o .= '
    ' . str_replace('\\','',jindent($x['body'])) . '
    '; + $o .= '
    ' . str_replace(['\\n','\\'],["\n",''],jindent($x['body'])) . '
    '; } return $o; } diff --git a/include/bbcode.php b/include/bbcode.php index c408af35d..9f9b5c5e1 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -7,7 +7,7 @@ require_once('include/oembed.php'); require_once('include/event.php'); require_once('include/zot.php'); - +require_once('include/html2plain.php'); function get_bb_tag_pos($s, $name, $occurance = 1) { From d06ce6294d8bbf6bed668e7f0f363fcad63f4e05 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Thu, 3 Aug 2017 04:55:56 -0700 Subject: [PATCH 054/441] some bb-to-markdown issues --- include/markdown.php | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/include/markdown.php b/include/markdown.php index 530af57a0..0cd9ab237 100644 --- a/include/markdown.php +++ b/include/markdown.php @@ -157,11 +157,11 @@ function bb_to_markdown($Text, $options = []) { * Transform #tags, strip off the [url] and replace spaces with underscore */ - $Text = preg_replace_callback('/#\[([zu])rl\=(\w+.*?)\](\w+.*?)\[\/[(zu)]rl\]/i', + $Text = preg_replace_callback('/#\[([zu])rl\=(.*?)\](.*?)\[\/[(zu)]rl\]/i', create_function('$match', 'return \'#\'. str_replace(\' \', \'_\', $match[3]);'), $Text); - $Text = preg_replace('/#\^\[([zu])rl\=(\w+.*?)\](\w+.*?)\[\/([zu])rl\]/i', '[$1rl=$2]$3[/$4rl]', $Text); + $Text = preg_replace('/#\^\[([zu])rl\=(.*?)\](.*?)\[\/([zu])rl\]/i', '[$1rl=$2]$3[/$4rl]', $Text); // Converting images with size parameters to simple images. Markdown doesn't know it. $Text = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", '[img]$3[/img]', $Text); @@ -197,9 +197,6 @@ function bb_to_markdown($Text, $options = []) { // Remove empty zrl links $Text = preg_replace("/\[zrl\=\].*?\[\/zrl\]/is", "", $Text); - // escape all unconverted tags - $Text = escape_tags($Text); - $Text = trim($Text); call_hooks('bb_to_markdown', $Text); From dc7c3f70ebff3220fa4586a36034476f56ea6481 Mon Sep 17 00:00:00 2001 From: git-marijus Date: Thu, 3 Aug 2017 14:08:34 +0200 Subject: [PATCH 055/441] return preview also if we have no attachment --- Zotlabs/Module/Mail.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Zotlabs/Module/Mail.php b/Zotlabs/Module/Mail.php index 7e6ec0cf9..e5509961a 100644 --- a/Zotlabs/Module/Mail.php +++ b/Zotlabs/Module/Mail.php @@ -53,8 +53,8 @@ class Mail extends \Zotlabs\Web\Controller { } $body = trim(str_replace($match[1],'',$body)); } - echo json_encode(['preview' => zidify_links(smilies(bbcode($body)))]); } + echo json_encode(['preview' => zidify_links(smilies(bbcode($body)))]); } killme(); } From 7b177be271c5ac2a87a5aadd36233bbe693800e0 Mon Sep 17 00:00:00 2001 From: git-marijus Date: Thu, 3 Aug 2017 15:30:40 +0200 Subject: [PATCH 056/441] fix attachment upload for private mail --- view/tpl/msg-header.tpl | 53 +++++++++++++++++++--------------------- view/tpl/prv_message.tpl | 1 + 2 files changed, 26 insertions(+), 28 deletions(-) diff --git a/view/tpl/msg-header.tpl b/view/tpl/msg-header.tpl index 013e1cfdc..0e8fb0389 100755 --- a/view/tpl/msg-header.tpl +++ b/view/tpl/msg-header.tpl @@ -1,34 +1,31 @@ - - + + + From b4880343524aab6b4583c6815d94a5dfe61dd042 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Sat, 19 Aug 2017 01:37:22 -0700 Subject: [PATCH 105/441] better error reporting on mod_display --- Zotlabs/Module/Display.php | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/Zotlabs/Module/Display.php b/Zotlabs/Module/Display.php index 81c72adb3..b054d9edf 100644 --- a/Zotlabs/Module/Display.php +++ b/Zotlabs/Module/Display.php @@ -324,12 +324,8 @@ class Display extends \Zotlabs\Web\Controller { } $o .= '
    '; - - return $o; - - - /* - elseif((! $update) && (! { + + if((! $update) && (! $items)) { $r = q("SELECT id, item_flags FROM item WHERE id = '%s' OR mid = '%s' LIMIT 1", dbesc($item_hash), @@ -348,7 +344,9 @@ class Display extends \Zotlabs\Web\Controller { } } - */ + + return $o; + } From ed71afa6c7ada8ae972474f1846932032c782a94 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Sat, 19 Aug 2017 15:11:12 -0700 Subject: [PATCH 106/441] more work on mod_display --- Zotlabs/Module/Display.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Zotlabs/Module/Display.php b/Zotlabs/Module/Display.php index b054d9edf..d9f623d8d 100644 --- a/Zotlabs/Module/Display.php +++ b/Zotlabs/Module/Display.php @@ -324,8 +324,9 @@ class Display extends \Zotlabs\Web\Controller { } $o .= '
    '; + - if((! $update) && (! $items)) { + if((($update && $load) || $checkjs->disabled()) && (! $items)) { $r = q("SELECT id, item_flags FROM item WHERE id = '%s' OR mid = '%s' LIMIT 1", dbesc($item_hash), From 830f1bcd50ca7b5501f9241a34b516f875cc9f03 Mon Sep 17 00:00:00 2001 From: Andrew Manning Date: Sun, 20 Aug 2017 14:12:09 -0500 Subject: [PATCH 107/441] Update zot_protocol.bb --- doc/developer/zot_protocol.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/developer/zot_protocol.bb b/doc/developer/zot_protocol.bb index 0d2edfc2b..12306c7b7 100644 --- a/doc/developer/zot_protocol.bb +++ b/doc/developer/zot_protocol.bb @@ -277,7 +277,7 @@ Discovery returns a JSON array with the following components: [h5]Permissions[/h5] -'permisssions' => extensible array of permissions appropriate to this target, values are '1' or '' +'permissions' => extensible array of permissions appropriate to this target, values are '1' or '' Permissions may include: [list] From 8a5c23fd50d26fb44d3d1d0f11d3bbd23872d060 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Sun, 20 Aug 2017 17:45:08 -0700 Subject: [PATCH 108/441] issue with oembed of a shared item, which wraps in another share. --- Zotlabs/Module/Oep.php | 30 ++++++++++++++++++++---------- include/conversation.php | 4 ++-- 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/Zotlabs/Module/Oep.php b/Zotlabs/Module/Oep.php index 9c05f5e3f..07094c1de 100644 --- a/Zotlabs/Module/Oep.php +++ b/Zotlabs/Module/Oep.php @@ -151,19 +151,29 @@ class Oep extends \Zotlabs\Web\Controller { xchan_query($p,true); $p = fetch_post_tags($p,true); - + + // This function can get tripped up if the item is already a reshare + // (the multiple share declarations do not parse cleanly if nested) + // So build a template with a known nonsense string as the content, and then + // replace that known string with the actual rendered content, sending + // each content layer through bbcode() separately. + + $x = '2eGriplW^*Jmf4'; + $o = "[share author='".urlencode($p[0]['author']['xchan_name']). - "' profile='".$p[0]['author']['xchan_url'] . - "' avatar='".$p[0]['author']['xchan_photo_s']. - "' link='".$p[0]['plink']. - "' posted='".$p[0]['created']. - "' message_id='".$p[0]['mid']."']"; - if($p[0]['title']) - $o .= '[b]'.$p[0]['title'].'[/b]'."\r\n"; - $o .= $p[0]['body']; - $o .= "[/share]"; + "' profile='".$p[0]['author']['xchan_url'] . + "' avatar='".$p[0]['author']['xchan_photo_s']. + "' link='".$p[0]['plink']. + "' posted='".$p[0]['created']. + "' message_id='".$p[0]['mid']."']"; + if($p[0]['title']) + $o .= '[b]'.$p[0]['title'].'[/b]'."\r\n"; + $o .= $x; + $o .= "[/share]"; $o = bbcode($o); + $o = str_replace($x,bbcode($p[0]['body']),$o); + $ret['type'] = 'rich'; $w = (($maxwidth) ? $maxwidth : 640); diff --git a/include/conversation.php b/include/conversation.php index 30ba4d812..3b8ec19d3 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -295,7 +295,7 @@ function localize_item(&$item){ } $plink = '[zrl=' . $obj['plink'] . ']' . $post_type . '[/zrl]'; - $parsedobj = parse_xml_string($xmlhead.$item['obj']); +// $parsedobj = parse_xml_string($xmlhead.$item['obj']); $tag = sprintf('#[zrl=%s]%s[/zrl]', $parsedobj->id, $parsedobj->content); $item['body'] = sprintf( t('%1$s tagged %2$s\'s %3$s with %4$s'), $author, $objauthor, $plink, $tag ); @@ -312,7 +312,7 @@ function localize_item(&$item){ $xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">"; - $obj = parse_xml_string($xmlhead.$item['obj']); +// $obj = parse_xml_string($xmlhead.$item['obj']); if(strlen($obj->id)) { $r = q("select * from item where mid = '%s' and uid = %d limit 1", dbesc($obj->id), From 081bff605a47e4e46f1842f81697386459792e11 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Sun, 20 Aug 2017 18:07:25 -0700 Subject: [PATCH 109/441] zot_protocol values are true and false; it is only php print_r() that turns them into '1' or '' --- doc/developer/zot_protocol.bb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/developer/zot_protocol.bb b/doc/developer/zot_protocol.bb index 0d2edfc2b..227c57a82 100644 --- a/doc/developer/zot_protocol.bb +++ b/doc/developer/zot_protocol.bb @@ -242,7 +242,7 @@ Example of discovery packet for 'mike@zothub.com' Discovery returns a JSON array with the following components: -'success' => ('1' or '') Operation was successful if '1'. Otherwise an optional 'message' may be present indicating the source of error. +'success' => (true or false) Operation was successful if true. Otherwise an optional 'message' may be present indicating the source of error. 'signed_token' => If a token parameter was provided in the request, it is prepended with the text 'token.' and then RSA signed with the channel private key and base64url encoded and returned as 'signed_token'. @@ -272,12 +272,12 @@ Discovery returns a JSON array with the following components: 'target_sig' => if a permissions target was specified, the signature is mirrored. -'searchable' => ('1' or '') '1' indicates this entry can be searched in a directory +'searchable' => (true or false) true indicates this entry can be searched in a directory [h5]Permissions[/h5] -'permisssions' => extensible array of permissions appropriate to this target, values are '1' or '' +'permissions' => extensible array of permissions appropriate to this target, values are true or false Permissions may include: [list] @@ -328,7 +328,7 @@ Each location is an array of 'address' => the webbie or user@host identifier associated with this location -'primary' => ('1' or '') whether or not this is the primary location for this channel where files and web pages are generally found +'primary' => (true or false) whether or not this is the primary location for this channel where files and web pages are generally found 'url' => url of the root of this DNS location e.g. https://example.com From 18c57eeaa03fedf9156369a10abe17bf61179adb Mon Sep 17 00:00:00 2001 From: zotlabs Date: Sun, 20 Aug 2017 18:30:12 -0700 Subject: [PATCH 110/441] httpsig - return an array with all the different signing possibilities enumerated --- Zotlabs/Web/HTTPSig.php | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/Zotlabs/Web/HTTPSig.php b/Zotlabs/Web/HTTPSig.php index 48adf4ad2..537cd52a1 100644 --- a/Zotlabs/Web/HTTPSig.php +++ b/Zotlabs/Web/HTTPSig.php @@ -27,10 +27,18 @@ class HTTPSig { $body = $data; $headers = null; + $result = [ + 'signer' => '', + 'header_signed' => false, + 'header_valid' => false, + 'content_signed' => false, + 'content_valid' => false + ]; + // decide if $data arrived via controller submission or curl if(is_array($data) && $data['header']) { if(! $data['success']) - return false; + return $result; $h = new \Zotlabs\Web\HTTPHeaders($data['header']); $headers = $h->fetcharr(); $body = $data['body']; @@ -59,7 +67,9 @@ class HTTPSig { } if(! $sig_block) - return null; + return $result; + + $result['header_signed'] = true; $signed_headers = $sig_block['headers']; if(! $signed_headers) @@ -79,6 +89,7 @@ class HTTPSig { } if(! $key) { + $result['signer'] = $sig_block['keyId']; $key = self::get_activitypub_key($sig_block['keyId']); } @@ -88,21 +99,23 @@ class HTTPSig { $x = rsa_verify($signed_data,$sig_block['signature'],$key,$algorithm); if($x === false) - return $x; + return $result; + + $result['header_valid'] = true; if(in_array('digest',$signed_headers)) { + $result['content_signed'] = true; $digest = explode('=', $headers['digest']); if($digest[0] === 'SHA-256') $hashalg = 'sha256'; // The explode operation will have stripped the '=' padding, so compare against unpadded base64 - if(rtrim(base64_encode(hash($hashalg,$body,true)),'=') === $digest[1]) - return true; - else - return false; + if(rtrim(base64_encode(hash($hashalg,$body,true)),'=') === $digest[1]) { + $result['content_valid'] = true; + } } - return $x; + return $result; } From f15d96bebe754d9cb38b1e043a30521d9fbcd668 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Sun, 20 Aug 2017 19:40:37 -0700 Subject: [PATCH 111/441] add namespaces to activitystreams parser --- Zotlabs/Lib/ActivityStreams.php | 65 +++++++++++++++++++++++++++------ 1 file changed, 53 insertions(+), 12 deletions(-) diff --git a/Zotlabs/Lib/ActivityStreams.php b/Zotlabs/Lib/ActivityStreams.php index 2b610c7a4..3bbe3b190 100644 --- a/Zotlabs/Lib/ActivityStreams.php +++ b/Zotlabs/Lib/ActivityStreams.php @@ -5,12 +5,14 @@ namespace Zotlabs\Lib; class ActivityStreams { public $data; - public $valid = false; - public $id = ''; - public $type = ''; - public $actor = null; - public $obj = null; - public $tgt = null; + public $valid = false; + public $id = ''; + public $type = ''; + public $actor = null; + public $obj = null; + public $tgt = null; + public $origin = null; + public $owner = null; function __construct($string) { @@ -26,6 +28,7 @@ class ActivityStreams { $this->obj = $this->get_compound_property('object'); $this->tgt = $this->get_compound_property('target'); $this->origin = $this->get_compound_property('origin'); + $this->owner = $this->get_compound_property('owner','','http://purl.org/zot/protocol'); if(($this->type === 'Note') && (! $this->obj)) { $this->obj = $this->data; @@ -38,9 +41,47 @@ class ActivityStreams { return $this->valid; } - function get_property_obj($property,$base = '') { + function get_namespace($base,$namespace) { + + $key = null; + + foreach( [ $this->data, $base ] as $b ) { + if(! $b) + continue; + if(array_key_exists('@context',$b)) { + if(is_array($b['@context'])) { + foreach($b['@context'] as $ns) { + if(is_array($ns)) { + foreach($ns as $k => $v) { + if($namespace === $v) + $key = $k; + } + } + else { + if($namespace === $ns) { + $key = ''; + } + } + } + } + else { + if($namespace === $b['@context']) { + $key = ''; + } + } + } + } + return $key; + } + + + function get_property_obj($property,$base = '',$namespace = 'https://www.w3.org/ns/activitystreams') { + $prefix = $this->get_namespace($base,$namespace); + if($prefix === null) + return null; $base = (($base) ? $base : $this->data); - return ((array_key_exists($property,$base)) ? $base[$property] : null); + $propname = (($prefix) ? $prefix . ':' : '') . $property; + return ((array_key_exists($propname,$base)) ? $base[$propname] : null); } function fetch_property($url) { @@ -57,8 +98,8 @@ class ActivityStreams { return null; } - function get_compound_property($property,$base = '') { - $x = $this->get_property_obj($property,$base); + function get_compound_property($property,$base = '',$namespace = 'https://www.w3.org/ns/activitystreams') { + $x = $this->get_property_obj($property,$base,$namespace); if($this->is_url($x)) { $x = $this->fetch_property($x); } @@ -72,10 +113,10 @@ class ActivityStreams { return false; } - function get_primary_type($base = '') { + function get_primary_type($base = '',$namespace = 'https://www.w3.org/ns/activitystreams') { if(! $base) $base = $this->data; - $x = $this->get_property_obj('type',$base); + $x = $this->get_property_obj('type',$base,$namespace); if(is_array($x)) { foreach($x as $y) { if(strpos($y,':') === false) { From 52c6ea51152b6255b45ffb68181fa63413a6fffc Mon Sep 17 00:00:00 2001 From: zotlabs Date: Sun, 20 Aug 2017 21:02:09 -0700 Subject: [PATCH 112/441] add dmkdir --- util/dmkdir | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100755 util/dmkdir diff --git a/util/dmkdir b/util/dmkdir new file mode 100755 index 000000000..ffb1932e5 --- /dev/null +++ b/util/dmkdir @@ -0,0 +1,48 @@ +#!/usr/bin/env php +' . PHP_EOL; + exit(1); +} + +require_once('include/cli_startup.php'); +require_once('include/attach.php'); + +cli_startup(); + +$dstfile = $argv[1]; + +if($argc != 2) { + echo "Usage: " . $argv[0] . ' directory' . "\n"; + echo 'Always run from the toplevel web directory.' . "\n"; + echo 'directory should begin with store/$nickname/desired/path or $nickname/desired/path' . "\n"; + echo 'Example: util/dmkdir store/bob/photos/2017' . "\n"; + exit; +} + + + + if(strpos($dstfile,'store/') === 0) + $dstfile = substr($dstfile,6); + + $nick = substr($dstfile,0,strpos($dstfile,'/')); + + $dstfile = substr($dstfile,strlen($nick)+1); + + $channel = channelx_by_nick($nick); + if(! $channel) + return; + + + $arr = [ + 'pathname' => $dstfile, + 'allow_cid' => $channel['channel_allow_cid'], + 'allow_gid' => $channel['channel_allow_gid'], + 'deny_cid' => $channel['channel_deny_cid'], + 'deny_gid' => $channel['channel_deny_gid'], + ]; + + $x = attach_mkdirp($channel,$channel['channel_hash'],$arr); From 31e62bd19e2fcfe70487ab38ee6b688e48a79c95 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Sun, 20 Aug 2017 21:24:58 -0700 Subject: [PATCH 113/441] a few file activities were not getting synced --- Zotlabs/Module/File_upload.php | 16 +++++++++++++++- Zotlabs/Module/Wall_attach.php | 6 ++++++ util/dcp | 9 +++++++-- util/dmkdir | 9 +++++++++ 4 files changed, 37 insertions(+), 3 deletions(-) diff --git a/Zotlabs/Module/File_upload.php b/Zotlabs/Module/File_upload.php index bce81ad7a..5c4b9a502 100644 --- a/Zotlabs/Module/File_upload.php +++ b/Zotlabs/Module/File_upload.php @@ -35,11 +35,25 @@ class File_upload extends \Zotlabs\Web\Controller { if($_REQUEST['filename']) { $r = attach_mkdir($channel, get_observer_hash(), $_REQUEST); - if($r['success']) + if($r['success']) { + $hash = $r['data']['hash']; + + $sync = attach_export_data($channel,$hash); + if($sync) { + build_sync_packet($channel['channel_id'],array('file' => array($sync))); + } goaway(z_root() . '/cloud/' . $channel['channel_address'] . '/' . $r['data']['display_path']); + + } } else { $r = attach_store($channel, get_observer_hash(), '', $_REQUEST); + if($r['success']) { + $sync = attach_export_data($channel,$r['data']['hash']); + if($sync) + build_sync_packet($channel['channel_id'],array('file' => array($sync))); + + } } goaway(z_root() . '/' . $_REQUEST['return_url']); diff --git a/Zotlabs/Module/Wall_attach.php b/Zotlabs/Module/Wall_attach.php index 03d4cb37b..e001ad929 100644 --- a/Zotlabs/Module/Wall_attach.php +++ b/Zotlabs/Module/Wall_attach.php @@ -97,6 +97,12 @@ class Wall_attach extends \Zotlabs\Web\Controller { $s = "\n\n" . '[attachment]' . $r['data']['hash'] . ',' . $r['data']['revision'] . '[/attachment]' . "\n"; } + + $sync = attach_export_data($channel,$r['data']['hash']); + if($sync) { + build_sync_packet($channel['channel_id'],array('file' => array($sync))); + } + if($using_api) return $s; diff --git a/util/dcp b/util/dcp index 86c25259f..14ff5d5d3 100755 --- a/util/dcp +++ b/util/dcp @@ -54,10 +54,12 @@ if($argc != 3) { $folder = $x['data']['hash']; } + $hash = random_string(); + $arr = [ 'src' => $srcfile, 'filename' => basename($srcfile), - 'hash' => random_string(), + 'hash' => $hash, 'allow_cid' => $channel['channel_allow_cid'], 'allow_gid' => $channel['channel_allow_gid'], 'deny_cid' => $channel['channel_deny_cid'], @@ -70,4 +72,7 @@ if($argc != 3) { attach_store($channel,$channel['channel_hash'],'import',$arr); - + $sync = attach_export_data($channel,$hash); + if($sync) + build_sync_packet($channel['channel_id'],array('file' => array($sync))); + diff --git a/util/dmkdir b/util/dmkdir index ffb1932e5..72ab22431 100755 --- a/util/dmkdir +++ b/util/dmkdir @@ -46,3 +46,12 @@ if($argc != 2) { ]; $x = attach_mkdirp($channel,$channel['channel_hash'],$arr); + + if($x['success']) { + $hash = $x['data']['hash']; + + $sync = attach_export_data($channel,$hash); + if($sync) { + build_sync_packet($channel['channel_id'],array('file' => array($sync))); + } + } \ No newline at end of file From 49cc952825bb9d8b2417f85d9d718b456357b364 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Sun, 20 Aug 2017 22:45:13 -0700 Subject: [PATCH 114/441] util/dcp will now accept a directory as a destination. The directory must exist. Recursion is not yet supported. --- util/dcp | 82 +++++++++++++++++++++++++++++++++----------------------- 1 file changed, 48 insertions(+), 34 deletions(-) diff --git a/util/dcp b/util/dcp index 14ff5d5d3..e38725aa1 100755 --- a/util/dcp +++ b/util/dcp @@ -13,18 +13,16 @@ require_once('include/attach.php'); cli_startup(); -$srcfile = $argv[1]; -$dstfile = $argv[2]; -if($argc != 3) { +if($argc <= 3) { echo "Usage: " . $argv[0] . ' source destination' . "\n"; echo 'Always run from the toplevel web directory.' . "\n"; - echo 'destination should begin with store/$nickname/desired/path/filename or $nickname/desired/path/filename' . "\n"; - echo 'destination must end with the destination filename (not a directory name).' . "\n"; + echo 'destination should begin with store/$nickname/desired/path or $nickname/desired/path' . "\n"; echo 'Example: util/dcp /etc/motd store/joe/etc/motd' . "\n"; exit; } + $dstfile = $argv[$argc - 1]; if(strpos($dstfile,'store/') === 0) @@ -38,41 +36,57 @@ if($argc != 3) { if(! $channel) return; + $isadir = false; - $arr = [ - 'pathname' => dirname($dstfile), - 'allow_cid' => $channel['channel_allow_cid'], - 'allow_gid' => $channel['channel_allow_gid'], - 'deny_cid' => $channel['channel_deny_cid'], - 'deny_gid' => $channel['channel_deny_gid'], - ]; + $r = q("select * from attach where display_path = '%s' and uid = %d limit 1", + dbesc($dstfile), + intval($channel['channel_id']) + ); - $folder = ''; - if(dirname($dstfile)) { - $x = attach_mkdirp($channel,$channel['channel_hash'],$arr); - if($x['success']) - $folder = $x['data']['hash']; + if($r && $r[0]['is_dir']) { + $isadir = true; + $folder = $r[0]['hash']; + } + else { + $arr = [ + 'pathname' => dirname($dstfile), + 'allow_cid' => $channel['channel_allow_cid'], + 'allow_gid' => $channel['channel_allow_gid'], + 'deny_cid' => $channel['channel_deny_cid'], + 'deny_gid' => $channel['channel_deny_gid'], + ]; + + $folder = ''; + if(dirname($dstfile)) { + $x = attach_mkdirp($channel,$channel['channel_hash'],$arr); + if($x['success']) + $folder = $x['data']['hash']; + } } - $hash = random_string(); - $arr = [ - 'src' => $srcfile, - 'filename' => basename($srcfile), - 'hash' => $hash, - 'allow_cid' => $channel['channel_allow_cid'], - 'allow_gid' => $channel['channel_allow_gid'], - 'deny_cid' => $channel['channel_deny_cid'], - 'deny_gid' => $channel['channel_deny_gid'], - 'preserve_original' => true, - ]; + for($x = 1; $x < ($argc - 1); $x ++) { + $srcfile = $argv[$x]; - if($folder) - $arr['folder'] = $folder; + $hash = random_string(); + + $arr = [ + 'src' => $srcfile, + 'filename' => basename($srcfile), + 'hash' => $hash, + 'allow_cid' => $channel['channel_allow_cid'], + 'allow_gid' => $channel['channel_allow_gid'], + 'deny_cid' => $channel['channel_deny_cid'], + 'deny_gid' => $channel['channel_deny_gid'], + 'preserve_original' => true, + ]; + + if($folder) + $arr['folder'] = $folder; - attach_store($channel,$channel['channel_hash'],'import',$arr); + attach_store($channel,$channel['channel_hash'],'import',$arr); - $sync = attach_export_data($channel,$hash); - if($sync) + $sync = attach_export_data($channel,$hash); + if($sync) build_sync_packet($channel['channel_id'],array('file' => array($sync))); - + } From 7a405da3b7b8cb838fa1dddca3860c6b5d9a05df Mon Sep 17 00:00:00 2001 From: zotlabs Date: Sun, 20 Aug 2017 23:22:52 -0700 Subject: [PATCH 115/441] some issues with message-ids and urlencoding (again) --- Zotlabs/Module/Display.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Zotlabs/Module/Display.php b/Zotlabs/Module/Display.php index d9f623d8d..d82ff2a55 100644 --- a/Zotlabs/Module/Display.php +++ b/Zotlabs/Module/Display.php @@ -96,8 +96,7 @@ class Display extends \Zotlabs\Web\Controller { $item_hash = $decoded; $r = q("select id, uid, mid, parent_mid, item_type, item_deleted from item where mid like '%s' limit 1", - dbesc($item_hash . '%'), - dbesc($decoded . '%') + dbesc($item_hash . '%') ); if($r) { From 9d5b6858ea627b5eb6115cacd870ef0277f87b2a Mon Sep 17 00:00:00 2001 From: zotlabs Date: Mon, 21 Aug 2017 02:01:41 -0700 Subject: [PATCH 116/441] stream_perms_xchans wasn't working which has effects in mod_display and there are also issues with the oembed provider for mod_display. This is a first cut for the second but hasn't yet been tested --- Zotlabs/Module/Oep.php | 64 ++++++++++++++++++++++++++++-------------- include/security.php | 3 +- 2 files changed, 45 insertions(+), 22 deletions(-) diff --git a/Zotlabs/Module/Oep.php b/Zotlabs/Module/Oep.php index 07094c1de..a3453ff31 100644 --- a/Zotlabs/Module/Oep.php +++ b/Zotlabs/Module/Oep.php @@ -67,44 +67,66 @@ class Oep extends \Zotlabs\Web\Controller { $maxwidth = intval($args['maxwidth']); $maxheight = intval($args['maxheight']); - if(preg_match('#//(.*?)/(.*?)/(.*?)/(.*?)mid\=(.*?)(&|$)#',$url,$matches)) { - $chn = $matches[3]; - $res = $matches[5]; + if(preg_match('#//display/(.*?)(&|\?|$)#',$url,$matches)) { + $res = $matches[1]; } - - if(! ($chn && $res)) - return; - $c = q("select * from channel where channel_address = '%s' limit 1", - dbesc($chn) + + if(strpos($res,'b64.') === 0) { + $res = base64url_decode(substr($res,4)); + } + + $item_normal = item_normal(); + + $p = q("select * from item where mid like '%s' limit 1", + dbesc($res . '%'), ); + + if(! $p) + return; + + $c = channelx_by_n($p[0]['uid']); + - if(! $c) + if(! ($c && $res)) return; - $sql_extra = item_permissions_sql($c[0]['channel_id']); + $sql_extra = item_permissions_sql($c['channel_id']); - $p = q("select * from item where mid = '%s' and uid = %d $sql_extra limit 1", - dbesc($res), - intval($c[0]['channel_id']) + $p = q("select * from item where mid like '%s' and uid = %d $sql_extra $item_normal limit 1", + dbesc($res . '%'), + intval($c['channel_id']) ); + if(! $p) return; xchan_query($p,true); $p = fetch_post_tags($p,true); + + // This function can get tripped up if the item is already a reshare + // (the multiple share declarations do not parse cleanly if nested) + // So build a template with a known nonsense string as the content, and then + // replace that known string with the actual rendered content, sending + // each content layer through bbcode() separately. + + $x = '2eGriplW^*Jmf4'; + $o = "[share author='".urlencode($p[0]['author']['xchan_name']). - "' profile='".$p[0]['author']['xchan_url'] . - "' avatar='".$p[0]['author']['xchan_photo_s']. - "' link='".$p[0]['plink']. - "' posted='".$p[0]['created']. - "' message_id='".$p[0]['mid']."']"; + "' profile='".$p[0]['author']['xchan_url'] . + "' avatar='".$p[0]['author']['xchan_photo_s']. + "' link='".$p[0]['plink']. + "' posted='".$p[0]['created']. + "' message_id='".$p[0]['mid']."']"; if($p[0]['title']) - $o .= '[b]'.$p[0]['title'].'[/b]'."\r\n"; - $o .= $p[0]['body']; - $o .= "[/share]"; + $o .= '[b]'.$p[0]['title'].'[/b]'."\r\n"; + + $o .= $x; + $o .= "[/share]"; $o = bbcode($o); + $o = str_replace($x,bbcode($p[0]['body']),$o); + $ret['type'] = 'rich'; $w = (($maxwidth) ? $maxwidth : 640); diff --git a/include/security.php b/include/security.php index 6e7b3dbb2..16c6f1680 100644 --- a/include/security.php +++ b/include/security.php @@ -640,7 +640,7 @@ function stream_perms_xchans($perms = NULL ) { if(local_channel()) $ret[] = get_observer_hash(); - $x = q("select uid from pconfig where cat = 'perm_limits' and k = 'view_stream' "); + $x = q("select uid, v from pconfig where cat = 'perm_limits' and k = 'view_stream' "); if($x) { $y = []; foreach($x as $xv) { @@ -650,6 +650,7 @@ function stream_perms_xchans($perms = NULL ) { } if($y) { $ids = ids_to_querystr($y,'uid'); + $r = q("select channel_hash from channel where channel_id in ( $ids ) and ( channel_pageflags & %d ) = 0 and channel_system = 0 and channel_removed = 0 ", intval(PAGE_ADULT|PAGE_CENSORED) ); From 894f0156afdb605883af4c3419ead4aec09617da Mon Sep 17 00:00:00 2001 From: zotlabs Date: Mon, 21 Aug 2017 15:00:45 -0700 Subject: [PATCH 117/441] more work on oembed from /display --- Zotlabs/Module/Display.php | 8 +++++--- Zotlabs/Module/Linkinfo.php | 2 +- Zotlabs/Module/Oep.php | 8 ++++---- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Zotlabs/Module/Display.php b/Zotlabs/Module/Display.php index d82ff2a55..5e03f91a9 100644 --- a/Zotlabs/Module/Display.php +++ b/Zotlabs/Module/Display.php @@ -174,6 +174,8 @@ class Display extends \Zotlabs\Web\Controller { '$verb' => '', '$mid' => $item_hash )); + + \App::$page['htmlhead'] .= "\r\n" . '' . "\r\n"; } @@ -218,13 +220,13 @@ class Display extends \Zotlabs\Web\Controller { if(! perm_is_allowed($sysid,$observer_hash,'view_stream')) $sysid = 0; - +dbg(1); $r = q("SELECT item.id as item_id from item WHERE mid = '%s' AND (((( item.allow_cid = '' AND item.allow_gid = '' AND item.deny_cid = '' AND item.deny_gid = '' AND item_private = 0 ) - and owner_xchan in ( " . stream_perms_xchans(($observer_hash) ? (PERMS_NETWORK|PERMS_PUBLIC) : PERMS_PUBLIC) . " )) + and uid in ( " . stream_perms_api_uids(($observer_hash) ? (PERMS_NETWORK|PERMS_PUBLIC) : PERMS_PUBLIC) . " )) OR uid = %d ) $sql_extra ) $item_normal @@ -232,7 +234,7 @@ class Display extends \Zotlabs\Web\Controller { dbesc($target_item['parent_mid']), intval($sysid) ); - +dbg(0); } } } diff --git a/Zotlabs/Module/Linkinfo.php b/Zotlabs/Module/Linkinfo.php index 8f8231c49..78c34583e 100644 --- a/Zotlabs/Module/Linkinfo.php +++ b/Zotlabs/Module/Linkinfo.php @@ -95,7 +95,7 @@ class Linkinfo extends \Zotlabs\Web\Controller { echo $arr['text']; killme(); } - + if($process_oembed) { $x = oembed_process($url); if($x) { diff --git a/Zotlabs/Module/Oep.php b/Zotlabs/Module/Oep.php index a3453ff31..6469a7007 100644 --- a/Zotlabs/Module/Oep.php +++ b/Zotlabs/Module/Oep.php @@ -66,9 +66,9 @@ class Oep extends \Zotlabs\Web\Controller { $url = $args['url']; $maxwidth = intval($args['maxwidth']); $maxheight = intval($args['maxheight']); - - if(preg_match('#//display/(.*?)(&|\?|$)#',$url,$matches)) { - $res = $matches[1]; + logger('processing display'); + if(preg_match('#//(.*?)/display/(.*?)(&|\?|$)#',$url,$matches)) { + $res = $matches[2]; } if(strpos($res,'b64.') === 0) { @@ -78,7 +78,7 @@ class Oep extends \Zotlabs\Web\Controller { $item_normal = item_normal(); $p = q("select * from item where mid like '%s' limit 1", - dbesc($res . '%'), + dbesc($res . '%') ); if(! $p) From 33528c616ae976891df7a778ce9360ceb56571f4 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Mon, 21 Aug 2017 18:52:22 -0700 Subject: [PATCH 118/441] remove debugging --- Zotlabs/Module/Display.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Zotlabs/Module/Display.php b/Zotlabs/Module/Display.php index 5e03f91a9..1077cbdb9 100644 --- a/Zotlabs/Module/Display.php +++ b/Zotlabs/Module/Display.php @@ -39,7 +39,7 @@ class Display extends \Zotlabs\Web\Controller { $observer_is_owner = false; $updateable = false; - + if(local_channel() && (! $update)) { $channel = \App::get_channel(); @@ -216,11 +216,11 @@ class Display extends \Zotlabs\Web\Controller { if($r === null) { // in case somebody turned off public access to sys channel content using permissions - // make that content unsearchable by ensuring the owner_xchan can't match + // make that content unsearchable by ensuring the owner uid can't match if(! perm_is_allowed($sysid,$observer_hash,'view_stream')) $sysid = 0; -dbg(1); + $r = q("SELECT item.id as item_id from item WHERE mid = '%s' @@ -234,7 +234,7 @@ dbg(1); dbesc($target_item['parent_mid']), intval($sysid) ); -dbg(0); + } } } From 9f37dbc6dc1798b9b56a683ed1975adc318ff931 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Tue, 22 Aug 2017 18:29:51 -0700 Subject: [PATCH 119/441] util/dcp - support recursion and folders full of photos by importing files singly in separate processes - not yet tested --- Zotlabs/Daemon/Importfile.php | 45 +++++++++++++++++ include/attach.php | 8 ++- util/dcp | 93 +++++++++++++++++++++++++---------- 3 files changed, 118 insertions(+), 28 deletions(-) create mode 100644 Zotlabs/Daemon/Importfile.php diff --git a/Zotlabs/Daemon/Importfile.php b/Zotlabs/Daemon/Importfile.php new file mode 100644 index 000000000..5f15b811d --- /dev/null +++ b/Zotlabs/Daemon/Importfile.php @@ -0,0 +1,45 @@ + 3) ? $argv[3] : ''); + $dstname = (($argc > 4) ? $argv[4] : ''); + + $hash = random_string(); + + $arr = [ + 'src' => $srcfile, + 'filename' => (($dstname) ? $dstname : basename($srcfile)), + 'hash' => $hash, + 'allow_cid' => $channel['channel_allow_cid'], + 'allow_gid' => $channel['channel_allow_gid'], + 'deny_cid' => $channel['channel_deny_cid'], + 'deny_gid' => $channel['channel_deny_gid'], + 'preserve_original' => true, + 'replace' => true + ]; + + if($folder) + $arr['folder'] = $folder; + + attach_store($channel,$channel['channel_hash'],'import',$arr); + + $sync = attach_export_data($channel,$hash); + if($sync) + build_sync_packet($channel['channel_id'],array('file' => array($sync))); + + return; + } +} diff --git a/include/attach.php b/include/attach.php index 79a38590b..78e133b03 100644 --- a/include/attach.php +++ b/include/attach.php @@ -460,6 +460,7 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) { // By default remove $src when finished $remove_when_processed = true; + $import_replace = false; if($options === 'import') { $src = $arr['src']; @@ -476,6 +477,9 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) { if($arr['preserve_original']) $remove_when_processed = false; + if($arr['replace']) + $import_replace = true; + // if importing a directory, just do it now and go home - we're done. if(array_key_exists('is_dir',$arr) && intval($arr['is_dir'])) { @@ -617,8 +621,10 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) { dbesc($folder_hash) ); if($r) { - $overwrite = get_pconfig($channel_id,'system','overwrite_dup_files'); + $overwrite = (($import_replace || get_pconfig($channel_id,'system','overwrite_dup_files')) ? true : false); if(($overwrite) || ($options === 'import')) { + if(! array_key_exists('edited',$arr)) + $arr['edited'] = datetime_convert(); $options = 'replace'; $existing_id = $x[0]['id']; $existing_size = intval($x[0]['filesize']); diff --git a/util/dcp b/util/dcp index e38725aa1..672117f4e 100755 --- a/util/dcp +++ b/util/dcp @@ -15,15 +15,15 @@ cli_startup(); if($argc <= 3) { - echo "Usage: " . $argv[0] . ' source destination' . "\n"; + echo "Usage: " . $argv[0] . ' src dstdir' . "\n"; echo 'Always run from the toplevel web directory.' . "\n"; echo 'destination should begin with store/$nickname/desired/path or $nickname/desired/path' . "\n"; - echo 'Example: util/dcp /etc/motd store/joe/etc/motd' . "\n"; + echo 'Example: util/dcp /etc/motd store/joe/etc' . "\n"; exit; } - $dstfile = $argv[$argc - 1]; - + $recursive = false; + $dstfile = $argv[$argc - 1]; if(strpos($dstfile,'store/') === 0) $dstfile = substr($dstfile,6); @@ -45,6 +45,7 @@ if($argc <= 3) { if($r && $r[0]['is_dir']) { $isadir = true; + $basepath = $dstfile; $folder = $r[0]['hash']; } else { @@ -64,29 +65,67 @@ if($argc <= 3) { } } - for($x = 1; $x < ($argc - 1); $x ++) { - $srcfile = $argv[$x]; + if(($argv[$x] === '-r') || ($argv[$x] === '-R')) { + $recursive = true; + continue; + } - $hash = random_string(); - - $arr = [ - 'src' => $srcfile, - 'filename' => basename($srcfile), - 'hash' => $hash, - 'allow_cid' => $channel['channel_allow_cid'], - 'allow_gid' => $channel['channel_allow_gid'], - 'deny_cid' => $channel['channel_deny_cid'], - 'deny_gid' => $channel['channel_deny_gid'], - 'preserve_original' => true, - ]; - - if($folder) - $arr['folder'] = $folder; - - attach_store($channel,$channel['channel_hash'],'import',$arr); - - $sync = attach_export_data($channel,$hash); - if($sync) - build_sync_packet($channel['channel_id'],array('file' => array($sync))); + if(is_dir($argv[$x])) { + if($recursive) { + dcp_recurse($channel,$argv[$x],$basepath,$folder); + } + else { + continue; + } + } + else { + $dstname = (($isadir) ? '' : basename($dstfile)); + $cmd = [ 'Importfile', $channel['channel_id'], $argv[$x], $folder, $dstname ]; + \Zotlabs\Daemon\Master::Summon($cmd); + } + } + + + function dcp_recurse($channel,$src,$basepath,$folder) { + $dir = opendir($src); + if($dir) { + while(($entry = readdir($dir)) !== false) { + if($entry === '.' || $entry === '..') + continue; + $dstfile = $basepath . '/' . $entry; + if(is_dir($src . '/' . $entry)) { + $r = q("select * from attach where display_path = '%s' and uid = %d limit 1", + dbesc($dstfile), + intval($channel['channel_id']) + ); + + if($r && $r[0]['is_dir']) { + $folder = $r[0]['hash']; + } + else { + + $arr = [ + 'pathname' => $dstfile, + 'allow_cid' => $channel['channel_allow_cid'], + 'allow_gid' => $channel['channel_allow_gid'], + 'deny_cid' => $channel['channel_deny_cid'], + 'deny_gid' => $channel['channel_deny_gid'], + ]; + + $folder = ''; + $x = attach_mkdirp($channel,$channel['channel_hash'],$arr); + if($x['success']) + $folder = $x['data']['hash']; + } + $basepath = $dstfile; + dcp_recurse($channel,$src . '/' . $entry,$basepath,$folder); + } + else { + $cmd = [ 'Importfile', $channel['channel_id'], $src . '/' . $entry, $folder ]; + \Zotlabs\Daemon\Master::Summon($cmd); + } + } + closedir($dir); + } } From 92077725c3b04c25425526163672ca55a773ec15 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Tue, 22 Aug 2017 19:13:25 -0700 Subject: [PATCH 120/441] add support for card doctype and activity_obj type --- boot.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/boot.php b/boot.php index 419efbac2..94f66e5a7 100755 --- a/boot.php +++ b/boot.php @@ -256,7 +256,7 @@ define ( 'NETWORK_OSTATUS', 'stat'); // status.net, identi.ca, GNU-s define ( 'NETWORK_GNUSOCIAL', 'gnusoc'); // status.net, identi.ca, GNU-social, other OStatus implementations define ( 'NETWORK_FEED', 'rss'); // RSS/Atom feeds with no known "post/notify" protocol define ( 'NETWORK_DIASPORA', 'diaspora'); // Diaspora -define ( 'NETWORK_ACTIVITYPUB', 'activitypub'); +define ( 'NETWORK_ACTIVITYPUB', 'activitypub'); define ( 'NETWORK_MAIL', 'mail'); // IMAP/POP define ( 'NETWORK_MAIL2', 'mai2'); // extended IMAP/POP define ( 'NETWORK_FACEBOOK', 'face'); // Facebook API @@ -509,6 +509,7 @@ define ( 'ACTIVITY_OBJ_PROFILE', NAMESPACE_ZOT . '/activity/profile' ); define ( 'ACTIVITY_OBJ_THING', NAMESPACE_ZOT . '/activity/thing' ); define ( 'ACTIVITY_OBJ_LOCATION',NAMESPACE_ZOT . '/activity/location' ); define ( 'ACTIVITY_OBJ_FILE', NAMESPACE_ZOT . '/activity/file' ); +define ( 'ACTIVITY_OBJ_CARD', NAMESPACE_ZOT . '/activity/card' ); /** * Account Flags @@ -554,6 +555,7 @@ define ( 'ITEM_TYPE_PDL', 2 ); define ( 'ITEM_TYPE_WEBPAGE', 3 ); define ( 'ITEM_TYPE_BUG', 4 ); define ( 'ITEM_TYPE_DOC', 5 ); +define ( 'ITEM_TYPE_CARD', 6 ); define ( 'ITEM_IS_STICKY', 1000 ); From 182f94a9ac8cfcd414d6f5899fbeb7a8e65284da Mon Sep 17 00:00:00 2001 From: zotlabs Date: Tue, 22 Aug 2017 19:41:16 -0700 Subject: [PATCH 121/441] allow cards to federate --- Zotlabs/Daemon/Notifier.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Zotlabs/Daemon/Notifier.php b/Zotlabs/Daemon/Notifier.php index 6763e0ef4..33dcbbf20 100644 --- a/Zotlabs/Daemon/Notifier.php +++ b/Zotlabs/Daemon/Notifier.php @@ -276,7 +276,7 @@ class Notifier { $deleted_item = true; } - if(intval($target_item['item_type']) != ITEM_TYPE_POST) { + if(! in_array(intval($target_item['item_type']), [ ITEM_TYPE_POST, ITEM_TYPE_CARD ] )) { logger('notifier: target item not forwardable: type ' . $target_item['item_type'], LOGGER_DEBUG); return; } From 41ff8fdd375fcf395b547dd02f3bdcbb198ec0c1 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Tue, 22 Aug 2017 20:32:02 -0700 Subject: [PATCH 122/441] test recursive dav copy --- Zotlabs/Daemon/Importfile.php | 2 ++ util/dcp | 22 +++++++++++++++++----- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/Zotlabs/Daemon/Importfile.php b/Zotlabs/Daemon/Importfile.php index 5f15b811d..c68ed21cf 100644 --- a/Zotlabs/Daemon/Importfile.php +++ b/Zotlabs/Daemon/Importfile.php @@ -6,6 +6,8 @@ class Importfile { static public function run($argc,$argv){ + logger('Importfile: ' . print_r($argv,true)); + if($argc < 3) return; diff --git a/util/dcp b/util/dcp index 672117f4e..2817ad4f1 100755 --- a/util/dcp +++ b/util/dcp @@ -36,8 +36,20 @@ if($argc <= 3) { if(! $channel) return; + for($x = 1; $x < ($argc - 1); $x ++) { + if(($argv[$x] === '-r') || ($argv[$x] === '-R')) { + $recursive = true; + break; + } + } + + $isadir = false; + if(($recursive) || ($argc > 3)) + $isadir = true; + + $r = q("select * from attach where display_path = '%s' and uid = %d limit 1", dbesc($dstfile), intval($channel['channel_id']) @@ -49,8 +61,9 @@ if($argc <= 3) { $folder = $r[0]['hash']; } else { + $pathname = (($isadir) ? $dstfile : dirname($dstfile)); $arr = [ - 'pathname' => dirname($dstfile), + 'pathname' => $pathname, 'allow_cid' => $channel['channel_allow_cid'], 'allow_gid' => $channel['channel_allow_gid'], 'deny_cid' => $channel['channel_deny_cid'], @@ -58,7 +71,7 @@ if($argc <= 3) { ]; $folder = ''; - if(dirname($dstfile)) { + if($pathname && $isadir) { $x = attach_mkdirp($channel,$channel['channel_hash'],$arr); if($x['success']) $folder = $x['data']['hash']; @@ -67,7 +80,6 @@ if($argc <= 3) { for($x = 1; $x < ($argc - 1); $x ++) { if(($argv[$x] === '-r') || ($argv[$x] === '-R')) { - $recursive = true; continue; } @@ -93,6 +105,7 @@ if($argc <= 3) { while(($entry = readdir($dir)) !== false) { if($entry === '.' || $entry === '..') continue; + $dstfile = $basepath . '/' . $entry; if(is_dir($src . '/' . $entry)) { $r = q("select * from attach where display_path = '%s' and uid = %d limit 1", @@ -118,8 +131,7 @@ if($argc <= 3) { if($x['success']) $folder = $x['data']['hash']; } - $basepath = $dstfile; - dcp_recurse($channel,$src . '/' . $entry,$basepath,$folder); + dcp_recurse($channel,$src . '/' . $entry,$dstfile,$folder); } else { $cmd = [ 'Importfile', $channel['channel_id'], $src . '/' . $entry, $folder ]; From 6c388575022cc10f28ed99e8e414fbc76a67bb00 Mon Sep 17 00:00:00 2001 From: Andrew Manning Date: Wed, 23 Aug 2017 03:33:03 +0000 Subject: [PATCH 123/441] Repaired and extended support for help page translations including table of contents files at the top level. Moved help module javascript to mod_help.js. --- Zotlabs/Widget/Helpindex.php | 12 +++++- doc/toc.html | 62 ------------------------------ include/help.php | 41 ++++++++++++++------ view/js/mod_help.js | 74 ++++++++++++++++++++++++++++++++++++ view/tpl/help.tpl | 18 --------- 5 files changed, 114 insertions(+), 93 deletions(-) create mode 100644 view/js/mod_help.js diff --git a/Zotlabs/Widget/Helpindex.php b/Zotlabs/Widget/Helpindex.php index f23e73e75..8299cf16a 100644 --- a/Zotlabs/Widget/Helpindex.php +++ b/Zotlabs/Widget/Helpindex.php @@ -9,14 +9,22 @@ class Helpindex { $o .= '
    '; $level_0 = get_help_content('sitetoc'); - if(! $level_0) - $level_0 = get_help_content('toc'); + if(! $level_0) { + $path = 'toc'; + $x = determine_help_language(); + $lang = $x['language']; + if($lang !== 'en') { + $path = $lang . '/toc'; + } + $level_0 = get_help_content($path); + } $level_0 = preg_replace('/\/','
      ',$level_0); $levels = array(); + // TODO: Implement support for translations in hierarchical table of content files if(argc() > 2) { $path = ''; for($x = 1; $x < argc(); $x ++) { diff --git a/doc/toc.html b/doc/toc.html index 4da01d55d..1b7de3cb3 100644 --- a/doc/toc.html +++ b/doc/toc.html @@ -71,65 +71,3 @@
- diff --git a/include/help.php b/include/help.php index 4f9251b1b..cbadd02d9 100644 --- a/include/help.php +++ b/include/help.php @@ -107,20 +107,39 @@ function preg_callback_help_include($matches) { } - +function determine_help_language() { + require_once('Text/LanguageDetect.php'); + $lang_detect = new Text_LanguageDetect(); + $lang_detect->setNameMode(2); + if($lang_detect->languageExists(argv(1))) { + $lang = argv(1); + $from_url = true; + } else { + $lang = \App::$language; + if(! isset($lang)) + $lang = 'en'; + $from_url = false; + } + return array('language' => $lang, 'from_url' => $from_url); +} function load_doc_file($s) { - $lang = \App::$language; - if(! isset($lang)) - $lang = 'en'; - $b = basename($s); - $d = dirname($s); - - if($dirname !== '-') { - $c = find_doc_file("$d/$lang/$b"); - if($c) - return $c; + $path = 'doc'; + $x = determine_help_language(); + $lang = $x['language']; + $url_idx = ($x['from_url'] ? 1 : 0); + if($x['from_url'] && $lang !== 'en') { + $path .= '/' . $lang; } + + $b = basename($s); + + for($i=1+$url_idx; $i').find('ul'); + tocUl.removeClass(); // Classes are automatically added to
    elements by something else + tocUl.toc({content: "#doco-content", headings: "h3"}); + tocUl.addClass('toc-content'); + tocUl.addClass('list-unstyled'); + tocUl.attr('id', 'doco-side-toc'); + + } + }); + + $(document.body).trigger("sticky_kit:recalc"); + + toc.contentTop = []; + toc.edgeMargin = 20; // margin above the top or margin from the end of the page + toc.topRange = 200; // measure from the top of the viewport to X pixels down + // Set up content an array of locations + $('#doco-side-toc').find('a').each(function () { + toc.contentTop.push($('#' + $(this).attr('href').split('#').pop()).offset().top); + }); + + + // adjust side menu + $(window).scroll(function () { + var winTop = $(window).scrollTop(), + bodyHt = $(document).height(), + vpHt = $(window).height() + toc.edgeMargin; // viewport height + margin + $.each(toc.contentTop, function (i, loc) { + if ((loc > winTop - toc.edgeMargin && (loc < winTop + toc.topRange || (winTop + vpHt) >= bodyHt))) { + $('#doco-side-toc li') + .removeClass('selected-doco-nav') + .eq(i).addClass('selected-doco-nav'); + if (typeof ($('#doco-side-toc li').eq(i).find('a').attr('href').split('#')[1]) !== 'undefined') { + window.history.pushState({}, '', location.href.split('#')[0] + '#' + $('#doco-side-toc li').eq(i).find('a').attr('href').split('#')[1]); + } + } + }); + }); + + // When the page loads, it does not scroll to the section specified in the URL because it + // has not been constructed yet by the script. This will reload the URL + if (typeof (location.href.split('#')[1]) !== 'undefined') { + var p = document.createElement('a'); + p.href = location.href; + var portstr = ''; + if (p.port !== '') { + portstr = ':' + p.port; + } + var newref = p.protocol + '//' + p.hostname + portstr + p.pathname + p.hash.split('?').shift(); + location.replace(newref) + } +}); diff --git a/view/tpl/help.tpl b/view/tpl/help.tpl index 43b061dcc..31e5b9794 100644 --- a/view/tpl/help.tpl +++ b/view/tpl/help.tpl @@ -13,21 +13,3 @@ {{$content}}
- - From e084b776eee9f1fc66e3f4a37b92ec70ccc49286 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Wed, 23 Aug 2017 00:01:02 -0700 Subject: [PATCH 124/441] cards feature --- Zotlabs/Daemon/Notifier.php | 2 +- Zotlabs/Lib/Apps.php | 1 + Zotlabs/Module/Cards.php | 189 ++++++++++++++++++++++++++++++++++ Zotlabs/Widget/Categories.php | 13 ++- app/cards.apd | 5 + include/contact_widgets.php | 43 ++++++++ include/conversation.php | 16 ++- include/features.php | 9 ++ include/nav.php | 12 +++ include/taxonomy.php | 76 ++++++++++++++ view/pdl/mod_cards.pdl | 2 + view/tpl/cards.tpl | 8 ++ view/tpl/jot.tpl | 4 +- 13 files changed, 373 insertions(+), 7 deletions(-) create mode 100644 Zotlabs/Module/Cards.php create mode 100644 app/cards.apd create mode 100644 view/pdl/mod_cards.pdl create mode 100644 view/tpl/cards.tpl diff --git a/Zotlabs/Daemon/Notifier.php b/Zotlabs/Daemon/Notifier.php index 33dcbbf20..e8cd4dac8 100644 --- a/Zotlabs/Daemon/Notifier.php +++ b/Zotlabs/Daemon/Notifier.php @@ -276,7 +276,7 @@ class Notifier { $deleted_item = true; } - if(! in_array(intval($target_item['item_type']), [ ITEM_TYPE_POST, ITEM_TYPE_CARD ] )) { + if(! in_array(intval($target_item['item_type']), [ ITEM_TYPE_POST ] )) { logger('notifier: target item not forwardable: type ' . $target_item['item_type'], LOGGER_DEBUG); return; } diff --git a/Zotlabs/Lib/Apps.php b/Zotlabs/Lib/Apps.php index 3730f3a23..37cbf9497 100644 --- a/Zotlabs/Lib/Apps.php +++ b/Zotlabs/Lib/Apps.php @@ -221,6 +221,7 @@ class Apps { static public function translate_system_apps(&$arr) { $apps = array( 'Apps' => t('Apps'), + 'Cards' => t('Cards'), 'Site Admin' => t('Site Admin'), 'Report Bug' => t('Report Bug'), 'View Bookmarks' => t('View Bookmarks'), diff --git a/Zotlabs/Module/Cards.php b/Zotlabs/Module/Cards.php new file mode 100644 index 000000000..1fdd3b63f --- /dev/null +++ b/Zotlabs/Module/Cards.php @@ -0,0 +1,189 @@ + 1) + $which = argv(1); + else + return; + + profile_load($which); + + } + + + function get() { + + if(observer_prohibited(true)) { + return login(); + } + + if(! \App::$profile) { + notice( t('Requested profile is not available.') . EOL ); + \App::$error = 404; + return; + } + + if(! feature_enabled(\App::$profile_uid,'cards')) { + return; + } + + nav_set_selected(t('Cards')); + + $category = (($_REQUEST['cat']) ? escape_tags(trim($_REQUEST['cat'])) : ''); + + if($category) { + $sql_extra2 .= protect_sprintf(term_item_parent_query(\App::$profile['profile_uid'],'item', $category, TERM_CATEGORY)); + } + + + $which = argv(1); + + $_SESSION['return_url'] = \App::$query_string; + + $uid = \App::$profile_uid; + $owner = 0; + $observer = \App::get_observer(); + + $channel = \App::$profile; + + if(! $owner) { + // Figure out who the page owner is. + $r = q("select channel_id from channel where channel_address = '%s'", + dbesc($which) + ); + if($r) { + $owner = intval($r[0]['channel_id']); + } + } + + $ob_hash = (($observer) ? $observer['xchan_hash'] : ''); + + if(! perm_is_allowed($owner,$ob_hash,'view_pages')) { + notice( t('Permission denied.') . EOL); + return; + } + + $mimetype = (($_REQUEST['mimetype']) ? $_REQUEST['mimetype'] : get_pconfig($owner,'system','page_mimetype')); + + $layout = (($_REQUEST['layout']) ? $_REQUEST['layout'] : get_pconfig($owner,'system','page_layout')); + + // Create a status editor (for now - we'll need a WYSIWYG eventually) to create pages + // Nickname is set to the observers xchan, and profile_uid to the owner's. + // This lets you post pages at other people's channels. + + if((! $channel) && ($uid) && ($uid == \App::$profile_uid)) { + $channel = \App::get_channel(); + } + if($channel) { + $channel_acl = array( + 'allow_cid' => $channel['channel_allow_cid'], + 'allow_gid' => $channel['channel_allow_gid'], + 'deny_cid' => $channel['channel_deny_cid'], + 'deny_gid' => $channel['channel_deny_gid'] + ); + } + else { + $channel_acl = [ 'allow_cid' => '', 'allow_gid' => '', 'deny_cid' => '', 'deny_gid' => '' ]; + } + + + $is_owner = ($uid && $uid == $owner); + + if(perm_is_allowed($owner,$ob_hash,'write_pages')) { + + $x = array( + 'webpage' => ITEM_TYPE_CARD, + 'is_owner' => true, + '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' => $channel_acl, + 'showacl' => (($is_owner) ? true : false), + 'visitor' => true, + 'hide_location' => true, + 'hide_voting' => true, + 'profile_uid' => intval($owner), + 'mimetype' => $mimetype, + 'mimeselect' => false, + 'layoutselect' => false, + 'expanded' => false, + 'novoting'=> true, + 'bbco_autocomplete' => 'bbcode', + 'bbcode' => true + ); + } + else { + $x = ''; + } + + if($_REQUEST['title']) + $x['title'] = $_REQUEST['title']; + if($_REQUEST['body']) + $x['body'] = $_REQUEST['body']; + + // Get a list of webpages. We can't display all them because endless scroll makes that unusable, + // so just list titles and an edit link. + + + $sql_extra = item_permissions_sql($owner); + + $r = q("select * from item + where item.uid = %d and item_type = %d + $sql_extra order by item.created desc", + intval($owner), + intval(ITEM_TYPE_CARD) + ); + + $item_normal = " and item.item_hidden = 0 and item.item_type in (0,6) and item.item_deleted = 0 + and item.item_unpublished = 0 and item.item_delayed = 0 and item.item_pending_remove = 0 + and item.item_blocked = 0 "; + + + if($x) + $editor = status_editor($a,$x); + + if($r) { + + $parents_str = ids_to_querystr($r,'id'); + + $items = q("SELECT item.*, item.id AS item_id + FROM item + WHERE item.uid = %d $item_normal + AND item.parent IN ( %s ) + $sql_extra $sql_extra2 ", + intval(\App::$profile['profile_uid']), + dbesc($parents_str) + ); + if($items) { + xchan_query($items); + $items = fetch_post_tags($items, true); + $items = conv_sort($items,'created'); + } + else + $items = []; + } + + $mode = 'channel'; + + $content = conversation($items,$mode,false,'traditional'); + + $o = replace_macros(get_markup_template('cards.tpl'), [ + '$title' => t('Cards'), + '$editor' => $editor, + '$content' => $content, + '$pager' => alt_pager($a,count($items)) + ]); + + return $o; + } + +} diff --git a/Zotlabs/Widget/Categories.php b/Zotlabs/Widget/Categories.php index d1dcfda93..a11b3d919 100644 --- a/Zotlabs/Widget/Categories.php +++ b/Zotlabs/Widget/Categories.php @@ -8,8 +8,13 @@ class Categories { function widget($arr) { + $cards = ((array_key_exists('cards',$arr) && $arr['cards']) ? true : false); + + if(($cards) && (! feature_enabled(\App::$profile['profile_uid'],'cards')) + return ''; + if((! \App::$profile['profile_uid']) - || (! perm_is_allowed(\App::$profile['profile_uid'],get_observer_hash(),'view_stream'))) { + || (! perm_is_allowed(\App::$profile['profile_uid'],get_observer_hash(),(($cards) ? 'view_pages' : 'view_stream')))) { return ''; } @@ -18,6 +23,10 @@ class Categories { $srchurl = rtrim(preg_replace('/cat\=[^\&].*?(\&|$)/is','',$srchurl),'&'); $srchurl = str_replace(array('?f=','&f='),array('',''),$srchurl); - return categories_widget($srchurl, $cat); + if($cards) + return cardcategories_widget($srchurl, $cat); + else + return categories_widget($srchurl, $cat); + } } diff --git a/app/cards.apd b/app/cards.apd new file mode 100644 index 000000000..4577dd681 --- /dev/null +++ b/app/cards.apd @@ -0,0 +1,5 @@ +version: 1 +url: $baseurl/cards/$nick +name: Cards +photo: icon:list +categories: Productivity diff --git a/include/contact_widgets.php b/include/contact_widgets.php index 8f76bb4bc..aac756a46 100644 --- a/include/contact_widgets.php +++ b/include/contact_widgets.php @@ -100,6 +100,49 @@ function categories_widget($baseurl,$selected = '') { return ''; } +function cardcategories_widget($baseurl,$selected = '') { + + if(! feature_enabled(App::$profile['profile_uid'],'categories')) + return ''; + + $item_normal = "and item.item_hidden = 0 and item.item_type = 6 and item.item_deleted = 0 + and item.item_unpublished = 0 and item.item_delayed = 0 and item.item_pending_remove = 0 + and item.item_blocked = 0 "; + + $terms = array(); + $r = q("select distinct(term.term) + from term join item on term.oid = item.id + where item.uid = %d + and term.uid = item.uid + and term.ttype = %d + and term.otype = %d + and item.owner_xchan = '%s' + $item_normal + order by term.term asc", + intval(App::$profile['profile_uid']), + intval(TERM_CATEGORY), + intval(TERM_OBJ_POST), + dbesc(App::$profile['channel_hash']) + ); + if($r && count($r)) { + foreach($r as $rr) + $terms[] = array('name' => $rr['term'], 'selected' => (($selected == $rr['term']) ? 'selected' : '')); + + return replace_macros(get_markup_template('categories_widget.tpl'),array( + '$title' => t('Categories'), + '$desc' => '', + '$sel_all' => (($selected == '') ? 'selected' : ''), + '$all' => t('Everything'), + '$terms' => $terms, + '$base' => $baseurl, + + )); + } + return ''; +} + + + function common_friends_visitor_widget($profile_uid) { if(local_channel() == $profile_uid) diff --git a/include/conversation.php b/include/conversation.php index 3b8ec19d3..c9142ac30 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1835,7 +1835,8 @@ function profile_tabs($a, $is_owner = false, $nickname = null){ require_once('include/menu.php'); $has_bookmarks = menu_list_count(local_channel(),'',MENU_BOOKMARK) + menu_list_count(local_channel(),'',MENU_SYSTEM|MENU_BOOKMARK); - if ($is_owner && $has_bookmarks) { + + if($is_owner && $has_bookmarks) { $tabs[] = array( 'label' => t('Bookmarks'), 'url' => z_root() . '/bookmarks', @@ -1846,6 +1847,17 @@ function profile_tabs($a, $is_owner = false, $nickname = null){ ); } + if(feature_enabled($uid,'cards')) { + $tabs[] = array( + 'label' => t('Cards'), + 'url' => z_root() . '/cards/' . $nickname, + 'sel' => ((argv(0) == 'cards') ? 'active' : ''), + 'title' => t('View Cards'), + 'id' => 'cards-tab', + 'icon' => 'list' + ); + } + if($has_webpages && feature_enabled($uid,'webpages')) { $tabs[] = array( 'label' => t('Webpages'), @@ -1856,7 +1868,7 @@ function profile_tabs($a, $is_owner = false, $nickname = null){ 'icon' => 'newspaper-o' ); } - + if ($p['view_wiki']) { if(feature_enabled($uid,'wiki') && (get_account_techlevel($account_id) > 3)) { diff --git a/include/features.php b/include/features.php index f32dbe82e..f84c9cb05 100644 --- a/include/features.php +++ b/include/features.php @@ -117,6 +117,15 @@ function get_features($filtered = true) { feature_level('private_notes',1), ], + [ + 'cards', + t('Cards'), + t('Create personal planning cards'), + false, + get_config('feature_lock','cards'), + feature_level('cards',1), + ], + [ 'nav_channel_select', t('Navigation Channel Select'), diff --git a/include/nav.php b/include/nav.php index 76a8f8fb9..f5a1236a8 100644 --- a/include/nav.php +++ b/include/nav.php @@ -434,6 +434,18 @@ function channel_apps($is_owner = false, $nickname = null) { ]; } + if($p['view_pages'] && feature_enabled($uid,'cards')) { + $tabs[] = [ + 'label' => t('Cards'), + 'url' => z_root() . '/cards/' . $nickname , + 'sel' => ((argv(0) == 'cards') ? 'active' : ''), + 'title' => t('View Cards'), + 'id' => 'cards-tab', + 'icon' => 'list' + ]; + } + + if($has_webpages && feature_enabled($uid,'webpages')) { $tabs[] = [ 'label' => t('Webpages'), diff --git a/include/taxonomy.php b/include/taxonomy.php index 46d661581..36e05b008 100644 --- a/include/taxonomy.php +++ b/include/taxonomy.php @@ -199,6 +199,62 @@ function tagadelic($uid, $count = 0, $authors = '', $owner = '', $flags = 0, $re } + + +function card_tagadelic($uid, $count = 0, $authors = '', $owner = '', $flags = 0, $restrict = 0, $type = TERM_CATEGORY) { + + require_once('include/security.php'); + + if(! perm_is_allowed($uid,get_observer_hash(),'view_pages')) + return array(); + + + $item_normal = item_normal(); + $sql_options = item_permissions_sql($uid); + $count = intval($count); + + if($flags) { + if($flags === 'wall') + $sql_options .= " and item_wall = 1 "; + } + + if($authors) { + if(! is_array($authors)) + $authors = array($authors); + + stringify_array_elms($authors,true); + $sql_options .= " and author_xchan in (" . implode(',',$authors) . ") "; + } + + if($owner) { + $sql_options .= " and owner_xchan = '" . dbesc($owner) . "' "; + } + + + // Fetch tags + $r = q("select term, count(term) as total from term left join item on term.oid = item.id + where term.uid = %d and term.ttype = %d + and otype = %d and item_type = %d and item_private = 0 + $sql_options $item_normal + group by term order by total desc %s", + intval($uid), + intval($type), + intval(TERM_OBJ_POST), + intval($restrict), + ((intval($count)) ? "limit $count" : '') + ); + + if(! $r) + return array(); + + return Zotlabs\Text\Tagadelic::calc($r); + +} + + + + + function dir_tagadelic($count = 0) { $count = intval($count); @@ -316,6 +372,26 @@ function catblock($uid,$count = 0,$authors = '',$owner = '', $flags = 0,$restric return $o; } +function card_catblock($uid,$count = 0,$authors = '',$owner = '', $flags = 0,$restrict = 0,$type = TERM_CATEGORY) { + $o = ''; + + $r = card_tagadelic($uid,$count,$authors,$owner,$flags,$restrict,$type); + + if($r) { + $c = q("select channel_address from channel where channel_id = %d limit 1", + intval($uid) + ); + + $o = '

' . t('Categories') . '

'; + foreach($r as $rr) { + $o .= ''.$rr[0].' ' . "\r\n"; + } + $o .= '
'; + } + + return $o; +} + function dir_tagblock($link,$r) { $o = ''; diff --git a/view/pdl/mod_cards.pdl b/view/pdl/mod_cards.pdl new file mode 100644 index 000000000..2d87136c9 --- /dev/null +++ b/view/pdl/mod_cards.pdl @@ -0,0 +1,2 @@ +[region=aside] +[widget=categories][var=cards]1[/var][/widget][/region] diff --git a/view/tpl/cards.tpl b/view/tpl/cards.tpl new file mode 100644 index 000000000..ae382a97f --- /dev/null +++ b/view/tpl/cards.tpl @@ -0,0 +1,8 @@ +
+
+

{{$title}}

+
+ {{$editor}} + {{$content}} +
+ {{$pager}} diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index 39ba9e59b..8e8070402 100755 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -27,7 +27,7 @@ - {{if $webpage}} + {{if $webpage && $webpage != 6 }}
@@ -35,7 +35,7 @@
- {{if $catsenabled}} + {{if $catsenabled || $webpage == 6 }}
From 9518dc0e4ee40c9672e533afbb1a506c3a85c598 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Wed, 23 Aug 2017 02:03:39 -0700 Subject: [PATCH 125/441] typo --- Zotlabs/Widget/Categories.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Zotlabs/Widget/Categories.php b/Zotlabs/Widget/Categories.php index a11b3d919..84deb03d6 100644 --- a/Zotlabs/Widget/Categories.php +++ b/Zotlabs/Widget/Categories.php @@ -10,7 +10,7 @@ class Categories { $cards = ((array_key_exists('cards',$arr) && $arr['cards']) ? true : false); - if(($cards) && (! feature_enabled(\App::$profile['profile_uid'],'cards')) + if(($cards) && (! feature_enabled(\App::$profile['profile_uid'],'cards'))) return ''; if((! \App::$profile['profile_uid']) From 3b68df1be6173cbcc50386efc0161ece2015112d Mon Sep 17 00:00:00 2001 From: zotlabs Date: Wed, 23 Aug 2017 17:46:20 -0700 Subject: [PATCH 126/441] several card enhancements --- Zotlabs/Lib/ThreadItem.php | 5 +- Zotlabs/Module/Card_edit.php | 135 +++++++++++++++++++++++++++++++++++ Zotlabs/Module/Cards.php | 54 ++++++-------- app/cards.apd | 3 +- boot.php | 2 + include/conversation.php | 7 +- include/items.php | 2 + view/tpl/jot.tpl | 4 +- 8 files changed, 175 insertions(+), 37 deletions(-) create mode 100644 Zotlabs/Module/Card_edit.php diff --git a/Zotlabs/Lib/ThreadItem.php b/Zotlabs/Lib/ThreadItem.php index ad944203c..526169e1b 100644 --- a/Zotlabs/Lib/ThreadItem.php +++ b/Zotlabs/Lib/ThreadItem.php @@ -101,10 +101,13 @@ class ThreadItem { if($item['author']['xchan_network'] === 'rss') $shareable = true; + $mode = $conv->get_mode(); + $edlink = (($item['item_type'] == ITEM_TYPE_CARD) ? 'card_edit' : 'editpost'); + if(local_channel() && $observer['xchan_hash'] === $item['author_xchan']) - $edpost = array(z_root()."/editpost/".$item['id'], t("Edit")); + $edpost = array(z_root() . '/' . $edlink . '/' . $item['id'], t('Edit')); else $edpost = false; diff --git a/Zotlabs/Module/Card_edit.php b/Zotlabs/Module/Card_edit.php new file mode 100644 index 000000000..216d2cf63 --- /dev/null +++ b/Zotlabs/Module/Card_edit.php @@ -0,0 +1,135 @@ + 1) ? intval(argv(1)) : 0); + + if(! $post_id) { + notice( t('Item not found') . EOL); + return; + } + + $itm = q("SELECT * FROM item WHERE id = %d and item_type = %d LIMIT 1", + intval($post_id), + intval(ITEM_TYPE_CARD) + ); + if($itm) { + $item_id = q("select * from iconfig where cat = 'system' and k = 'CARD' and iid = %d limit 1", + intval($itm[0]['id']) + ); + if($item_id) + $card_title = $item_id[0]['v']; + } + else { + notice( t('Item not found') . EOL); + return; + } + + $owner = $itm[0]['uid']; + $uid = local_channel(); + + $observer = \App::get_observer(); + + $channel = channelx_by_n($owner); + if(! $channel) { + notice( t('Channel not found.') . EOL); + return; + } + + $ob_hash = (($observer) ? $observer['xchan_hash'] : ''); + + if(! perm_is_allowed($owner,$ob_hash,'write_pages')) { + notice( t('Permission denied.') . EOL); + return; + } + + $is_owner = (($uid && $uid == $owner) ? true : false); + + $o = ''; + + + + $category = ''; + $catsenabled = ((feature_enabled($owner,'categories')) ? 'categories' : ''); + + if ($catsenabled){ + $itm = fetch_post_tags($itm); + + $cats = get_terms_oftype($itm[0]['term'], TERM_CATEGORY); + + foreach ($cats as $cat) { + if (strlen($category)) + $category .= ', '; + $category .= $cat['term']; + } + } + + if($itm[0]['attach']) { + $j = json_decode($itm[0]['attach'],true); + if($j) { + foreach($j as $jj) { + $itm[0]['body'] .= "\n" . '[attachment]' . basename($jj['href']) . ',' . $jj['revision'] . '[/attachment]' . "\n"; + } + } + } + + + $mimetype = $itm[0]['mimetype']; + + $content = $itm[0]['body']; + + + + $rp = 'cards/' . $channel['channel_address']; + + $x = array( + 'nickname' => $channel['channel_address'], + 'bbco_autocomplete'=> 'bbcode', + 'return_path' => $rp, + 'webpage' => ITEM_TYPE_CARD, + 'button' => t('Edit'), + 'writefiles' => perm_is_allowed($owner, get_observer_hash(), 'write_pages'), + 'weblink' => t('Insert web link'), + 'hide_voting' => false, + 'hide_future' => false, + 'hide_location' => false, + 'hide_expire' => false, + 'showacl' => true, + 'ptyp' => $itm[0]['type'], + 'mimeselect' => false, + 'mimetype' => $itm[0]['mimetype'], + 'body' => undo_post_tagging($content), + 'post_id' => $post_id, + 'visitor' => true, + 'title' => htmlspecialchars($itm[0]['title'],ENT_COMPAT,'UTF-8'), + 'placeholdertitle' => t('Title (optional)'), + 'pagetitle' => $card_title, + 'profile_uid' => (intval($channel['channel_id'])), + 'catsenabled' => $catsenabled, + 'category' => $category, + 'bbcode' => (($mimetype == 'text/bbcode') ? true : false) + ); + + $editor = status_editor($a, $x); + + $o .= replace_macros(get_markup_template('edpost_head.tpl'), array( + '$title' => t('Edit Block'), + '$delete' => ((($itm[0]['author_xchan'] === $ob_hash) || ($itm[0]['owner_xchan'] === $ob_hash)) ? t('Delete') : false), + '$id' => $itm[0]['id'], + '$editor' => $editor + )); + + return $o; + + } + +} diff --git a/Zotlabs/Module/Cards.php b/Zotlabs/Module/Cards.php index 1fdd3b63f..1c37ca13d 100644 --- a/Zotlabs/Module/Cards.php +++ b/Zotlabs/Module/Cards.php @@ -47,24 +47,14 @@ class Cards extends \Zotlabs\Web\Controller { $which = argv(1); + $selected_card = ((argc() > 2) ? argv(2) : ''); + $_SESSION['return_url'] = \App::$query_string; - $uid = \App::$profile_uid; - $owner = 0; + $uid = local_channel(); + $owner = \App::$profile_uid; $observer = \App::get_observer(); - $channel = \App::$profile; - - if(! $owner) { - // Figure out who the page owner is. - $r = q("select channel_id from channel where channel_address = '%s'", - dbesc($which) - ); - if($r) { - $owner = intval($r[0]['channel_id']); - } - } - $ob_hash = (($observer) ? $observer['xchan_hash'] : ''); if(! perm_is_allowed($owner,$ob_hash,'view_pages')) { @@ -76,13 +66,10 @@ class Cards extends \Zotlabs\Web\Controller { $layout = (($_REQUEST['layout']) ? $_REQUEST['layout'] : get_pconfig($owner,'system','page_layout')); - // Create a status editor (for now - we'll need a WYSIWYG eventually) to create pages - // Nickname is set to the observers xchan, and profile_uid to the owner's. - // This lets you post pages at other people's channels. + $is_owner = ($uid && $uid == $owner); - if((! $channel) && ($uid) && ($uid == \App::$profile_uid)) { - $channel = \App::get_channel(); - } + $channel = channelx_by_n($owner); + if($channel) { $channel_acl = array( 'allow_cid' => $channel['channel_allow_cid'], @@ -95,28 +82,25 @@ class Cards extends \Zotlabs\Web\Controller { $channel_acl = [ 'allow_cid' => '', 'allow_gid' => '', 'deny_cid' => '', 'deny_gid' => '' ]; } - - $is_owner = ($uid && $uid == $owner); - if(perm_is_allowed($owner,$ob_hash,'write_pages')) { $x = array( 'webpage' => ITEM_TYPE_CARD, 'is_owner' => true, - 'nickname' => \App::$profile['channel_address'], + 'nickname' => $channel['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' => $channel_acl, 'showacl' => (($is_owner) ? true : false), 'visitor' => true, - 'hide_location' => true, - 'hide_voting' => true, + 'hide_location' => false, + 'hide_voting' => false, 'profile_uid' => intval($owner), 'mimetype' => $mimetype, 'mimeselect' => false, 'layoutselect' => false, 'expanded' => false, - 'novoting'=> true, + 'novoting'=> false, 'bbco_autocomplete' => 'bbcode', 'bbcode' => true ); @@ -130,12 +114,18 @@ class Cards extends \Zotlabs\Web\Controller { if($_REQUEST['body']) $x['body'] = $_REQUEST['body']; - // Get a list of webpages. We can't display all them because endless scroll makes that unusable, - // so just list titles and an edit link. - - + $sql_extra = item_permissions_sql($owner); - + + if($selected_card) { + $r = q("select * from iconfig where iconfig.cat = 'system' and iconfig.k = 'CARD' and iconfig.v = '%s' limit 1", + dbesc($selected_card) + ); + if($r) { + $sql_extra .= "and item.id = " . intval($r[0]['iid']) . " "; + } + } + $r = q("select * from item where item.uid = %d and item_type = %d $sql_extra order by item.created desc", diff --git a/app/cards.apd b/app/cards.apd index 4577dd681..047aaeac9 100644 --- a/app/cards.apd +++ b/app/cards.apd @@ -1,5 +1,6 @@ -version: 1 +version: 1.1 url: $baseurl/cards/$nick name: Cards +requires: local_channel, cards photo: icon:list categories: Productivity diff --git a/boot.php b/boot.php index 94f66e5a7..d9a6cd230 100755 --- a/boot.php +++ b/boot.php @@ -548,6 +548,8 @@ define ( 'ITEM_PDL', 0x0200); // Page Description Language - e.g. Comanche define ( 'ITEM_BUG', 0x0400); // Is a bug, can be used by the internal bug tracker define ( 'ITEM_PENDING_REMOVE', 0x0800); // deleted, notification period has lapsed define ( 'ITEM_DOC', 0x1000); // hubzilla only, define here so that item import does the right thing +define ( 'ITEM_CARD', 0x2000); + define ( 'ITEM_TYPE_POST', 0 ); define ( 'ITEM_TYPE_BLOCK', 1 ); diff --git a/include/conversation.php b/include/conversation.php index c9142ac30..e0de6fdce 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1305,6 +1305,11 @@ function status_editor($a, $x, $popup = false) { if(! $cipher) $cipher = 'aes256'; + if(array_key_exists('catsenabled',$x)) + $catsenabled = $x['catsenabled']; + else + $catsenabled = ((feature_enabled($x['profile_uid'], 'categories') && (! $webpage)) ? 'categories' : ''); + // avoid illegal offset errors if(! array_key_exists('permissions',$x)) $x['permissions'] = [ 'allow_cid' => '', 'allow_gid' => '', 'deny_cid' => '', 'deny_gid' => '' ]; @@ -1349,7 +1354,7 @@ function status_editor($a, $x, $popup = false) { '$clearloc' => $clearloc, '$title' => ((x($x, 'title')) ? htmlspecialchars($x['title'], ENT_COMPAT,'UTF-8') : ''), '$placeholdertitle' => ((x($x, 'placeholdertitle')) ? $x['placeholdertitle'] : t('Title (optional)')), - '$catsenabled' => ((feature_enabled($x['profile_uid'], 'categories') && (! $webpage)) ? 'categories' : ''), + '$catsenabled' => $catsenabled, '$category' => ((x($x, 'category')) ? $x['category'] : ''), '$placeholdercategory' => t('Categories (optional, comma-separated list)'), '$permset' => t('Permission settings'), diff --git a/include/items.php b/include/items.php index e7bec7f20..070c4571a 100755 --- a/include/items.php +++ b/include/items.php @@ -4111,6 +4111,8 @@ function webpage_to_namespace($webpage) { $page_type = 'BUILDBLOCK'; elseif($webpage == ITEM_TYPE_PDL) $page_type = 'PDL'; + elseif($webpage == ITEM_TYPE_CARD) + $page_type = 'CARD'; elseif($webpage == ITEM_TYPE_DOC) $page_type = 'docfile'; else diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index 8e8070402..39ba9e59b 100755 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -27,7 +27,7 @@ - {{if $webpage && $webpage != 6 }} + {{if $webpage}}
@@ -35,7 +35,7 @@
- {{if $catsenabled || $webpage == 6 }} + {{if $catsenabled}}
From ecfc7b8f4cc6fbc646e58a2445398341fae5e642 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Wed, 23 Aug 2017 18:15:31 -0700 Subject: [PATCH 127/441] add category support to main page --- Zotlabs/Module/Cards.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Zotlabs/Module/Cards.php b/Zotlabs/Module/Cards.php index 1c37ca13d..c542cd6ff 100644 --- a/Zotlabs/Module/Cards.php +++ b/Zotlabs/Module/Cards.php @@ -82,6 +82,8 @@ class Cards extends \Zotlabs\Web\Controller { $channel_acl = [ 'allow_cid' => '', 'allow_gid' => '', 'deny_cid' => '', 'deny_gid' => '' ]; } + + if(perm_is_allowed($owner,$ob_hash,'write_pages')) { $x = array( @@ -101,6 +103,7 @@ class Cards extends \Zotlabs\Web\Controller { 'layoutselect' => false, 'expanded' => false, 'novoting'=> false, + 'catsenabled' => feature_enabled($owner,'categories'), 'bbco_autocomplete' => 'bbcode', 'bbcode' => true ); From 89df4551aa22aa4c9a30221d4b13ae715673d567 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Wed, 23 Aug 2017 18:20:12 -0700 Subject: [PATCH 128/441] cards: acl support --- Zotlabs/Module/Card_edit.php | 1 + 1 file changed, 1 insertion(+) diff --git a/Zotlabs/Module/Card_edit.php b/Zotlabs/Module/Card_edit.php index 216d2cf63..b5b44c567 100644 --- a/Zotlabs/Module/Card_edit.php +++ b/Zotlabs/Module/Card_edit.php @@ -104,6 +104,7 @@ class Card_edit extends \Zotlabs\Web\Controller { 'hide_location' => false, 'hide_expire' => false, 'showacl' => true, + 'acl' => populate_acl($itm[0],false,\Zotlabs\Lib\PermissionDescription::fromGlobalPermission('view_pages')), 'ptyp' => $itm[0]['type'], 'mimeselect' => false, 'mimetype' => $itm[0]['mimetype'], From 8873fbfee9a8c0437fa1acdf1588aeb3fd3e7681 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Wed, 23 Aug 2017 19:18:44 -0700 Subject: [PATCH 129/441] fix permalink for cards --- Zotlabs/Module/Item.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Zotlabs/Module/Item.php b/Zotlabs/Module/Item.php index 5e7a3fbc0..797b46f93 100644 --- a/Zotlabs/Module/Item.php +++ b/Zotlabs/Module/Item.php @@ -735,6 +735,10 @@ class Item extends \Zotlabs\Web\Controller { if($parent_item) $parent_mid = $parent_item['mid']; + if($webpage == ITEM_TYPE_CARD && $pagetitle) { + $plink = z_root() . '/cards/' . $channel['channel_address'] . '/' . $pagetitle; + } + // Fallback so that we alway have a thr_parent if(!$thr_parent) From 64cf36a2b5dc314728fbb262471f1dd7b0ad2d96 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Wed, 23 Aug 2017 19:25:42 -0700 Subject: [PATCH 130/441] lognoise: don't log sync packet contents if there are no clones to receive them --- include/zot.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/include/zot.php b/include/zot.php index 3e2a66734..343bc8ad8 100644 --- a/include/zot.php +++ b/include/zot.php @@ -2965,8 +2965,6 @@ function build_sync_packet($uid = 0, $packet = null, $groups_changed = false) { logger('build_sync_packet'); - if($packet) - logger('packet: ' . print_r($packet, true),LOGGER_DATA, LOG_DEBUG); $keychange = (($packet && array_key_exists('keychange',$packet)) ? true : false); if($keychange) { @@ -3033,6 +3031,9 @@ function build_sync_packet($uid = 0, $packet = null, $groups_changed = false) { $env_recips = array(); $env_recips[] = array('guid' => $r[0]['xchan_guid'],'guid_sig' => $r[0]['xchan_guid_sig']); + if($packet) + logger('packet: ' . print_r($packet, true),LOGGER_DATA, LOG_DEBUG); + $info = (($packet) ? $packet : array()); $info['type'] = 'channel_sync'; $info['encoding'] = 'red'; // note: not zot, this packet is very platform specific From f2e802229acb871e0b50afb729445cdef8586951 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Wed, 23 Aug 2017 20:02:28 -0700 Subject: [PATCH 131/441] add new conv_sort option --- Zotlabs/Module/Cards.php | 2 +- include/conversation.php | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Zotlabs/Module/Cards.php b/Zotlabs/Module/Cards.php index c542cd6ff..33688cba0 100644 --- a/Zotlabs/Module/Cards.php +++ b/Zotlabs/Module/Cards.php @@ -159,7 +159,7 @@ class Cards extends \Zotlabs\Web\Controller { if($items) { xchan_query($items); $items = fetch_post_tags($items, true); - $items = conv_sort($items,'created'); + $items = conv_sort($items,'updated'); } else $items = []; diff --git a/include/conversation.php b/include/conversation.php index e0de6fdce..2448775af 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1461,6 +1461,8 @@ function conv_sort($arr, $order) { usort($parents,'sort_thr_created'); elseif(stristr($order,'commented')) usort($parents,'sort_thr_commented'); + elseif(stristr($order,'updated')) + usort($parents,'sort_thr_updated'); elseif(stristr($order,'ascending')) usort($parents,'sort_thr_created_rev'); @@ -1502,6 +1504,10 @@ function sort_thr_commented($a,$b) { return strcmp($b['commented'],$a['commented']); } +function sort_thr_updated($a,$b) { + return strcmp($b['updated'],$a['updated']); +} + function find_thread_parent_index($arr,$x) { foreach($arr as $k => $v) if($v['id'] == $x['parent']) From e7788156052bcb3676fe761f89769c2d72dc4bca Mon Sep 17 00:00:00 2001 From: zotlabs Date: Wed, 23 Aug 2017 20:12:40 -0700 Subject: [PATCH 132/441] use two keys for the updated sort --- include/conversation.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/conversation.php b/include/conversation.php index 2448775af..7e0394058 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1505,7 +1505,9 @@ function sort_thr_commented($a,$b) { } function sort_thr_updated($a,$b) { - return strcmp($b['updated'],$a['updated']); + $indexa = (($a['changed'] > $a['edited']) ? $a['changed'] : $a['edited']); + $indexb = (($b['changed'] > $b['edited']) ? $b['changed'] : $b['edited']); + return strcmp($indexb,$indexa); } function find_thread_parent_index($arr,$x) { From bf7b0b11ef7a8d110f2fc2a5967d8178183d9435 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Wed, 23 Aug 2017 20:16:08 -0700 Subject: [PATCH 133/441] add autotime to cards --- view/js/mod_cards.js | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 view/js/mod_cards.js diff --git a/view/js/mod_cards.js b/view/js/mod_cards.js new file mode 100644 index 000000000..477cd61ed --- /dev/null +++ b/view/js/mod_cards.js @@ -0,0 +1,4 @@ +$(document).ready( function() { + $("> .wall-item-outside-wrapper .autotime, > .thread-wrapper .autotime").timeago(); + $("> .shared_header .autotime").timeago(); +}); \ No newline at end of file From c9745a41295337444832f0c787d0dd4fb3425e1f Mon Sep 17 00:00:00 2001 From: zotlabs Date: Wed, 23 Aug 2017 20:19:52 -0700 Subject: [PATCH 134/441] apply autotime to all autotime classed elements when static loading a page --- view/js/mod_cards.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/view/js/mod_cards.js b/view/js/mod_cards.js index 477cd61ed..78b2e1bd0 100644 --- a/view/js/mod_cards.js +++ b/view/js/mod_cards.js @@ -1,4 +1,3 @@ $(document).ready( function() { - $("> .wall-item-outside-wrapper .autotime, > .thread-wrapper .autotime").timeago(); - $("> .shared_header .autotime").timeago(); + $(".autotime").timeago(); }); \ No newline at end of file From 66b032823b4fd941f613b0194bb8412b216cc748 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Wed, 23 Aug 2017 20:47:08 -0700 Subject: [PATCH 135/441] oembed provider cleanup, add oembed to cards --- Zotlabs/Module/Cards.php | 8 +++ Zotlabs/Module/Channel.php | 7 ++- Zotlabs/Module/Display.php | 9 ++-- Zotlabs/Module/Oep.php | 106 ++++++++++++++++++++++++++++++++++++- Zotlabs/Module/Photos.php | 9 +++- Zotlabs/Module/Profile.php | 14 ++--- 6 files changed, 139 insertions(+), 14 deletions(-) diff --git a/Zotlabs/Module/Cards.php b/Zotlabs/Module/Cards.php index 33688cba0..f354544d5 100644 --- a/Zotlabs/Module/Cards.php +++ b/Zotlabs/Module/Cards.php @@ -38,6 +38,14 @@ class Cards extends \Zotlabs\Web\Controller { nav_set_selected(t('Cards')); + head_add_link([ + 'rel' => 'alternate', + 'type' => 'application/json+oembed', + 'href' => z_root() . '/oep?f=&url=' . urlencode(z_root() . '/' . \App::$query_string), + 'title' => 'oembed' + ]); + + $category = (($_REQUEST['cat']) ? escape_tags(trim($_REQUEST['cat'])) : ''); if($category) { diff --git a/Zotlabs/Module/Channel.php b/Zotlabs/Module/Channel.php index c006d65d4..5e7db79d9 100644 --- a/Zotlabs/Module/Channel.php +++ b/Zotlabs/Module/Channel.php @@ -180,7 +180,12 @@ class Channel extends \Zotlabs\Web\Controller { $simple_update = (($update) ? " AND item_unseen = 1 " : ''); - \App::$page['htmlhead'] .= "\r\n" . '' . "\r\n"; + head_add_link([ + 'rel' => 'alternate', + 'type' => 'application/json+oembed', + 'href' => z_root() . '/oep?f=&url=' . urlencode(z_root() . '/' . \App::$query_string), + 'title' => 'oembed' + ]); if($update && $_SESSION['loadtime']) $simple_update = " AND (( item_unseen = 1 AND item.changed > '" . datetime_convert('UTC','UTC',$_SESSION['loadtime']) . "' ) OR item.changed > '" . datetime_convert('UTC','UTC',$_SESSION['loadtime']) . "' ) "; diff --git a/Zotlabs/Module/Display.php b/Zotlabs/Module/Display.php index 1077cbdb9..b698513ba 100644 --- a/Zotlabs/Module/Display.php +++ b/Zotlabs/Module/Display.php @@ -175,9 +175,12 @@ class Display extends \Zotlabs\Web\Controller { '$mid' => $item_hash )); - \App::$page['htmlhead'] .= "\r\n" . '' . "\r\n"; - - + head_add_link([ + 'rel' => 'alternate', + 'type' => 'application/json+oembed', + 'href' => z_root() . '/oep?f=&url=' . urlencode(z_root() . '/' . \App::$query_string), + 'title' => 'oembed' + ]); } $observer_hash = get_observer_hash(); diff --git a/Zotlabs/Module/Oep.php b/Zotlabs/Module/Oep.php index 6469a7007..02aa4aba9 100644 --- a/Zotlabs/Module/Oep.php +++ b/Zotlabs/Module/Oep.php @@ -41,6 +41,8 @@ class Oep extends \Zotlabs\Web\Controller { $arr = $this->oep_profile_reply($_REQUEST); elseif(fnmatch('*/profile/*',$url)) $arr = $this->oep_profile_reply($_REQUEST); + elseif(fnmatch('*/cards/*',$url)) + $arr = $this->oep_cards_reply($_REQUEST); if($arr) { if($html) { @@ -89,7 +91,10 @@ class Oep extends \Zotlabs\Web\Controller { if(! ($c && $res)) return; - + + if(! perm_is_allowed($c[0]['channel_id'],get_observer_hash(),'view_stream')) + return; + $sql_extra = item_permissions_sql($c['channel_id']); $p = q("select * from item where mid like '%s' and uid = %d $sql_extra $item_normal limit 1", @@ -140,6 +145,91 @@ class Oep extends \Zotlabs\Web\Controller { return $ret; } + + + function oep_cards_reply($args) { + + $ret = []; + $url = $args['url']; + $maxwidth = intval($args['maxwidth']); + $maxheight = intval($args['maxheight']); + + if(preg_match('#//(.*?)/cards/(.*?)/(.*?)(&|\?|$)#',$url,$matches)) { + $nick = $matches[2]; + $res = $matches[3]; + } + if(! ($nick && $res)) + return $ret; + + $channel = channelx_by_nick($nick); + + if(! $channel) + return $ret; + + + if(! perm_is_allowed($channel['channel_id'],get_observer_hash(),'view_pages')) + return $ret; + + $sql_extra = items_permissions_sql($channel['channel_id'],get_observer_hash()); + + $r = q("select * from iconfig where iconfig.cat = 'system' and iconfig.k = 'CARD' and iconfig.v = '%s' limit 1", + dbesc($res) + ); + if($r) { + $sql_extra = "and item.id = " . intval($r[0]['iid']) . " "; + } + else { + return $ret; + } + + $r = q("select * from item + where item.uid = %d and item_type = %d + $sql_extra order by item.created desc", + intval($channel['channel_id']), + intval(ITEM_TYPE_CARD) + ); + + $item_normal = " and item.item_hidden = 0 and item.item_type in (0,6) and item.item_deleted = 0 + and item.item_unpublished = 0 and item.item_delayed = 0 and item.item_pending_remove = 0 + and item.item_blocked = 0 "; + + if($r) { + xchan_query($r); + $p = fetch_post_tags($r, true); + } + + $x = '2eGriplW^*Jmf4'; + + + $o = "[share author='".urlencode($p[0]['author']['xchan_name']). + "' profile='".$p[0]['author']['xchan_url'] . + "' avatar='".$p[0]['author']['xchan_photo_s']. + "' link='".$p[0]['plink']. + "' posted='".$p[0]['created']. + "' message_id='".$p[0]['mid']."']"; + if($p[0]['title']) + $o .= '[b]'.$p[0]['title'].'[/b]'."\r\n"; + + $o .= $x; + $o .= "[/share]"; + $o = bbcode($o); + + $o = str_replace($x,bbcode($p[0]['body']),$o); + + $ret['type'] = 'rich'; + + $w = (($maxwidth) ? $maxwidth : 640); + $h = (($maxheight) ? $maxheight : intval($w * 2 / 3)); + + $ret['html'] = '
' . $o . '
'; + + $ret['width'] = $w; + $ret['height'] = $h; + + return $ret; + + } + function oep_mid_reply($args) { @@ -161,6 +251,9 @@ class Oep extends \Zotlabs\Web\Controller { if(! $c) return; + + if(! perm_is_allowed($c[0]['channel_id'],get_observer_hash(),'view_stream')) + return; $sql_extra = item_permissions_sql($c[0]['channel_id']); @@ -279,6 +372,9 @@ class Oep extends \Zotlabs\Web\Controller { if(! $c) return; + if(! perm_is_allowed($c[0]['channel_id'],get_observer_hash(),'view_files')) + return; + $sql_extra = permissions_sql($c[0]['channel_id']); $p = q("select resource_id from photo where album = '%s' and uid = %d and imgscale = 0 $sql_extra order by created desc limit 1", @@ -340,6 +436,9 @@ class Oep extends \Zotlabs\Web\Controller { if(! $c) return; + if(! perm_is_allowed($c[0]['channel_id'],get_observer_hash(),'view_files')) + return; + $sql_extra = permissions_sql($c[0]['channel_id']); $p = q("select resource_id from photo where uid = %d and imgscale = 0 $sql_extra order by created desc limit 1", @@ -400,7 +499,10 @@ class Oep extends \Zotlabs\Web\Controller { if(! $c) return; - + + if(! perm_is_allowed($c[0]['channel_id'],get_observer_hash(),'view_files')) + return; + $sql_extra = permissions_sql($c[0]['channel_id']); diff --git a/Zotlabs/Module/Photos.php b/Zotlabs/Module/Photos.php index 0f80f46a5..bb7079a6a 100644 --- a/Zotlabs/Module/Photos.php +++ b/Zotlabs/Module/Photos.php @@ -671,8 +671,13 @@ class Photos extends \Zotlabs\Web\Controller { */ if($datatype === 'album') { - - \App::$page['htmlhead'] .= "\r\n" . '' . "\r\n"; + + head_add_link([ + 'rel' => 'alternate', + 'type' => 'application/json+oembed', + 'href' => z_root() . '/oep?f=&url=' . urlencode(z_root() . '/' . \App::$query_string), + 'title' => 'oembed' + ]); if($x = photos_album_exists($owner_uid, get_observer_hash(), $datum)) { \App::set_pager_itemspage(60); diff --git a/Zotlabs/Module/Profile.php b/Zotlabs/Module/Profile.php index 6930d50ca..43106e3af 100644 --- a/Zotlabs/Module/Profile.php +++ b/Zotlabs/Module/Profile.php @@ -94,7 +94,6 @@ class Profile extends \Zotlabs\Web\Controller { echo \App::$profile['profile_vcard']; killme(); } - $is_owner = ((local_channel()) && (local_channel() == \App::$profile['profile_uid']) ? true : false); @@ -102,11 +101,14 @@ class Profile extends \Zotlabs\Web\Controller { notice( t('Permission denied.') . EOL); return; } - - //$o .= profile_tabs($a, $is_owner, \App::$profile['channel_address']); - - \App::$page['htmlhead'] .= "\r\n" . '' . "\r\n"; - + + head_add_link([ + 'rel' => 'alternate', + 'type' => 'application/json+oembed', + 'href' => z_root() . '/oep?f=&url=' . urlencode(z_root() . '/' . \App::$query_string), + 'title' => 'oembed' + ]); + $o .= advanced_profile($a); call_hooks('profile_advanced',$o); return $o; From 4450170790de3999dc9c6f8876074e76edee8241 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Wed, 23 Aug 2017 21:26:09 -0700 Subject: [PATCH 136/441] partial support (unfinished) for ajax loading cards with liveupdate; page still functions even though this isn't finished --- Zotlabs/Module/Cards.php | 5 ++--- Zotlabs/Module/Update_cards.php | 39 +++++++++++++++++++++++++++++++++ include/conversation.php | 9 ++++++++ view/js/main.js | 1 + 4 files changed, 51 insertions(+), 3 deletions(-) create mode 100644 Zotlabs/Module/Update_cards.php diff --git a/Zotlabs/Module/Cards.php b/Zotlabs/Module/Cards.php index f354544d5..19932769f 100644 --- a/Zotlabs/Module/Cards.php +++ b/Zotlabs/Module/Cards.php @@ -19,8 +19,7 @@ class Cards extends \Zotlabs\Web\Controller { } - - function get() { + function get($update = 0, $load = false) { if(observer_prohibited(true)) { return login(); @@ -173,7 +172,7 @@ class Cards extends \Zotlabs\Web\Controller { $items = []; } - $mode = 'channel'; + $mode = 'cards'; $content = conversation($items,$mode,false,'traditional'); diff --git a/Zotlabs/Module/Update_cards.php b/Zotlabs/Module/Update_cards.php new file mode 100644 index 000000000..bb87357e8 --- /dev/null +++ b/Zotlabs/Module/Update_cards.php @@ -0,0 +1,39 @@ + 1) && (argv(1) == 'load')) ? 1 : 0); + + header("Content-type: text/html"); + echo "
\r\n"; + + killme(); + + + $mod = new Cards(); + + $text = $mod->get($profile_uid,$load); + + /** + * reportedly some versions of MSIE don't handle tabs in XMLHttpRequest documents very well + */ + + echo str_replace("\t",' ',$text); + echo (($_GET['msie'] == 1) ? '' : ''); + echo "\r\n"; + killme(); + +} +} diff --git a/include/conversation.php b/include/conversation.php index 7e0394058..0d2dd2224 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -517,6 +517,15 @@ function conversation($items, $mode, $update, $page_mode = 'traditional', $prepa } } + elseif ($mode === 'cards') { + $profile_owner = App::$profile['profile_uid']; + $page_writeable = ($profile_owner == local_channel()); + $live_update_div = '
' . "\r\n" + . "\r\n"; + } + + elseif ($mode === 'display') { $profile_owner = local_channel(); $page_writeable = false; diff --git a/view/js/main.js b/view/js/main.js index f20432735..bbdb0759b 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -380,6 +380,7 @@ function NavUpdate() { if($('#live-pubstream').length) { src = 'pubstream'; liveUpdate(); } if($('#live-display').length) { src = 'display'; liveUpdate(); } if($('#live-search').length) { src = 'search'; liveUpdate(); } + if($('#live-cards').length) { src = 'cards'; liveUpdate(); } if($('#live-photos').length) { if(liking) { From e157e3bec8722c04ed8dc2d215cd2efd0ce3ce79 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Wed, 23 Aug 2017 22:06:42 -0700 Subject: [PATCH 137/441] cards: make page load after comment post --- Zotlabs/Lib/ThreadItem.php | 11 +++++- Zotlabs/Lib/ThreadStream.php | 6 ++++ Zotlabs/Module/Cards.php | 70 +++++++++++++++++------------------- include/conversation.php | 6 ++++ 4 files changed, 55 insertions(+), 38 deletions(-) diff --git a/Zotlabs/Lib/ThreadItem.php b/Zotlabs/Lib/ThreadItem.php index 526169e1b..313001cc7 100644 --- a/Zotlabs/Lib/ThreadItem.php +++ b/Zotlabs/Lib/ThreadItem.php @@ -29,6 +29,7 @@ class ThreadItem { private $visiting = false; private $channel = null; private $display_mode = 'normal'; + private $reload = ''; public function __construct($data) { @@ -483,6 +484,14 @@ class ThreadItem { return $this->threaded; } + public function set_reload($val) { + $this->reload = $val; + } + + public function get_reload() { + return $this->reload; + } + public function set_commentable($val) { $this->commentable = $val; foreach($this->get_children() as $child) @@ -719,7 +728,7 @@ class ThreadItem { $comment_box = replace_macros($template,array( '$return_path' => '', '$threaded' => $this->is_threaded(), - '$jsreload' => '', //(($conv->get_mode() === 'display') ? $_SESSION['return_url'] : ''), + '$jsreload' => $conv->reload, '$type' => (($conv->get_mode() === 'channel') ? 'wall-comment' : 'net-comment'), '$id' => $this->get_id(), '$parent' => $this->get_id(), diff --git a/Zotlabs/Lib/ThreadStream.php b/Zotlabs/Lib/ThreadStream.php index 0465b20ef..d7a898704 100644 --- a/Zotlabs/Lib/ThreadStream.php +++ b/Zotlabs/Lib/ThreadStream.php @@ -22,6 +22,7 @@ class ThreadStream { private $profile_owner = 0; private $preview = false; private $prepared_item = ''; + public $reload = ''; private $cipher = 'aes256'; // $prepared_item is for use by alternate conversation structures such as photos @@ -57,6 +58,11 @@ class ThreadStream { $this->profile_owner = \App::$profile['profile_uid']; $this->writable = perm_is_allowed($this->profile_owner,$ob_hash,'post_comments'); break; + case 'cards': + $this->profile_owner = \App::$profile['profile_uid']; + $this->writable = perm_is_allowed($this->profile_owner,$ob_hash,'post_comments'); + $this->reload = $_SESSION['return_url']; + break; case 'display': // in this mode we set profile_owner after initialisation (from conversation()) and then // pull some trickery which allows us to re-invoke this function afterward diff --git a/Zotlabs/Module/Cards.php b/Zotlabs/Module/Cards.php index 19932769f..9114e3b89 100644 --- a/Zotlabs/Module/Cards.php +++ b/Zotlabs/Module/Cards.php @@ -58,8 +58,8 @@ class Cards extends \Zotlabs\Web\Controller { $_SESSION['return_url'] = \App::$query_string; - $uid = local_channel(); - $owner = \App::$profile_uid; + $uid = local_channel(); + $owner = \App::$profile_uid; $observer = \App::get_observer(); $ob_hash = (($observer) ? $observer['xchan_hash'] : ''); @@ -68,11 +68,7 @@ class Cards extends \Zotlabs\Web\Controller { notice( t('Permission denied.') . EOL); return; } - - $mimetype = (($_REQUEST['mimetype']) ? $_REQUEST['mimetype'] : get_pconfig($owner,'system','page_mimetype')); - - $layout = (($_REQUEST['layout']) ? $_REQUEST['layout'] : get_pconfig($owner,'system','page_layout')); - + $is_owner = ($uid && $uid == $owner); $channel = channelx_by_n($owner); @@ -93,38 +89,42 @@ class Cards extends \Zotlabs\Web\Controller { if(perm_is_allowed($owner,$ob_hash,'write_pages')) { - $x = array( - 'webpage' => ITEM_TYPE_CARD, - 'is_owner' => true, - 'nickname' => $channel['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' => $channel_acl, - 'showacl' => (($is_owner) ? true : false), - 'visitor' => true, - 'hide_location' => false, - 'hide_voting' => false, - 'profile_uid' => intval($owner), - 'mimetype' => $mimetype, - 'mimeselect' => false, - 'layoutselect' => false, - 'expanded' => false, - 'novoting'=> false, - 'catsenabled' => feature_enabled($owner,'categories'), + $x = [ + 'webpage' => ITEM_TYPE_CARD, + 'is_owner' => true, + 'nickname' => $channel['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' => $channel_acl, + 'showacl' => (($is_owner) ? true : false), + 'visitor' => true, + 'hide_location' => false, + 'hide_voting' => false, + 'profile_uid' => intval($owner), + 'mimetype' => 'text/bbcode', + 'mimeselect' => false, + 'layoutselect' => false, + 'expanded' => false, + 'novoting' => false, + 'catsenabled' => feature_enabled($owner,'categories'), 'bbco_autocomplete' => 'bbcode', - 'bbcode' => true - ); + 'bbcode' => true + ]; + + if($_REQUEST['title']) + $x['title'] = $_REQUEST['title']; + if($_REQUEST['body']) + $x['body'] = $_REQUEST['body']; + $editor = status_editor($a,$x); + } else { - $x = ''; + $editor = ''; } - if($_REQUEST['title']) - $x['title'] = $_REQUEST['title']; - if($_REQUEST['body']) - $x['body'] = $_REQUEST['body']; - $sql_extra = item_permissions_sql($owner); if($selected_card) { @@ -147,10 +147,6 @@ class Cards extends \Zotlabs\Web\Controller { and item.item_unpublished = 0 and item.item_delayed = 0 and item.item_pending_remove = 0 and item.item_blocked = 0 "; - - if($x) - $editor = status_editor($a,$x); - if($r) { $parents_str = ids_to_querystr($r,'id'); diff --git a/include/conversation.php b/include/conversation.php index 0d2dd2224..2d5ccb5b1 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -464,6 +464,7 @@ function conversation($items, $mode, $update, $page_mode = 'traditional', $prepa $profile_owner = 0; $page_writeable = false; $live_update_div = ''; + $jsreload = ''; $preview = (($page_mode === 'preview') ? true : false); $previewing = (($preview) ? ' preview ' : ''); @@ -523,6 +524,7 @@ function conversation($items, $mode, $update, $page_mode = 'traditional', $prepa $live_update_div = '
' . "\r\n" . "\r\n"; + $jsreload = $_SESSION['return_url']; } @@ -817,6 +819,10 @@ function conversation($items, $mode, $update, $page_mode = 'traditional', $prepa $item_object->set_template('conv_list.tpl'); $item_object->set_display_mode('list'); } + if($page_mode === 'cards') { + $item_object->set_reload($jsreload); + } + } } From 186f85483fe3ab45281c442b2b275448c5230c4f Mon Sep 17 00:00:00 2001 From: zotlabs Date: Wed, 23 Aug 2017 22:17:15 -0700 Subject: [PATCH 138/441] cards: make likes reload page --- view/js/main.js | 4 ++-- view/tpl/cards.tpl | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/view/js/main.js b/view/js/main.js index bbdb0759b..fd3c8b08f 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -380,9 +380,9 @@ function NavUpdate() { if($('#live-pubstream').length) { src = 'pubstream'; liveUpdate(); } if($('#live-display').length) { src = 'display'; liveUpdate(); } if($('#live-search').length) { src = 'search'; liveUpdate(); } - if($('#live-cards').length) { src = 'cards'; liveUpdate(); } + // if($('#live-cards').length) { src = 'cards'; liveUpdate(); } - if($('#live-photos').length) { + if($('#live-photos').length || $('#live-cards').length) { if(liking) { liking = 0; window.location.href=window.location.href; diff --git a/view/tpl/cards.tpl b/view/tpl/cards.tpl index ae382a97f..a06e2fd22 100644 --- a/view/tpl/cards.tpl +++ b/view/tpl/cards.tpl @@ -2,6 +2,7 @@

{{$title}}

+
{{$editor}} {{$content}} From af8ed605f8619fa9ec14521137d7781f3f0f97ef Mon Sep 17 00:00:00 2001 From: zotlabs Date: Wed, 23 Aug 2017 22:40:52 -0700 Subject: [PATCH 139/441] add a section to the admin guide about admin rights and how to grant them if the first account on the system used a different email address than the desired administrator email. --- doc/admin/administrator_guide.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/doc/admin/administrator_guide.md b/doc/admin/administrator_guide.md index 9e0ee3c59..e3b6190cb 100644 --- a/doc/admin/administrator_guide.md +++ b/doc/admin/administrator_guide.md @@ -346,6 +346,19 @@ empty: 1. After successful import (check!) delete your channel on the old RedMatrix Server. 1. On the $Projectname server visit new.hub/locs and upgrade to your channel to a primary one. And when the old Redmatrix server is still listed delete them here as well. Press "Sync" to inform all other server in the grid. +### Administration + +#### Site Administration + +Administration of the website is commonly done through the admin webpage located at /admin on your website. In order to access this page you must have administration rights to the server. Administration rights are granted to the first account to register on your site, **provided** the email address of that account exactly matches the email address you provided as the administrator's email address during setup. + +There are several ways that this can fail and leave the system without an administrator account, for instance if the first account that was created provided a different email address than the administrator email address that was supplied during setup. + +For security reasons there is no web page or interface on the system which will give you administrator access. If you need to correct a situation where a system has no administrator account it **must** be done by editing the account table in the database. There is no other way. To do this, you will need to locate the entry in the account table which belongs to the desired administrator, and set 'account_roles' for that entry to 4096. You will then be able to access the admin page from your system's profile menu or directly via /admin . + +A hub can have multiple admins and there is no limit to how administrators you can have. Repeat the above process for every account you wish to provide with administration rights. + + ### Troubleshooting #### Log files From 1c4629f5e1b7733472e2f721e5a4080734b9e2d5 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Wed, 23 Aug 2017 23:37:45 -0700 Subject: [PATCH 140/441] add tasklist and notes to cards page --- view/pdl/mod_cards.pdl | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/view/pdl/mod_cards.pdl b/view/pdl/mod_cards.pdl index 2d87136c9..5546d97cb 100644 --- a/view/pdl/mod_cards.pdl +++ b/view/pdl/mod_cards.pdl @@ -1,2 +1,5 @@ [region=aside] -[widget=categories][var=cards]1[/var][/widget][/region] +[widget=categories][var=cards]1[/var][/widget] +[widget=tasklist][/widget] +[widget=notes][/widget] +[/region] From 85f24c292f071b9a83aea0aa122231afd57e7f73 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Wed, 23 Aug 2017 23:59:05 -0700 Subject: [PATCH 141/441] last remaining task in tasklist was not removed from view when 'completed' --- Zotlabs/Module/Tasks.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Zotlabs/Module/Tasks.php b/Zotlabs/Module/Tasks.php index c8deb11bf..0709f31f6 100644 --- a/Zotlabs/Module/Tasks.php +++ b/Zotlabs/Module/Tasks.php @@ -19,8 +19,8 @@ class Tasks extends \Zotlabs\Web\Controller { $arr['all'] = 1; $x = tasks_fetch($arr); + $x['html'] = ''; if($x['tasks']) { - $x['html'] = ''; foreach($x['tasks'] as $y) { $x['html'] .= '
' . $y['summary'] . '
'; } @@ -69,6 +69,7 @@ class Tasks extends \Zotlabs\Web\Controller { if($x) $ret['success'] = true; } + json_return_and_die($ret); } From 592cf893c006f24c652902fa4fae7d2d94496c3c Mon Sep 17 00:00:00 2001 From: Andrew Manning Date: Thu, 24 Aug 2017 11:19:11 +0000 Subject: [PATCH 142/441] Fixed incorrect language path when choosing the language from browser preference --- include/help.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/help.php b/include/help.php index cbadd02d9..f38f77854 100644 --- a/include/help.php +++ b/include/help.php @@ -128,7 +128,7 @@ function load_doc_file($s) { $x = determine_help_language(); $lang = $x['language']; $url_idx = ($x['from_url'] ? 1 : 0); - if($x['from_url'] && $lang !== 'en') { + if($lang !== 'en') { $path .= '/' . $lang; } From cf2609530fcffdc7f5477336232b7cfde8b6403f Mon Sep 17 00:00:00 2001 From: Andrew Manning Date: Thu, 24 Aug 2017 18:57:41 +0000 Subject: [PATCH 143/441] Added language selector menu for Help pages --- Zotlabs/Module/Help.php | 5 ++++- include/help.php | 25 ++++++++++++++++++++- view/js/mod_help.js | 50 +++++++++++++++++++++++++++++++++++++++++ view/tpl/help.tpl | 15 +++++++++++++ 4 files changed, 93 insertions(+), 2 deletions(-) diff --git a/Zotlabs/Module/Help.php b/Zotlabs/Module/Help.php index e98cb9d4d..f3cc3aa5f 100644 --- a/Zotlabs/Module/Help.php +++ b/Zotlabs/Module/Help.php @@ -88,12 +88,15 @@ class Help extends \Zotlabs\Web\Controller { $heading = $headings[argv(1)]; $content = get_help_content(); + + $language = determine_help_language()['language']; return replace_macros(get_markup_template('help.tpl'), array( '$title' => t('$Projectname Documentation'), '$tocHeading' => t('Contents'), '$content' => $content, - '$heading' => $heading + '$heading' => $heading, + '$language' => $language )); } diff --git a/include/help.php b/include/help.php index f38f77854..ef6b77e12 100644 --- a/include/help.php +++ b/include/help.php @@ -32,6 +32,13 @@ function get_help_content($tocpath = false) { if(! $tocpath) \App::$page['title'] = t('Help:') . ' ' . ucwords(str_replace('-',' ',notags($title))); + if($tocpath !== false && + load_doc_file('doc/' . $path . '.md') === '' && + load_doc_file('doc/' . $path . '.bb') === '' && + load_doc_file('doc/' . $path . '.html') === '' + ) { + $path = 'toc'; + } $text = load_doc_file('doc/' . $path . '.md'); if(! $text) { @@ -110,7 +117,10 @@ function preg_callback_help_include($matches) { function determine_help_language() { require_once('Text/LanguageDetect.php'); $lang_detect = new Text_LanguageDetect(); + // Set this mode to recognize language by the short code like "en", "ru", etc. $lang_detect->setNameMode(2); + // If the language was specified in the URL, override the language preference + // of the browser. Default to English if both of these are absent. if($lang_detect->languageExists(argv(1))) { $lang = argv(1); $from_url = true; @@ -125,13 +135,16 @@ function determine_help_language() { function load_doc_file($s) { $path = 'doc'; + // Determine the language and modify the path accordingly $x = determine_help_language(); $lang = $x['language']; $url_idx = ($x['from_url'] ? 1 : 0); + // The English translation is at the root of /doc/. Other languages are in + // subfolders named by the language code such as "de", "es", etc. if($lang !== 'en') { $path .= '/' . $lang; } - + $b = basename($s); for($i=1+$url_idx; $i 0) { + pathParts.push(help_language); + pick_me = false; + if($.inArray(path[i], langChoices) < 0) { + i--; + } + } + } else { + if(path[i].length > 0) { + pathParts.push(path[i]); + } + } + + } + // Update the address bar to reflect the loaded language + window.history.pushState({}, '', '/' + pathParts.join('/')); + + // Highlight the language in the language selector that is currently viewed + $('.lang-selector').find('.lang-choice:contains("' + help_language + '")').css('font-weight','bold').css('background-color','lightgray'); + + // Construct the links to the available translations based and populate the selector menu + $('.lang-selector').find('.lang-choice').each(function (idx, a) { + var langLink = []; + + for (var i = 0; i < pathParts.length; i++) { + + if(i === 1) { + langLink.push($(a).html()); + } else { + langLink.push(pathParts[i]); + } + + } + $(a).attr('href', '/' + langLink.join('/')); + }); + }); diff --git a/view/tpl/help.tpl b/view/tpl/help.tpl index 31e5b9794..bdb25edf1 100644 --- a/view/tpl/help.tpl +++ b/view/tpl/help.tpl @@ -1,5 +1,17 @@
+
+
+ +
+ de + en + es +
+
+

{{$title}}: {{$heading}}

@@ -13,3 +25,6 @@ {{$content}}
+ From 2d5768b71c0fa588524849749cfb0b6ffe6300b7 Mon Sep 17 00:00:00 2001 From: git-marijus Date: Thu, 24 Aug 2017 21:47:01 +0200 Subject: [PATCH 144/441] ditch discover tab in favour of the public stream app --- Zotlabs/Module/Network.php | 22 ++++------------------ include/conversation.php | 19 +------------------ 2 files changed, 5 insertions(+), 36 deletions(-) diff --git a/Zotlabs/Module/Network.php b/Zotlabs/Module/Network.php index 36ae7f047..82c997270 100644 --- a/Zotlabs/Module/Network.php +++ b/Zotlabs/Module/Network.php @@ -116,7 +116,6 @@ class Network extends \Zotlabs\Web\Controller { $spam = ((x($_GET,'spam')) ? intval($_GET['spam']) : 0); $cmin = ((x($_GET,'cmin')) ? intval($_GET['cmin']) : 0); $cmax = ((x($_GET,'cmax')) ? intval($_GET['cmax']) : 99); - $firehose = ((x($_GET,'fh')) ? intval($_GET['fh']) : 0); $file = ((x($_GET,'file')) ? $_GET['file'] : ''); $xchan = ((x($_GET,'xchan')) ? $_GET['xchan'] : ''); @@ -290,9 +289,6 @@ class Network extends \Zotlabs\Web\Controller { // We only launch liveUpdate if you aren't filtering in some incompatible // way and also you aren't writing a comment (discovered in javascript). - if($gid || $cid || $cmin || ($cmax != 99) || $star || $liked || $conv || $spam || $nouveau || $list) - $firehose = 0; - $maxheight = get_pconfig(local_channel(),'system','network_divmore_height'); if(! $maxheight) $maxheight = 400; @@ -315,7 +311,7 @@ class Network extends \Zotlabs\Web\Controller { '$liked' => (($liked) ? $liked : '0'), '$conv' => (($conv) ? $conv : '0'), '$spam' => (($spam) ? $spam : '0'), - '$fh' => (($firehose) ? $firehose : '0'), + '$fh' => '0', '$nouveau' => (($nouveau) ? $nouveau : '0'), '$wall' => '0', '$static' => $static, @@ -409,17 +405,7 @@ class Network extends \Zotlabs\Web\Controller { } $abook_uids = " and abook.abook_channel = " . local_channel() . " "; - - $disable_discover_tab = get_config('system','disable_discover_tab') || get_config('system','disable_discover_tab') === false; - if($firehose && (! $disable_discover_tab)) { - require_once('include/channel.php'); - $sys = get_sys_channel(); - $uids = " and item.uid = " . intval($sys['channel_id']) . " "; - \App::$data['firehose'] = intval($sys['channel_id']); - } - else { - $uids = " and item.uid = " . local_channel() . " "; - } + $uids = " and item.uid = " . local_channel() . " "; if(get_pconfig(local_channel(),'system','network_list_mode')) $page_mode = 'list'; @@ -516,7 +502,7 @@ class Network extends \Zotlabs\Web\Controller { dbesc($parents_str) ); - xchan_query($items,true,(($firehose) ? local_channel() : 0)); + xchan_query($items,true); $items = fetch_post_tags($items,true); $items = conv_sort($items,$ordering); } @@ -546,7 +532,7 @@ class Network extends \Zotlabs\Web\Controller { } } - if(($update_unseen) && (! $firehose)) { + if($update_unseen) { $x = [ 'channel_id' => local_channel(), 'update' => 'unset' ]; call_hooks('update_unseen',$x); if($x['update'] === 'unset' || intval($x['update'])) { diff --git a/include/conversation.php b/include/conversation.php index 2d5ccb5b1..78d90a6fc 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1616,7 +1616,6 @@ function network_tabs() { $conv_active = ''; $spam_active = ''; $postord_active = ''; - $public_active = ''; if(x($_GET,'new')) { $new_active = 'active'; @@ -1638,16 +1637,11 @@ function network_tabs() { $spam_active = 'active'; } - if(x($_GET,'fh')) { - $public_active = 'active'; - } - if (($new_active == '') && ($starred_active == '') && ($conv_active == '') && ($search_active == '') - && ($spam_active == '') - && ($public_active == '')) { + && ($spam_active == '')) { $no_active = 'active'; } @@ -1665,17 +1659,6 @@ function network_tabs() { // tabs $tabs = array(); - $disable_discover_tab = get_config('system','disable_discover_tab') || get_config('system','disable_discover_tab') === false; - - if(! $disable_discover_tab) { - $tabs[] = array( - 'label' => t('Discover'), - 'url' => z_root() . '/' . $cmd . '?f=&fh=1' , - 'sel' => $public_active, - 'title' => t('Imported public streams'), - ); - } - $tabs[] = array( 'label' => t('Commented Order'), 'url'=>z_root() . '/' . $cmd . '?f=&order=comment' . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : '') . ((x($_GET,'gid')) ? '&gid=' . $_GET['gid'] : ''), From 383b7928cf41b750ec367abfc8cbfdc71e1a6291 Mon Sep 17 00:00:00 2001 From: git-marijus Date: Thu, 24 Aug 2017 22:32:28 +0200 Subject: [PATCH 145/441] minor adjustmen to the help language selector --- view/js/mod_help.js | 2 +- view/tpl/help.tpl | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/view/js/mod_help.js b/view/js/mod_help.js index 257be67e6..8ee89dd61 100644 --- a/view/js/mod_help.js +++ b/view/js/mod_help.js @@ -103,7 +103,7 @@ $(document).ready(function () { window.history.pushState({}, '', '/' + pathParts.join('/')); // Highlight the language in the language selector that is currently viewed - $('.lang-selector').find('.lang-choice:contains("' + help_language + '")').css('font-weight','bold').css('background-color','lightgray'); + $('.lang-selector').find('.lang-choice:contains("' + help_language + '")').addClass('active'); // Construct the links to the available translations based and populate the selector menu $('.lang-selector').find('.lang-choice').each(function (idx, a) { diff --git a/view/tpl/help.tpl b/view/tpl/help.tpl index bdb25edf1..d36494123 100644 --- a/view/tpl/help.tpl +++ b/view/tpl/help.tpl @@ -1,9 +1,9 @@
-
+
de From bd84a3ee08ecbf028af5b3ea672062abc93ab3e1 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Thu, 24 Aug 2017 16:58:39 -0700 Subject: [PATCH 146/441] fix permalinks for card comments (send to parent url) --- Zotlabs/Module/Item.php | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Zotlabs/Module/Item.php b/Zotlabs/Module/Item.php index 797b46f93..4131bab03 100644 --- a/Zotlabs/Module/Item.php +++ b/Zotlabs/Module/Item.php @@ -734,10 +734,21 @@ class Item extends \Zotlabs\Web\Controller { if($parent_item) $parent_mid = $parent_item['mid']; + + + // fix permalinks for cards if($webpage == ITEM_TYPE_CARD && $pagetitle) { $plink = z_root() . '/cards/' . $channel['channel_address'] . '/' . $pagetitle; } + if(($parent_item) && ($parent_item['item_type'] == ITEM_TYPE_CARD)) { + $r = q("select v from iconfig where iconfig.cat = 'system' and iconfig.k = 'CARD' and iconfig.iid = %d limit 1", + intval($parent_item['id']) + ); + if($r) { + $plink = z_root() . '/cards/' . $channel['channel_address'] . '/' . $r[0]['v']; + } + } // Fallback so that we alway have a thr_parent From 341386a95ba68227f60964ab50f9b20989ac6802 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Thu, 24 Aug 2017 18:15:19 -0700 Subject: [PATCH 147/441] make cards searchable --- Zotlabs/Module/Item.php | 28 +++++++++++++++------------- include/conversation.php | 5 ++++- include/items.php | 2 +- 3 files changed, 20 insertions(+), 15 deletions(-) diff --git a/Zotlabs/Module/Item.php b/Zotlabs/Module/Item.php index 4131bab03..a86106b6a 100644 --- a/Zotlabs/Module/Item.php +++ b/Zotlabs/Module/Item.php @@ -736,19 +736,6 @@ class Item extends \Zotlabs\Web\Controller { $parent_mid = $parent_item['mid']; - // fix permalinks for cards - - if($webpage == ITEM_TYPE_CARD && $pagetitle) { - $plink = z_root() . '/cards/' . $channel['channel_address'] . '/' . $pagetitle; - } - if(($parent_item) && ($parent_item['item_type'] == ITEM_TYPE_CARD)) { - $r = q("select v from iconfig where iconfig.cat = 'system' and iconfig.k = 'CARD' and iconfig.iid = %d limit 1", - intval($parent_item['id']) - ); - if($r) { - $plink = z_root() . '/cards/' . $channel['channel_address'] . '/' . $r[0]['v']; - } - } // Fallback so that we alway have a thr_parent @@ -759,6 +746,21 @@ class Item extends \Zotlabs\Web\Controller { $item_thread_top = ((! $parent) ? 1 : 0); + + // fix permalinks for cards + + if($webpage == ITEM_TYPE_CARD) { + $plink = z_root() . '/cards/' . $channel['channel_address'] . '/' . (($pagetitle) ? $pagetitle : substr($mid,0,16)); + } + if(($parent_item) && ($parent_item['item_type'] == ITEM_TYPE_CARD)) { + $r = q("select v from iconfig where iconfig.cat = 'system' and iconfig.k = 'CARD' and iconfig.iid = %d limit 1", + intval($parent_item['id']) + ); + if($r) { + $plink = z_root() . '/cards/' . $channel['channel_address'] . '/' . $r[0]['v']; + } + } + if ((! $plink) && ($item_thread_top)) { $plink = z_root() . '/channel/' . $channel['channel_address'] . '/?f=&mid=' . $mid; } diff --git a/include/conversation.php b/include/conversation.php index 2d5ccb5b1..5cb85c3f9 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -703,6 +703,9 @@ function conversation($items, $mode, $update, $page_mode = 'traditional', $prepa if(strcmp(datetime_convert('UTC','UTC',$item['created']),datetime_convert('UTC','UTC','now - 12 hours')) > 0) $is_new = true; + $conv_link = (($item['item_type'] == ITEM_TYPE_CARD) ? $item['plink'] : z_root() . '/display/' . gen_link_id($item['mid'])); + + $tmp_item = array( 'template' => $tpl, 'toplevel' => 'toplevel_item', @@ -757,7 +760,7 @@ function conversation($items, $mode, $update, $page_mode = 'traditional', $prepa 'like' => '', 'dislike' => '', 'comment' => '', - 'conv' => (($preview) ? '' : array('href'=> z_root() . '/display/' . gen_link_id($item['mid']), 'title'=> t('View in context'))), + 'conv' => (($preview) ? '' : array('href'=> $conv_link, 'title'=> t('View in context'))), 'previewing' => $previewing, 'wait' => t('Please wait'), 'thread_level' => 1, diff --git a/include/items.php b/include/items.php index 070c4571a..8489ec162 100755 --- a/include/items.php +++ b/include/items.php @@ -177,7 +177,7 @@ function item_normal() { } function item_normal_search() { - return " and item.item_hidden = 0 and item.item_type in (0,3) and item.item_deleted = 0 + return " and item.item_hidden = 0 and item.item_type in (0,3,6) and item.item_deleted = 0 and item.item_unpublished = 0 and item.item_delayed = 0 and item.item_pending_remove = 0 and item.item_blocked = 0 "; } From 5c92337821834853dc03eecbc8af9e59b16b70a1 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Thu, 24 Aug 2017 18:34:12 -0700 Subject: [PATCH 148/441] cards - change placeholdertext, separate from button text --- Zotlabs/Module/Cards.php | 2 ++ include/conversation.php | 6 +++++- view/tpl/jot.tpl | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Zotlabs/Module/Cards.php b/Zotlabs/Module/Cards.php index 9114e3b89..22c5d673c 100644 --- a/Zotlabs/Module/Cards.php +++ b/Zotlabs/Module/Cards.php @@ -92,6 +92,8 @@ class Cards extends \Zotlabs\Web\Controller { $x = [ 'webpage' => ITEM_TYPE_CARD, 'is_owner' => true, + 'content_label' => t('Add Card'), + 'button' => t('Create'), 'nickname' => $channel['channel_address'], 'lockstate' => (($channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'), diff --git a/include/conversation.php b/include/conversation.php index 5cb85c3f9..9a48a83d2 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1340,10 +1340,14 @@ function status_editor($a, $x, $popup = false) { call_hooks('jot_networks', $jotnets); } + $sharebutton = (x($x,'button') ? $x['button'] : t('Share')); + $placeholdtext = (x($x,'content_label') ? $x['content_label'] : $sharebutton); + $o .= replace_macros($tpl, array( '$return_path' => ((x($x, 'return_path')) ? $x['return_path'] : App::$query_string), '$action' => z_root() . '/item', - '$share' => (x($x,'button') ? $x['button'] : t('Share')), + '$share' => $sharebutton, + '$placeholdtext' => $placeholdtext, '$webpage' => $webpage, '$placeholdpagetitle' => ((x($x,'ptlabel')) ? $x['ptlabel'] : t('Page link name')), '$pagetitle' => (x($x,'pagetitle') ? $x['pagetitle'] : ''), diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index 39ba9e59b..ce17f2f24 100755 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -41,7 +41,7 @@
{{/if}}
- +
{{if $attachment}}
From 45c033b9aa461ade1e9041f919c317752d86a315 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Thu, 24 Aug 2017 18:39:50 -0700 Subject: [PATCH 149/441] fix title of edit card which showed up as 'edit block' due to copy/paste --- Zotlabs/Module/Card_edit.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Zotlabs/Module/Card_edit.php b/Zotlabs/Module/Card_edit.php index b5b44c567..6927c0b6f 100644 --- a/Zotlabs/Module/Card_edit.php +++ b/Zotlabs/Module/Card_edit.php @@ -123,7 +123,7 @@ class Card_edit extends \Zotlabs\Web\Controller { $editor = status_editor($a, $x); $o .= replace_macros(get_markup_template('edpost_head.tpl'), array( - '$title' => t('Edit Block'), + '$title' => t('Edit Card'), '$delete' => ((($itm[0]['author_xchan'] === $ob_hash) || ($itm[0]['owner_xchan'] === $ob_hash)) ? t('Delete') : false), '$id' => $itm[0]['id'], '$editor' => $editor From 0098dce5976bffb23dbb31d151d2d871c7cab8f9 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Fri, 25 Aug 2017 00:00:51 -0700 Subject: [PATCH 150/441] radically reduce code duplication in updateConvItems(); it's a bit easier to understand now although the different modes aren't as cleanly separated as they were. --- view/js/main.js | 166 ++++++++++++++++-------------------------------- 1 file changed, 56 insertions(+), 110 deletions(-) diff --git a/view/js/main.js b/view/js/main.js index fd3c8b08f..ece4c2015 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -533,133 +533,76 @@ function updatePageItems(mode, data) { function updateConvItems(mode,data) { - if(mode === 'update') { + if(mode === 'update' || mode === 'replace') { prev = 'threads-begin'; - - $('.thread-wrapper.toplevel_item',data).each(function() { - - var ident = $(this).attr('id'); - // This should probably use the context argument instead - var commentWrap = $('#'+ident+' .collapsed-comments').attr('id'); - var itmId = 0; - var isVisible = false; - - if(typeof commentWrap !== 'undefined') - itmId = commentWrap.replace('collapsed-comments-',''); - - if($('#' + ident).length == 0 && profile_page == 1) { - $('img',this).each(function() { - $(this).attr('src',$(this).attr('dst')); - }); - if($('#collapsed-comments-'+itmId).is(':visible')) - isVisible = true; - $('#' + prev).after($(this)); - if(isVisible) - showHideComments(itmId); - $("> .wall-item-outside-wrapper .autotime, > .thread-wrapper .autotime",this).timeago(); - $("> .shared_header .autotime",this).timeago(); - } - else { - $('img',this).each(function() { - $(this).attr('src',$(this).attr('dst')); - }); - if($('#collapsed-comments-'+itmId).is(':visible')) - isVisible = true; - $('#' + ident).replaceWith($(this)); - if(isVisible) - showHideComments(itmId); - $("> .wall-item-outside-wrapper .autotime, > .thread-wrapper .autotime",this).timeago(); - $("> .shared_header .autotime",this).timeago(); - } - prev = ident; - }); } if(mode === 'append') { - next = 'threads-end'; - - $('.thread-wrapper.toplevel_item',data).each(function() { - var ident = $(this).attr('id'); - var commentWrap = $('#'+ident+' .collapsed-comments').attr('id'); - var itmId = 0; - var isVisible = false; - - if(typeof commentWrap !== 'undefined') - itmId = commentWrap.replace('collapsed-comments-', ''); - - if($('#' + ident).length == 0) { - $('img',this).each(function() { - $(this).attr('src',$(this).attr('dst')); - }); - if($('#collapsed-comments-'+itmId).is(':visible')) - isVisible = true; - $('#threads-end').before($(this)); - if(isVisible) - showHideComments(itmId); - $("> .wall-item-outside-wrapper .autotime, > .thread-wrapper .autotime",this).timeago(); - $("> .shared_header .autotime",this).timeago(); - } - else { - $('img',this).each(function() { - $(this).attr('src', $(this).attr('dst')); - }); - if($('#collapsed-comments-'+itmId).is(':visible')) - isVisible = true; - $('#' + ident).replaceWith($(this)); - if(isVisible) - showHideComments(itmId); - $("> .wall-item-outside-wrapper .autotime, > .thread-wrapper .autotime",this).timeago(); - $("> .shared_header .autotime",this).timeago(); - } - }); - - if(loadingPage) { - loadingPage = false; - } } + if(mode === 'replace') { - // clear existing content - $('.thread-wrapper').remove(); + $('.thread-wrapper').remove(); // clear existing content + } - prev = 'threads-begin'; + $('.thread-wrapper.toplevel_item',data).each(function() { - $('.thread-wrapper.toplevel_item',data).each(function() { + var ident = $(this).attr('id'); - var ident = $(this).attr('id'); - var commentWrap = $('#'+ident+' .collapsed-comments').attr('id'); - var itmId = 0; - var isVisible = false; + var commentWrap = $('#'+ident+' .collapsed-comments').attr('id'); + var itmId = 0; + var isVisible = false; - if(typeof commentWrap !== 'undefined') - itmId = commentWrap.replace('collapsed-comments-',''); + // figure out the comment state + if(typeof commentWrap !== 'undefined') + itmId = commentWrap.replace('collapsed-comments-',''); + + if($('#collapsed-comments-'+itmId).is(':visible')) + isVisible = true; - if($('#' + ident).length == 0 && profile_page == 1) { - $('img',this).each(function() { - $(this).attr('src',$(this).attr('dst')); - }); - if($('#collapsed-comments-'+itmId).is(':visible')) - isVisible = true; - $('#' + prev).after($(this)); - if(isVisible) - showHideComments(itmId); - $("> .wall-item-outside-wrapper .autotime, > .thread-wrapper .autotime",this).timeago(); - $("> .shared_header .autotime",this).timeago(); + // insert the content according to the mode and first_page + // and whether or not the content exists already (overwrite it) + + if($('#' + ident).length == 0) { + if((mode === 'update' || mode === 'replace') && profile_page == 1) { + $('#' + prev).after($(this)); + prev = ident; } - prev = ident; - }); + if(mode === 'append') { + $('#' + next).before($(this)); + } + } + else { + $('#' + ident).replaceWith($(this)); + } - if(loadingPage) { + // set the comment state to the state we discovered earlier + + if(isVisible) + showHideComments(itmId); + + // trigger the autotime function on all newly created content + + $("> .wall-item-outside-wrapper .autotime, > .thread-wrapper .autotime",this).timeago(); + $("> .shared_header .autotime",this).timeago(); + + if((mode === 'append' || mode === 'replace') && (loadingPage)) { loadingPage = false; } - if (window.location.search.indexOf("mid=") != -1 || window.location.pathname.indexOf("display") != -1) { - var title = $(".wall-item-title").text(); - title.replace(/^\s+/, ''); - title.replace(/\s+$/, ''); - if (title) - document.title = title + " - " + document.title; + // if single thread view and the item has a title, display it in the title bar + + if(mode === 'replace') { + if (window.location.search.indexOf("mid=") != -1 || window.location.pathname.indexOf("display") != -1) { + var title = $(".wall-item-title").text(); + title.replace(/^\s+/, ''); + title.replace(/\s+$/, ''); + if (title) + document.title = title + " - " + document.title; + } } - } + }); + + // reset rotators and cursors we may have set before reaching this place $('.like-rotator').spin(false); @@ -668,6 +611,9 @@ function updateConvItems(mode,data) { $('body').css('cursor', 'auto'); } + // Setup to determine if the media player is playing. This affects + // some content loading decisions. + $('video').off('playing'); $('video').off('pause'); $('audio').off('playing'); From 75f3e9202e191486b8c9079b08cc6de4e1251b8d Mon Sep 17 00:00:00 2001 From: Andrew Manning Date: Fri, 25 Aug 2017 11:32:18 +0000 Subject: [PATCH 151/441] Removed duplicated table of contents (TOC) in Help pages by breaking hierarchical TOC loading. --- Zotlabs/Widget/Helpindex.php | 2 ++ include/help.php | 8 +++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Zotlabs/Widget/Helpindex.php b/Zotlabs/Widget/Helpindex.php index 8299cf16a..6c8748194 100644 --- a/Zotlabs/Widget/Helpindex.php +++ b/Zotlabs/Widget/Helpindex.php @@ -25,6 +25,7 @@ class Helpindex { // TODO: Implement support for translations in hierarchical table of content files + /* if(argc() > 2) { $path = ''; for($x = 1; $x < argc(); $x ++) { @@ -36,6 +37,7 @@ class Helpindex { $levels[] = preg_replace('/\/','
    ',$y); } } + */ if($level_0) $o .= $level_0; diff --git a/include/help.php b/include/help.php index ef6b77e12..02c3cb8e4 100644 --- a/include/help.php +++ b/include/help.php @@ -28,16 +28,22 @@ function get_help_content($tocpath = false) { } if($path) { + $title = basename($path); if(! $tocpath) \App::$page['title'] = t('Help:') . ' ' . ucwords(str_replace('-',' ',notags($title))); + // Check that there is a "toc" or "sitetoc" located at the specified path. + // If there is not, then there was not a translation of the table of contents + // available and so default back to the English TOC at /doc/toc.{html,bb,md} + // TODO: This is incompatible with the hierarchical TOC construction + // defined in /Zotlabs/Widget/Helpindex.php. if($tocpath !== false && load_doc_file('doc/' . $path . '.md') === '' && load_doc_file('doc/' . $path . '.bb') === '' && load_doc_file('doc/' . $path . '.html') === '' ) { - $path = 'toc'; + $path = $title; } $text = load_doc_file('doc/' . $path . '.md'); From 187f19b1704b8a877b53a3e66c67ec26383a3ee9 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Sat, 26 Aug 2017 17:21:33 -0700 Subject: [PATCH 152/441] fix titles on ajaxupdate issue, add jsonld-php library --- library/jsonld/LICENSE | 30 + library/jsonld/README.md | 193 ++ library/jsonld/composer.json | 29 + library/jsonld/jsonld.php | 6038 ++++++++++++++++++++++++++++++++++ library/jsonld/test.php | 765 +++++ view/js/main.js | 5 +- 6 files changed, 7058 insertions(+), 2 deletions(-) create mode 100644 library/jsonld/LICENSE create mode 100644 library/jsonld/README.md create mode 100644 library/jsonld/composer.json create mode 100644 library/jsonld/jsonld.php create mode 100644 library/jsonld/test.php diff --git a/library/jsonld/LICENSE b/library/jsonld/LICENSE new file mode 100644 index 000000000..bd572d3e0 --- /dev/null +++ b/library/jsonld/LICENSE @@ -0,0 +1,30 @@ +BSD 3-Clause License +Copyright (c) 2011, Digital Bazaar, Inc. +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +Redistributions of source code must retain the above copyright notice, +this list of conditions and the following disclaimer. + +Redistributions in binary form must reproduce the above copyright +notice, this list of conditions and the following disclaimer in the +documentation and/or other materials provided with the distribution. + +Neither the name of the Digital Bazaar, Inc. nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS +IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED +TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A +PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED +TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + diff --git a/library/jsonld/README.md b/library/jsonld/README.md new file mode 100644 index 000000000..5853c94bf --- /dev/null +++ b/library/jsonld/README.md @@ -0,0 +1,193 @@ +php-json-ld +=========== + +[![Build Status][travis-ci-png]][travis-ci-site] +[travis-ci-png]: https://travis-ci.org/digitalbazaar/php-json-ld.png?branch=master +[travis-ci-site]: https://travis-ci.org/digitalbazaar/php-json-ld + +Introduction +------------ + +This library is an implementation of the [JSON-LD][] specification in [PHP][]. + +JSON, as specified in [RFC7159][], is a simple language for representing +objects on the Web. Linked Data is a way of describing content across +different documents or Web sites. Web resources are described using +IRIs, and typically are dereferencable entities that may be used to find +more information, creating a "Web of Knowledge". [JSON-LD][] is intended +to be a simple publishing method for expressing not only Linked Data in +JSON, but for adding semantics to existing JSON. + +JSON-LD is designed as a light-weight syntax that can be used to express +Linked Data. It is primarily intended to be a way to express Linked Data +in JavaScript and other Web-based programming environments. It is also +useful when building interoperable Web Services and when storing Linked +Data in JSON-based document storage engines. It is practical and +designed to be as simple as possible, utilizing the large number of JSON +parsers and existing code that is in use today. It is designed to be +able to express key-value pairs, RDF data, [RDFa][] data, +[Microformats][] data, and [Microdata][]. That is, it supports every +major Web-based structured data model in use today. + +The syntax does not require many applications to change their JSON, but +easily add meaning by adding context in a way that is either in-band or +out-of-band. The syntax is designed to not disturb already deployed +systems running on JSON, but provide a smooth migration path from JSON +to JSON with added semantics. Finally, the format is intended to be fast +to parse, fast to generate, stream-based and document-based processing +compatible, and require a very small memory footprint in order to operate. + +## Quick Examples + +```php +$doc = (object)array( + "http://schema.org/name" => "Manu Sporny", + "http://schema.org/url" => (object)array("@id" => "http://manu.sporny.org/"), + "http://schema.org/image" => (object)array("@id" => "http://manu.sporny.org/images/manu.png") +); + +$context = (object)array( + "name" => "http://schema.org/name", + "homepage" => (object)array("@id" => "http://schema.org/url", "@type" => "@id"), + "image" => (object)array("@id" => "http://schema.org/image", "@type" => "@id") +); + +// compact a document according to a particular context +// see: http://json-ld.org/spec/latest/json-ld/#compacted-document-form +$compacted = jsonld_compact($doc, $context); + +echo json_encode($compacted, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES); +/* Output: +{ + "@context": {...}, + "image": "http://manu.sporny.org/images/manu.png", + "homepage": "http://manu.sporny.org/", + "name": "Manu Sporny" +} +*/ + +// compact using URLs +jsonld_compact('http://example.org/doc', 'http://example.org/context'); + +// expand a document, removing its context +// see: http://json-ld.org/spec/latest/json-ld/#expanded-document-form +$expanded = jsonld_expand($compacted) { +echo json_encode($expanded, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES); +/* Output: +{ + "http://schema.org/image": [{"@id": "http://manu.sporny.org/images/manu.png"}], + "http://schema.org/name": [{"@value": "Manu Sporny"}], + "http://schema.org/url": [{"@id": "http://manu.sporny.org/"}] +} +*/ + +// expand using URLs +jsonld_expand('http://example.org/doc'); + +// flatten a document +// see: http://json-ld.org/spec/latest/json-ld/#flattened-document-form +$flattened = jsonld_flatten($doc); +// all deep-level trees flattened to the top-level + +// frame a document +// see: http://json-ld.org/spec/latest/json-ld-framing/#introduction +$framed = jsonld_frame($doc, $frame); +// document transformed into a particular tree structure per the given frame + +// normalize a document using the RDF Dataset Normalization Algorithm +// (URDNA2015), see: http://json-ld.github.io/normalization/spec/ +$normalized = jsonld_normalize( + $doc, array('algorithm' => 'URDNA2015', 'format' => 'application/nquads')); +// normalized is a string that is a canonical representation of the document +// that can be used for hashing, comparison, etc. + +// force HTTPS-only context loading: +// use built-in secure document loader +jsonld_set_document_loader('jsonld_default_secure_document_loader'); + +// set a default custom document loader +jsonld_set_document_loader('my_custom_doc_loader'); + +// a custom loader that demonstrates using a simple in-memory mock for +// certain contexts before falling back to the default loader +// note: if you want to set this loader as the new default, you'll need to +// store the previous default in another variable first and access that inside +// the loader +global $mocks; +$mocks = array('http://example.com/mycontext' => (object)array( + 'hombre' => 'http://schema.org/name')); +function mock_load($url) { + global $jsonld_default_load_document, $mocks; + if(isset($mocks[$url])) { + // return a "RemoteDocument", it has these three properties: + return (object)array( + 'contextUrl' => null, + 'document' => $mocks[$url], + 'documentUrl' => $url); + } + // use default loader + return call_user_func($jsonld_default_load_document, $url); +} + +// use the mock loader for just this call, witout modifying the default one +$compacted = jsonld_compact($foo, 'http://example.com/mycontext', array( + 'documentLoader' => 'mock_load')); + +// a custom loader that uses a simplistic in-memory cache (no invalidation) +global $cache; +$cache = array(); +function cache_load($url) { + global $jsonld_default_load_document, $cache; + if(isset($cache[$url])) { + return $cache[$url]; + } + // use default loader + $doc = call_user_func($jsonld_default_load_document, $url); + $cache[$url] = $doc; + return $doc; +} + +// use the cache loader for just this call, witout modifying the default one +$compacted = jsonld_compact($foo, 'http://schema.org', array( + 'documentLoader' => 'cache_load')); +``` + +Commercial Support +------------------ + +Commercial support for this library is available upon request from +[Digital Bazaar][]: support@digitalbazaar.com + +Source +------ + +The source code for the PHP implementation of the JSON-LD API +is available at: + +http://github.com/digitalbazaar/php-json-ld + +Tests +----- + +This library includes a sample testing utility which may be used to verify +that changes to the processor maintain the correct output. + +To run the sample tests you will need to get the test suite files by cloning +the `json-ld.org` and `normalization` repositories hosted on GitHub: + +- https://github.com/json-ld/json-ld.org +- https://github.com/json-ld/normalization + +Then run the PHPUnit test.php application and point it at the directories +containing the tests: + + phpunit --group json-ld.org test.php -d {PATH_TO_JSON_LD_ORG/test-suite} + phpunit --group normalization test.php -d {PATH_TO_NORMALIZATION/tests} + +[Digital Bazaar]: http://digitalbazaar.com/ +[JSON-LD]: http://json-ld.org/ +[Microdata]: http://www.w3.org/TR/microdata/ +[Microformats]: http://microformats.org/ +[PHP]: http://php.net +[RDFa]: http://www.w3.org/TR/rdfa-core/ +[RFC7159]: http://tools.ietf.org/html/rfc7159 diff --git a/library/jsonld/composer.json b/library/jsonld/composer.json new file mode 100644 index 000000000..cc985b23e --- /dev/null +++ b/library/jsonld/composer.json @@ -0,0 +1,29 @@ +{ + "name": "digitalbazaar/json-ld", + "type": "library", + "description": "A JSON-LD Processor and API implementation in PHP.", + "keywords": [ + "JSON", + "Linked Data", + "JSON-LD", + "RDF", + "Semantic Web", + "jsonld" + ], + "homepage": "https://github.com/digitalbazaar/php-json-ld", + "license": "BSD-3-Clause", + "authors": [ + { + "name": "Digital Bazaar, Inc.", + "email": "support@digitalbazaar.com", + "url": "http://digitalbazaar.com/" + } + ], + "require": { + "php": ">=5.3.0", + "ext-json": "*" + }, + "autoload": { + "files": [ "jsonld.php" ] + } +} diff --git a/library/jsonld/jsonld.php b/library/jsonld/jsonld.php new file mode 100644 index 000000000..28b3e7ce3 --- /dev/null +++ b/library/jsonld/jsonld.php @@ -0,0 +1,6038 @@ +compact($input, $ctx, $options); +} + +/** + * Performs JSON-LD expansion. + * + * @param mixed $input the JSON-LD object to expand. + * @param assoc[$options] the options to use: + * [base] the base IRI to use. + * [documentLoader(url)] the document loader. + * + * @return array the expanded JSON-LD output. + */ +function jsonld_expand($input, $options=array()) { + $p = new JsonLdProcessor(); + return $p->expand($input, $options); +} + +/** + * Performs JSON-LD flattening. + * + * @param mixed $input the JSON-LD to flatten. + * @param mixed $ctx the context to use to compact the flattened output, or + * null. + * @param [options] the options to use: + * [base] the base IRI to use. + * [documentLoader(url)] the document loader. + * + * @return mixed the flattened JSON-LD output. + */ +function jsonld_flatten($input, $ctx, $options=array()) { + $p = new JsonLdProcessor(); + return $p->flatten($input, $ctx, $options); +} + +/** + * Performs JSON-LD framing. + * + * @param mixed $input the JSON-LD object to frame. + * @param stdClass $frame the JSON-LD frame to use. + * @param assoc [$options] the framing options. + * [base] the base IRI to use. + * [embed] default @embed flag (default: true). + * [explicit] default @explicit flag (default: false). + * [requireAll] default @requireAll flag (default: true). + * [omitDefault] default @omitDefault flag (default: false). + * [documentLoader(url)] the document loader. + * + * @return stdClass the framed JSON-LD output. + */ +function jsonld_frame($input, $frame, $options=array()) { + $p = new JsonLdProcessor(); + return $p->frame($input, $frame, $options); +} + +/** + * **Experimental** + * + * Links a JSON-LD document's nodes in memory. + * + * @param mixed $input the JSON-LD document to link. + * @param mixed $ctx the JSON-LD context to apply or null. + * @param assoc [$options] the options to use: + * [base] the base IRI to use. + * [expandContext] a context to expand with. + * [documentLoader(url)] the document loader. + * + * @return the linked JSON-LD output. + */ +function jsonld_link($input, $ctx, $options) { + // API matches running frame with a wildcard frame and embed: '@link' + // get arguments + $frame = new stdClass(); + if($ctx) { + $frame->{'@context'} = $ctx; + } + $frame->{'@embed'} = '@link'; + return jsonld_frame($input, $frame, $options); +}; + +/** + * Performs RDF dataset normalization on the given input. The input is + * JSON-LD unless the 'inputFormat' option is used. The output is an RDF + * dataset unless the 'format' option is used. + * + * @param mixed $input the JSON-LD object to normalize. + * @param assoc [$options] the options to use: + * [base] the base IRI to use. + * [intputFormat] the format if input is not JSON-LD: + * 'application/nquads' for N-Quads. + * [format] the format if output is a string: + * 'application/nquads' for N-Quads. + * [documentLoader(url)] the document loader. + * + * @return mixed the normalized output. + */ +function jsonld_normalize($input, $options=array()) { + $p = new JsonLdProcessor(); + return $p->normalize($input, $options); +} + +/** + * Converts an RDF dataset to JSON-LD. + * + * @param mixed $input a serialized string of RDF in a format specified + * by the format option or an RDF dataset to convert. + * @param assoc [$options] the options to use: + * [format] the format if input not an array: + * 'application/nquads' for N-Quads (default). + * [useRdfType] true to use rdf:type, false to use @type + * (default: false). + * [useNativeTypes] true to convert XSD types into native types + * (boolean, integer, double), false not to (default: false). + * + * @return array the JSON-LD output. + */ +function jsonld_from_rdf($input, $options=array()) { + $p = new JsonLdProcessor(); + return $p->fromRDF($input, $options); +} + +/** + * Outputs the RDF dataset found in the given JSON-LD object. + * + * @param mixed $input the JSON-LD object. + * @param assoc [$options] the options to use: + * [base] the base IRI to use. + * [format] the format to use to output a string: + * 'application/nquads' for N-Quads. + * [produceGeneralizedRdf] true to output generalized RDF, false + * to produce only standard RDF (default: false). + * [documentLoader(url)] the document loader. + * + * @return mixed the resulting RDF dataset (or a serialization of it). + */ +function jsonld_to_rdf($input, $options=array()) { + $p = new JsonLdProcessor(); + return $p->toRDF($input, $options); +} + +/** + * JSON-encodes (with unescaped slashes) the given stdClass or array. + * + * @param mixed $input the native PHP stdClass or array which will be + * converted to JSON by json_encode(). + * @param int $options the options to use. + * [JSON_PRETTY_PRINT] pretty print. + * @param int $depth the maximum depth to use. + * + * @return the encoded JSON data. + */ +function jsonld_encode($input, $options=0, $depth=512) { + // newer PHP has a flag to avoid escaped '/' + if(defined('JSON_UNESCAPED_SLASHES')) { + return json_encode($input, JSON_UNESCAPED_SLASHES | $options, $depth); + } + // use a simple string replacement of '\/' to '/'. + return str_replace('\\/', '/', json_encode($input, $options, $depth)); +} + +/** + * Decodes a serialized JSON-LD object. + * + * @param string $input the JSON-LD input. + * + * @return mixed the resolved JSON-LD object, null on error. + */ +function jsonld_decode($input) { + return json_decode($input); +} + +/** + * Parses a link header. The results will be key'd by the value of "rel". + * + * Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" + * + * Parses as: { + * 'http://www.w3.org/ns/json-ld#context': { + * target: http://json-ld.org/contexts/person.jsonld, + * type: 'application/ld+json' + * } + * } + * + * If there is more than one "rel" with the same IRI, then entries in the + * resulting map for that "rel" will be arrays of objects, otherwise they will + * be single objects. + * + * @param string $header the link header to parse. + * + * @return assoc the parsed result. + */ +function jsonld_parse_link_header($header) { + $rval = array(); + // split on unbracketed/unquoted commas + if(!preg_match_all( + '/(?:<[^>]*?>|"[^"]*?"|[^,])+/', $header, $entries, PREG_SET_ORDER)) { + return $rval; + } + $r_link_header = '/\s*<([^>]*?)>\s*(?:;\s*(.*))?/'; + foreach($entries as $entry) { + if(!preg_match($r_link_header, $entry[0], $match)) { + continue; + } + $result = (object)array('target' => $match[1]); + $params = $match[2]; + $r_params = '/(.*?)=(?:(?:"([^"]*?)")|([^"]*?))\s*(?:(?:;\s*)|$)/'; + preg_match_all($r_params, $params, $matches, PREG_SET_ORDER); + foreach($matches as $match) { + $result->{$match[1]} = $match[2] ?: $match[3]; + } + $rel = property_exists($result, 'rel') ? $result->rel : ''; + if(!isset($rval[$rel])) { + $rval[$rel] = $result; + } else if(is_array($rval[$rel])) { + $rval[$rel][] = $result; + } else { + $rval[$rel] = array($rval[$rel], $result); + } + } + return $rval; +} + +/** + * Relabels all blank nodes in the given JSON-LD input. + * + * @param mixed input the JSON-LD input. + */ +function jsonld_relabel_blank_nodes($input) { + $p = new JsonLdProcessor(); + return $p->_labelBlankNodes(new UniqueNamer('_:b'), $input); +} + +/** JSON-LD shared in-memory cache. */ +global $jsonld_cache; +$jsonld_cache = new stdClass(); + +/** The default active context cache. */ +$jsonld_cache->activeCtx = new ActiveContextCache(); + +/** Stores the default JSON-LD document loader. */ +global $jsonld_default_load_document; +$jsonld_default_load_document = 'jsonld_default_document_loader'; + +/** + * Sets the default JSON-LD document loader. + * + * @param callable load_document(url) the document loader. + */ +function jsonld_set_document_loader($load_document) { + global $jsonld_default_load_document; + $jsonld_default_load_document = $load_document; +} + +/** + * Retrieves JSON-LD at the given URL. + * + * @param string $url the URL to retrieve. + * + * @return the JSON-LD. + */ +function jsonld_get_url($url) { + global $jsonld_default_load_document; + if($jsonld_default_load_document !== null) { + $document_loader = $jsonld_default_load_document; + } else { + $document_loader = 'jsonld_default_document_loader'; + } + + $remote_doc = call_user_func($document_loader, $url); + if($remote_doc) { + return $remote_doc->document; + } + return null; +} + +/** + * The default implementation to retrieve JSON-LD at the given URL. + * + * @param string $url the URL to to retrieve. + * + * @return stdClass the RemoteDocument object. + */ +function jsonld_default_document_loader($url) { + $doc = (object)array( + 'contextUrl' => null, 'document' => null, 'documentUrl' => $url); + $redirects = array(); + + $opts = array( + 'http' => array( + 'method' => 'GET', + 'header' => + "Accept: application/ld+json\r\n"), + /* Note: Use jsonld_default_secure_document_loader for security. */ + 'ssl' => array( + 'verify_peer' => false, + 'allow_self_signed' => true) + ); + + $context = stream_context_create($opts); + $content_type = null; + stream_context_set_params($context, array('notification' => + function($notification_code, $severity, $message) use ( + &$redirects, &$content_type) { + switch($notification_code) { + case STREAM_NOTIFY_REDIRECTED: + $redirects[] = $message; + break; + case STREAM_NOTIFY_MIME_TYPE_IS: + $content_type = $message; + break; + }; + })); + $result = @file_get_contents($url, false, $context); + if($result === false) { + throw new JsonLdException( + 'Could not retrieve a JSON-LD document from the URL: ' . $url, + 'jsonld.LoadDocumentError', 'loading document failed'); + } + $link_header = array(); + foreach($http_response_header as $header) { + if(strpos($header, 'link') === 0) { + $value = explode(': ', $header); + if(count($value) > 1) { + $link_header[] = $value[1]; + } + } + } + $link_header = jsonld_parse_link_header(join(',', $link_header)); + if(isset($link_header['http://www.w3.org/ns/json-ld#context'])) { + $link_header = $link_header['http://www.w3.org/ns/json-ld#context']; + } else { + $link_header = null; + } + if($link_header && $content_type !== 'application/ld+json') { + // only 1 related link header permitted + if(is_array($link_header)) { + throw new JsonLdException( + 'URL could not be dereferenced, it has more than one ' . + 'associated HTTP Link Header.', 'jsonld.LoadDocumentError', + 'multiple context link headers', array('url' => $url)); + } + $doc->{'contextUrl'} = $link_header->target; + } + + // update document url based on redirects + $redirs = count($redirects); + if($redirs > 0) { + $url = $redirects[$redirs - 1]; + } + $doc->document = $result; + $doc->documentUrl = $url; + return $doc; +} + +/** + * The default implementation to retrieve JSON-LD at the given secure URL. + * + * @param string $url the secure URL to to retrieve. + * + * @return stdClass the RemoteDocument object. + */ +function jsonld_default_secure_document_loader($url) { + if(strpos($url, 'https') !== 0) { + throw new JsonLdException( + "Could not GET url: '$url'; 'https' is required.", + 'jsonld.LoadDocumentError', 'loading document failed'); + } + + $doc = (object)array( + 'contextUrl' => null, 'document' => null, 'documentUrl' => $url); + $redirects = array(); + + // default JSON-LD https GET implementation + $opts = array( + 'http' => array( + 'method' => 'GET', + 'header' => + "Accept: application/ld+json\r\n"), + 'ssl' => array( + 'verify_peer' => true, + 'allow_self_signed' => false, + 'cafile' => '/etc/ssl/certs/ca-certificates.crt')); + $context = stream_context_create($opts); + $content_type = null; + stream_context_set_params($context, array('notification' => + function($notification_code, $severity, $message) use ( + &$redirects, &$content_type) { + switch($notification_code) { + case STREAM_NOTIFY_REDIRECTED: + $redirects[] = $message; + break; + case STREAM_NOTIFY_MIME_TYPE_IS: + $content_type = $message; + break; + }; + })); + $result = @file_get_contents($url, false, $context); + if($result === false) { + throw new JsonLdException( + 'Could not retrieve a JSON-LD document from the URL: ' + $url, + 'jsonld.LoadDocumentError', 'loading document failed'); + } + $link_header = array(); + foreach($http_response_header as $header) { + if(strpos($header, 'link') === 0) { + $value = explode(': ', $header); + if(count($value) > 1) { + $link_header[] = $value[1]; + } + } + } + $link_header = jsonld_parse_link_header(join(',', $link_header)); + if(isset($link_header['http://www.w3.org/ns/json-ld#context'])) { + $link_header = $link_header['http://www.w3.org/ns/json-ld#context']; + } else { + $link_header = null; + } + if($link_header && $content_type !== 'application/ld+json') { + // only 1 related link header permitted + if(is_array($link_header)) { + throw new JsonLdException( + 'URL could not be dereferenced, it has more than one ' . + 'associated HTTP Link Header.', 'jsonld.LoadDocumentError', + 'multiple context link headers', array('url' => $url)); + } + $doc->{'contextUrl'} = $link_header->target; + } + + // update document url based on redirects + foreach($redirects as $redirect) { + if(strpos($redirect, 'https') !== 0) { + throw new JsonLdException( + "Could not GET redirected url: '$redirect'; 'https' is required.", + 'jsonld.LoadDocumentError', 'loading document failed'); + } + $url = $redirect; + } + $doc->document = $result; + $doc->documentUrl = $url; + return $doc; +} + +/** Registered global RDF dataset parsers hashed by content-type. */ +global $jsonld_rdf_parsers; +$jsonld_rdf_parsers = new stdClass(); + +/** + * Registers a global RDF dataset parser by content-type, for use with + * jsonld_from_rdf. Global parsers will be used by JsonLdProcessors that do + * not register their own parsers. + * + * @param string $content_type the content-type for the parser. + * @param callable $parser(input) the parser function (takes a string as + * a parameter and returns an RDF dataset). + */ +function jsonld_register_rdf_parser($content_type, $parser) { + global $jsonld_rdf_parsers; + $jsonld_rdf_parsers->{$content_type} = $parser; +} + +/** + * Unregisters a global RDF dataset parser by content-type. + * + * @param string $content_type the content-type for the parser. + */ +function jsonld_unregister_rdf_parser($content_type) { + global $jsonld_rdf_parsers; + if(property_exists($jsonld_rdf_parsers, $content_type)) { + unset($jsonld_rdf_parsers->{$content_type}); + } +} + +/** + * Parses a URL into its component parts. + * + * @param string $url the URL to parse. + * + * @return assoc the parsed URL. + */ +function jsonld_parse_url($url) { + if($url === null) { + $url = ''; + } + + $keys = array( + 'href', 'protocol', 'scheme', '?authority', 'authority', + '?auth', 'auth', 'user', 'pass', 'host', '?port', 'port', 'path', + '?query', 'query', '?fragment', 'fragment'); + $regex = "/^(([^:\/?#]+):)?(\/\/(((([^:@]*)(?::([^:@]*))?)?@)?([^:\/?#]*)(:(\d*))?))?([^?#]*)(\?([^#]*))?(#(.*))?/"; + preg_match($regex, $url, $match); + + $rval = array(); + $flags = array(); + $len = count($keys); + for($i = 0; $i < $len; ++$i) { + $key = $keys[$i]; + if(strpos($key, '?') === 0) { + $flags[substr($key, 1)] = !empty($match[$i]); + } else if(!isset($match[$i])) { + $rval[$key] = null; + } else { + $rval[$key] = $match[$i]; + } + } + + if(!$flags['authority']) { + $rval['authority'] = null; + } + if(!$flags['auth']) { + $rval['auth'] = $rval['user'] = $rval['pass'] = null; + } + if(!$flags['port']) { + $rval['port'] = null; + } + if(!$flags['query']) { + $rval['query'] = null; + } + if(!$flags['fragment']) { + $rval['fragment'] = null; + } + + $rval['normalizedPath'] = jsonld_remove_dot_segments( + $rval['path'], !!$rval['authority']); + + return $rval; +} + +/** + * Removes dot segments from a URL path. + * + * @param string $path the path to remove dot segments from. + * @param bool $has_authority true if the URL has an authority, false if not. + */ +function jsonld_remove_dot_segments($path, $has_authority) { + $rval = ''; + + if(strpos($path, '/') === 0) { + $rval = '/'; + } + + // RFC 3986 5.2.4 (reworked) + $input = explode('/', $path); + $output = array(); + while(count($input) > 0) { + if($input[0] === '.' || ($input[0] === '' && count($input) > 1)) { + array_shift($input); + continue; + } + if($input[0] === '..') { + array_shift($input); + if($has_authority || + (count($output) > 0 && $output[count($output) - 1] !== '..')) { + array_pop($output); + } else { + // leading relative URL '..' + $output[] = '..'; + } + continue; + } + $output[] = array_shift($input); + } + + return $rval . implode('/', $output); +} + +/** + * Prepends a base IRI to the given relative IRI. + * + * @param mixed $base a string or the parsed base IRI. + * @param string $iri the relative IRI. + * + * @return string the absolute IRI. + */ +function jsonld_prepend_base($base, $iri) { + // skip IRI processing + if($base === null) { + return $iri; + } + + // already an absolute IRI + if(strpos($iri, ':') !== false) { + return $iri; + } + + // parse base if it is a string + if(is_string($base)) { + $base = jsonld_parse_url($base); + } + + // parse given IRI + $rel = jsonld_parse_url($iri); + + // per RFC3986 5.2.2 + $transform = array('protocol' => $base['protocol']); + + if($rel['authority'] !== null) { + $transform['authority'] = $rel['authority']; + $transform['path'] = $rel['path']; + $transform['query'] = $rel['query']; + } else { + $transform['authority'] = $base['authority']; + + if($rel['path'] === '') { + $transform['path'] = $base['path']; + if($rel['query'] !== null) { + $transform['query'] = $rel['query']; + } else { + $transform['query'] = $base['query']; + } + } else { + if(strpos($rel['path'], '/') === 0) { + // IRI represents an absolute path + $transform['path'] = $rel['path']; + } else { + // merge paths + $path = $base['path']; + + // append relative path to the end of the last directory from base + if($rel['path'] !== '') { + $idx = strrpos($path, '/'); + $idx = ($idx === false) ? 0 : $idx + 1; + $path = substr($path, 0, $idx); + if(strlen($path) > 0 && substr($path, -1) !== '/') { + $path .= '/'; + } + $path .= $rel['path']; + } + + $transform['path'] = $path; + } + $transform['query'] = $rel['query']; + } + } + + // remove slashes and dots in path + $transform['path'] = jsonld_remove_dot_segments( + $transform['path'], !!$transform['authority']); + + // construct URL + $rval = $transform['protocol']; + if($transform['authority'] !== null) { + $rval .= '//' . $transform['authority']; + } + $rval .= $transform['path']; + if($transform['query'] !== null) { + $rval .= '?' . $transform['query']; + } + if($rel['fragment'] !== null) { + $rval .= '#' . $rel['fragment']; + } + + // handle empty base + if($rval === '') { + $rval = './'; + } + + return $rval; +} + +/** + * Removes a base IRI from the given absolute IRI. + * + * @param mixed $base the base IRI. + * @param string $iri the absolute IRI. + * + * @return string the relative IRI if relative to base, otherwise the absolute + * IRI. + */ +function jsonld_remove_base($base, $iri) { + // skip IRI processing + if($base === null) { + return $iri; + } + + if(is_string($base)) { + $base = jsonld_parse_url($base); + } + + // establish base root + $root = ''; + if($base['href'] !== '') { + $root .= "{$base['protocol']}//{$base['authority']}"; + } else if(strpos($iri, '//') === false) { + // support network-path reference with empty base + $root .= '//'; + } + + // IRI not relative to base + if($root === '' || strpos($iri, $root) !== 0) { + return $iri; + } + + // remove root from IRI + $rel = jsonld_parse_url(substr($iri, strlen($root))); + + // remove path segments that match (do not remove last segment unless there + // is a hash or query) + $base_segments = explode('/', $base['normalizedPath']); + $iri_segments = explode('/', $rel['normalizedPath']); + $last = ($rel['query'] || $rel['fragment']) ? 0 : 1; + while(count($base_segments) > 0 && count($iri_segments) > $last) { + if($base_segments[0] !== $iri_segments[0]) { + break; + } + array_shift($base_segments); + array_shift($iri_segments); + } + + // use '../' for each non-matching base segment + $rval = ''; + if(count($base_segments) > 0) { + // don't count the last segment (if it ends with '/' last path doesn't + // count and if it doesn't end with '/' it isn't a path) + array_pop($base_segments); + foreach($base_segments as $segment) { + $rval .= '../'; + } + } + + // prepend remaining segments + $rval .= implode('/', $iri_segments); + + // add query and hash + if($rel['query'] !== null) { + $rval .= "?{$rel['query']}"; + } + if($rel['fragment'] !== null) { + $rval .= "#{$rel['fragment']}"; + } + + if($rval === '') { + $rval = './'; + } + + return $rval; +} + + +/** + * A JSON-LD processor. + */ +class JsonLdProcessor { + /** XSD constants */ + const XSD_BOOLEAN = 'http://www.w3.org/2001/XMLSchema#boolean'; + const XSD_DOUBLE = 'http://www.w3.org/2001/XMLSchema#double'; + const XSD_INTEGER = 'http://www.w3.org/2001/XMLSchema#integer'; + const XSD_STRING = 'http://www.w3.org/2001/XMLSchema#string'; + + /** RDF constants */ + const RDF_LIST = 'http://www.w3.org/1999/02/22-rdf-syntax-ns#List'; + const RDF_FIRST = 'http://www.w3.org/1999/02/22-rdf-syntax-ns#first'; + const RDF_REST = 'http://www.w3.org/1999/02/22-rdf-syntax-ns#rest'; + const RDF_NIL = 'http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'; + const RDF_TYPE = 'http://www.w3.org/1999/02/22-rdf-syntax-ns#type'; + const RDF_LANGSTRING = + 'http://www.w3.org/1999/02/22-rdf-syntax-ns#langString'; + + /** Restraints */ + const MAX_CONTEXT_URLS = 10; + + /** Processor-specific RDF dataset parsers. */ + protected $rdfParsers = null; + + /** + * Constructs a JSON-LD processor. + */ + public function __construct() {} + + /** + * Performs JSON-LD compaction. + * + * @param mixed $input the JSON-LD object to compact. + * @param mixed $ctx the context to compact with. + * @param assoc $options the compaction options. + * [base] the base IRI to use. + * [compactArrays] true to compact arrays to single values when + * appropriate, false not to (default: true). + * [graph] true to always output a top-level graph (default: false). + * [skipExpansion] true to assume the input is expanded and skip + * expansion, false not to, defaults to false. + * [activeCtx] true to also return the active context used. + * [documentLoader(url)] the document loader. + * + * @return mixed the compacted JSON-LD output. + */ + public function compact($input, $ctx, $options) { + global $jsonld_default_load_document; + + if($ctx === null) { + throw new JsonLdException( + 'The compaction context must not be null.', + 'jsonld.CompactError', 'invalid local context'); + } + + // nothing to compact + if($input === null) { + return null; + } + + self::setdefaults($options, array( + 'base' => is_string($input) ? $input : '', + 'compactArrays' => true, + 'graph' => false, + 'skipExpansion' => false, + 'activeCtx' => false, + 'documentLoader' => $jsonld_default_load_document, + 'link' => false)); + if($options['link']) { + // force skip expansion when linking, "link" is not part of the + // public API, it should only be called from framing + $options['skipExpansion'] = true; + } + + if($options['skipExpansion'] === true) { + $expanded = $input; + } else { + // expand input + try { + $expanded = $this->expand($input, $options); + } catch(JsonLdException $e) { + throw new JsonLdException( + 'Could not expand input before compaction.', + 'jsonld.CompactError', null, null, $e); + } + } + + // process context + $active_ctx = $this->_getInitialContext($options); + try { + $active_ctx = $this->processContext($active_ctx, $ctx, $options); + } catch(JsonLdException $e) { + throw new JsonLdException( + 'Could not process context before compaction.', + 'jsonld.CompactError', null, null, $e); + } + + // do compaction + $compacted = $this->_compact($active_ctx, null, $expanded, $options); + + if($options['compactArrays'] && + !$options['graph'] && is_array($compacted)) { + if(count($compacted) === 1) { + // simplify to a single item + $compacted = $compacted[0]; + } else if(count($compacted) === 0) { + // simplify to an empty object + $compacted = new stdClass(); + } + } else if($options['graph']) { + // always use array if graph option is on + $compacted = self::arrayify($compacted); + } + + // follow @context key + if(is_object($ctx) && property_exists($ctx, '@context')) { + $ctx = $ctx->{'@context'}; + } + + // build output context + $ctx = self::copy($ctx); + $ctx = self::arrayify($ctx); + + // remove empty contexts + $tmp = $ctx; + $ctx = array(); + foreach($tmp as $v) { + if(!is_object($v) || count(array_keys((array)$v)) > 0) { + $ctx[] = $v; + } + } + + // remove array if only one context + $ctx_length = count($ctx); + $has_context = ($ctx_length > 0); + if($ctx_length === 1) { + $ctx = $ctx[0]; + } + + // add context and/or @graph + if(is_array($compacted)) { + // use '@graph' keyword + $kwgraph = $this->_compactIri($active_ctx, '@graph'); + $graph = $compacted; + $compacted = new stdClass(); + if($has_context) { + $compacted->{'@context'} = $ctx; + } + $compacted->{$kwgraph} = $graph; + } else if(is_object($compacted) && $has_context) { + // reorder keys so @context is first + $graph = $compacted; + $compacted = new stdClass(); + $compacted->{'@context'} = $ctx; + foreach($graph as $k => $v) { + $compacted->{$k} = $v; + } + } + + if($options['activeCtx']) { + return array('compacted' => $compacted, 'activeCtx' => $active_ctx); + } + + return $compacted; + } + + /** + * Performs JSON-LD expansion. + * + * @param mixed $input the JSON-LD object to expand. + * @param assoc $options the options to use: + * [base] the base IRI to use. + * [expandContext] a context to expand with. + * [keepFreeFloatingNodes] true to keep free-floating nodes, + * false not to, defaults to false. + * [documentLoader(url)] the document loader. + * + * @return array the expanded JSON-LD output. + */ + public function expand($input, $options) { + global $jsonld_default_load_document; + self::setdefaults($options, array( + 'keepFreeFloatingNodes' => false, + 'documentLoader' => $jsonld_default_load_document)); + + // if input is a string, attempt to dereference remote document + if(is_string($input)) { + $remote_doc = call_user_func($options['documentLoader'], $input); + } else { + $remote_doc = (object)array( + 'contextUrl' => null, + 'documentUrl' => null, + 'document' => $input); + } + + try { + if($remote_doc->document === null) { + throw new JsonLdException( + 'No remote document found at the given URL.', + 'jsonld.NullRemoteDocument'); + } + if(is_string($remote_doc->document)) { + $remote_doc->document = self::_parse_json($remote_doc->document); + } + } catch(Exception $e) { + throw new JsonLdException( + 'Could not retrieve a JSON-LD document from the URL.', + 'jsonld.LoadDocumentError', 'loading document failed', + array('remoteDoc' => $remote_doc), $e); + } + + // set default base + self::setdefault($options, 'base', $remote_doc->documentUrl ?: ''); + + // build meta-object and retrieve all @context urls + $input = (object)array( + 'document' => self::copy($remote_doc->document), + 'remoteContext' => (object)array( + '@context' => $remote_doc->contextUrl)); + if(isset($options['expandContext'])) { + $expand_context = self::copy($options['expandContext']); + if(is_object($expand_context) && + property_exists($expand_context, '@context')) { + $input->expandContext = $expand_context; + } else { + $input->expandContext = (object)array('@context' => $expand_context); + } + } + + // retrieve all @context URLs in the input + try { + $this->_retrieveContextUrls( + $input, new stdClass(), $options['documentLoader'], $options['base']); + } catch(Exception $e) { + throw new JsonLdException( + 'Could not perform JSON-LD expansion.', + 'jsonld.ExpandError', null, null, $e); + } + + $active_ctx = $this->_getInitialContext($options); + $document = $input->document; + $remote_context = $input->remoteContext->{'@context'}; + + // process optional expandContext + if(property_exists($input, 'expandContext')) { + $active_ctx = self::_processContext( + $active_ctx, $input->expandContext, $options); + } + + // process remote context from HTTP Link Header + if($remote_context) { + $active_ctx = self::_processContext( + $active_ctx, $remote_context, $options); + } + + // do expansion + $expanded = $this->_expand($active_ctx, null, $document, $options, false); + + // optimize away @graph with no other properties + if(is_object($expanded) && property_exists($expanded, '@graph') && + count(array_keys((array)$expanded)) === 1) { + $expanded = $expanded->{'@graph'}; + } else if($expanded === null) { + $expanded = array(); + } + // normalize to an array + return self::arrayify($expanded); + } + + /** + * Performs JSON-LD flattening. + * + * @param mixed $input the JSON-LD to flatten. + * @param ctx the context to use to compact the flattened output, or null. + * @param assoc $options the options to use: + * [base] the base IRI to use. + * [expandContext] a context to expand with. + * [documentLoader(url)] the document loader. + * + * @return array the flattened output. + */ + public function flatten($input, $ctx, $options) { + global $jsonld_default_load_document; + self::setdefaults($options, array( + 'base' => is_string($input) ? $input : '', + 'documentLoader' => $jsonld_default_load_document)); + + try { + // expand input + $expanded = $this->expand($input, $options); + } catch(Exception $e) { + throw new JsonLdException( + 'Could not expand input before flattening.', + 'jsonld.FlattenError', null, null, $e); + } + + // do flattening + $flattened = $this->_flatten($expanded); + + if($ctx === null) { + return $flattened; + } + + // compact result (force @graph option to true, skip expansion) + $options['graph'] = true; + $options['skipExpansion'] = true; + try { + $compacted = $this->compact($flattened, $ctx, $options); + } catch(Exception $e) { + throw new JsonLdException( + 'Could not compact flattened output.', + 'jsonld.FlattenError', null, null, $e); + } + + return $compacted; + } + + /** + * Performs JSON-LD framing. + * + * @param mixed $input the JSON-LD object to frame. + * @param stdClass $frame the JSON-LD frame to use. + * @param $options the framing options. + * [base] the base IRI to use. + * [expandContext] a context to expand with. + * [embed] default @embed flag: '@last', '@always', '@never', '@link' + * (default: '@last'). + * [explicit] default @explicit flag (default: false). + * [requireAll] default @requireAll flag (default: true). + * [omitDefault] default @omitDefault flag (default: false). + * [documentLoader(url)] the document loader. + * + * @return stdClass the framed JSON-LD output. + */ + public function frame($input, $frame, $options) { + global $jsonld_default_load_document; + self::setdefaults($options, array( + 'base' => is_string($input) ? $input : '', + 'compactArrays' => true, + 'embed' => '@last', + 'explicit' => false, + 'requireAll' => true, + 'omitDefault' => false, + 'documentLoader' => $jsonld_default_load_document)); + + // if frame is a string, attempt to dereference remote document + if(is_string($frame)) { + $remote_frame = call_user_func($options['documentLoader'], $frame); + } else { + $remote_frame = (object)array( + 'contextUrl' => null, + 'documentUrl' => null, + 'document' => $frame); + } + + try { + if($remote_frame->document === null) { + throw new JsonLdException( + 'No remote document found at the given URL.', + 'jsonld.NullRemoteDocument'); + } + if(is_string($remote_frame->document)) { + $remote_frame->document = self::_parse_json($remote_frame->document); + } + } catch(Exception $e) { + throw new JsonLdException( + 'Could not retrieve a JSON-LD document from the URL.', + 'jsonld.LoadDocumentError', 'loading document failed', + array('remoteDoc' => $remote_frame), $e); + } + + // preserve frame context + $frame = $remote_frame->document; + if($frame !== null) { + $ctx = (property_exists($frame, '@context') ? + $frame->{'@context'} : new stdClass()); + if($remote_frame->contextUrl !== null) { + if($ctx !== null) { + $ctx = $remote_frame->contextUrl; + } else { + $ctx = self::arrayify($ctx); + $ctx[] = $remote_frame->contextUrl; + } + $frame->{'@context'} = $ctx; + } + } + + try { + // expand input + $expanded = $this->expand($input, $options); + } catch(Exception $e) { + throw new JsonLdException( + 'Could not expand input before framing.', + 'jsonld.FrameError', null, null, $e); + } + + try { + // expand frame + $opts = $options; + $opts['keepFreeFloatingNodes'] = true; + $expanded_frame = $this->expand($frame, $opts); + } catch(Exception $e) { + throw new JsonLdException( + 'Could not expand frame before framing.', + 'jsonld.FrameError', null, null, $e); + } + + // do framing + $framed = $this->_frame($expanded, $expanded_frame, $options); + + try { + // compact result (force @graph option to true, skip expansion, check + // for linked embeds) + $options['graph'] = true; + $options['skipExpansion'] = true; + $options['link'] = new ArrayObject(); + $options['activeCtx'] = true; + $result = $this->compact($framed, $ctx, $options); + } catch(Exception $e) { + throw new JsonLdException( + 'Could not compact framed output.', + 'jsonld.FrameError', null, null, $e); + } + + $compacted = $result['compacted']; + $active_ctx = $result['activeCtx']; + + // get graph alias + $graph = $this->_compactIri($active_ctx, '@graph'); + // remove @preserve from results + $options['link'] = new ArrayObject(); + $compacted->{$graph} = $this->_removePreserve( + $active_ctx, $compacted->{$graph}, $options); + return $compacted; + } + + /** + * Performs JSON-LD normalization. + * + * @param mixed $input the JSON-LD object to normalize. + * @param assoc $options the options to use: + * [base] the base IRI to use. + * [expandContext] a context to expand with. + * [inputFormat] the format if input is not JSON-LD: + * 'application/nquads' for N-Quads. + * [format] the format if output is a string: + * 'application/nquads' for N-Quads. + * [documentLoader(url)] the document loader. + * + * @return mixed the normalized output. + */ + public function normalize($input, $options) { + global $jsonld_default_load_document; + self::setdefaults($options, array( + 'base' => is_string($input) ? $input : '', + 'documentLoader' => $jsonld_default_load_document)); + + if(isset($options['inputFormat'])) { + if($options['inputFormat'] != 'application/nquads') { + throw new JsonLdException( + 'Unknown normalization input format.', 'jsonld.NormalizeError'); + } + $dataset = $this->parseNQuads($input); + } else { + try { + // convert to RDF dataset then do normalization + $opts = $options; + if(isset($opts['format'])) { + unset($opts['format']); + } + $opts['produceGeneralizedRdf'] = false; + $dataset = $this->toRDF($input, $opts); + } catch(Exception $e) { + throw new JsonLdException( + 'Could not convert input to RDF dataset before normalization.', + 'jsonld.NormalizeError', null, null, $e); + } + } + + // do normalization + return $this->_normalize($dataset, $options); + } + + /** + * Converts an RDF dataset to JSON-LD. + * + * @param mixed $dataset a serialized string of RDF in a format specified + * by the format option or an RDF dataset to convert. + * @param assoc $options the options to use: + * [format] the format if input is a string: + * 'application/nquads' for N-Quads (default). + * [useRdfType] true to use rdf:type, false to use @type + * (default: false). + * [useNativeTypes] true to convert XSD types into native types + * (boolean, integer, double), false not to (default: false). + * + * @return array the JSON-LD output. + */ + public function fromRDF($dataset, $options) { + global $jsonld_rdf_parsers; + + self::setdefaults($options, array( + 'useRdfType' => false, + 'useNativeTypes' => false)); + + if(!isset($options['format']) && is_string($dataset)) { + // set default format to nquads + $options['format'] = 'application/nquads'; + } + + // handle special format + if(isset($options['format']) && $options['format']) { + // supported formats (processor-specific and global) + if(($this->rdfParsers !== null && + !property_exists($this->rdfParsers, $options['format'])) || + $this->rdfParsers === null && + !property_exists($jsonld_rdf_parsers, $options['format'])) { + throw new JsonLdException( + 'Unknown input format.', + 'jsonld.UnknownFormat', null, array('format' => $options['format'])); + } + if($this->rdfParsers !== null) { + $callable = $this->rdfParsers->{$options['format']}; + } else { + $callable = $jsonld_rdf_parsers->{$options['format']}; + } + $dataset = call_user_func($callable, $dataset); + } + + // convert from RDF + return $this->_fromRDF($dataset, $options); + } + + /** + * Outputs the RDF dataset found in the given JSON-LD object. + * + * @param mixed $input the JSON-LD object. + * @param assoc $options the options to use: + * [base] the base IRI to use. + * [expandContext] a context to expand with. + * [format] the format to use to output a string: + * 'application/nquads' for N-Quads. + * [produceGeneralizedRdf] true to output generalized RDF, false + * to produce only standard RDF (default: false). + * [documentLoader(url)] the document loader. + * + * @return mixed the resulting RDF dataset (or a serialization of it). + */ + public function toRDF($input, $options) { + global $jsonld_default_load_document; + self::setdefaults($options, array( + 'base' => is_string($input) ? $input : '', + 'produceGeneralizedRdf' => false, + 'documentLoader' => $jsonld_default_load_document)); + + try { + // expand input + $expanded = $this->expand($input, $options); + } catch(JsonLdException $e) { + throw new JsonLdException( + 'Could not expand input before serialization to RDF.', + 'jsonld.RdfError', null, null, $e); + } + + // create node map for default graph (and any named graphs) + $namer = new UniqueNamer('_:b'); + $node_map = (object)array('@default' => new stdClass()); + $this->_createNodeMap($expanded, $node_map, '@default', $namer); + + // output RDF dataset + $dataset = new stdClass(); + $graph_names = array_keys((array)$node_map); + sort($graph_names); + foreach($graph_names as $graph_name) { + $graph = $node_map->{$graph_name}; + // skip relative IRIs + if($graph_name === '@default' || self::_isAbsoluteIri($graph_name)) { + $dataset->{$graph_name} = $this->_graphToRDF($graph, $namer, $options); + } + } + + $rval = $dataset; + + // convert to output format + if(isset($options['format']) && $options['format']) { + // supported formats + if($options['format'] === 'application/nquads') { + $rval = self::toNQuads($dataset); + } else { + throw new JsonLdException( + 'Unknown output format.', 'jsonld.UnknownFormat', + null, array('format' => $options['format'])); + } + } + + return $rval; + } + + /** + * Processes a local context, resolving any URLs as necessary, and returns a + * new active context in its callback. + * + * @param stdClass $active_ctx the current active context. + * @param mixed $local_ctx the local context to process. + * @param assoc $options the options to use: + * [documentLoader(url)] the document loader. + * + * @return stdClass the new active context. + */ + public function processContext($active_ctx, $local_ctx, $options) { + global $jsonld_default_load_document; + self::setdefaults($options, array( + 'base' => '', + 'documentLoader' => $jsonld_default_load_document)); + + // return initial context early for null context + if($local_ctx === null) { + return $this->_getInitialContext($options); + } + + // retrieve URLs in local_ctx + $local_ctx = self::copy($local_ctx); + if(is_string($local_ctx) or ( + is_object($local_ctx) && !property_exists($local_ctx, '@context'))) { + $local_ctx = (object)array('@context' => $local_ctx); + } + try { + $this->_retrieveContextUrls( + $local_ctx, new stdClass(), + $options['documentLoader'], $options['base']); + } catch(Exception $e) { + throw new JsonLdException( + 'Could not process JSON-LD context.', + 'jsonld.ContextError', null, null, $e); + } + + // process context + return $this->_processContext($active_ctx, $local_ctx, $options); + } + + /** + * Returns true if the given subject has the given property. + * + * @param stdClass $subject the subject to check. + * @param string $property the property to look for. + * + * @return bool true if the subject has the given property, false if not. + */ + public static function hasProperty($subject, $property) { + $rval = false; + if(property_exists($subject, $property)) { + $value = $subject->{$property}; + $rval = (!is_array($value) || count($value) > 0); + } + return $rval; + } + + /** + * Determines if the given value is a property of the given subject. + * + * @param stdClass $subject the subject to check. + * @param string $property the property to check. + * @param mixed $value the value to check. + * + * @return bool true if the value exists, false if not. + */ + public static function hasValue($subject, $property, $value) { + $rval = false; + if(self::hasProperty($subject, $property)) { + $val = $subject->{$property}; + $is_list = self::_isList($val); + if(is_array($val) || $is_list) { + if($is_list) { + $val = $val->{'@list'}; + } + foreach($val as $v) { + if(self::compareValues($value, $v)) { + $rval = true; + break; + } + } + } else if(!is_array($value)) { + // avoid matching the set of values with an array value parameter + $rval = self::compareValues($value, $val); + } + } + return $rval; + } + + /** + * Adds a value to a subject. If the value is an array, all values in the + * array will be added. + * + * Note: If the value is a subject that already exists as a property of the + * given subject, this method makes no attempt to deeply merge properties. + * Instead, the value will not be added. + * + * @param stdClass $subject the subject to add the value to. + * @param string $property the property that relates the value to the subject. + * @param mixed $value the value to add. + * @param assoc [$options] the options to use: + * [propertyIsArray] true if the property is always an array, false + * if not (default: false). + * [allowDuplicate] true to allow duplicates, false not to (uses a + * simple shallow comparison of subject ID or value) + * (default: true). + */ + public static function addValue( + $subject, $property, $value, $options=array()) { + self::setdefaults($options, array( + 'allowDuplicate' => true, + 'propertyIsArray' => false)); + + if(is_array($value)) { + if(count($value) === 0 && $options['propertyIsArray'] && + !property_exists($subject, $property)) { + $subject->{$property} = array(); + } + foreach($value as $v) { + self::addValue($subject, $property, $v, $options); + } + } else if(property_exists($subject, $property)) { + // check if subject already has value if duplicates not allowed + $has_value = (!$options['allowDuplicate'] && + self::hasValue($subject, $property, $value)); + + // make property an array if value not present or always an array + if(!is_array($subject->{$property}) && + (!$has_value || $options['propertyIsArray'])) { + $subject->{$property} = array($subject->{$property}); + } + + // add new value + if(!$has_value) { + $subject->{$property}[] = $value; + } + } else { + // add new value as set or single value + $subject->{$property} = ($options['propertyIsArray'] ? + array($value) : $value); + } + } + + /** + * Gets all of the values for a subject's property as an array. + * + * @param stdClass $subject the subject. + * @param string $property the property. + * + * @return array all of the values for a subject's property as an array. + */ + public static function getValues($subject, $property) { + $rval = (property_exists($subject, $property) ? + $subject->{$property} : array()); + return self::arrayify($rval); + } + + /** + * Removes a property from a subject. + * + * @param stdClass $subject the subject. + * @param string $property the property. + */ + public static function removeProperty($subject, $property) { + unset($subject->{$property}); + } + + /** + * Removes a value from a subject. + * + * @param stdClass $subject the subject. + * @param string $property the property that relates the value to the subject. + * @param mixed $value the value to remove. + * @param assoc [$options] the options to use: + * [propertyIsArray] true if the property is always an array, + * false if not (default: false). + */ + public static function removeValue( + $subject, $property, $value, $options=array()) { + self::setdefaults($options, array( + 'propertyIsArray' => false)); + + // filter out value + $filter = function($e) use ($value) { + return !self::compareValues($e, $value); + }; + $values = self::getValues($subject, $property); + $values = array_values(array_filter($values, $filter)); + + if(count($values) === 0) { + self::removeProperty($subject, $property); + } else if(count($values) === 1 && !$options['propertyIsArray']) { + $subject->{$property} = $values[0]; + } else { + $subject->{$property} = $values; + } + } + + /** + * Compares two JSON-LD values for equality. Two JSON-LD values will be + * considered equal if: + * + * 1. They are both primitives of the same type and value. + * 2. They are both @values with the same @value, @type, @language, + * and @index, OR + * 3. They both have @ids that are the same. + * + * @param mixed $v1 the first value. + * @param mixed $v2 the second value. + * + * @return bool true if v1 and v2 are considered equal, false if not. + */ + public static function compareValues($v1, $v2) { + // 1. equal primitives + if($v1 === $v2) { + return true; + } + + // 2. equal @values + if(self::_isValue($v1) && self::_isValue($v2)) { + return ( + self::_compareKeyValues($v1, $v2, '@value') && + self::_compareKeyValues($v1, $v2, '@type') && + self::_compareKeyValues($v1, $v2, '@language') && + self::_compareKeyValues($v1, $v2, '@index')); + } + + // 3. equal @ids + if(is_object($v1) && property_exists($v1, '@id') && + is_object($v2) && property_exists($v2, '@id')) { + return $v1->{'@id'} === $v2->{'@id'}; + } + + return false; + } + + /** + * Gets the value for the given active context key and type, null if none is + * set. + * + * @param stdClass $ctx the active context. + * @param string $key the context key. + * @param string [$type] the type of value to get (eg: '@id', '@type'), if not + * specified gets the entire entry for a key, null if not found. + * + * @return mixed the value. + */ + public static function getContextValue($ctx, $key, $type) { + $rval = null; + + // return null for invalid key + if($key === null) { + return $rval; + } + + // get default language + if($type === '@language' && property_exists($ctx, $type)) { + $rval = $ctx->{$type}; + } + + // get specific entry information + if(property_exists($ctx->mappings, $key)) { + $entry = $ctx->mappings->{$key}; + if($entry === null) { + return null; + } + + if($type === null) { + // return whole entry + $rval = $entry; + } else if(property_exists($entry, $type)) { + // return entry value for type + $rval = $entry->{$type}; + } + } + + return $rval; + } + + /** + * Parses RDF in the form of N-Quads. + * + * @param string $input the N-Quads input to parse. + * + * @return stdClass an RDF dataset. + */ + public static function parseNQuads($input) { + // define partial regexes + $iri = '(?:<([^:]+:[^>]*)>)'; + $bnode = '(_:(?:[A-Za-z][A-Za-z0-9]*))'; + $plain = '"([^"\\\\]*(?:\\\\.[^"\\\\]*)*)"'; + $datatype = "(?:\\^\\^$iri)"; + $language = '(?:@([a-z]+(?:-[a-z0-9]+)*))'; + $literal = "(?:$plain(?:$datatype|$language)?)"; + $ws = '[ \\t]'; + $eoln = '/(?:\r\n)|(?:\n)|(?:\r)/'; + $empty = "/^$ws*$/"; + + // define quad part regexes + $subject = "(?:$iri|$bnode)$ws+"; + $property = "$iri$ws+"; + $object = "(?:$iri|$bnode|$literal)$ws*"; + $graph_name = "(?:\\.|(?:(?:$iri|$bnode)$ws*\\.))"; + + // full quad regex + $quad = "/^$ws*$subject$property$object$graph_name$ws*$/"; + + // build RDF dataset + $dataset = new stdClass(); + + // split N-Quad input into lines + $lines = preg_split($eoln, $input); + $line_number = 0; + foreach($lines as $line) { + $line_number += 1; + + // skip empty lines + if(preg_match($empty, $line)) { + continue; + } + + // parse quad + if(!preg_match($quad, $line, $match)) { + throw new JsonLdException( + 'Error while parsing N-Quads; invalid quad.', + 'jsonld.ParseError', null, array('line' => $line_number)); + } + + // create RDF triple + $triple = (object)array( + 'subject' => new stdClass(), + 'predicate' => new stdClass(), + 'object' => new stdClass()); + + // get subject + if($match[1] !== '') { + $triple->subject->type = 'IRI'; + $triple->subject->value = $match[1]; + } else { + $triple->subject->type = 'blank node'; + $triple->subject->value = $match[2]; + } + + // get predicate + $triple->predicate->type = 'IRI'; + $triple->predicate->value = $match[3]; + + // get object + if($match[4] !== '') { + $triple->object->type = 'IRI'; + $triple->object->value = $match[4]; + } else if($match[5] !== '') { + $triple->object->type = 'blank node'; + $triple->object->value = $match[5]; + } else { + $triple->object->type = 'literal'; + $unescaped = str_replace( + array('\"', '\t', '\n', '\r', '\\\\'), + array('"', "\t", "\n", "\r", '\\'), + $match[6]); + if(isset($match[7]) && $match[7] !== '') { + $triple->object->datatype = $match[7]; + } else if(isset($match[8]) && $match[8] !== '') { + $triple->object->datatype = self::RDF_LANGSTRING; + $triple->object->language = $match[8]; + } else { + $triple->object->datatype = self::XSD_STRING; + } + $triple->object->value = $unescaped; + } + + // get graph name ('@default' is used for the default graph) + $name = '@default'; + if(isset($match[9]) && $match[9] !== '') { + $name = $match[9]; + } else if(isset($match[10]) && $match[10] !== '') { + $name = $match[10]; + } + + // initialize graph in dataset + if(!property_exists($dataset, $name)) { + $dataset->{$name} = array($triple); + } else { + // add triple if unique to its graph + $unique = true; + $triples = &$dataset->{$name}; + foreach($triples as $t) { + if(self::_compareRDFTriples($t, $triple)) { + $unique = false; + break; + } + } + if($unique) { + $triples[] = $triple; + } + } + } + + return $dataset; + } + + /** + * Converts an RDF dataset to N-Quads. + * + * @param stdClass $dataset the RDF dataset to convert. + * + * @return string the N-Quads string. + */ + public static function toNQuads($dataset) { + $quads = array(); + foreach($dataset as $graph_name => $triples) { + foreach($triples as $triple) { + if($graph_name === '@default') { + $graph_name = null; + } + $quads[] = self::toNQuad($triple, $graph_name); + } + } + sort($quads); + return implode($quads); + } + + /** + * Converts an RDF triple and graph name to an N-Quad string (a single quad). + * + * @param stdClass $triple the RDF triple to convert. + * @param mixed $graph_name the name of the graph containing the triple, null + * for the default graph. + * @param string $bnode the bnode the quad is mapped to (optional, for + * use during normalization only). + * + * @return string the N-Quad string. + */ + public static function toNQuad($triple, $graph_name, $bnode=null) { + $s = $triple->subject; + $p = $triple->predicate; + $o = $triple->object; + $g = $graph_name; + + $quad = ''; + + // subject is an IRI + if($s->type === 'IRI') { + $quad .= "<{$s->value}>"; + } else if($bnode !== null) { + // bnode normalization mode + $quad .= ($s->value === $bnode) ? '_:a' : '_:z'; + } else { + // bnode normal mode + $quad .= $s->value; + } + $quad .= ' '; + + // predicate is an IRI + if($p->type === 'IRI') { + $quad .= "<{$p->value}>"; + } else if($bnode !== null) { + // FIXME: TBD what to do with bnode predicates during normalization + // bnode normalization mode + $quad .= '_:p'; + } else { + // bnode normal mode + $quad .= $p->value; + } + $quad .= ' '; + + // object is IRI, bnode, or literal + if($o->type === 'IRI') { + $quad .= "<{$o->value}>"; + } else if($o->type === 'blank node') { + if($bnode !== null) { + // normalization mode + $quad .= ($o->value === $bnode) ? '_:a' : '_:z'; + } else { + // normal mode + $quad .= $o->value; + } + } else { + $escaped = str_replace( + array('\\', "\t", "\n", "\r", '"'), + array('\\\\', '\t', '\n', '\r', '\"'), + $o->value); + $quad .= '"' . $escaped . '"'; + if($o->datatype === self::RDF_LANGSTRING) { + if($o->language) { + $quad .= "@{$o->language}"; + } + } else if($o->datatype !== self::XSD_STRING) { + $quad .= "^^<{$o->datatype}>"; + } + } + + // graph + if($g !== null) { + if(strpos($g, '_:') !== 0) { + $quad .= " <$g>"; + } else if($bnode) { + $quad .= ' _:g'; + } else { + $quad .= " $g"; + } + } + + $quad .= " .\n"; + return $quad; + } + + /** + * Registers a processor-specific RDF dataset parser by content-type. + * Global parsers will no longer be used by this processor. + * + * @param string $content_type the content-type for the parser. + * @param callable $parser(input) the parser function (takes a string as + * a parameter and returns an RDF dataset). + */ + public function registerRDFParser($content_type, $parser) { + if($this->rdfParsers === null) { + $this->rdfParsers = new stdClass(); + } + $this->rdfParsers->{$content_type} = $parser; + } + + /** + * Unregisters a process-specific RDF dataset parser by content-type. If + * there are no remaining processor-specific parsers, then the global + * parsers will be re-enabled. + * + * @param string $content_type the content-type for the parser. + */ + public function unregisterRDFParser($content_type) { + if($this->rdfParsers !== null && + property_exists($this->rdfParsers, $content_type)) { + unset($this->rdfParsers->{$content_type}); + if(count(get_object_vars($content_type)) === 0) { + $this->rdfParsers = null; + } + } + } + + /** + * If $value is an array, returns $value, otherwise returns an array + * containing $value as the only element. + * + * @param mixed $value the value. + * + * @return array an array. + */ + public static function arrayify($value) { + return is_array($value) ? $value : array($value); + } + + /** + * Clones an object, array, or string/number. + * + * @param mixed $value the value to clone. + * + * @return mixed the cloned value. + */ + public static function copy($value) { + if(is_object($value) || is_array($value)) { + return unserialize(serialize($value)); + } + return $value; + } + + /** + * Sets the value of a key for the given array if that property + * has not already been set. + * + * @param &assoc $arr the object to update. + * @param string $key the key to update. + * @param mixed $value the value to set. + */ + public static function setdefault(&$arr, $key, $value) { + isset($arr[$key]) or $arr[$key] = $value; + } + + /** + * Sets default values for keys in the given array. + * + * @param &assoc $arr the object to update. + * @param assoc $defaults the default keys and values. + */ + public static function setdefaults(&$arr, $defaults) { + foreach($defaults as $key => $value) { + self::setdefault($arr, $key, $value); + } + } + + /** + * Recursively compacts an element using the given active context. All values + * must be in expanded form before this method is called. + * + * @param stdClass $active_ctx the active context to use. + * @param mixed $active_property the compacted property with the element + * to compact, null for none. + * @param mixed $element the element to compact. + * @param assoc $options the compaction options. + * + * @return mixed the compacted value. + */ + protected function _compact( + $active_ctx, $active_property, $element, $options) { + // recursively compact array + if(is_array($element)) { + $rval = array(); + foreach($element as $e) { + // compact, dropping any null values + $compacted = $this->_compact( + $active_ctx, $active_property, $e, $options); + if($compacted !== null) { + $rval[] = $compacted; + } + } + if($options['compactArrays'] && count($rval) === 1) { + // use single element if no container is specified + $container = self::getContextValue( + $active_ctx, $active_property, '@container'); + if($container === null) { + $rval = $rval[0]; + } + } + return $rval; + } + + // recursively compact object + if(is_object($element)) { + if($options['link'] && property_exists($element, '@id') && + isset($options['link'][$element->{'@id'}])) { + // check for a linked element to reuse + $linked = $options['link'][$element->{'@id'}]; + foreach($linked as $link) { + if($link['expanded'] === $element) { + return $link['compacted']; + } + } + } + + // do value compaction on @values and subject references + if(self::_isValue($element) || self::_isSubjectReference($element)) { + $rval = $this->_compactValue($active_ctx, $active_property, $element); + if($options['link'] && self::_isSubjectReference($element)) { + // store linked element + if(!isset($options['link'][$element->{'@id'}])) { + $options['link'][$element->{'@id'}] = array(); + } + $options['link'][$element->{'@id'}][] = array( + 'expanded' => $element, 'compacted' => $rval); + } + return $rval; + } + + // FIXME: avoid misuse of active property as an expanded property? + $inside_reverse = ($active_property === '@reverse'); + + $rval = new stdClass(); + + if($options['link'] && property_exists($element, '@id')) { + // store linked element + if(!isset($options['link'][$element->{'@id'}])) { + $options['link'][$element->{'@id'}] = array(); + } + $options['link'][$element->{'@id'}][] = array( + 'expanded' => $element, 'compacted' => $rval); + } + + // process element keys in order + $keys = array_keys((array)$element); + sort($keys); + foreach($keys as $expanded_property) { + $expanded_value = $element->{$expanded_property}; + + // compact @id and @type(s) + if($expanded_property === '@id' || $expanded_property === '@type') { + if(is_string($expanded_value)) { + // compact single @id + $compacted_value = $this->_compactIri( + $active_ctx, $expanded_value, null, + array('vocab' => ($expanded_property === '@type'))); + } else { + // expanded value must be a @type array + $compacted_value = array(); + foreach($expanded_value as $ev) { + $compacted_value[] = $this->_compactIri( + $active_ctx, $ev, null, array('vocab' => true)); + } + } + + // use keyword alias and add value + $alias = $this->_compactIri($active_ctx, $expanded_property); + $is_array = (is_array($compacted_value) && + count($expanded_value) === 0); + self::addValue( + $rval, $alias, $compacted_value, + array('propertyIsArray' => $is_array)); + continue; + } + + // handle @reverse + if($expanded_property === '@reverse') { + // recursively compact expanded value + $compacted_value = $this->_compact( + $active_ctx, '@reverse', $expanded_value, $options); + + // handle double-reversed properties + foreach($compacted_value as $compacted_property => $value) { + if(property_exists($active_ctx->mappings, $compacted_property) && + $active_ctx->mappings->{$compacted_property} && + $active_ctx->mappings->{$compacted_property}->reverse) { + $container = self::getContextValue( + $active_ctx, $compacted_property, '@container'); + $use_array = ($container === '@set' || + !$options['compactArrays']); + self::addValue( + $rval, $compacted_property, $value, + array('propertyIsArray' => $use_array)); + unset($compacted_value->{$compacted_property}); + } + } + + if(count(array_keys((array)$compacted_value)) > 0) { + // use keyword alias and add value + $alias = $this->_compactIri($active_ctx, $expanded_property); + self::addValue($rval, $alias, $compacted_value); + } + + continue; + } + + // handle @index property + if($expanded_property === '@index') { + // drop @index if inside an @index container + $container = self::getContextValue( + $active_ctx, $active_property, '@container'); + if($container === '@index') { + continue; + } + + // use keyword alias and add value + $alias = $this->_compactIri($active_ctx, $expanded_property); + self::addValue($rval, $alias, $expanded_value); + continue; + } + + // skip array processing for keywords that aren't @graph or @list + if($expanded_property !== '@graph' && $expanded_property !== '@list' && + self::_isKeyword($expanded_property)) { + // use keyword alias and add value as is + $alias = $this->_compactIri($active_ctx, $expanded_property); + self::addValue($rval, $alias, $expanded_value); + continue; + } + + // Note: expanded value must be an array due to expansion algorithm. + + // preserve empty arrays + if(count($expanded_value) === 0) { + $item_active_property = $this->_compactIri( + $active_ctx, $expanded_property, $expanded_value, + array('vocab' => true), $inside_reverse); + self::addValue( + $rval, $item_active_property, array(), + array('propertyIsArray' => true)); + } + + // recusively process array values + foreach($expanded_value as $expanded_item) { + // compact property and get container type + $item_active_property = $this->_compactIri( + $active_ctx, $expanded_property, $expanded_item, + array('vocab' => true), $inside_reverse); + $container = self::getContextValue( + $active_ctx, $item_active_property, '@container'); + + // get @list value if appropriate + $is_list = self::_isList($expanded_item); + $list = null; + if($is_list) { + $list = $expanded_item->{'@list'}; + } + + // recursively compact expanded item + $compacted_item = $this->_compact( + $active_ctx, $item_active_property, + $is_list ? $list : $expanded_item, $options); + + // handle @list + if($is_list) { + // ensure @list value is an array + $compacted_item = self::arrayify($compacted_item); + + if($container !== '@list') { + // wrap using @list alias + $compacted_item = (object)array( + $this->_compactIri($active_ctx, '@list') => $compacted_item); + + // include @index from expanded @list, if any + if(property_exists($expanded_item, '@index')) { + $compacted_item->{$this->_compactIri($active_ctx, '@index')} = + $expanded_item->{'@index'}; + } + } else if(property_exists($rval, $item_active_property)) { + // can't use @list container for more than 1 list + throw new JsonLdException( + 'JSON-LD compact error; property has a "@list" @container ' . + 'rule but there is more than a single @list that matches ' . + 'the compacted term in the document. Compaction might mix ' . + 'unwanted items into the list.', 'jsonld.SyntaxError', + 'compaction to list of lists'); + } + } + + // handle language and index maps + if($container === '@language' || $container === '@index') { + // get or create the map object + if(property_exists($rval, $item_active_property)) { + $map_object = $rval->{$item_active_property}; + } else { + $rval->{$item_active_property} = $map_object = new stdClass(); + } + + // if container is a language map, simplify compacted value to + // a simple string + if($container === '@language' && self::_isValue($compacted_item)) { + $compacted_item = $compacted_item->{'@value'}; + } + + // add compact value to map object using key from expanded value + // based on the container type + self::addValue( + $map_object, $expanded_item->{$container}, $compacted_item); + } else { + // use an array if: compactArrays flag is false, + // @container is @set or @list, value is an empty + // array, or key is @graph + $is_array = (!$options['compactArrays'] || + $container === '@set' || $container === '@list' || + (is_array($compacted_item) && count($compacted_item) === 0) || + $expanded_property === '@list' || + $expanded_property === '@graph'); + + // add compact value + self::addValue( + $rval, $item_active_property, $compacted_item, + array('propertyIsArray' => $is_array)); + } + } + } + + return $rval; + } + + // only primitives remain which are already compact + return $element; + } + + /** + * Recursively expands an element using the given context. Any context in + * the element will be removed. All context URLs must have been retrieved + * before calling this method. + * + * @param stdClass $active_ctx the active context to use. + * @param mixed $active_property the property for the element, null for none. + * @param mixed $element the element to expand. + * @param assoc $options the expansion options. + * @param bool $inside_list true if the property is a list, false if not. + * + * @return mixed the expanded value. + */ + protected function _expand( + $active_ctx, $active_property, $element, $options, $inside_list) { + // nothing to expand + if($element === null) { + return $element; + } + + // recursively expand array + if(is_array($element)) { + $rval = array(); + $container = self::getContextValue( + $active_ctx, $active_property, '@container'); + $inside_list = $inside_list || $container === '@list'; + foreach($element as $e) { + // expand element + $e = $this->_expand( + $active_ctx, $active_property, $e, $options, $inside_list); + if($inside_list && (is_array($e) || self::_isList($e))) { + // lists of lists are illegal + throw new JsonLdException( + 'Invalid JSON-LD syntax; lists of lists are not permitted.', + 'jsonld.SyntaxError', 'list of lists'); + } + // drop null values + if($e !== null) { + if(is_array($e)) { + $rval = array_merge($rval, $e); + } else { + $rval[] = $e; + } + } + } + return $rval; + } + + if(!is_object($element)) { + // drop free-floating scalars that are not in lists + if(!$inside_list && + ($active_property === null || + $this->_expandIri($active_ctx, $active_property, + array('vocab' => true)) === '@graph')) { + return null; + } + + // expand element according to value expansion rules + return $this->_expandValue($active_ctx, $active_property, $element); + } + + // recursively expand object: + + // if element has a context, process it + if(property_exists($element, '@context')) { + $active_ctx = $this->_processContext( + $active_ctx, $element->{'@context'}, $options); + } + + // expand the active property + $expanded_active_property = $this->_expandIri( + $active_ctx, $active_property, array('vocab' => true)); + + $rval = new stdClass(); + $keys = array_keys((array)$element); + sort($keys); + foreach($keys as $key) { + $value = $element->{$key}; + + if($key === '@context') { + continue; + } + + // expand key to IRI + $expanded_property = $this->_expandIri( + $active_ctx, $key, array('vocab' => true)); + + // drop non-absolute IRI keys that aren't keywords + if($expanded_property === null || + !(self::_isAbsoluteIri($expanded_property) || + self::_isKeyword($expanded_property))) { + continue; + } + + if(self::_isKeyword($expanded_property)) { + if($expanded_active_property === '@reverse') { + throw new JsonLdException( + 'Invalid JSON-LD syntax; a keyword cannot be used as a @reverse ' . + 'property.', 'jsonld.SyntaxError', 'invalid reverse property map', + array('value' => $value)); + } + if(property_exists($rval, $expanded_property)) { + throw new JsonLdException( + 'Invalid JSON-LD syntax; colliding keywords detected.', + 'jsonld.SyntaxError', 'colliding keywords', + array('keyword' => $expanded_property)); + } + } + + // syntax error if @id is not a string + if($expanded_property === '@id' && !is_string($value)) { + if(!isset($options['isFrame']) || !$options['isFrame']) { + throw new JsonLdException( + 'Invalid JSON-LD syntax; "@id" value must a string.', + 'jsonld.SyntaxError', 'invalid @id value', + array('value' => $value)); + } + if(!is_object($value)) { + throw new JsonLdException( + 'Invalid JSON-LD syntax; "@id" value must a string or an object.', + 'jsonld.SyntaxError', 'invalid @id value', + array('value' => $value)); + } + } + + // validate @type value + if($expanded_property === '@type') { + $this->_validateTypeValue($value); + } + + // @graph must be an array or an object + if($expanded_property === '@graph' && + !(is_object($value) || is_array($value))) { + throw new JsonLdException( + 'Invalid JSON-LD syntax; "@graph" value must not be an ' . + 'object or an array.', 'jsonld.SyntaxError', + 'invalid @graph value', array('value' => $value)); + } + + // @value must not be an object or an array + if($expanded_property === '@value' && + (is_object($value) || is_array($value))) { + throw new JsonLdException( + 'Invalid JSON-LD syntax; "@value" value must not be an ' . + 'object or an array.', 'jsonld.SyntaxError', + 'invalid value object value', array('value' => $value)); + } + + // @language must be a string + if($expanded_property === '@language') { + if($value === null) { + // drop null @language values, they expand as if they didn't exist + continue; + } + if(!is_string($value)) { + throw new JsonLdException( + 'Invalid JSON-LD syntax; "@language" value must not be a string.', + 'jsonld.SyntaxError', 'invalid language-tagged string', + array('value' => $value)); + } + // ensure language value is lowercase + $value = strtolower($value); + } + + // @index must be a string + if($expanded_property === '@index') { + if(!is_string($value)) { + throw new JsonLdException( + 'Invalid JSON-LD syntax; "@index" value must be a string.', + 'jsonld.SyntaxError', 'invalid @index value', + array('value' => $value)); + } + } + + // @reverse must be an object + if($expanded_property === '@reverse') { + if(!is_object($value)) { + throw new JsonLdException( + 'Invalid JSON-LD syntax; "@reverse" value must be an object.', + 'jsonld.SyntaxError', 'invalid @reverse value', + array('value' => $value)); + } + + $expanded_value = $this->_expand( + $active_ctx, '@reverse', $value, $options, $inside_list); + + // properties double-reversed + if(property_exists($expanded_value, '@reverse')) { + foreach($expanded_value->{'@reverse'} as $rproperty => $rvalue) { + self::addValue( + $rval, $rproperty, $rvalue, array('propertyIsArray' => true)); + } + } + + // FIXME: can this be merged with code below to simplify? + // merge in all reversed properties + if(property_exists($rval, '@reverse')) { + $reverse_map = $rval->{'@reverse'}; + } else { + $reverse_map = null; + } + foreach($expanded_value as $property => $items) { + if($property === '@reverse') { + continue; + } + if($reverse_map === null) { + $reverse_map = $rval->{'@reverse'} = new stdClass(); + } + self::addValue( + $reverse_map, $property, array(), + array('propertyIsArray' => true)); + foreach($items as $item) { + if(self::_isValue($item) || self::_isList($item)) { + throw new JsonLdException( + 'Invalid JSON-LD syntax; "@reverse" value must not be a ' + + '@value or an @list.', 'jsonld.SyntaxError', + 'invalid reverse property value', + array('value' => $expanded_value)); + } + self::addValue( + $reverse_map, $property, $item, + array('propertyIsArray' => true)); + } + } + + continue; + } + + $container = self::getContextValue($active_ctx, $key, '@container'); + + if($container === '@language' && is_object($value)) { + // handle language map container (skip if value is not an object) + $expanded_value = $this->_expandLanguageMap($value); + } else if($container === '@index' && is_object($value)) { + // handle index container (skip if value is not an object) + $expanded_value = array(); + $value_keys = array_keys((array)$value); + sort($value_keys); + foreach($value_keys as $value_key) { + $val = $value->{$value_key}; + $val = self::arrayify($val); + $val = $this->_expand($active_ctx, $key, $val, $options, false); + foreach($val as $item) { + if(!property_exists($item, '@index')) { + $item->{'@index'} = $value_key; + } + $expanded_value[] = $item; + } + } + } else { + // recurse into @list or @set + $is_list = ($expanded_property === '@list'); + if($is_list || $expanded_property === '@set') { + $next_active_property = $active_property; + if($is_list && $expanded_active_property === '@graph') { + $next_active_property = null; + } + $expanded_value = $this->_expand( + $active_ctx, $next_active_property, $value, $options, $is_list); + if($is_list && self::_isList($expanded_value)) { + throw new JsonLdException( + 'Invalid JSON-LD syntax; lists of lists are not permitted.', + 'jsonld.SyntaxError', 'list of lists'); + } + } else { + // recursively expand value with key as new active property + $expanded_value = $this->_expand( + $active_ctx, $key, $value, $options, false); + } + } + + // drop null values if property is not @value + if($expanded_value === null && $expanded_property !== '@value') { + continue; + } + + // convert expanded value to @list if container specifies it + if($expanded_property !== '@list' && !self::_isList($expanded_value) && + $container === '@list') { + // ensure expanded value is an array + $expanded_value = (object)array( + '@list' => self::arrayify($expanded_value)); + } + + // FIXME: can this be merged with code above to simplify? + // merge in reverse properties + if(property_exists($active_ctx->mappings, $key) && + $active_ctx->mappings->{$key} && + $active_ctx->mappings->{$key}->reverse) { + if(property_exists($rval, '@reverse')) { + $reverse_map = $rval->{'@reverse'}; + } else { + $reverse_map = $rval->{'@reverse'} = new stdClass(); + } + $expanded_value = self::arrayify($expanded_value); + foreach($expanded_value as $item) { + if(self::_isValue($item) || self::_isList($item)) { + throw new JsonLdException( + 'Invalid JSON-LD syntax; "@reverse" value must not be a ' + + '@value or an @list.', 'jsonld.SyntaxError', + 'invalid reverse property value', + array('value' => $expanded_value)); + } + self::addValue( + $reverse_map, $expanded_property, $item, + array('propertyIsArray' => true)); + } + continue; + } + + // add value for property + // use an array except for certain keywords + $use_array = (!in_array( + $expanded_property, array( + '@index', '@id', '@type', '@value', '@language'))); + self::addValue( + $rval, $expanded_property, $expanded_value, + array('propertyIsArray' => $use_array)); + } + + // get property count on expanded output + $keys = array_keys((array)$rval); + $count = count($keys); + + // @value must only have @language or @type + if(property_exists($rval, '@value')) { + // @value must only have @language or @type + if(property_exists($rval, '@type') && + property_exists($rval, '@language')) { + throw new JsonLdException( + 'Invalid JSON-LD syntax; an element containing "@value" may not ' . + 'contain both "@type" and "@language".', + 'jsonld.SyntaxError', 'invalid value object', + array('element' => $rval)); + } + $valid_count = $count - 1; + if(property_exists($rval, '@type')) { + $valid_count -= 1; + } + if(property_exists($rval, '@index')) { + $valid_count -= 1; + } + if(property_exists($rval, '@language')) { + $valid_count -= 1; + } + if($valid_count !== 0) { + throw new JsonLdException( + 'Invalid JSON-LD syntax; an element containing "@value" may only ' . + 'have an "@index" property and at most one other property ' . + 'which can be "@type" or "@language".', + 'jsonld.SyntaxError', 'invalid value object', + array('element' => $rval)); + } + // drop null @values + if($rval->{'@value'} === null) { + $rval = null; + } else if(property_exists($rval, '@language') && + !is_string($rval->{'@value'})) { + // if @language is present, @value must be a string + throw new JsonLdException( + 'Invalid JSON-LD syntax; only strings may be language-tagged.', + 'jsonld.SyntaxError', 'invalid language-tagged value', + array('element' => $rval)); + } else if(property_exists($rval, '@type') && + (!self::_isAbsoluteIri($rval->{'@type'}) || + strpos($rval->{'@type'}, '_:') === 0)) { + throw new JsonLdException( + 'Invalid JSON-LD syntax; an element containing "@value" ' . + 'and "@type" must have an absolute IRI for the value ' . + 'of "@type".', 'jsonld.SyntaxError', 'invalid typed value', + array('element' => $rval)); + } + } else if(property_exists($rval, '@type') && !is_array($rval->{'@type'})) { + // convert @type to an array + $rval->{'@type'} = array($rval->{'@type'}); + } else if(property_exists($rval, '@set') || + property_exists($rval, '@list')) { + // handle @set and @list + if($count > 1 && !($count === 2 && property_exists($rval, '@index'))) { + throw new JsonLdException( + 'Invalid JSON-LD syntax; if an element has the property "@set" ' . + 'or "@list", then it can have at most one other property that is ' . + '"@index".', 'jsonld.SyntaxError', 'invalid set or list object', + array('element' => $rval)); + } + // optimize away @set + if(property_exists($rval, '@set')) { + $rval = $rval->{'@set'}; + $keys = array_keys((array)$rval); + $count = count($keys); + } + } else if($count === 1 && property_exists($rval, '@language')) { + // drop objects with only @language + $rval = null; + } + + // drop certain top-level objects that do not occur in lists + if(is_object($rval) && + !$options['keepFreeFloatingNodes'] && !$inside_list && + ($active_property === null || $expanded_active_property === '@graph')) { + // drop empty object or top-level @value/@list, or object with only @id + if($count === 0 || property_exists($rval, '@value') || + property_exists($rval, '@list') || + ($count === 1 && property_exists($rval, '@id'))) { + $rval = null; + } + } + + return $rval; + } + + /** + * Performs JSON-LD flattening. + * + * @param array $input the expanded JSON-LD to flatten. + * + * @return array the flattened output. + */ + protected function _flatten($input) { + // produce a map of all subjects and name each bnode + $namer = new UniqueNamer('_:b'); + $graphs = (object)array('@default' => new stdClass()); + $this->_createNodeMap($input, $graphs, '@default', $namer); + + // add all non-default graphs to default graph + $default_graph = $graphs->{'@default'}; + $graph_names = array_keys((array)$graphs); + foreach($graph_names as $graph_name) { + if($graph_name === '@default') { + continue; + } + $node_map = $graphs->{$graph_name}; + if(!property_exists($default_graph, $graph_name)) { + $default_graph->{$graph_name} = (object)array( + '@id' => $graph_name, '@graph' => array()); + } + $subject = $default_graph->{$graph_name}; + if(!property_exists($subject, '@graph')) { + $subject->{'@graph'} = array(); + } + $ids = array_keys((array)$node_map); + sort($ids); + foreach($ids as $id) { + $node = $node_map->{$id}; + // only add full subjects + if(!self::_isSubjectReference($node)) { + $subject->{'@graph'}[] = $node; + } + } + } + + // produce flattened output + $flattened = array(); + $keys = array_keys((array)$default_graph); + sort($keys); + foreach($keys as $key) { + $node = $default_graph->{$key}; + // only add full subjects to top-level + if(!self::_isSubjectReference($node)) { + $flattened[] = $node; + } + } + return $flattened; + } + + /** + * Performs JSON-LD framing. + * + * @param array $input the expanded JSON-LD to frame. + * @param array $frame the expanded JSON-LD frame to use. + * @param assoc $options the framing options. + * + * @return array the framed output. + */ + protected function _frame($input, $frame, $options) { + // create framing state + $state = (object)array( + 'options' => $options, + 'graphs' => (object)array( + '@default' => new stdClass(), + '@merged' => new stdClass()), + 'subjectStack' => array(), + 'link' => new stdClass()); + + // produce a map of all graphs and name each bnode + // FIXME: currently uses subjects from @merged graph only + $namer = new UniqueNamer('_:b'); + $this->_createNodeMap($input, $state->graphs, '@merged', $namer); + $state->subjects = $state->graphs->{'@merged'}; + + // frame the subjects + $framed = new ArrayObject(); + $keys = array_keys((array)$state->subjects); + sort($keys); + $this->_matchFrame($state, $keys, $frame, $framed, null); + return (array)$framed; + } + + /** + * Performs normalization on the given RDF dataset. + * + * @param stdClass $dataset the RDF dataset to normalize. + * @param assoc $options the normalization options. + * + * @return mixed the normalized output. + */ + protected function _normalize($dataset, $options) { + // create quads and map bnodes to their associated quads + $quads = array(); + $bnodes = new stdClass(); + foreach($dataset as $graph_name => $triples) { + if($graph_name === '@default') { + $graph_name = null; + } + foreach($triples as $triple) { + $quad = $triple; + if($graph_name !== null) { + if(strpos($graph_name, '_:') === 0) { + $quad->name = (object)array( + 'type' => 'blank node', 'value' => $graph_name); + } else { + $quad->name = (object)array( + 'type' => 'IRI', 'value' => $graph_name); + } + } + $quads[] = $quad; + + foreach(array('subject', 'object', 'name') as $attr) { + if(property_exists($quad, $attr) && + $quad->{$attr}->type === 'blank node') { + $id = $quad->{$attr}->value; + if(property_exists($bnodes, $id)) { + $bnodes->{$id}->quads[] = $quad; + } else { + $bnodes->{$id} = (object)array('quads' => array($quad)); + } + } + } + } + } + + // mapping complete, start canonical naming + $namer = new UniqueNamer('_:c14n'); + + // continue to hash bnode quads while bnodes are assigned names + $unnamed = null; + $nextUnnamed = array_keys((array)$bnodes); + $duplicates = null; + do { + $unnamed = $nextUnnamed; + $nextUnnamed = array(); + $duplicates = new stdClass(); + $unique = new stdClass(); + foreach($unnamed as $bnode) { + // hash quads for each unnamed bnode + $hash = $this->_hashQuads($bnode, $bnodes, $namer); + + // store hash as unique or a duplicate + if(property_exists($duplicates, $hash)) { + $duplicates->{$hash}[] = $bnode; + $nextUnnamed[] = $bnode; + } else if(property_exists($unique, $hash)) { + $duplicates->{$hash} = array($unique->{$hash}, $bnode); + $nextUnnamed[] = $unique->{$hash}; + $nextUnnamed[] = $bnode; + unset($unique->{$hash}); + } else { + $unique->{$hash} = $bnode; + } + } + + // name unique bnodes in sorted hash order + $hashes = array_keys((array)$unique); + sort($hashes); + foreach($hashes as $hash) { + $namer->getName($unique->{$hash}); + } + } + while(count($unnamed) > count($nextUnnamed)); + + // enumerate duplicate hash groups in sorted order + $hashes = array_keys((array)$duplicates); + sort($hashes); + foreach($hashes as $hash) { + // process group + $group = $duplicates->{$hash}; + $results = array(); + foreach($group as $bnode) { + // skip already-named bnodes + if($namer->isNamed($bnode)) { + continue; + } + + // hash bnode paths + $path_namer = new UniqueNamer('_:b'); + $path_namer->getName($bnode); + $results[] = $this->_hashPaths($bnode, $bnodes, $namer, $path_namer); + } + + // name bnodes in hash order + usort($results, function($a, $b) { + $a = $a->hash; + $b = $b->hash; + return ($a < $b) ? -1 : (($a > $b) ? 1 : 0); + }); + foreach($results as $result) { + // name all bnodes in path namer in key-entry order + foreach($result->pathNamer->order as $bnode) { + $namer->getName($bnode); + } + } + } + + // create normalized array + $normalized = array(); + + /* Note: At this point all bnodes in the set of RDF quads have been + assigned canonical names, which have been stored in the 'namer' object. + Here each quad is updated by assigning each of its bnodes its new name + via the 'namer' object. */ + + // update bnode names in each quad and serialize + foreach($quads as $quad) { + foreach(array('subject', 'object', 'name') as $attr) { + if(property_exists($quad, $attr) && + $quad->{$attr}->type === 'blank node' && + strpos($quad->{$attr}->value, '_:c14n') !== 0) { + $quad->{$attr}->value = $namer->getName($quad->{$attr}->value); + } + } + $normalized[] = $this->toNQuad($quad, property_exists($quad, 'name') ? + $quad->name->value : null); + } + + // sort normalized output + sort($normalized); + + // handle output format + if(isset($options['format']) && $options['format']) { + if($options['format'] === 'application/nquads') { + return implode($normalized); + } + throw new JsonLdException( + 'Unknown output format.', + 'jsonld.UnknownFormat', null, array('format' => $options['format'])); + } + + // return RDF dataset + return $this->parseNQuads(implode($normalized)); + } + + /** + * Converts an RDF dataset to JSON-LD. + * + * @param stdClass $dataset the RDF dataset. + * @param assoc $options the RDF serialization options. + * + * @return array the JSON-LD output. + */ + protected function _fromRDF($dataset, $options) { + $default_graph = new stdClass(); + $graph_map = (object)array('@default' => $default_graph); + $referenced_once = (object)array(); + + foreach($dataset as $name => $graph) { + if(!property_exists($graph_map, $name)) { + $graph_map->{$name} = new stdClass(); + } + if($name !== '@default' && !property_exists($default_graph, $name)) { + $default_graph->{$name} = (object)array('@id' => $name); + } + $node_map = $graph_map->{$name}; + foreach($graph as $triple) { + // get subject, predicate, object + $s = $triple->subject->value; + $p = $triple->predicate->value; + $o = $triple->object; + + if(!property_exists($node_map, $s)) { + $node_map->{$s} = (object)array('@id' => $s); + } + $node = $node_map->{$s}; + + $object_is_id = ($o->type === 'IRI' || $o->type === 'blank node'); + if($object_is_id && !property_exists($node_map, $o->value)) { + $node_map->{$o->value} = (object)array('@id' => $o->value); + } + + if($p === self::RDF_TYPE && !$options['useRdfType'] && $object_is_id) { + self::addValue( + $node, '@type', $o->value, array('propertyIsArray' => true)); + continue; + } + + $value = self::_RDFToObject($o, $options['useNativeTypes']); + self::addValue($node, $p, $value, array('propertyIsArray' => true)); + + // object may be an RDF list/partial list node but we can't know + // easily until all triples are read + if($object_is_id) { + if($o->value === self::RDF_NIL) { + $object = $node_map->{$o->value}; + if(!property_exists($object, 'usages')) { + $object->usages = array(); + } + $object->usages[] = (object)array( + 'node' => $node, + 'property' => $p, + 'value' => $value); + } else if(property_exists($referenced_once, $o->value)) { + // object referenced more than once + $referenced_once->{$o->value} = false; + } else { + // track single reference + $referenced_once->{$o->value} = (object)array( + 'node' => $node, + 'property' => $p, + 'value' => $value); + } + } + } + } + + // convert linked lists to @list arrays + foreach($graph_map as $name => $graph_object) { + // no @lists to be converted, continue + if(!property_exists($graph_object, self::RDF_NIL)) { + continue; + } + + // iterate backwards through each RDF list + $nil = $graph_object->{self::RDF_NIL}; + foreach($nil->usages as $usage) { + $node = $usage->node; + $property = $usage->property; + $head = $usage->value; + $list = array(); + $list_nodes = array(); + + // ensure node is a well-formed list node; it must: + // 1. Be referenced only once. + // 2. Have an array for rdf:first that has 1 item. + // 3. Have an array for rdf:rest that has 1 item. + // 4. Have no keys other than: @id, rdf:first, rdf:rest, and, + // optionally, @type where the value is rdf:List. + $node_key_count = count(array_keys((array)$node)); + while($property === self::RDF_REST && + property_exists($referenced_once, $node->{'@id'}) && + is_object($referenced_once->{$node->{'@id'}}) && + property_exists($node, self::RDF_FIRST) && + property_exists($node, self::RDF_REST) && + is_array($node->{self::RDF_FIRST}) && + is_array($node->{self::RDF_REST}) && + count($node->{self::RDF_FIRST}) === 1 && + count($node->{self::RDF_REST}) === 1 && + ($node_key_count === 3 || ($node_key_count === 4 && + property_exists($node, '@type') && is_array($node->{'@type'}) && + count($node->{'@type'}) === 1 && + $node->{'@type'}[0] === self::RDF_LIST))) { + $list[] = $node->{self::RDF_FIRST}[0]; + $list_nodes[] = $node->{'@id'}; + + // get next node, moving backwards through list + $usage = $referenced_once->{$node->{'@id'}}; + $node = $usage->node; + $property = $usage->property; + $head = $usage->value; + $node_key_count = count(array_keys((array)$node)); + + // if node is not a blank node, then list head found + if(strpos($node->{'@id'}, '_:') !== 0) { + break; + } + } + + // list is nested in another list + if($property === self::RDF_FIRST) { + // empty list + if($node->{'@id'} === self::RDF_NIL) { + // can't convert rdf:nil to a @list object because it would + // result in a list of lists which isn't supported + continue; + } + + // preserve list head + $head = $graph_object->{$head->{'@id'}}->{self::RDF_REST}[0]; + array_pop($list); + array_pop($list_nodes); + } + + // transform list into @list object + unset($head->{'@id'}); + $head->{'@list'} = array_reverse($list); + foreach($list_nodes as $list_node) { + unset($graph_object->{$list_node}); + } + } + + unset($nil->usages); + } + + $result = array(); + $subjects = array_keys((array)$default_graph); + sort($subjects); + foreach($subjects as $subject) { + $node = $default_graph->{$subject}; + if(property_exists($graph_map, $subject)) { + $node->{'@graph'} = array(); + $graph_object = $graph_map->{$subject}; + $subjects_ = array_keys((array)$graph_object); + sort($subjects_); + foreach($subjects_ as $subject_) { + $node_ = $graph_object->{$subject_}; + // only add full subjects to top-level + if(!self::_isSubjectReference($node_)) { + $node->{'@graph'}[] = $node_; + } + } + } + // only add full subjects to top-level + if(!self::_isSubjectReference($node)) { + $result[] = $node; + } + } + + return $result; + } + + /** + * Processes a local context and returns a new active context. + * + * @param stdClass $active_ctx the current active context. + * @param mixed $local_ctx the local context to process. + * @param assoc $options the context processing options. + * + * @return stdClass the new active context. + */ + protected function _processContext($active_ctx, $local_ctx, $options) { + global $jsonld_cache; + + // normalize local context to an array + if(is_object($local_ctx) && property_exists($local_ctx, '@context') && + is_array($local_ctx->{'@context'})) { + $local_ctx = $local_ctx->{'@context'}; + } + $ctxs = self::arrayify($local_ctx); + + // no contexts in array, clone existing context + if(count($ctxs) === 0) { + return self::_cloneActiveContext($active_ctx); + } + + // process each context in order, update active context + // on each iteration to ensure proper caching + $rval = $active_ctx; + foreach($ctxs as $ctx) { + // reset to initial context + if($ctx === null) { + $rval = $active_ctx = $this->_getInitialContext($options); + continue; + } + + // dereference @context key if present + if(is_object($ctx) && property_exists($ctx, '@context')) { + $ctx = $ctx->{'@context'}; + } + + // context must be an object by now, all URLs retrieved before this call + if(!is_object($ctx)) { + throw new JsonLdException( + 'Invalid JSON-LD syntax; @context must be an object.', + 'jsonld.SyntaxError', 'invalid local context', + array('context' => $ctx)); + } + + // get context from cache if available + if(property_exists($jsonld_cache, 'activeCtx')) { + $cached = $jsonld_cache->activeCtx->get($active_ctx, $ctx); + if($cached) { + $rval = $active_ctx = $cached; + $must_clone = true; + continue; + } + } + + // update active context and clone new one before updating + $active_ctx = $rval; + $rval = self::_cloneActiveContext($rval); + + // define context mappings for keys in local context + $defined = new stdClass(); + + // handle @base + if(property_exists($ctx, '@base')) { + $base = $ctx->{'@base'}; + if($base === null) { + $base = null; + } else if(!is_string($base)) { + throw new JsonLdException( + 'Invalid JSON-LD syntax; the value of "@base" in a ' . + '@context must be a string or null.', + 'jsonld.SyntaxError', 'invalid base IRI', array('context' => $ctx)); + } else if($base !== '' && !self::_isAbsoluteIri($base)) { + throw new JsonLdException( + 'Invalid JSON-LD syntax; the value of "@base" in a ' . + '@context must be an absolute IRI or the empty string.', + 'jsonld.SyntaxError', 'invalid base IRI', array('context' => $ctx)); + } + if($base !== null) { + $base = jsonld_parse_url($base); + } + $rval->{'@base'} = $base; + $defined->{'@base'} = true; + } + + // handle @vocab + if(property_exists($ctx, '@vocab')) { + $value = $ctx->{'@vocab'}; + if($value === null) { + unset($rval->{'@vocab'}); + } else if(!is_string($value)) { + throw new JsonLdException( + 'Invalid JSON-LD syntax; the value of "@vocab" in a ' . + '@context must be a string or null.', + 'jsonld.SyntaxError', 'invalid vocab mapping', + array('context' => $ctx)); + } else if(!self::_isAbsoluteIri($value)) { + throw new JsonLdException( + 'Invalid JSON-LD syntax; the value of "@vocab" in a ' . + '@context must be an absolute IRI.', + 'jsonld.SyntaxError', 'invalid vocab mapping', + array('context' => $ctx)); + } else { + $rval->{'@vocab'} = $value; + } + $defined->{'@vocab'} = true; + } + + // handle @language + if(property_exists($ctx, '@language')) { + $value = $ctx->{'@language'}; + if($value === null) { + unset($rval->{'@language'}); + } else if(!is_string($value)) { + throw new JsonLdException( + 'Invalid JSON-LD syntax; the value of "@language" in a ' . + '@context must be a string or null.', + 'jsonld.SyntaxError', 'invalid default language', + array('context' => $ctx)); + } else { + $rval->{'@language'} = strtolower($value); + } + $defined->{'@language'} = true; + } + + // process all other keys + foreach($ctx as $k => $v) { + $this->_createTermDefinition($rval, $ctx, $k, $defined); + } + + // cache result + if(property_exists($jsonld_cache, 'activeCtx')) { + $jsonld_cache->activeCtx->set($active_ctx, $ctx, $rval); + } + } + + return $rval; + } + + /** + * Expands a language map. + * + * @param stdClass $language_map the language map to expand. + * + * @return array the expanded language map. + */ + protected function _expandLanguageMap($language_map) { + $rval = array(); + $keys = array_keys((array)$language_map); + sort($keys); + foreach($keys as $key) { + $values = $language_map->{$key}; + $values = self::arrayify($values); + foreach($values as $item) { + if($item === null) { + continue; + } + if(!is_string($item)) { + throw new JsonLdException( + 'Invalid JSON-LD syntax; language map values must be strings.', + 'jsonld.SyntaxError', 'invalid language map value', + array('languageMap', $language_map)); + } + $rval[] = (object)array( + '@value' => $item, + '@language' => strtolower($key)); + } + } + return $rval; + } + + /** + * Labels the blank nodes in the given value using the given UniqueNamer. + * + * @param UniqueNamer $namer the UniqueNamer to use. + * @param mixed $element the element with blank nodes to rename. + * + * @return mixed the element. + */ + public function _labelBlankNodes($namer, $element) { + if(is_array($element)) { + $length = count($element); + for($i = 0; $i < $length; ++$i) { + $element[$i] = $this->_labelBlankNodes($namer, $element[$i]); + } + } else if(self::_isList($element)) { + $element->{'@list'} = $this->_labelBlankNodes( + $namer, $element->{'@list'}); + } else if(is_object($element)) { + // rename blank node + if(self::_isBlankNode($element)) { + $name = null; + if(property_exists($element, '@id')) { + $name = $element->{'@id'}; + } + $element->{'@id'} = $namer->getName($name); + } + + // recursively apply to all keys + $keys = array_keys((array)$element); + sort($keys); + foreach($keys as $key) { + if($key !== '@id') { + $element->{$key} = $this->_labelBlankNodes($namer, $element->{$key}); + } + } + } + + return $element; + } + + /** + * Expands the given value by using the coercion and keyword rules in the + * given context. + * + * @param stdClass $active_ctx the active context to use. + * @param string $active_property the property the value is associated with. + * @param mixed $value the value to expand. + * + * @return mixed the expanded value. + */ + protected function _expandValue($active_ctx, $active_property, $value) { + // nothing to expand + if($value === null) { + return null; + } + + // special-case expand @id and @type (skips '@id' expansion) + $expanded_property = $this->_expandIri( + $active_ctx, $active_property, array('vocab' => true)); + if($expanded_property === '@id') { + return $this->_expandIri($active_ctx, $value, array('base' => true)); + } else if($expanded_property === '@type') { + return $this->_expandIri( + $active_ctx, $value, array('vocab' => true, 'base' => true)); + } + + // get type definition from context + $type = self::getContextValue($active_ctx, $active_property, '@type'); + + // do @id expansion (automatic for @graph) + if($type === '@id' || ($expanded_property === '@graph' && + is_string($value))) { + return (object)array('@id' => $this->_expandIri( + $active_ctx, $value, array('base' => true))); + } + // do @id expansion w/vocab + if($type === '@vocab') { + return (object)array('@id' => $this->_expandIri( + $active_ctx, $value, array('vocab' => true, 'base' => true))); + } + + // do not expand keyword values + if(self::_isKeyword($expanded_property)) { + return $value; + } + + $rval = new stdClass(); + + // other type + if($type !== null) { + $rval->{'@type'} = $type; + } else if(is_string($value)) { + // check for language tagging for strings + $language = self::getContextValue( + $active_ctx, $active_property, '@language'); + if($language !== null) { + $rval->{'@language'} = $language; + } + } + $rval->{'@value'} = $value; + + return $rval; + } + + /** + * Creates an array of RDF triples for the given graph. + * + * @param stdClass $graph the graph to create RDF triples for. + * @param UniqueNamer $namer for assigning bnode names. + * @param assoc $options the RDF serialization options. + * + * @return array the array of RDF triples for the given graph. + */ + protected function _graphToRDF($graph, $namer, $options) { + $rval = array(); + + $ids = array_keys((array)$graph); + sort($ids); + foreach($ids as $id) { + $node = $graph->{$id}; + if($id === '"') { + $id = ''; + } + $properties = array_keys((array)$node); + sort($properties); + foreach($properties as $property) { + $items = $node->{$property}; + if($property === '@type') { + $property = self::RDF_TYPE; + } else if(self::_isKeyword($property)) { + continue; + } + + foreach($items as $item) { + // skip relative IRI subjects and predicates + if(!(self::_isAbsoluteIri($id) && self::_isAbsoluteIri($property))) { + continue; + } + + // RDF subject + $subject = new stdClass(); + $subject->type = (strpos($id, '_:') === 0) ? 'blank node' : 'IRI'; + $subject->value = $id; + + // RDF predicate + $predicate = new stdClass(); + $predicate->type = (strpos($property, '_:') === 0 ? + 'blank node' : 'IRI'); + $predicate->value = $property; + + // skip bnode predicates unless producing generalized RDF + if($predicate->type === 'blank node' && + !$options['produceGeneralizedRdf']) { + continue; + } + + if(self::_isList($item)) { + // convert @list to triples + $this->_listToRDF( + $item->{'@list'}, $namer, $subject, $predicate, $rval); + } else { + // convert value or node object to triple + $object = $this->_objectToRDF($item); + // skip null objects (they are relative IRIs) + if($object) { + $rval[] = (object)array( + 'subject' => $subject, + 'predicate' => $predicate, + 'object' => $object); + } + } + } + } + } + + return $rval; + } + + /** + * Converts a @list value into linked list of blank node RDF triples + * (an RDF collection). + * + * @param array $list the @list value. + * @param UniqueNamer $namer for assigning blank node names. + * @param stdClass $subject the subject for the head of the list. + * @param stdClass $predicate the predicate for the head of the list. + * @param &array $triples the array of triples to append to. + */ + protected function _listToRDF( + $list, $namer, $subject, $predicate, &$triples) { + $first = (object)array('type' => 'IRI', 'value' => self::RDF_FIRST); + $rest = (object)array('type' => 'IRI', 'value' => self::RDF_REST); + $nil = (object)array('type' => 'IRI', 'value' => self::RDF_NIL); + + foreach($list as $item) { + $blank_node = (object)array( + 'type' => 'blank node', 'value' => $namer->getName()); + $triples[] = (object)array( + 'subject' => $subject, + 'predicate' => $predicate, + 'object' => $blank_node); + + $subject = $blank_node; + $predicate = $first; + $object = $this->_objectToRDF($item); + // skip null objects (they are relative IRIs) + if($object) { + $triples[] = (object)array( + 'subject' => $subject, + 'predicate' => $predicate, + 'object' => $object); + } + + $predicate = $rest; + } + + $triples[] = (object)array( + 'subject' => $subject, 'predicate' => $predicate, 'object' => $nil); + } + + /** + * Converts a JSON-LD value object to an RDF literal or a JSON-LD string or + * node object to an RDF resource. + * + * @param mixed $item the JSON-LD value or node object. + * + * @return stdClass the RDF literal or RDF resource. + */ + protected function _objectToRDF($item) { + $object = new stdClass(); + + if(self::_isValue($item)) { + $object->type = 'literal'; + $value = $item->{'@value'}; + $datatype = property_exists($item, '@type') ? $item->{'@type'} : null; + + // convert to XSD datatypes as appropriate + if(is_bool($value)) { + $object->value = ($value ? 'true' : 'false'); + $object->datatype = $datatype ? $datatype : self::XSD_BOOLEAN; + } else if(is_double($value) || $datatype == self::XSD_DOUBLE) { + // canonical double representation + $object->value = preg_replace( + '/(\d)0*E\+?/', '$1E', sprintf('%1.15E', $value)); + $object->datatype = $datatype ? $datatype : self::XSD_DOUBLE; + } else if(is_integer($value)) { + $object->value = strval($value); + $object->datatype = $datatype ? $datatype : self::XSD_INTEGER; + } else if(property_exists($item, '@language')) { + $object->value = $value; + $object->datatype = $datatype ? $datatype : self::RDF_LANGSTRING; + $object->language = $item->{'@language'}; + } else { + $object->value = $value; + $object->datatype = $datatype ? $datatype : self::XSD_STRING; + } + } else { + // convert string/node object to RDF + $id = is_object($item) ? $item->{'@id'} : $item; + $object->type = (strpos($id, '_:') === 0) ? 'blank node' : 'IRI'; + $object->value = $id; + } + + // skip relative IRIs + if($object->type === 'IRI' && !self::_isAbsoluteIri($object->value)) { + return null; + } + + return $object; + } + + /** + * Converts an RDF triple object to a JSON-LD object. + * + * @param stdClass $o the RDF triple object to convert. + * @param bool $use_native_types true to output native types, false not to. + * + * @return stdClass the JSON-LD object. + */ + protected function _RDFToObject($o, $use_native_types) { + // convert IRI/blank node object to JSON-LD + if($o->type === 'IRI' || $o->type === 'blank node') { + return (object)array('@id' => $o->value); + } + + // convert literal object to JSON-LD + $rval = (object)array('@value' => $o->value); + + if(property_exists($o, 'language')) { + // add language + $rval->{'@language'} = $o->language; + } else { + // add datatype + $type = $o->datatype; + // use native types for certain xsd types + if($use_native_types) { + if($type === self::XSD_BOOLEAN) { + if($rval->{'@value'} === 'true') { + $rval->{'@value'} = true; + } else if($rval->{'@value'} === 'false') { + $rval->{'@value'} = false; + } + } else if(is_numeric($rval->{'@value'})) { + if($type === self::XSD_INTEGER) { + $i = intval($rval->{'@value'}); + if(strval($i) === $rval->{'@value'}) { + $rval->{'@value'} = $i; + } + } else if($type === self::XSD_DOUBLE) { + $rval->{'@value'} = doubleval($rval->{'@value'}); + } + } + // do not add native type + if(!in_array($type, array( + self::XSD_BOOLEAN, self::XSD_INTEGER, self::XSD_DOUBLE, + self::XSD_STRING))) { + $rval->{'@type'} = $type; + } + } else if($type !== self::XSD_STRING) { + $rval->{'@type'} = $type; + } + } + + return $rval; + } + + /** + * Recursively flattens the subjects in the given JSON-LD expanded input + * into a node map. + * + * @param mixed $input the JSON-LD expanded input. + * @param stdClass $graphs a map of graph name to subject map. + * @param string $graph the name of the current graph. + * @param UniqueNamer $namer the blank node namer. + * @param mixed $name the name assigned to the current input if it is a bnode. + * @param mixed $list the list to append to, null for none. + */ + protected function _createNodeMap( + $input, $graphs, $graph, $namer, $name=null, $list=null) { + // recurse through array + if(is_array($input)) { + foreach($input as $e) { + $this->_createNodeMap($e, $graphs, $graph, $namer, null, $list); + } + return; + } + + // add non-object to list + if(!is_object($input)) { + if($list !== null) { + $list[] = $input; + } + return; + } + + // add values to list + if(self::_isValue($input)) { + if(property_exists($input, '@type')) { + $type = $input->{'@type'}; + // rename @type blank node + if(strpos($type, '_:') === 0) { + $type = $input->{'@type'} = $namer->getName($type); + } + } + if($list !== null) { + $list[] = $input; + } + return; + } + + // Note: At this point, input must be a subject. + + // spec requires @type to be named first, so assign names early + if(property_exists($input, '@type')) { + foreach($input->{'@type'} as $type) { + if(strpos($type, '_:') === 0) { + $namer->getName($type); + } + } + } + + // get name for subject + if($name === null) { + if(property_exists($input, '@id')) { + $name = $input->{'@id'}; + } + if(self::_isBlankNode($input)) { + $name = $namer->getName($name); + } + } + + // add subject reference to list + if($list !== null) { + $list[] = (object)array('@id' => $name); + } + + // create new subject or merge into existing one + if(!property_exists($graphs, $graph)) { + $graphs->{$graph} = new stdClass(); + } + $subjects = $graphs->{$graph}; + if(!property_exists($subjects, $name)) { + if($name === '') { + $subjects->{'"'} = new stdClass(); + } else { + $subjects->{$name} = new stdClass(); + } + } + if($name === '') { + $subject = $subjects->{'"'}; + } else { + $subject = $subjects->{$name}; + } + $subject->{'@id'} = $name; + $properties = array_keys((array)$input); + sort($properties); + foreach($properties as $property) { + // skip @id + if($property === '@id') { + continue; + } + + // handle reverse properties + if($property === '@reverse') { + $referenced_node = (object)array('@id' => $name); + $reverse_map = $input->{'@reverse'}; + foreach($reverse_map as $reverse_property => $items) { + foreach($items as $item) { + $item_name = null; + if(property_exists($item, '@id')) { + $item_name = $item->{'@id'}; + } + if(self::_isBlankNode($item)) { + $item_name = $namer->getName($item_name); + } + $this->_createNodeMap($item, $graphs, $graph, $namer, $item_name); + if($item_name === '') { + $item_name = '"'; + } + self::addValue( + $subjects->{$item_name}, $reverse_property, $referenced_node, + array('propertyIsArray' => true, 'allowDuplicate' => false)); + } + } + continue; + } + + // recurse into graph + if($property === '@graph') { + // add graph subjects map entry + if(!property_exists($graphs, $name)) { + // FIXME: temporary hack to avoid empty property bug + if(!$name) { + $name = '"'; + } + $graphs->{$name} = new stdClass(); + } + $g = ($graph === '@merged') ? $graph : $name; + $this->_createNodeMap( + $input->{$property}, $graphs, $g, $namer, null, null); + continue; + } + + // copy non-@type keywords + if($property !== '@type' && self::_isKeyword($property)) { + if($property === '@index' && property_exists($subject, '@index') && + ($input->{'@index'} !== $subject->{'@index'} || + $input->{'@index'}->{'@id'} !== $subject->{'@index'}->{'@id'})) { + throw new JsonLdException( + 'Invalid JSON-LD syntax; conflicting @index property detected.', + 'jsonld.SyntaxError', 'conflicting indexes', + array('subject' => $subject)); + } + $subject->{$property} = $input->{$property}; + continue; + } + + // iterate over objects + $objects = $input->{$property}; + + // if property is a bnode, assign it a new id + if(strpos($property, '_:') === 0) { + $property = $namer->getName($property); + } + + // ensure property is added for empty arrays + if(count($objects) === 0) { + self::addValue( + $subject, $property, array(), array('propertyIsArray' => true)); + continue; + } + foreach($objects as $o) { + if($property === '@type') { + // rename @type blank nodes + $o = (strpos($o, '_:') === 0) ? $namer->getName($o) : $o; + } + + // handle embedded subject or subject reference + if(self::_isSubject($o) || self::_isSubjectReference($o)) { + // rename blank node @id + $id = property_exists($o, '@id') ? $o->{'@id'} : null; + if(self::_isBlankNode($o)) { + $id = $namer->getName($id); + } + + // add reference and recurse + self::addValue( + $subject, $property, (object)array('@id' => $id), + array('propertyIsArray' => true, 'allowDuplicate' => false)); + $this->_createNodeMap($o, $graphs, $graph, $namer, $id, null); + } else if(self::_isList($o)) { + // handle @list + $_list = new ArrayObject(); + $this->_createNodeMap( + $o->{'@list'}, $graphs, $graph, $namer, $name, $_list); + $o = (object)array('@list' => (array)$_list); + self::addValue( + $subject, $property, $o, + array('propertyIsArray' => true, 'allowDuplicate' => false)); + } else { + // handle @value + $this->_createNodeMap($o, $graphs, $graph, $namer, $name, null); + self::addValue( + $subject, $property, $o, + array('propertyIsArray' => true, 'allowDuplicate' => false)); + } + } + } + } + + /** + * Frames subjects according to the given frame. + * + * @param stdClass $state the current framing state. + * @param array $subjects the subjects to filter. + * @param array $frame the frame. + * @param mixed $parent the parent subject or top-level array. + * @param mixed $property the parent property, initialized to null. + */ + protected function _matchFrame( + $state, $subjects, $frame, $parent, $property) { + // validate the frame + $this->_validateFrame($frame); + $frame = $frame[0]; + + // get flags for current frame + $options = $state->options; + $flags = array( + 'embed' => $this->_getFrameFlag($frame, $options, 'embed'), + 'explicit' => $this->_getFrameFlag($frame, $options, 'explicit'), + 'requireAll' => $this->_getFrameFlag($frame, $options, 'requireAll')); + + // filter out subjects that match the frame + $matches = $this->_filterSubjects($state, $subjects, $frame, $flags); + + // add matches to output + foreach($matches as $id => $subject) { + if($flags['embed'] === '@link' && property_exists($state->link, $id)) { + // TODO: may want to also match an existing linked subject against + // the current frame ... so different frames could produce different + // subjects that are only shared in-memory when the frames are the same + + // add existing linked subject + $this->_addFrameOutput($parent, $property, $state->link->{$id}); + continue; + } + + /* Note: In order to treat each top-level match as a compartmentalized + result, clear the unique embedded subjects map when the property is null, + which only occurs at the top-level. */ + if($property === null) { + $state->uniqueEmbeds = new stdClass(); + } + + // start output for subject + $output = new stdClass(); + $output->{'@id'} = $id; + $state->link->{$id} = $output; + + // if embed is @never or if a circular reference would be created by an + // embed, the subject cannot be embedded, just add the reference; + // note that a circular reference won't occur when the embed flag is + // `@link` as the above check will short-circuit before reaching this point + if($flags['embed'] === '@never' || + $this->_createsCircularReference($subject, $state->subjectStack)) { + $this->_addFrameOutput($parent, $property, $output); + continue; + } + + // if only the last match should be embedded + if($flags['embed'] === '@last') { + // remove any existing embed + if(property_exists($state->uniqueEmbeds, $id)) { + $this->_removeEmbed($state, $id); + } + $state->uniqueEmbeds->{$id} = array( + 'parent' => $parent, 'property' => $property); + } + + // push matching subject onto stack to enable circular embed checks + $state->subjectStack[] = $subject; + + // iterate over subject properties + $props = array_keys((array)$subject); + sort($props); + foreach($props as $prop) { + // copy keywords to output + if(self::_isKeyword($prop)) { + $output->{$prop} = self::copy($subject->{$prop}); + continue; + } + + // explicit is on and property isn't in the frame, skip processing + if($flags['explicit'] && !property_exists($frame, $prop)) { + continue; + } + + // add objects + $objects = $subject->{$prop}; + foreach($objects as $o) { + // recurse into list + if(self::_isList($o)) { + // add empty list + $list = (object)array('@list' => array()); + $this->_addFrameOutput($output, $prop, $list); + + // add list objects + $src = $o->{'@list'}; + foreach($src as $o) { + if(self::_isSubjectReference($o)) { + // recurse into subject reference + $subframe = (property_exists($frame, $prop) ? + $frame->{$prop}[0]->{'@list'} : + $this->_createImplicitFrame($flags)); + $this->_matchFrame( + $state, array($o->{'@id'}), $subframe, $list, '@list'); + } else { + // include other values automatically + $this->_addFrameOutput($list, '@list', self::copy($o)); + } + } + continue; + } + + if(self::_isSubjectReference($o)) { + // recurse into subject reference + $subframe = (property_exists($frame, $prop) ? + $frame->{$prop} : $this->_createImplicitFrame($flags)); + $this->_matchFrame( + $state, array($o->{'@id'}), $subframe, $output, $prop); + } else { + // include other values automatically + $this->_addFrameOutput($output, $prop, self::copy($o)); + } + } + } + + // handle defaults + $props = array_keys((array)$frame); + sort($props); + foreach($props as $prop) { + // skip keywords + if(self::_isKeyword($prop)) { + continue; + } + + // if omit default is off, then include default values for properties + // that appear in the next frame but are not in the matching subject + $next = $frame->{$prop}[0]; + $omit_default_on = $this->_getFrameFlag( + $next, $options, 'omitDefault'); + if(!$omit_default_on && !property_exists($output, $prop)) { + $preserve = '@null'; + if(property_exists($next, '@default')) { + $preserve = self::copy($next->{'@default'}); + } + $preserve = self::arrayify($preserve); + $output->{$prop} = array((object)array('@preserve' => $preserve)); + } + } + + // add output to parent + $this->_addFrameOutput($parent, $property, $output); + + // pop matching subject from circular ref-checking stack + array_pop($state->subjectStack); + } + } + + /** + * Creates an implicit frame when recursing through subject matches. If + * a frame doesn't have an explicit frame for a particular property, then + * a wildcard child frame will be created that uses the same flags that the + * parent frame used. + * + * @param assoc flags the current framing flags. + * + * @return array the implicit frame. + */ + function _createImplicitFrame($flags) { + $frame = new stdClass(); + foreach($flags as $key => $value) { + $frame->{'@' . $key} = array($flags[$key]); + } + return array($frame); + } + + /** + * Checks the current subject stack to see if embedding the given subject + * would cause a circular reference. + * + * @param stdClass subject_to_embed the subject to embed. + * @param assoc subject_stack the current stack of subjects. + * + * @return bool true if a circular reference would be created, false if not. + */ + function _createsCircularReference($subject_to_embed, $subject_stack) { + for($i = count($subject_stack) - 1; $i >= 0; --$i) { + if($subject_stack[$i]->{'@id'} === $subject_to_embed->{'@id'}) { + return true; + } + } + return false; + } + + /** + * Gets the frame flag value for the given flag name. + * + * @param stdClass $frame the frame. + * @param stdClass $options the framing options. + * @param string $name the flag name. + * + * @return mixed $the flag value. + */ + protected function _getFrameFlag($frame, $options, $name) { + $flag = "@$name"; + $rval = (property_exists($frame, $flag) ? + $frame->{$flag}[0] : $options[$name]); + if($name === 'embed') { + // default is "@last" + // backwards-compatibility support for "embed" maps: + // true => "@last" + // false => "@never" + if($rval === true) { + $rval = '@last'; + } else if($rval === false) { + $rval = '@never'; + } else if($rval !== '@always' && $rval !== '@never' && + $rval !== '@link') { + $rval = '@last'; + } + } + return $rval; + } + + /** + * Validates a JSON-LD frame, throwing an exception if the frame is invalid. + * + * @param array $frame the frame to validate. + */ + protected function _validateFrame($frame) { + if(!is_array($frame) || count($frame) !== 1 || !is_object($frame[0])) { + throw new JsonLdException( + 'Invalid JSON-LD syntax; a JSON-LD frame must be a single object.', + 'jsonld.SyntaxError', null, array('frame' => $frame)); + } + } + + /** + * Returns a map of all of the subjects that match a parsed frame. + * + * @param stdClass $state the current framing state. + * @param array $subjects the set of subjects to filter. + * @param stdClass $frame the parsed frame. + * @param assoc $flags the frame flags. + * + * @return stdClass all of the matched subjects. + */ + protected function _filterSubjects($state, $subjects, $frame, $flags) { + $rval = new stdClass(); + sort($subjects); + foreach($subjects as $id) { + $subject = $state->subjects->{$id}; + if($this->_filterSubject($subject, $frame, $flags)) { + $rval->{$id} = $subject; + } + } + return $rval; + } + + /** + * Returns true if the given subject matches the given frame. + * + * @param stdClass $subject the subject to check. + * @param stdClass $frame the frame to check. + * @param assoc $flags the frame flags. + * + * @return bool true if the subject matches, false if not. + */ + protected function _filterSubject($subject, $frame, $flags) { + // check @type (object value means 'any' type, fall through to ducktyping) + if(property_exists($frame, '@type') && + !(count($frame->{'@type'}) === 1 && is_object($frame->{'@type'}[0]))) { + $types = $frame->{'@type'}; + foreach($types as $type) { + // any matching @type is a match + if(self::hasValue($subject, '@type', $type)) { + return true; + } + } + return false; + } + + // check ducktype + $wildcard = true; + $matches_some = false; + foreach($frame as $k => $v) { + if(self::_isKeyword($k)) { + // skip non-@id and non-@type + if($k !== '@id' && $k !== '@type') { + continue; + } + $wildcard = false; + + // check @id for a specific @id value + if($k === '@id' && is_string($v)) { + if(!property_exists($subject, $k) || $subject->{$k} !== $v) { + return false; + } + $matches_some = true; + continue; + } + } + + $wildcard = false; + + if(property_exists($subject, $k)) { + // $v === [] means do not match if property is present + if(is_array($v) && count($v) === 0) { + return false; + } + $matches_some = true; + continue; + } + + // all properties must match to be a duck unless a @default is specified + $has_default = (is_array($v) && count($v) === 1 && is_object($v[0]) && + property_exists($v[0], '@default')); + if($flags['requireAll'] && !$has_default) { + return false; + } + } + + // return true if wildcard or subject matches some properties + return $wildcard || $matches_some; + } + + /** + * Removes an existing embed. + * + * @param stdClass $state the current framing state. + * @param string $id the @id of the embed to remove. + */ + protected function _removeEmbed($state, $id) { + // get existing embed + $embeds = $state->uniqueEmbeds; + $embed = $embeds->{$id}; + $property = $embed['property']; + + // create reference to replace embed + $subject = (object)array('@id' => $id); + + // remove existing embed + if(is_array($embed->parent)) { + // replace subject with reference + foreach($embed->parent as $i => $parent) { + if(self::compareValues($parent, $subject)) { + $embed->parent[$i] = $subject; + break; + } + } + } else { + // replace subject with reference + $use_array = is_array($embed->parent->{$property}); + self::removeValue($embed->parent, $property, $subject, + array('propertyIsArray' => $use_array)); + self::addValue($embed->parent, $property, $subject, + array('propertyIsArray' => $use_array)); + } + + // recursively remove dependent dangling embeds + $removeDependents = function($id) { + // get embed keys as a separate array to enable deleting keys in map + $ids = array_keys((array)$embeds); + foreach($ids as $next) { + if(property_exists($embeds, $next) && + is_object($embeds->{$next}->parent) && + $embeds->{$next}->parent->{'@id'} === $id) { + unset($embeds->{$next}); + $removeDependents($next); + } + } + }; + $removeDependents($id); + } + + /** + * Adds framing output to the given parent. + * + * @param mixed $parent the parent to add to. + * @param string $property the parent property. + * @param mixed $output the output to add. + */ + protected function _addFrameOutput($parent, $property, $output) { + if(is_object($parent) && !($parent instanceof ArrayObject)) { + self::addValue( + $parent, $property, $output, array('propertyIsArray' => true)); + } else { + $parent[] = $output; + } + } + + /** + * Removes the @preserve keywords as the last step of the framing algorithm. + * + * @param stdClass $ctx the active context used to compact the input. + * @param mixed $input the framed, compacted output. + * @param assoc $options the compaction options used. + * + * @return mixed the resulting output. + */ + protected function _removePreserve($ctx, $input, $options) { + // recurse through arrays + if(is_array($input)) { + $output = array(); + foreach($input as $e) { + $result = $this->_removePreserve($ctx, $e, $options); + // drop nulls from arrays + if($result !== null) { + $output[] = $result; + } + } + $input = $output; + } else if(is_object($input)) { + // remove @preserve + if(property_exists($input, '@preserve')) { + if($input->{'@preserve'} === '@null') { + return null; + } + return $input->{'@preserve'}; + } + + // skip @values + if(self::_isValue($input)) { + return $input; + } + + // recurse through @lists + if(self::_isList($input)) { + $input->{'@list'} = $this->_removePreserve( + $ctx, $input->{'@list'}, $options); + return $input; + } + + // handle in-memory linked nodes + $id_alias = $this->_compactIri($ctx, '@id'); + if(property_exists($input, $id_alias)) { + $id = $input->{$id_alias}; + if(isset($options['link'][$id])) { + $idx = array_search($input, $options['link'][$id]); + if($idx === false) { + // prevent circular visitation + $options['link'][$id][] = $input; + } else { + // already visited + return $options['link'][$id][$idx]; + } + } else { + // prevent circular visitation + $options['link'][$id] = array($input); + } + } + + // recurse through properties + foreach($input as $prop => $v) { + $result = $this->_removePreserve($ctx, $v, $options); + $container = self::getContextValue($ctx, $prop, '@container'); + if($options['compactArrays'] && + is_array($result) && count($result) === 1 && + $container !== '@set' && $container !== '@list') { + $result = $result[0]; + } + $input->{$prop} = $result; + } + } + return $input; + } + + /** + * Compares two RDF triples for equality. + * + * @param stdClass $t1 the first triple. + * @param stdClass $t2 the second triple. + * + * @return true if the triples are the same, false if not. + */ + protected static function _compareRDFTriples($t1, $t2) { + foreach(array('subject', 'predicate', 'object') as $attr) { + if($t1->{$attr}->type !== $t2->{$attr}->type || + $t1->{$attr}->value !== $t2->{$attr}->value) { + return false; + } + } + if(property_exists($t1->object, 'language') !== + property_exists($t1->object, 'language')) { + return false; + } + if(property_exists($t1->object, 'language') && + $t1->object->language !== $t2->object->language) { + return false; + } + if(property_exists($t1->object, 'datatype') && + $t1->object->datatype !== $t2->object->datatype) { + return false; + } + return true; + } + + /** + * Hashes all of the quads about a blank node. + * + * @param string $id the ID of the bnode to hash quads for. + * @param stdClass $bnodes the mapping of bnodes to quads. + * @param UniqueNamer $namer the canonical bnode namer. + * + * @return string the new hash. + */ + protected function _hashQuads($id, $bnodes, $namer) { + // return cached hash + if(property_exists($bnodes->{$id}, 'hash')) { + return $bnodes->{$id}->hash; + } + + // serialize all of bnode's quads + $quads = $bnodes->{$id}->quads; + $nquads = array(); + foreach($quads as $quad) { + $nquads[] = $this->toNQuad($quad, property_exists($quad, 'name') ? + $quad->name->value : null, $id); + } + + // sort serialized quads + sort($nquads); + + // cache and return hashed quads + $hash = $bnodes->{$id}->hash = sha1(implode($nquads)); + return $hash; + } + + /** + * Produces a hash for the paths of adjacent bnodes for a bnode, + * incorporating all information about its subgraph of bnodes. This + * method will recursively pick adjacent bnode permutations that produce the + * lexicographically-least 'path' serializations. + * + * @param string $id the ID of the bnode to hash paths for. + * @param stdClass $bnodes the map of bnode quads. + * @param UniqueNamer $namer the canonical bnode namer. + * @param UniqueNamer $path_namer the namer used to assign names to adjacent + * bnodes. + * + * @return stdClass the hash and path namer used. + */ + protected function _hashPaths($id, $bnodes, $namer, $path_namer) { + // create SHA-1 digest + $md = hash_init('sha1'); + + // group adjacent bnodes by hash, keep properties and references separate + $groups = new stdClass(); + $quads = $bnodes->{$id}->quads; + foreach($quads as $quad) { + // get adjacent bnode + $bnode = $this->_getAdjacentBlankNodeName($quad->subject, $id); + if($bnode !== null) { + // normal property + $direction = 'p'; + } else { + $bnode = $this->_getAdjacentBlankNodeName($quad->object, $id); + if($bnode !== null) { + // reverse property + $direction = 'r'; + } + } + if($bnode !== null) { + // get bnode name (try canonical, path, then hash) + if($namer->isNamed($bnode)) { + $name = $namer->getName($bnode); + } else if($path_namer->isNamed($bnode)) { + $name = $path_namer->getName($bnode); + } else { + $name = $this->_hashQuads($bnode, $bnodes, $namer); + } + + // hash direction, property, and bnode name/hash + $group_md = hash_init('sha1'); + hash_update($group_md, $direction); + hash_update($group_md, $quad->predicate->value); + hash_update($group_md, $name); + $group_hash = hash_final($group_md); + + // add bnode to hash group + if(property_exists($groups, $group_hash)) { + $groups->{$group_hash}[] = $bnode; + } else { + $groups->{$group_hash} = array($bnode); + } + } + } + + // iterate over groups in sorted hash order + $group_hashes = array_keys((array)$groups); + sort($group_hashes); + foreach($group_hashes as $group_hash) { + // digest group hash + hash_update($md, $group_hash); + + // choose a path and namer from the permutations + $chosen_path = null; + $chosen_namer = null; + $permutator = new Permutator($groups->{$group_hash}); + while($permutator->hasNext()) { + $permutation = $permutator->next(); + $path_namer_copy = clone $path_namer; + + // build adjacent path + $path = ''; + $skipped = false; + $recurse = array(); + foreach($permutation as $bnode) { + // use canonical name if available + if($namer->isNamed($bnode)) { + $path .= $namer->getName($bnode); + } else { + // recurse if bnode isn't named in the path yet + if(!$path_namer_copy->isNamed($bnode)) { + $recurse[] = $bnode; + } + $path .= $path_namer_copy->getName($bnode); + } + + // skip permutation if path is already >= chosen path + if($chosen_path !== null && strlen($path) >= strlen($chosen_path) && + $path > $chosen_path) { + $skipped = true; + break; + } + } + + // recurse + if(!$skipped) { + foreach($recurse as $bnode) { + $result = $this->_hashPaths( + $bnode, $bnodes, $namer, $path_namer_copy); + $path .= $path_namer_copy->getName($bnode); + $path .= "<{$result->hash}>"; + $path_namer_copy = $result->pathNamer; + + // skip permutation if path is already >= chosen path + if($chosen_path !== null && + strlen($path) >= strlen($chosen_path) && $path > $chosen_path) { + $skipped = true; + break; + } + } + } + + if(!$skipped && ($chosen_path === null || $path < $chosen_path)) { + $chosen_path = $path; + $chosen_namer = $path_namer_copy; + } + } + + // digest chosen path and update namer + hash_update($md, $chosen_path); + $path_namer = $chosen_namer; + } + + // return SHA-1 hash and path namer + return (object)array( + 'hash' => hash_final($md), 'pathNamer' => $path_namer); + } + + /** + * A helper function that gets the blank node name from an RDF quad + * node (subject or object). If the node is not a blank node or its + * value does not match the given blank node ID, it will be returned. + * + * @param stdClass $node the RDF quad node. + * @param string $id the ID of the blank node to look next to. + * + * @return mixed the adjacent blank node name or null if none was found. + */ + protected function _getAdjacentBlankNodeName($node, $id) { + if($node->type === 'blank node' && $node->value !== $id) { + return $node->value; + } + return null; + } + + /** + * Compares two strings first based on length and then lexicographically. + * + * @param string $a the first string. + * @param string $b the second string. + * + * @return integer -1 if a < b, 1 if a > b, 0 if a == b. + */ + protected function _compareShortestLeast($a, $b) { + $len_a = strlen($a); + $len_b = strlen($b); + if($len_a < $len_b) { + return -1; + } + if($len_b < $len_a) { + return 1; + } + if($a === $b) { + return 0; + } + return ($a < $b) ? -1 : 1; + } + + /** + * Picks the preferred compaction term from the given inverse context entry. + * + * @param active_ctx the active context. + * @param iri the IRI to pick the term for. + * @param value the value to pick the term for. + * @param containers the preferred containers. + * @param type_or_language either '@type' or '@language'. + * @param type_or_language_value the preferred value for '@type' or + * '@language'. + * + * @return mixed the preferred term. + */ + protected function _selectTerm( + $active_ctx, $iri, $value, $containers, + $type_or_language, $type_or_language_value) { + if($type_or_language_value === null) { + $type_or_language_value = '@null'; + } + + // options for the value of @type or @language + $prefs = array(); + + // determine prefs for @id based on whether or not value compacts to a term + if(($type_or_language_value === '@id' || + $type_or_language_value === '@reverse') && + self::_isSubjectReference($value)) { + // prefer @reverse first + if($type_or_language_value === '@reverse') { + $prefs[] = '@reverse'; + } + // try to compact value to a term + $term = $this->_compactIri( + $active_ctx, $value->{'@id'}, null, array('vocab' => true)); + if(property_exists($active_ctx->mappings, $term) && + $active_ctx->mappings->{$term} && + $active_ctx->mappings->{$term}->{'@id'} === $value->{'@id'}) { + // prefer @vocab + array_push($prefs, '@vocab', '@id'); + } else { + // prefer @id + array_push($prefs, '@id', '@vocab'); + } + } else { + $prefs[] = $type_or_language_value; + } + $prefs[] = '@none'; + + $container_map = $active_ctx->inverse->{$iri}; + foreach($containers as $container) { + // if container not available in the map, continue + if(!property_exists($container_map, $container)) { + continue; + } + + $type_or_language_value_map = + $container_map->{$container}->{$type_or_language}; + foreach($prefs as $pref) { + // if type/language option not available in the map, continue + if(!property_exists($type_or_language_value_map, $pref)) { + continue; + } + + // select term + return $type_or_language_value_map->{$pref}; + } + } + return null; + } + + /** + * Compacts an IRI or keyword into a term or prefix if it can be. If the + * IRI has an associated value it may be passed. + * + * @param stdClass $active_ctx the active context to use. + * @param string $iri the IRI to compact. + * @param mixed $value the value to check or null. + * @param assoc $relative_to options for how to compact IRIs: + * vocab: true to split after @vocab, false not to. + * @param bool $reverse true if a reverse property is being compacted, false + * if not. + * + * @return string the compacted term, prefix, keyword alias, or original IRI. + */ + protected function _compactIri( + $active_ctx, $iri, $value=null, $relative_to=array(), $reverse=false) { + // can't compact null + if($iri === null) { + return $iri; + } + + $inverse_ctx = $this->_getInverseContext($active_ctx); + + if(self::_isKeyword($iri)) { + // a keyword can only be compacted to simple alias + if(property_exists($inverse_ctx, $iri)) { + return $inverse_ctx->$iri->{'@none'}->{'@type'}->{'@none'}; + } + return $iri; + } + + if(!isset($relative_to['vocab'])) { + $relative_to['vocab'] = false; + } + + // use inverse context to pick a term if iri is relative to vocab + if($relative_to['vocab'] && property_exists($inverse_ctx, $iri)) { + $default_language = '@none'; + if(property_exists($active_ctx, '@language')) { + $default_language = $active_ctx->{'@language'}; + } + + // prefer @index if available in value + $containers = array(); + if(is_object($value) && property_exists($value, '@index')) { + $containers[] = '@index'; + } + + // defaults for term selection based on type/language + $type_or_language = '@language'; + $type_or_language_value = '@null'; + + if($reverse) { + $type_or_language = '@type'; + $type_or_language_value = '@reverse'; + $containers[] = '@set'; + } else if(self::_isList($value)) { + // choose the most specific term that works for all elements in @list + // only select @list containers if @index is NOT in value + if(!property_exists($value, '@index')) { + $containers[] = '@list'; + } + $list = $value->{'@list'}; + $common_language = (count($list) === 0) ? $default_language : null; + $common_type = null; + foreach($list as $item) { + $item_language = '@none'; + $item_type = '@none'; + if(self::_isValue($item)) { + if(property_exists($item, '@language')) { + $item_language = $item->{'@language'}; + } else if(property_exists($item, '@type')) { + $item_type = $item->{'@type'}; + } else { + // plain literal + $item_language = '@null'; + } + } else { + $item_type = '@id'; + } + if($common_language === null) { + $common_language = $item_language; + } else if($item_language !== $common_language && + self::_isValue($item)) { + $common_language = '@none'; + } + if($common_type === null) { + $common_type = $item_type; + } else if($item_type !== $common_type) { + $common_type = '@none'; + } + // there are different languages and types in the list, so choose + // the most generic term, no need to keep iterating the list + if($common_language === '@none' && $common_type === '@none') { + break; + } + } + if($common_language === null) { + $common_language = '@none'; + } + if($common_type === null) { + $common_type = '@none'; + } + if($common_type !== '@none') { + $type_or_language = '@type'; + $type_or_language_value = $common_type; + } else { + $type_or_language_value = $common_language; + } + } else { + if(self::_isValue($value)) { + if(property_exists($value, '@language') && + !property_exists($value, '@index')) { + $containers[] = '@language'; + $type_or_language_value = $value->{'@language'}; + } else if(property_exists($value, '@type')) { + $type_or_language = '@type'; + $type_or_language_value = $value->{'@type'}; + } + } else { + $type_or_language = '@type'; + $type_or_language_value = '@id'; + } + $containers[] = '@set'; + } + + // do term selection + $containers[] = '@none'; + $term = $this->_selectTerm( + $active_ctx, $iri, $value, + $containers, $type_or_language, $type_or_language_value); + if($term !== null) { + return $term; + } + } + + // no term match, use @vocab if available + if($relative_to['vocab']) { + if(property_exists($active_ctx, '@vocab')) { + // determine if vocab is a prefix of the iri + $vocab = $active_ctx->{'@vocab'}; + if(strpos($iri, $vocab) === 0 && $iri !== $vocab) { + // use suffix as relative iri if it is not a term in the active + // context + $suffix = substr($iri, strlen($vocab)); + if(!property_exists($active_ctx->mappings, $suffix)) { + return $suffix; + } + } + } + } + + // no term or @vocab match, check for possible CURIEs + $choice = null; + $idx = 0; + $partial_matches = array(); + $iri_map = $active_ctx->fast_curie_map; + // check for partial matches of against `iri`, which means look until + // iri.length - 1, not full length + $max_partial_length = strlen($iri) - 1; + for(; $idx < $max_partial_length && isset($iri_map[$iri[$idx]]); ++$idx) { + $iri_map = $iri_map[$iri[$idx]]; + if(isset($iri_map[''])) { + $entry = $iri_map[''][0]; + $entry->iri_length = $idx + 1; + $partial_matches[] = $entry; + } + } + // check partial matches in reverse order to prefer longest ones first + $partial_matches = array_reverse($partial_matches); + foreach($partial_matches as $entry) { + $terms = $entry->terms; + foreach($terms as $term) { + // a CURIE is usable if: + // 1. it has no mapping, OR + // 2. value is null, which means we're not compacting an @value, AND + // the mapping matches the IRI + $curie = $term . ':' . substr($iri, $entry->iri_length); + $is_usable_curie = (!property_exists($active_ctx->mappings, $curie) || + ($value === null && + $active_ctx->mappings->{$curie}->{'@id'} === $iri)); + + // select curie if it is shorter or the same length but + // lexicographically less than the current choice + if($is_usable_curie && ($choice === null || + self::_compareShortestLeast($curie, $choice) < 0)) { + $choice = $curie; + } + } + } + + // return chosen curie + if($choice !== null) { + return $choice; + } + + // compact IRI relative to base + if(!$relative_to['vocab']) { + return jsonld_remove_base($active_ctx->{'@base'}, $iri); + } + + // return IRI as is + return $iri; + } + + /** + * Performs value compaction on an object with '@value' or '@id' as the only + * property. + * + * @param stdClass $active_ctx the active context. + * @param string $active_property the active property that points to the + * value. + * @param mixed $value the value to compact. + * + * @return mixed the compaction result. + */ + protected function _compactValue($active_ctx, $active_property, $value) { + // value is a @value + if(self::_isValue($value)) { + // get context rules + $type = self::getContextValue($active_ctx, $active_property, '@type'); + $language = self::getContextValue( + $active_ctx, $active_property, '@language'); + $container = self::getContextValue( + $active_ctx, $active_property, '@container'); + + // whether or not the value has an @index that must be preserved + $preserve_index = (property_exists($value, '@index') && + $container !== '@index'); + + // if there's no @index to preserve + if(!$preserve_index) { + // matching @type or @language specified in context, compact value + if(self::_hasKeyValue($value, '@type', $type) || + self::_hasKeyValue($value, '@language', $language)) { + return $value->{'@value'}; + } + } + + // return just the value of @value if all are true: + // 1. @value is the only key or @index isn't being preserved + // 2. there is no default language or @value is not a string or + // the key has a mapping with a null @language + $key_count = count(array_keys((array)$value)); + $is_value_only_key = ($key_count === 1 || + ($key_count === 2 && property_exists($value, '@index') && + !$preserve_index)); + $has_default_language = property_exists($active_ctx, '@language'); + $is_value_string = is_string($value->{'@value'}); + $has_null_mapping = ( + property_exists($active_ctx->mappings, $active_property) && + $active_ctx->mappings->{$active_property} !== null && + self::_hasKeyValue( + $active_ctx->mappings->{$active_property}, '@language', null)); + if($is_value_only_key && + (!$has_default_language || !$is_value_string || $has_null_mapping)) { + return $value->{'@value'}; + } + + $rval = new stdClass(); + + // preserve @index + if($preserve_index) { + $rval->{$this->_compactIri($active_ctx, '@index')} = $value->{'@index'}; + } + + // compact @type IRI + if(property_exists($value, '@type')) { + $rval->{$this->_compactIri($active_ctx, '@type')} = $this->_compactIri( + $active_ctx, $value->{'@type'}, null, array('vocab' => true)); + } else if(property_exists($value, '@language')) { + // alias @language + $rval->{$this->_compactIri($active_ctx, '@language')} = + $value->{'@language'}; + } + + // alias @value + $rval->{$this->_compactIri($active_ctx, '@value')} = $value->{'@value'}; + + return $rval; + } + + // value is a subject reference + $expanded_property = $this->_expandIri( + $active_ctx, $active_property, array('vocab' => true)); + $type = self::getContextValue($active_ctx, $active_property, '@type'); + $compacted = $this->_compactIri( + $active_ctx, $value->{'@id'}, null, + array('vocab' => ($type === '@vocab'))); + + // compact to scalar + if($type === '@id' || $type === '@vocab' || + $expanded_property === '@graph') { + return $compacted; + } + + $rval = (object)array( + $this->_compactIri($active_ctx, '@id') => $compacted); + return $rval; + } + + /** + * Creates a term definition during context processing. + * + * @param stdClass $active_ctx the current active context. + * @param stdClass $local_ctx the local context being processed. + * @param string $term the key in the local context to define the mapping for. + * @param stdClass $defined a map of defining/defined keys to detect cycles + * and prevent double definitions. + */ + protected function _createTermDefinition( + $active_ctx, $local_ctx, $term, $defined) { + if(property_exists($defined, $term)) { + // term already defined + if($defined->{$term}) { + return; + } + // cycle detected + throw new JsonLdException( + 'Cyclical context definition detected.', + 'jsonld.CyclicalContext', 'cyclic IRI mapping', + array('context' => $local_ctx, 'term' => $term)); + } + + // now defining term + $defined->{$term} = false; + + if(self::_isKeyword($term)) { + throw new JsonLdException( + 'Invalid JSON-LD syntax; keywords cannot be overridden.', + 'jsonld.SyntaxError', 'keyword redefinition', + array('context' => $local_ctx, 'term' => $term)); + } + + // remove old mapping + if(property_exists($active_ctx->mappings, $term)) { + unset($active_ctx->mappings->{$term}); + } + + // get context term value + $value = $local_ctx->{$term}; + + // clear context entry + if($value === null || (is_object($value) && + self::_hasKeyValue($value, '@id', null))) { + $active_ctx->mappings->{$term} = null; + $defined->{$term} = true; + return; + } + + // convert short-hand value to object w/@id + if(is_string($value)) { + $value = (object)array('@id' => $value); + } + + if(!is_object($value)) { + throw new JsonLdException( + 'Invalid JSON-LD syntax; @context property values must be ' . + 'strings or objects.', 'jsonld.SyntaxError', 'invalid term definition', + array('context' => $local_ctx)); + } + + // create new mapping + $mapping = $active_ctx->mappings->{$term} = new stdClass(); + $mapping->reverse = false; + + if(property_exists($value, '@reverse')) { + if(property_exists($value, '@id')) { + throw new JsonLdException( + 'Invalid JSON-LD syntax; a @reverse term definition must not ' + + 'contain @id.', 'jsonld.SyntaxError', 'invalid reverse property', + array('context' => $local_ctx)); + } + $reverse = $value->{'@reverse'}; + if(!is_string($reverse)) { + throw new JsonLdException( + 'Invalid JSON-LD syntax; a @context @reverse value must be a string.', + 'jsonld.SyntaxError', 'invalid IRI mapping', + array('context' => $local_ctx)); + } + + // expand and add @id mapping + $id = $this->_expandIri( + $active_ctx, $reverse, array('vocab' => true, 'base' => false), + $local_ctx, $defined); + if(!self::_isAbsoluteIri($id)) { + throw new JsonLdException( + 'Invalid JSON-LD syntax; @context @reverse value must be ' . + 'an absolute IRI or a blank node identifier.', + 'jsonld.SyntaxError', 'invalid IRI mapping', + array('context' => $local_ctx)); + } + $mapping->{'@id'} = $id; + $mapping->reverse = true; + } else if(property_exists($value, '@id')) { + $id = $value->{'@id'}; + if(!is_string($id)) { + throw new JsonLdException( + 'Invalid JSON-LD syntax; @context @id value must be a string.', + 'jsonld.SyntaxError', 'invalid IRI mapping', + array('context' => $local_ctx)); + } + if($id !== $term) { + // add @id to mapping + $id = $this->_expandIri( + $active_ctx, $id, array('vocab' => true, 'base' => false), + $local_ctx, $defined); + if(!self::_isAbsoluteIri($id) && !self::_isKeyword($id)) { + throw new JsonLdException( + 'Invalid JSON-LD syntax; @context @id value must be an ' . + 'absolute IRI, a blank node identifier, or a keyword.', + 'jsonld.SyntaxError', 'invalid IRI mapping', + array('context' => $local_ctx)); + } + $mapping->{'@id'} = $id; + } + } + + // always compute whether term has a colon as an optimization for + // _compactIri + $colon = strpos($term, ':'); + $mapping->_term_has_colon = ($colon !== false); + + if(!property_exists($mapping, '@id')) { + // see if the term has a prefix + if($mapping->_term_has_colon) { + $prefix = substr($term, 0, $colon); + if(property_exists($local_ctx, $prefix)) { + // define parent prefix + $this->_createTermDefinition( + $active_ctx, $local_ctx, $prefix, $defined); + } + + if(property_exists($active_ctx->mappings, $prefix) && + $active_ctx->mappings->{$prefix}) { + // set @id based on prefix parent + $suffix = substr($term, $colon + 1); + $mapping->{'@id'} = $active_ctx->mappings->{$prefix}->{'@id'} . + $suffix; + } else { + // term is an absolute IRI + $mapping->{'@id'} = $term; + } + } else { + // non-IRIs *must* define @ids if @vocab is not available + if(!property_exists($active_ctx, '@vocab')) { + throw new JsonLdException( + 'Invalid JSON-LD syntax; @context terms must define an @id.', + 'jsonld.SyntaxError', 'invalid IRI mapping', + array('context' => $local_ctx, 'term' => $term)); + } + // prepend vocab to term + $mapping->{'@id'} = $active_ctx->{'@vocab'} . $term; + } + } + + // optimization to store length of @id once for _compactIri + $mapping->_id_length = strlen($mapping->{'@id'}); + + // IRI mapping now defined + $defined->{$term} = true; + + if(property_exists($value, '@type')) { + $type = $value->{'@type'}; + if(!is_string($type)) { + throw new JsonLdException( + 'Invalid JSON-LD syntax; @context @type values must be strings.', + 'jsonld.SyntaxError', 'invalid type mapping', + array('context' => $local_ctx)); + } + + if($type !== '@id' && $type !== '@vocab') { + // expand @type to full IRI + $type = $this->_expandIri( + $active_ctx, $type, array('vocab' => true), $local_ctx, $defined); + if(!self::_isAbsoluteIri($type)) { + throw new JsonLdException( + 'Invalid JSON-LD syntax; an @context @type value must ' . + 'be an absolute IRI.', 'jsonld.SyntaxError', + 'invalid type mapping', array('context' => $local_ctx)); + } + if(strpos($type, '_:') === 0) { + throw new JsonLdException( + 'Invalid JSON-LD syntax; an @context @type values must ' . + 'be an IRI, not a blank node identifier.', + 'jsonld.SyntaxError', 'invalid type mapping', + array('context' => $local_ctx)); + } + } + + // add @type to mapping + $mapping->{'@type'} = $type; + } + + if(property_exists($value, '@container')) { + $container = $value->{'@container'}; + if($container !== '@list' && $container !== '@set' && + $container !== '@index' && $container !== '@language') { + throw new JsonLdException( + 'Invalid JSON-LD syntax; @context @container value must be ' . + 'one of the following: @list, @set, @index, or @language.', + 'jsonld.SyntaxError', 'invalid container mapping', + array('context' => $local_ctx)); + } + if($mapping->reverse && $container !== '@index' && + $container !== '@set' && $container !== null) { + throw new JsonLdException( + 'Invalid JSON-LD syntax; @context @container value for a @reverse ' + + 'type definition must be @index or @set.', + 'jsonld.SyntaxError', 'invalid reverse property', + array('context' => $local_ctx)); + } + + // add @container to mapping + $mapping->{'@container'} = $container; + } + + if(property_exists($value, '@language') && + !property_exists($value, '@type')) { + $language = $value->{'@language'}; + if($language !== null && !is_string($language)) { + throw new JsonLdException( + 'Invalid JSON-LD syntax; @context @language value must be ' . + 'a string or null.', 'jsonld.SyntaxError', + 'invalid language mapping', array('context' => $local_ctx)); + } + + // add @language to mapping + if($language !== null) { + $language = strtolower($language); + } + $mapping->{'@language'} = $language; + } + + // disallow aliasing @context and @preserve + $id = $mapping->{'@id'}; + if($id === '@context' || $id === '@preserve') { + throw new JsonLdException( + 'Invalid JSON-LD syntax; @context and @preserve cannot be aliased.', + 'jsonld.SyntaxError', 'invalid keyword alias', + array('context' => $local_ctx)); + } + } + + /** + * Expands a string to a full IRI. The string may be a term, a prefix, a + * relative IRI, or an absolute IRI. The associated absolute IRI will be + * returned. + * + * @param stdClass $active_ctx the current active context. + * @param string $value the string to expand. + * @param assoc $relative_to options for how to resolve relative IRIs: + * base: true to resolve against the base IRI, false not to. + * vocab: true to concatenate after @vocab, false not to. + * @param stdClass $local_ctx the local context being processed (only given + * if called during document processing). + * @param defined a map for tracking cycles in context definitions (only given + * if called during document processing). + * + * @return mixed the expanded value. + */ + function _expandIri( + $active_ctx, $value, $relative_to=array(), $local_ctx=null, $defined=null) { + // already expanded + if($value === null || self::_isKeyword($value)) { + return $value; + } + + // define term dependency if not defined + if($local_ctx !== null && property_exists($local_ctx, $value) && + !self::_hasKeyValue($defined, $value, true)) { + $this->_createTermDefinition($active_ctx, $local_ctx, $value, $defined); + } + + if(isset($relative_to['vocab']) && $relative_to['vocab']) { + if(property_exists($active_ctx->mappings, $value)) { + $mapping = $active_ctx->mappings->{$value}; + + // value is explicitly ignored with a null mapping + if($mapping === null) { + return null; + } + + // value is a term + return $mapping->{'@id'}; + } + } + + // split value into prefix:suffix + $colon = strpos($value, ':'); + if($colon !== false) { + $prefix = substr($value, 0, $colon); + $suffix = substr($value, $colon + 1); + + // do not expand blank nodes (prefix of '_') or already-absolute + // IRIs (suffix of '//') + if($prefix === '_' || strpos($suffix, '//') === 0) { + return $value; + } + + // prefix dependency not defined, define it + if($local_ctx !== null && property_exists($local_ctx, $prefix)) { + $this->_createTermDefinition( + $active_ctx, $local_ctx, $prefix, $defined); + } + + // use mapping if prefix is defined + if(property_exists($active_ctx->mappings, $prefix)) { + $mapping = $active_ctx->mappings->{$prefix}; + if($mapping) { + return $mapping->{'@id'} . $suffix; + } + } + + // already absolute IRI + return $value; + } + + // prepend vocab + if(isset($relative_to['vocab']) && $relative_to['vocab'] && + property_exists($active_ctx, '@vocab')) { + return $active_ctx->{'@vocab'} . $value; + } + + // prepend base + $rval = $value; + if(isset($relative_to['base']) && $relative_to['base']) { + $rval = jsonld_prepend_base($active_ctx->{'@base'}, $rval); + } + + return $rval; + } + + /** + * Finds all @context URLs in the given JSON-LD input. + * + * @param mixed $input the JSON-LD input. + * @param stdClass $urls a map of URLs (url => false/@contexts). + * @param bool $replace true to replace the URLs in the given input with + * the @contexts from the urls map, false not to. + * @param string $base the base URL to resolve relative URLs with. + */ + protected function _findContextUrls($input, $urls, $replace, $base) { + if(is_array($input)) { + foreach($input as $e) { + $this->_findContextUrls($e, $urls, $replace, $base); + } + } else if(is_object($input)) { + foreach($input as $k => &$v) { + if($k !== '@context') { + $this->_findContextUrls($v, $urls, $replace, $base); + continue; + } + + // array @context + if(is_array($v)) { + $length = count($v); + for($i = 0; $i < $length; ++$i) { + if(is_string($v[$i])) { + $url = jsonld_prepend_base($base, $v[$i]); + // replace w/@context if requested + if($replace) { + $ctx = $urls->{$url}; + if(is_array($ctx)) { + // add flattened context + array_splice($v, $i, 1, $ctx); + $i += count($ctx) - 1; + $length = count($v); + } else { + $v[$i] = $ctx; + } + } else if(!property_exists($urls, $url)) { + // @context URL found + $urls->{$url} = false; + } + } + } + } else if(is_string($v)) { + // string @context + $v = jsonld_prepend_base($base, $v); + // replace w/@context if requested + if($replace) { + $input->{$k} = $urls->{$v}; + } else if(!property_exists($urls, $v)) { + // @context URL found + $urls->{$v} = false; + } + } + } + } + } + + /** + * Retrieves external @context URLs using the given document loader. Each + * instance of @context in the input that refers to a URL will be replaced + * with the JSON @context found at that URL. + * + * @param mixed $input the JSON-LD input with possible contexts. + * @param stdClass $cycles an object for tracking context cycles. + * @param callable $load_document(url) the document loader. + * @param base $base the base URL to resolve relative URLs against. + * + * @return mixed the result. + */ + protected function _retrieveContextUrls( + &$input, $cycles, $load_document, $base='') { + if(count(get_object_vars($cycles)) > self::MAX_CONTEXT_URLS) { + throw new JsonLdException( + 'Maximum number of @context URLs exceeded.', + 'jsonld.ContextUrlError', 'loading remote context failed', + array('max' => self::MAX_CONTEXT_URLS)); + } + + // for tracking the URLs to retrieve + $urls = new stdClass(); + + // regex for validating URLs + $regex = '/(http|https):\/\/(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?/'; + + // find all URLs in the given input + $this->_findContextUrls($input, $urls, false, $base); + + // queue all unretrieved URLs + $queue = array(); + foreach($urls as $url => $ctx) { + if($ctx === false) { + // validate URL + if(!preg_match($regex, $url)) { + throw new JsonLdException( + 'Malformed or unsupported URL.', 'jsonld.InvalidUrl', + 'loading remote context failed', array('url' => $url)); + } + $queue[] = $url; + } + } + + // retrieve URLs in queue + foreach($queue as $url) { + // check for context URL cycle + if(property_exists($cycles, $url)) { + throw new JsonLdException( + 'Cyclical @context URLs detected.', + 'jsonld.ContextUrlError', 'recursive context inclusion', + array('url' => $url)); + } + $_cycles = self::copy($cycles); + $_cycles->{$url} = true; + + // retrieve URL + $remote_doc = call_user_func($load_document, $url); + $ctx = $remote_doc->document; + + // parse string context as JSON + if(is_string($ctx)) { + try { + $ctx = self::_parse_json($ctx); + } catch(Exception $e) { + throw new JsonLdException( + 'Could not parse JSON from URL.', + 'jsonld.ParseError', 'loading remote context failed', + array('url' => $url), $e); + } + } + + // ensure ctx is an object + if(!is_object($ctx)) { + throw new JsonLdException( + 'Derefencing a URL did not result in a valid JSON-LD object.', + 'jsonld.InvalidUrl', 'invalid remote context', array('url' => $url)); + } + + // use empty context if no @context key is present + if(!property_exists($ctx, '@context')) { + $ctx = (object)array('@context' => new stdClass()); + } else { + $ctx = (object)array('@context' => $ctx->{'@context'}); + } + + // append context URL to context if given + if($remote_doc->contextUrl !== null) { + $ctx->{'@context'} = self::arrayify($ctx->{'@context'}); + $ctx->{'@context'}[] = $remote_doc->contextUrl; + } + + // recurse + $this->_retrieveContextUrls($ctx, $_cycles, $load_document, $url); + $urls->{$url} = $ctx->{'@context'}; + } + + // replace all URLS in the input + $this->_findContextUrls($input, $urls, true, $base); + } + + /** + * Gets the initial context. + * + * @param assoc $options the options to use. + * base the document base IRI. + * + * @return stdClass the initial context. + */ + protected function _getInitialContext($options) { + return (object)array( + '@base' => jsonld_parse_url($options['base']), + 'mappings' => new stdClass(), + 'inverse' => null); + } + + /** + * Generates an inverse context for use in the compaction algorithm, if + * not already generated for the given active context. + * + * @param stdClass $active_ctx the active context to use. + * + * @return stdClass the inverse context. + */ + protected function _getInverseContext($active_ctx) { + // inverse context already generated + if($active_ctx->inverse) { + return $active_ctx->inverse; + } + + $inverse = $active_ctx->inverse = new stdClass(); + + // variables for building fast CURIE map + $fast_curie_map = $active_ctx->fast_curie_map = new ArrayObject(); + $iris_to_terms = array(); + + // handle default language + $default_language = '@none'; + if(property_exists($active_ctx, '@language')) { + $default_language = $active_ctx->{'@language'}; + } + + // create term selections for each mapping in the context, ordered by + // shortest and then lexicographically least + $mappings = $active_ctx->mappings; + $terms = array_keys((array)$mappings); + usort($terms, array($this, '_compareShortestLeast')); + foreach($terms as $term) { + $mapping = $mappings->{$term}; + if($mapping === null) { + continue; + } + + // add term selection where it applies + if(property_exists($mapping, '@container')) { + $container = $mapping->{'@container'}; + } else { + $container = '@none'; + } + + // iterate over every IRI in the mapping + $iris = $mapping->{'@id'}; + $iris = self::arrayify($iris); + foreach($iris as $iri) { + $is_keyword = self::_isKeyword($iri); + + // initialize container map + if(!property_exists($inverse, $iri)) { + $inverse->{$iri} = new stdClass(); + if(!$is_keyword && !$mapping->_term_has_colon) { + // init IRI to term map and fast CURIE map + $iris_to_terms[$iri] = new ArrayObject(); + $iris_to_terms[$iri][] = $term; + $fast_curie_entry = (object)array( + 'iri' => $iri, 'terms' => $iris_to_terms[$iri]); + if(!array_key_exists($iri[0], (array)$fast_curie_map)) { + $fast_curie_map[$iri[0]] = new ArrayObject(); + } + $fast_curie_map[$iri[0]][] = $fast_curie_entry; + } + } else if(!$is_keyword && !$mapping->_term_has_colon) { + // add IRI to term match + $iris_to_terms[$iri][] = $term; + } + $container_map = $inverse->{$iri}; + + // add new entry + if(!property_exists($container_map, $container)) { + $container_map->{$container} = (object)array( + '@language' => new stdClass(), + '@type' => new stdClass()); + } + $entry = $container_map->{$container}; + + if($mapping->reverse) { + // term is preferred for values using @reverse + $this->_addPreferredTerm( + $mapping, $term, $entry->{'@type'}, '@reverse'); + } else if(property_exists($mapping, '@type')) { + // term is preferred for values using specific type + $this->_addPreferredTerm( + $mapping, $term, $entry->{'@type'}, $mapping->{'@type'}); + } else if(property_exists($mapping, '@language')) { + // term is preferred for values using specific language + $language = $mapping->{'@language'}; + if($language === null) { + $language = '@null'; + } + $this->_addPreferredTerm( + $mapping, $term, $entry->{'@language'}, $language); + } else { + // term is preferred for values w/default language or no type and + // no language + // add an entry for the default language + $this->_addPreferredTerm( + $mapping, $term, $entry->{'@language'}, $default_language); + + // add entries for no type and no language + $this->_addPreferredTerm( + $mapping, $term, $entry->{'@type'}, '@none'); + $this->_addPreferredTerm( + $mapping, $term, $entry->{'@language'}, '@none'); + } + } + } + + // build fast CURIE map + foreach($fast_curie_map as $key => $value) { + $this->_buildIriMap($fast_curie_map, $key, 1); + } + + return $inverse; + } + + /** + * Runs a recursive algorithm to build a lookup map for quickly finding + * potential CURIEs. + * + * @param ArrayObject $iri_map the map to build. + * @param string $key the current key in the map to work on. + * @param int $idx the index into the IRI to compare. + */ + function _buildIriMap($iri_map, $key, $idx) { + $entries = $iri_map[$key]; + $next = $iri_map[$key] = new ArrayObject(); + + foreach($entries as $entry) { + $iri = $entry->iri; + if($idx >= strlen($iri)) { + $letter = ''; + } else { + $letter = $iri[$idx]; + } + if(!isset($next[$letter])) { + $next[$letter] = new ArrayObject(); + } + $next[$letter][] = $entry; + } + + foreach($next as $key => $value) { + if($key === '') { + continue; + } + $this->_buildIriMap($next, $key, $idx + 1); + } + } + + /** + * Adds the term for the given entry if not already added. + * + * @param stdClass $mapping the term mapping. + * @param string $term the term to add. + * @param stdClass $entry the inverse context type_or_language entry to + * add to. + * @param string $type_or_language_value the key in the entry to add to. + */ + function _addPreferredTerm($mapping, $term, $entry, $type_or_language_value) { + if(!property_exists($entry, $type_or_language_value)) { + $entry->{$type_or_language_value} = $term; + } + } + + /** + * Clones an active context, creating a child active context. + * + * @return stdClass a clone (child) of the active context. + */ + protected function _cloneActiveContext($active_ctx) { + $child = new stdClass(); + $child->{'@base'} = $active_ctx->{'@base'}; + $child->mappings = self::copy($active_ctx->mappings); + $child->inverse = null; + if(property_exists($active_ctx, '@language')) { + $child->{'@language'} = $active_ctx->{'@language'}; + } + if(property_exists($active_ctx, '@vocab')) { + $child->{'@vocab'} = $active_ctx->{'@vocab'}; + } + return $child; + } + + /** + * Returns whether or not the given value is a keyword. + * + * @param string $v the value to check. + * + * @return bool true if the value is a keyword, false if not. + */ + protected static function _isKeyword($v) { + if(!is_string($v)) { + return false; + } + switch($v) { + case '@base': + case '@context': + case '@container': + case '@default': + case '@embed': + case '@explicit': + case '@graph': + case '@id': + case '@index': + case '@language': + case '@list': + case '@omitDefault': + case '@preserve': + case '@requireAll': + case '@reverse': + case '@set': + case '@type': + case '@value': + case '@vocab': + return true; + } + return false; + } + + /** + * Returns true if the given value is an empty Object. + * + * @param mixed $v the value to check. + * + * @return bool true if the value is an empty Object, false if not. + */ + protected static function _isEmptyObject($v) { + return is_object($v) && count(get_object_vars($v)) === 0; + } + + /** + * Throws an exception if the given value is not a valid @type value. + * + * @param mixed $v the value to check. + */ + protected static function _validateTypeValue($v) { + // must be a string or empty object + if(is_string($v) || self::_isEmptyObject($v)) { + return; + } + + // must be an array + $is_valid = false; + if(is_array($v)) { + // must contain only strings + $is_valid = true; + foreach($v as $e) { + if(!(is_string($e))) { + $is_valid = false; + break; + } + } + } + + if(!$is_valid) { + throw new JsonLdException( + 'Invalid JSON-LD syntax; "@type" value must a string, an array ' . + 'of strings, or an empty object.', + 'jsonld.SyntaxError', 'invalid type value', array('value' => $v)); + } + } + + /** + * Returns true if the given value is a subject with properties. + * + * @param mixed $v the value to check. + * + * @return bool true if the value is a subject with properties, false if not. + */ + protected static function _isSubject($v) { + // Note: A value is a subject if all of these hold true: + // 1. It is an Object. + // 2. It is not a @value, @set, or @list. + // 3. It has more than 1 key OR any existing key is not @id. + $rval = false; + if(is_object($v) && + !property_exists($v, '@value') && + !property_exists($v, '@set') && + !property_exists($v, '@list')) { + $count = count(get_object_vars($v)); + $rval = ($count > 1 || !property_exists($v, '@id')); + } + return $rval; + } + + /** + * Returns true if the given value is a subject reference. + * + * @param mixed $v the value to check. + * + * @return bool true if the value is a subject reference, false if not. + */ + protected static function _isSubjectReference($v) { + // Note: A value is a subject reference if all of these hold true: + // 1. It is an Object. + // 2. It has a single key: @id. + return (is_object($v) && count(get_object_vars($v)) === 1 && + property_exists($v, '@id')); + } + + /** + * Returns true if the given value is a @value. + * + * @param mixed $v the value to check. + * + * @return bool true if the value is a @value, false if not. + */ + protected static function _isValue($v) { + // Note: A value is a @value if all of these hold true: + // 1. It is an Object. + // 2. It has the @value property. + return is_object($v) && property_exists($v, '@value'); + } + + /** + * Returns true if the given value is a @list. + * + * @param mixed $v the value to check. + * + * @return bool true if the value is a @list, false if not. + */ + protected static function _isList($v) { + // Note: A value is a @list if all of these hold true: + // 1. It is an Object. + // 2. It has the @list property. + return is_object($v) && property_exists($v, '@list'); + } + + /** + * Returns true if the given value is a blank node. + * + * @param mixed $v the value to check. + * + * @return bool true if the value is a blank node, false if not. + */ + protected static function _isBlankNode($v) { + // Note: A value is a blank node if all of these hold true: + // 1. It is an Object. + // 2. If it has an @id key its value begins with '_:'. + // 3. It has no keys OR is not a @value, @set, or @list. + $rval = false; + if(is_object($v)) { + if(property_exists($v, '@id')) { + $rval = (strpos($v->{'@id'}, '_:') === 0); + } else { + $rval = (count(get_object_vars($v)) === 0 || + !(property_exists($v, '@value') || + property_exists($v, '@set') || + property_exists($v, '@list'))); + } + } + return $rval; + } + + /** + * Returns true if the given value is an absolute IRI, false if not. + * + * @param string $v the value to check. + * + * @return bool true if the value is an absolute IRI, false if not. + */ + protected static function _isAbsoluteIri($v) { + return strpos($v, ':') !== false; + } + + /** + * Returns true if the given target has the given key and its + * value equals is the given value. + * + * @param stdClass $target the target object. + * @param string key the key to check. + * @param mixed $value the value to check. + * + * @return bool true if the target has the given key and its value matches. + */ + protected static function _hasKeyValue($target, $key, $value) { + return (property_exists($target, $key) && $target->{$key} === $value); + } + + /** + * Returns true if both of the given objects have the same value for the + * given key or if neither of the objects contain the given key. + * + * @param stdClass $o1 the first object. + * @param stdClass $o2 the second object. + * @param string key the key to check. + * + * @return bool true if both objects have the same value for the key or + * neither has the key. + */ + protected static function _compareKeyValues($o1, $o2, $key) { + if(property_exists($o1, $key)) { + return property_exists($o2, $key) && $o1->{$key} === $o2->{$key}; + } + return !property_exists($o2, $key); + } + + /** + * Parses JSON and sets an appropriate exception message on error. + * + * @param string $json the JSON to parse. + * + * @return mixed the parsed JSON object or array. + */ + protected static function _parse_json($json) { + $rval = json_decode($json); + $error = json_last_error(); + if($error === JSON_ERROR_NONE && $rval === null) { + $error = JSON_ERROR_SYNTAX; + } + switch($error) { + case JSON_ERROR_NONE: + break; + case JSON_ERROR_DEPTH: + throw new JsonLdException( + 'Could not parse JSON; the maximum stack depth has been exceeded.', + 'jsonld.ParseError'); + case JSON_ERROR_STATE_MISMATCH: + throw new JsonLdException( + 'Could not parse JSON; invalid or malformed JSON.', + 'jsonld.ParseError'); + case JSON_ERROR_CTRL_CHAR: + case JSON_ERROR_SYNTAX: + throw new JsonLdException( + 'Could not parse JSON; syntax error, malformed JSON.', + 'jsonld.ParseError'); + case JSON_ERROR_UTF8: + throw new JsonLdException( + 'Could not parse JSON from URL; malformed UTF-8 characters.', + 'jsonld.ParseError'); + default: + throw new JsonLdException( + 'Could not parse JSON from URL; unknown error.', + 'jsonld.ParseError'); + } + return $rval; + } +} + +// register the N-Quads RDF parser +jsonld_register_rdf_parser( + 'application/nquads', array('JsonLdProcessor', 'parseNQuads')); + +/** + * A JSON-LD Exception. + */ +class JsonLdException extends Exception { + public function __construct( + $msg, $type, $code='error', $details=null, $previous=null) { + $this->type = $type; + $this->code = $code; + $this->details = $details; + $this->cause = $previous; + parent::__construct($msg, 0, $previous); + } + public function __toString() { + $rval = __CLASS__ . ": [{$this->type}]: {$this->message}\n"; + if($this->code) { + $rval .= 'Code: ' . $this->code . "\n"; + } + if($this->details) { + $rval .= 'Details: ' . print_r($this->details, true) . "\n"; + } + if($this->cause) { + $rval .= 'Cause: ' . $this->cause; + } + $rval .= $this->getTraceAsString() . "\n"; + return $rval; + } +}; + +/** + * A UniqueNamer issues unique names, keeping track of any previously issued + * names. + */ +class UniqueNamer { + /** + * Constructs a new UniqueNamer. + * + * @param prefix the prefix to use (''). + */ + public function __construct($prefix) { + $this->prefix = $prefix; + $this->counter = 0; + $this->existing = new stdClass(); + $this->order = array(); + } + + /** + * Clones this UniqueNamer. + */ + public function __clone() { + $this->existing = clone $this->existing; + } + + /** + * Gets the new name for the given old name, where if no old name is given + * a new name will be generated. + * + * @param mixed [$old_name] the old name to get the new name for. + * + * @return string the new name. + */ + public function getName($old_name=null) { + // return existing old name + if($old_name && property_exists($this->existing, $old_name)) { + return $this->existing->{$old_name}; + } + + // get next name + $name = $this->prefix . $this->counter; + $this->counter += 1; + + // save mapping + if($old_name !== null) { + $this->existing->{$old_name} = $name; + $this->order[] = $old_name; + } + + return $name; + } + + /** + * Returns true if the given old name has already been assigned a new name. + * + * @param string $old_name the old name to check. + * + * @return true if the old name has been assigned a new name, false if not. + */ + public function isNamed($old_name) { + return property_exists($this->existing, $old_name); + } +} + +/** + * A Permutator iterates over all possible permutations of the given array + * of elements. + */ +class Permutator { + /** + * Constructs a new Permutator. + * + * @param array $list the array of elements to iterate over. + */ + public function __construct($list) { + // original array + $this->list = $list; + sort($this->list); + // indicates whether there are more permutations + $this->done = false; + // directional info for permutation algorithm + $this->left = new stdClass(); + foreach($list as $v) { + $this->left->{$v} = true; + } + } + + /** + * Returns true if there is another permutation. + * + * @return bool true if there is another permutation, false if not. + */ + public function hasNext() { + return !$this->done; + } + + /** + * Gets the next permutation. Call hasNext() to ensure there is another one + * first. + * + * @return array the next permutation. + */ + public function next() { + // copy current permutation + $rval = $this->list; + + /* Calculate the next permutation using the Steinhaus-Johnson-Trotter + permutation algorithm. */ + + // get largest mobile element k + // (mobile: element is greater than the one it is looking at) + $k = null; + $pos = 0; + $length = count($this->list); + for($i = 0; $i < $length; ++$i) { + $element = $this->list[$i]; + $left = $this->left->{$element}; + if(($k === null || $element > $k) && + (($left && $i > 0 && $element > $this->list[$i - 1]) || + (!$left && $i < ($length - 1) && $element > $this->list[$i + 1]))) { + $k = $element; + $pos = $i; + } + } + + // no more permutations + if($k === null) { + $this->done = true; + } else { + // swap k and the element it is looking at + $swap = $this->left->{$k} ? $pos - 1 : $pos + 1; + $this->list[$pos] = $this->list[$swap]; + $this->list[$swap] = $k; + + // reverse the direction of all elements larger than k + for($i = 0; $i < $length; ++$i) { + if($this->list[$i] > $k) { + $this->left->{$this->list[$i]} = !$this->left->{$this->list[$i]}; + } + } + } + + return $rval; + } +} + +/** + * An ActiveContextCache caches active contexts so they can be reused without + * the overhead of recomputing them. + */ +class ActiveContextCache { + /** + * Constructs a new ActiveContextCache. + * + * @param int size the maximum size of the cache, defaults to 100. + */ + public function __construct($size=100) { + $this->order = array(); + $this->cache = new stdClass(); + $this->size = $size; + } + + /** + * Gets an active context from the cache based on the current active + * context and the new local context. + * + * @param stdClass $active_ctx the current active context. + * @param stdClass $local_ctx the new local context. + * + * @return mixed a shared copy of the cached active context or null. + */ + public function get($active_ctx, $local_ctx) { + $key1 = serialize($active_ctx); + $key2 = serialize($local_ctx); + if(property_exists($this->cache, $key1)) { + $level1 = $this->cache->{$key1}; + if(property_exists($level1, $key2)) { + return $level1->{$key2}; + } + } + return null; + } + + /** + * Sets an active context in the cache based on the previous active + * context and the just-processed local context. + * + * @param stdClass $active_ctx the previous active context. + * @param stdClass $local_ctx the just-processed local context. + * @param stdClass $result the resulting active context. + */ + public function set($active_ctx, $local_ctx, $result) { + if(count($this->order) === $this->size) { + $entry = array_shift($this->order); + unset($this->cache->{$entry->activeCtx}->{$entry->localCtx}); + } + $key1 = serialize($active_ctx); + $key2 = serialize($local_ctx); + $this->order[] = (object)array( + 'activeCtx' => $key1, 'localCtx' => $key2); + if(!property_exists($this->cache, $key1)) { + $this->cache->{$key1} = new stdClass(); + } + $this->cache->{$key1}->{$key2} = JsonLdProcessor::copy($result); + } +} + +/* end of file, omit ?> */ diff --git a/library/jsonld/test.php b/library/jsonld/test.php new file mode 100644 index 000000000..11b72ac09 --- /dev/null +++ b/library/jsonld/test.php @@ -0,0 +1,765 @@ +attach($result); + $this->result = $result; + parent::run($result); + } + + /** + * Tests expansion. + * + * @param JsonLdTest $test the test to run. + * + * @group expand + * @group json-ld.org + * @dataProvider expandProvider + */ + public function testExpand($test) { + $this->test = $test; + $input = $test->readUrl('input'); + $options = $test->createOptions(); + $test->run('jsonld_expand', array($input, $options)); + } + + /** + * Tests compaction. + * + * @param JsonLdTest $test the test to run. + * + * @group compact + * @group json-ld.org + * @dataProvider compactProvider + */ + public function testCompact($test) { + $this->test = $test; + $input = $test->readUrl('input'); + $context = $test->readProperty('context'); + $options = $test->createOptions(); + $test->run('jsonld_compact', array($input, $context, $options)); + } + + /** + * Tests flatten. + * + * @param JsonLdTest $test the test to run. + * + * @group flatten + * @group json-ld.org + * @dataProvider flattenProvider + */ + public function testFlatten($test) { + $this->test = $test; + $input = $test->readUrl('input'); + $context = $test->readProperty('context'); + $options = $test->createOptions(); + $test->run('jsonld_flatten', array($input, $context, $options)); + } + + /** + * Tests serialization to RDF. + * + * @param JsonLdTest $test the test to run. + * + * @group toRdf + * @group json-ld.org + * @dataProvider toRdfProvider + */ + public function testToRdf($test) { + $this->test = $test; + $input = $test->readUrl('input'); + $options = $test->createOptions(array('format' => 'application/nquads')); + $test->run('jsonld_to_rdf', array($input, $options)); + } + + /** + * Tests deserialization from RDF. + * + * @param JsonLdTest $test the test to run. + * + * @group fromRdf + * @group json-ld.org + * @dataProvider fromRdfProvider + */ + public function testFromRdf($test) { + $this->test = $test; + $input = $test->readProperty('input'); + $options = $test->createOptions(array('format' => 'application/nquads')); + $test->run('jsonld_from_rdf', array($input, $options)); + } + + /** + * Tests framing. + * + * @param JsonLdTest $test the test to run. + * + * @group frame + * @group json-ld.org + * @dataProvider frameProvider + */ + public function testFrame($test) { + $this->test = $test; + $input = $test->readUrl('input'); + $frame = $test->readProperty('frame'); + $options = $test->createOptions(); + $test->run('jsonld_frame', array($input, $frame, $options)); + } + + /** + * Tests normalization. + * + * @param JsonLdTest $test the test to run. + * + * @group normalize + * @group json-ld.org + * @dataProvider normalizeProvider + */ + public function testNormalize($test) { + $this->test = $test; + $input = $test->readUrl('input'); + $options = $test->createOptions(array('format' => 'application/nquads')); + $test->run('jsonld_normalize', array($input, $options)); + } + + /** + * Tests URGNA2012 normalization. + * + * @param JsonLdTest $test the test to run. + * + * @group normalize + * @group normalization + * @dataProvider urgna2012Provider + */ + public function testUrgna2012($test) { + $this->test = $test; + $input = $test->readProperty('action'); + $options = $test->createOptions(array( + 'algorithm' => 'URGNA2012', + 'inputFormat' => 'application/nquads', + 'format' => 'application/nquads')); + $test->run('jsonld_normalize', array($input, $options)); + } + + /** + * Tests URDNA2015 normalization. + * + * @param JsonLdTest $test the test to run. + * + * @group normalize + * @group normalization + * @dataProvider urdna2015Provider + */ + public function testUrdna2015($test) { + $this->test = $test; + $input = $test->readProperty('action'); + $options = $test->createOptions(array( + 'algorithm' => 'URDNA2015', + 'inputFormat' => 'application/nquads', + 'format' => 'application/nquads')); + $test->run('jsonld_normalize', array($input, $options)); + } + + public function expandProvider() { + return new JsonLdTestIterator('jld:ExpandTest'); + } + + public function compactProvider() { + return new JsonLdTestIterator('jld:CompactTest'); + } + + public function flattenProvider() { + return new JsonLdTestIterator('jld:FlattenTest'); + } + + public function toRdfProvider() { + return new JsonLdTestIterator('jld:ToRDFTest'); + } + + public function fromRdfProvider() { + return new JsonLdTestIterator('jld:FromRDFTest'); + } + + public function normalizeProvider() { + return new JsonLdTestIterator('jld:NormalizeTest'); + } + + public function frameProvider() { + return new JsonLdTestIterator('jld:FrameTest'); + } + + public function urgna2012Provider() { + return new JsonLdTestIterator('rdfn:Urgna2012EvalTest'); + } + + public function urdna2015Provider() { + return new JsonLdTestIterator('rdfn:Urdna2015EvalTest'); + } +} + +class JsonLdManifest { + public function __construct($data, $filename) { + $this->data = $data; + $this->filename = $filename; + $this->dirname = dirname($filename); + } + + public function load(&$tests) { + $entries = array_merge( + JsonLdProcessor::getValues($this->data, 'sequence'), + JsonLdProcessor::getValues($this->data, 'entries')); + $includes = JsonLdProcessor::getValues($this->data, 'include'); + foreach($includes as $include) { + array_push($entries, $include . '.jsonld'); + } + foreach($entries as $entry) { + if(is_string($entry)) { + $filename = join( + DIRECTORY_SEPARATOR, array($this->dirname, $entry)); + $entry = Util::readJson($filename); + } else { + $filename = $this->filename; + } + + if(JsonLdProcessor::hasValue($entry, '@type', 'mf:Manifest') || + JsonLdProcessor::hasValue($entry, 'type', 'mf:Manifest')) { + // entry is another manifest + $manifest = new JsonLdManifest($entry, $filename); + $manifest->load($tests); + } else { + // assume entry is a test + $test = new JsonLdTest($this, $entry, $filename); + $types = array_merge( + JsonLdProcessor::getValues($test->data, '@type'), + JsonLdProcessor::getValues($test->data, 'type')); + foreach($types as $type) { + if(!isset($tests[$type])) { + $tests[$type] = array(); + } + $tests[$type][] = $test; + } + } + } + } +} + +class JsonLdTest { + public function __construct($manifest, $data, $filename) { + $this->manifest = $manifest; + $this->data = $data; + $this->filename = $filename; + $this->dirname = dirname($filename); + $this->isPositive = + JsonLdProcessor::hasValue( + $data, '@type', 'jld:PositiveEvaluationTest') || + JsonLdProcessor::hasValue( + $data, 'type', 'jld:PositiveEvaluationTest'); + $this->isNegative = + JsonLdProcessor::hasValue( + $data, '@type', 'jld:NegativeEvaluationTest') || + JsonLdProcessor::hasValue( + $data, 'type', 'jld:NegativeEvaluationTest'); + + // generate test name + if(isset($manifest->data->name)) { + $manifestLabel = $manifest->data->name; + } else if(isset($manifest->data->label)) { + $manifestLabel = $manifest->data->label; + } else { + $manifestLabel = 'UNNAMED'; + } + if(isset($this->data->id)) { + $testId = $this->data->id; + } else { + $testId = $this->data->{'@id'}; + } + if(isset($this->data->name)) { + $testLabel = $this->data->name; + } else if(isset($this->data->label)) { + $testLabel = $this->data->label; + } else { + $testLabel = 'UNNAMED'; + } + + $this->name = $manifestLabel . ' ' . $testId . ' - ' . $testLabel; + + // expand @id and input base + if(isset($manifest->data->baseIri)) { + $data->{'@id'} = ($manifest->data->baseIri . + basename($manifest->filename) . $data->{'@id'}); + $this->base = $manifest->data->baseIri . $data->input; + } + } + + private function _getResultProperty() { + if(isset($this->data->expect)) { + return 'expect'; + } else if(isset($this->data->result)) { + return 'result'; + } else { + throw new Exception('No test result property found.'); + } + } + + public function run($fn, $params) { + // read expected data + if($this->isNegative) { + $this->expected = $this->data->expect; + } else { + $this->expected = $this->readProperty($this->_getResultProperty()); + } + + try { + $this->actual = call_user_func_array($fn, $params); + if($this->isNegative) { + throw new Exception('Expected an error; one was not raised.'); + } + PHPUnit_Framework_TestCase::assertEquals($this->expected, $this->actual); + } catch(Exception $e) { + // assume positive test + if($this->isNegative) { + $this->actual = $this->getJsonLdErrorCode($e); + PHPUnit_Framework_TestCase::assertEquals( + $this->expected, $this->actual); + } else { + throw $e; + } + } + } + + public function readUrl($property) { + if(!property_exists($this->data, $property)) { + return null; + } + return $this->manifest->data->baseIri . $this->data->{$property}; + } + + public function readProperty($property) { + $data = $this->data; + if(!property_exists($data, $property)) { + return null; + } + $filename = join( + DIRECTORY_SEPARATOR, array($this->dirname, $data->{$property})); + $extension = pathinfo($filename, PATHINFO_EXTENSION); + if($extension === 'jsonld') { + return Util::readJson($filename); + } + return Util::readFile($filename); + } + + public function createOptions($opts=array()) { + $http_options = array( + 'contentType', 'httpLink', 'httpStatus', 'redirectTo'); + $test_options = (property_exists($this->data, 'option') ? + $this->data->option : array()); + $options = array(); + foreach($test_options as $k => $v) { + if(!in_array($k, $http_options)) { + $options[$k] = $v; + } + } + $options['documentLoader'] = $this->createDocumentLoader(); + $options = array_merge($options, $opts); + if(isset($options['expandContext'])) { + $filename = join( + DIRECTORY_SEPARATOR, array($this->dirname, $options['expandContext'])); + $options['expandContext'] = Util::readJson($filename); + } + return $options; + } + + public function createDocumentLoader() { + $base = 'http://json-ld.org/test-suite'; + $test = $this; + + $load_locally = function($url) use ($test, $base) { + $doc = (object)array( + 'contextUrl' => null, 'documentUrl' => $url, 'document' => null); + $options = (property_exists($test->data, 'option') ? + $test->data->option : null); + if($options and $url === $test->base) { + if(property_exists($options, 'redirectTo') && + property_exists($options, 'httpStatus') && + $options->httpStatus >= '300') { + $doc->documentUrl = ($test->manifest->data->baseIri . + $options->redirectTo); + } else if(property_exists($options, 'httpLink')) { + $content_type = (property_exists($options, 'contentType') ? + $options->contentType : null); + $extension = pathinfo($url, PATHINFO_EXTENSION); + if(!$content_type && $extension === 'jsonld') { + $content_type = 'application/ld+json'; + } + $link_header = $options->httpLink; + if(is_array($link_header)) { + $link_header = join(',', $link_header); + } + $link_header = jsonld_parse_link_header($link_header); + if(isset($link_header['http://www.w3.org/ns/json-ld#context'])) { + $link_header = $link_header['http://www.w3.org/ns/json-ld#context']; + } else { + $link_header = null; + } + if($link_header && $content_type !== 'application/ld+json') { + if(is_array($link_header)) { + throw new Exception('multiple context link headers'); + } + $doc->contextUrl = $link_header->target; + } + } + } + global $ROOT_MANIFEST_DIR; + if(strpos($doc->documentUrl, ':') === false) { + $filename = join( + DIRECTORY_SEPARATOR, array( + $ROOT_MANIFEST_DIR, $doc->documentUrl)); + $doc->documentUrl = 'file://' . $filename; + } else { + $filename = join( + DIRECTORY_SEPARATOR, array( + $ROOT_MANIFEST_DIR, substr($doc->documentUrl, strlen($base)))); + } + try { + $doc->document = Util::readJson($filename); + } catch(Exception $e) { + throw new Exception('loading document failed'); + } + return $doc; + }; + + $local_loader = function($url) use ($test, $base, $load_locally) { + // always load remote-doc and non-base tests remotely + if((strpos($url, $base) !== 0 && strpos($url, ':') !== false) || + $test->manifest->data->name === 'Remote document') { + return call_user_func('jsonld_default_document_loader', $url); + } + + // attempt to load locally + return call_user_func($load_locally, $url); + }; + + return $local_loader; + } + + public function getJsonLdErrorCode($err) { + if($err instanceof JsonLdException) { + if($err->getCode()) { + return $err->getCode(); + } + if($err->cause) { + return $this->getJsonLdErrorCode($err->cause); + } + } + return $err->getMessage(); + } +} + +class JsonLdTestIterator implements Iterator { + /** + * The current test index. + */ + protected $index = 0; + + /** + * The total number of tests. + */ + protected $count = 0; + + /** + * Creates a TestIterator. + * + * @param string $type the type of tests to iterate over. + */ + public function __construct($type) { + global $TESTS; + if(isset($TESTS[$type])) { + $this->tests = $TESTS[$type]; + } else { + $this->tests = array(); + } + $this->count = count($this->tests); + } + + /** + * Gets the parameters for the next test. + * + * @return assoc the parameters for the next test. + */ + public function current() { + return array('test' => $this->tests[$this->index]); + } + + /** + * Gets the current test number. + * + * @return int the current test number. + */ + public function key() { + return $this->index; + } + + /** + * Proceeds to the next test. + */ + public function next() { + $this->index += 1; + } + + /** + * Rewinds to the first test. + */ + public function rewind() { + $this->index = 0; + } + + /** + * Returns true if there are more tests to be run. + * + * @return bool true if there are more tests to be run. + */ + public function valid() { + return $this->index < $this->count; + } +} + +class EarlReport extends PHPUnit_Util_Printer + implements PHPUnit_Framework_TestListener { + public function __construct() { + $this->filename = null; + $this->attached = false; + $this->report = (object)array( + '@context' => (object)array( + 'doap' => 'http://usefulinc.com/ns/doap#', + 'foaf' => 'http://xmlns.com/foaf/0.1/', + 'dc' => 'http://purl.org/dc/terms/', + 'earl' => 'http://www.w3.org/ns/earl#', + 'xsd' => 'http://www.w3.org/2001/XMLSchema#', + 'doap:homepage' => (object)array('@type' => '@id'), + 'doap:license' => (object)array('@type' => '@id'), + 'dc:creator' => (object)array('@type' => '@id'), + 'foaf:homepage' => (object)array('@type' => '@id'), + 'subjectOf' => (object)array('@reverse' => 'earl:subject'), + 'earl:assertedBy' => (object)array('@type' => '@id'), + 'earl:mode' => (object)array('@type' => '@id'), + 'earl:test' => (object)array('@type' => '@id'), + 'earl:outcome' => (object)array('@type' => '@id'), + 'dc:date' => (object)array('@type' => 'xsd:date') + ), + '@id' => 'https://github.com/digitalbazaar/php-json-ld', + '@type' => array('doap:Project', 'earl:TestSubject', 'earl:Software'), + 'doap:name' => 'php-json-ld', + 'dc:title' => 'php-json-ld', + 'doap:homepage' => 'https://github.com/digitalbazaar/php-json-ld', + 'doap:license' => 'https://github.com/digitalbazaar/php-json-ld/blob/master/LICENSE', + 'doap:description' => 'A JSON-LD processor for PHP', + 'doap:programming-language' => 'PHP', + 'dc:creator' => 'https://github.com/dlongley', + 'doap:developer' => (object)array( + '@id' => 'https://github.com/dlongley', + '@type' => array('foaf:Person', 'earl:Assertor'), + 'foaf:name' => 'Dave Longley', + 'foaf:homepage' => 'https://github.com/dlongley' + ), + 'dc:date' => array( + '@value' => gmdate('Y-m-d'), + '@type' => 'xsd:date' + ), + 'subjectOf' => array() + ); + } + + /** + * Attaches to the given test result, if not yet attached. + * + * @param PHPUnit_Framework_Test $result the result to attach to. + */ + public function attach(PHPUnit_Framework_TestResult $result) { + if(!$this->attached && $this->filename) { + $this->attached = true; + $result->addListener($this); + } + } + + /** + * Adds an assertion to this EARL report. + * + * @param JsonLdTest $test the JsonLdTest for the assertion is for. + * @param bool $passed whether or not the test passed. + */ + public function addAssertion($test, $passed) { + $this->report->{'subjectOf'}[] = (object)array( + '@type' => 'earl:Assertion', + 'earl:assertedBy' => $this->report->{'doap:developer'}->{'@id'}, + 'earl:mode' => 'earl:automatic', + 'earl:test' => $test->data->{'@id'}, + 'earl:result' => (object)array( + '@type' => 'earl:TestResult', + 'dc:date' => gmdate(DateTime::ISO8601), + 'earl:outcome' => $passed ? 'earl:passed' : 'earl:failed' + ) + ); + return $this; + } + + /** + * Writes this EARL report to a file. + */ + public function flush() { + if($this->filename) { + printf("\nWriting EARL report to: %s\n", $this->filename); + $fd = fopen($this->filename, 'w'); + fwrite($fd, Util::jsonldEncode($this->report)); + fclose($fd); + } + } + + public function endTest(PHPUnit_Framework_Test $test, $time) { + $this->addAssertion($test->test, true); + } + + public function addError( + PHPUnit_Framework_Test $test, Exception $e, $time) { + $this->addAssertion($test->test, false); + } + + public function addFailure( + PHPUnit_Framework_Test $test, + PHPUnit_Framework_AssertionFailedError $e, $time) { + $this->addAssertion($test->test, false); + if($test->result->shouldStop()) { + if(isset($test->test->name)) { + $name = $test->test->name; + } else if(isset($test->test->label)) { + $name = $test->test->label; + } else { + $name = 'UNNAMED'; + } + printf("\n\nFAILED\n"); + printf("Test: %s\n", $name); + printf("Purpose: %s\n", $test->test->data->purpose); + printf("EXPECTED: %s\n", Util::jsonldEncode($test->test->expected)); + printf("ACTUAL: %s\n", Util::jsonldEncode($test->test->actual)); + } + } + + public function addIncompleteTest( + PHPUnit_Framework_Test $test, Exception $e, $time) { + $this->addAssertion($test->test, false); + } + + public function addRiskyTest( + PHPUnit_Framework_Test $test, Exception $e, $time) {} + public function addSkippedTest( + PHPUnit_Framework_Test $test, Exception $e, $time) {} + public function startTest(PHPUnit_Framework_Test $test) {} + public function startTestSuite(PHPUnit_Framework_TestSuite $suite) {} + public function endTestSuite(PHPUnit_Framework_TestSuite $suite) {} +} + +class Util { + public static function readFile($filename) { + $rval = @file_get_contents($filename); + if($rval === false) { + throw new Exception('File read error: ' . $filename); + } + return $rval; + } + + public static function readJson($filename) { + $rval = json_decode(self::readFile($filename)); + if($rval === null) { + throw new Exception('JSON parse error'); + } + return $rval; + } + + public static function readNQuads($filename) { + return self::readFile($filename); + } + + public static function jsonldEncode($input) { + // newer PHP has a flag to avoid escaped '/' + if(defined('JSON_UNESCAPED_SLASHES')) { + $options = JSON_UNESCAPED_SLASHES; + if(defined('JSON_PRETTY_PRINT')) { + $options |= JSON_PRETTY_PRINT; + } + $json = json_encode($input, $options); + } else { + // use a simple string replacement of '\/' to '/'. + $json = str_replace('\\/', '/', json_encode($input)); + } + return $json; + } +} + +// tests to skip +$SKIP_TESTS = array(); + +// root manifest directory +$ROOT_MANIFEST_DIR; + +// parsed tests; keyed by type +$TESTS = array(); + +// parsed command line options +$OPTIONS = array(); + +// parse command line options +global $argv; +$args = $argv; +$total = count($args); +$start = false; +for($i = 0; $i < $total; ++$i) { + $arg = $args[$i]; + if(!$start) { + if(realpath($arg) === realpath(__FILE__)) { + $start = true; + } + continue; + } + if($arg[0] !== '-') { + break; + } + $i += 1; + $OPTIONS[$arg] = $args[$i]; +} +if(!isset($OPTIONS['-d'])) { + $dvar = 'path to json-ld.org/test-suite'; + $evar = 'file to write EARL report to'; + echo "php-json-ld Tests\n"; + echo "Usage: phpunit test.php -d <$dvar> [-e <$evar>]\n\n"; + exit(0); +} + +// EARL Report +$EARL = new EarlReport(); +if(isset($OPTIONS['-e'])) { + $EARL->filename = $OPTIONS['-e']; +} + +// load root manifest +$ROOT_MANIFEST_DIR = realpath($OPTIONS['-d']); +$filename = join( + DIRECTORY_SEPARATOR, array($ROOT_MANIFEST_DIR, 'manifest.jsonld')); +$root_manifest = Util::readJson($filename); +$manifest = new JsonLdManifest($root_manifest, $filename); +$manifest->load($TESTS); + +/* end of file, omit ?> */ diff --git a/view/js/main.js b/view/js/main.js index ece4c2015..47815d2c6 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -596,8 +596,9 @@ function updateConvItems(mode,data) { var title = $(".wall-item-title").text(); title.replace(/^\s+/, ''); title.replace(/\s+$/, ''); - if (title) - document.title = title + " - " + document.title; + if (title) { + savedTitle = title + " " + savedTitle; + } } } }); From 99ca2a7cc6e5560a90abe4acbf73a95539231d1f Mon Sep 17 00:00:00 2001 From: zotlabs Date: Sun, 27 Aug 2017 18:28:44 -0700 Subject: [PATCH 153/441] fix card category widget links when a specific card is opened --- Zotlabs/Widget/Categories.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Zotlabs/Widget/Categories.php b/Zotlabs/Widget/Categories.php index 84deb03d6..305869706 100644 --- a/Zotlabs/Widget/Categories.php +++ b/Zotlabs/Widget/Categories.php @@ -19,7 +19,7 @@ class Categories { } $cat = ((x($_REQUEST,'cat')) ? htmlspecialchars($_REQUEST['cat'],ENT_COMPAT,'UTF-8') : ''); - $srchurl = \App::$query_string; + $srchurl = (($cards) ? \App::$argv[0] . '/' . \App::$argv[1] : \App::$query_string); $srchurl = rtrim(preg_replace('/cat\=[^\&].*?(\&|$)/is','',$srchurl),'&'); $srchurl = str_replace(array('?f=','&f='),array('',''),$srchurl); From d0d0a2df3a4011cf92c34293d21deee4412ac4a1 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Sun, 27 Aug 2017 19:02:50 -0700 Subject: [PATCH 154/441] fix issue with comment box re-opening after submit; however I should note that bind and unbind are deprecated in jquery > 1.3 and these calls probably need to be upgraded. --- view/js/main.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/view/js/main.js b/view/js/main.js index 47815d2c6..486f5b8d6 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -1084,8 +1084,10 @@ function post_comment(id) { $("#comment-edit-wrapper-" + id).hide(); $("#comment-edit-text-" + id).val(''); var tarea = document.getElementById("comment-edit-text-" + id); - if(tarea) + if(tarea) { commentClose(tarea, id); + $(document).unbind( "click.commentOpen"); + } if(timer) clearTimeout(timer); timer = setTimeout(NavUpdate,1500); } From 6385d11b5489d3d3cf0c8200e689276824af148e Mon Sep 17 00:00:00 2001 From: zotlabs Date: Sun, 27 Aug 2017 21:46:10 -0700 Subject: [PATCH 155/441] AS2: recipient collection --- Zotlabs/Lib/ActivityStreams.php | 43 ++++++++++++++++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-) diff --git a/Zotlabs/Lib/ActivityStreams.php b/Zotlabs/Lib/ActivityStreams.php index 3bbe3b190..686f4a140 100644 --- a/Zotlabs/Lib/ActivityStreams.php +++ b/Zotlabs/Lib/ActivityStreams.php @@ -14,6 +14,8 @@ class ActivityStreams { public $origin = null; public $owner = null; + public $recips = null; + function __construct($string) { $this->data = json_decode($string,true); @@ -28,7 +30,7 @@ class ActivityStreams { $this->obj = $this->get_compound_property('object'); $this->tgt = $this->get_compound_property('target'); $this->origin = $this->get_compound_property('origin'); - $this->owner = $this->get_compound_property('owner','','http://purl.org/zot/protocol'); + $this->recips = $this->collect_recips(); if(($this->type === 'Note') && (! $this->obj)) { $this->obj = $this->data; @@ -41,6 +43,45 @@ class ActivityStreams { return $this->valid; } + function collect_recips($base = '',$namespace = 'https://www.w3.org/ns/activitystreams') { + $x = []; + $fields = [ 'to','cc','bto','bcc','audience']; + foreach($fields as $f) { + $y = $this->get_compound_property($f,$base,$namespace); + if($y) + $x = array_merge($x,$y); + } +// not yet ready for prime time +// $x = $this->expand($x,$base,$namespace); + return $x; + } + + function expand($arr,$base = '',$namespace = 'https://www.w3.org/ns/activitystreams') { + $ret = []; + + // right now use a hardwired recursion depth of 5 + + for($z = 0; $z < 5; $z ++) { + if(is_array($arr) && $arr) { + foreach($arr as $a) { + if(is_array($a)) { + $ret[] = $a; + } + else { + $x = $this->get_compound_property($a,$base,$namespace); + if($x) { + $ret = array_merge($ret,$x); + } + } + } + } + } + + // @fixme de-duplicate + + return $ret; + } + function get_namespace($base,$namespace) { $key = null; From e70bf975084ee44662bc2c1c19d2fe6aa0268dee Mon Sep 17 00:00:00 2001 From: git-marijus Date: Mon, 28 Aug 2017 23:42:17 +0200 Subject: [PATCH 156/441] rewrite comment form handling --- Zotlabs/Lib/ThreadItem.php | 6 +-- view/css/conversation.css | 15 +++---- view/js/main.js | 75 ++++++++++++++++++++++++------- view/theme/redbasic/css/style.css | 7 +-- view/tpl/comment_item.tpl | 2 +- 5 files changed, 70 insertions(+), 35 deletions(-) diff --git a/Zotlabs/Lib/ThreadItem.php b/Zotlabs/Lib/ThreadItem.php index 313001cc7..f9565d339 100644 --- a/Zotlabs/Lib/ThreadItem.php +++ b/Zotlabs/Lib/ThreadItem.php @@ -758,9 +758,9 @@ class ThreadItem { '$sourceapp' => \App::$sourcename, '$observer' => get_observer_hash(), '$anoncomments' => (($conv->get_mode() === 'channel' && perm_is_allowed($conv->get_profile_owner(),'','post_comments')) ? true : false), - '$anonname' => [ 'anonname', t('Your full name (required)'),'','','','onBlur="commentCloseUI(this,\'' . $this->get_id() . '\')"' ], - '$anonmail' => [ 'anonmail', t('Your email address (required)'),'','','','onBlur="commentCloseUI(this,\'' . $this->get_id() . '\')"' ], - '$anonurl' => [ 'anonurl', t('Your website URL (optional)'),'','','','onBlur="commentCloseUI(this,\'' . $this->get_id() . '\')"' ] + '$anonname' => [ 'anonname', t('Your full name (required)') ], + '$anonmail' => [ 'anonmail', t('Your email address (required)') ], + '$anonurl' => [ 'anonurl', t('Your website URL (optional)') ] )); return $comment_box; diff --git a/view/css/conversation.css b/view/css/conversation.css index d10e1e14e..dcabb5f3c 100644 --- a/view/css/conversation.css +++ b/view/css/conversation.css @@ -183,24 +183,19 @@ a.wall-item-name-link { /* comment_item */ -.comment-edit-text-empty, -.comment-edit-text-full { + +.comment-edit-text { padding: 0.5rem; width: 100%; display: inherit; -} - -.comment-edit-text-empty { - height: 2rem; line-height: 1; - overflow: hidden; + height: 2rem; resize: none; } -.comment-edit-text-full { - height: 7rem; +.comment-edit-text.expanded { line-height: 1.25; - overflow: auto; + height: 7rem; resize: vertical; } diff --git a/view/js/main.js b/view/js/main.js index 47815d2c6..109b864a2 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -1,6 +1,55 @@ function confirmDelete() { return confirm(aStr.delitem); } +function handle_comment_form(e) { + e.stopPropagation(); + + //handle eventual expanded forms + var expanded = $('.comment-edit-text.expanded'); + var i = 0; + + if(expanded.length) { + expanded.each(function() { + var ex_form = $(expanded[i].form); + var ex_fields = ex_form.find(':input[type=text], textarea'); + var ex_fields_empty = true; + + ex_fields.each(function() { + if($(this).val() != '') + ex_fields_empty = false; + }); + if(ex_fields_empty) { + ex_form.find('.comment-edit-text').removeClass('expanded').attr('placeholder', aStr.comment); + ex_form.find(':not(.comment-edit-text)').hide(); + } + i++ + }); + } + + // handle clicked form + var form = $(this); + var fields = form.find(':input[type=text], textarea'); + var fields_empty = true; + + if(form.find('.comment-edit-text').length) { + form.find('.comment-edit-text').addClass('expanded').removeAttr('placeholder'); + form.find(':not(:visible)').show(); + } + + // handle click outside of form (close empty forms) + $(document).on('click', function(e) { + fields.each(function() { + if($(this).val() != '') + fields_empty = false; + }); + if(fields_empty) { + form.find('.comment-edit-text').removeClass('expanded').attr('placeholder', aStr.comment); + form.find(':not(.comment-edit-text)').hide(); + } + }); +} + +/* function commentOpenUI(obj, id) { $(document).unbind( "click.commentOpen", handler ); @@ -44,8 +93,7 @@ function commentCloseUI(obj, id) { function commentOpen(obj, id) { if(obj.value == aStr.comment) { obj.value = ''; - $("#comment-edit-text-" + id).addClass("comment-edit-text-full"); - $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty"); + $("#comment-edit-text-" + id).addClass("expanded"); $("#mod-cmnt-wrap-" + id).show(); $("#comment-tools-" + id).show(); $("#comment-edit-anon-" + id).show(); @@ -53,12 +101,11 @@ function commentOpen(obj, id) { } return false; } - +*/ function commentClose(obj, id) { if(obj.value === '') { obj.value = aStr.comment; - $("#comment-edit-text-" + id).removeClass("comment-edit-text-full"); - $("#comment-edit-text-" + id).addClass("comment-edit-text-empty"); + $("#comment-edit-text-" + id).removeClass("expanded"); $("#mod-cmnt-wrap-" + id).hide(); $("#comment-tools-" + id).hide(); $("#comment-edit-anon-" + id).hide(); @@ -67,6 +114,7 @@ function commentClose(obj, id) { return false; } + function showHideCommentBox(id) { if( $('#comment-edit-form-' + id).is(':visible')) { $('#comment-edit-form-' + id).hide(); @@ -79,8 +127,7 @@ function commentInsert(obj, id) { var tmpStr = $("#comment-edit-text-" + id).val(); if(tmpStr == '$comment') { tmpStr = ''; - $("#comment-edit-text-" + id).addClass("comment-edit-text-full"); - $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty"); + $("#comment-edit-text-" + id).addClass("expanded"); openMenu("comment-tools-" + id); } var ins = $(obj).html(); @@ -101,8 +148,7 @@ function insertbbcomment(comment, BBcode, id) { var tmpStr = $("#comment-edit-text-" + id).val(); if(tmpStr == comment) { tmpStr = ""; - $("#comment-edit-text-" + id).addClass("comment-edit-text-full"); - $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty"); + $("#comment-edit-text-" + id).addClass("expanded"); openMenu("comment-tools-" + id); $("#comment-edit-text-" + id).val(tmpStr); } @@ -160,8 +206,7 @@ function insertCommentURL(comment, id) { var tmpStr = $("#comment-edit-text-" + id).val(); if(tmpStr == comment) { tmpStr = ""; - $("#comment-edit-text-" + id).addClass("comment-edit-text-full"); - $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty"); + $("#comment-edit-text-" + id).addClass("expanded"); openMenu("comment-tools-" + id); $("#comment-edit-text-" + id).val(tmpStr); } @@ -183,8 +228,7 @@ function qCommentInsert(obj, id) { var tmpStr = $("#comment-edit-text-" + id).val(); if(tmpStr == aStr.comment) { tmpStr = ''; - $("#comment-edit-text-" + id).addClass("comment-edit-text-full"); - $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty"); + $("#comment-edit-text-" + id).addClass("expanded"); openMenu("comment-edit-submit-wrapper-" + id); } var ins = $(obj).val(); @@ -728,7 +772,7 @@ function collapseHeight() { function liveUpdate() { if(typeof profile_uid === 'undefined') profile_uid = false; /* Should probably be unified with channelId defined in head.tpl */ if((src === null) || (stopped) || (! profile_uid)) { $('.like-rotator').spin(false); return; } - if(($('.comment-edit-text-full').length) || (in_progress)) { + if(($('.comment-edit-text.expanded').length) || (in_progress)) { if(livetime) { clearTimeout(livetime); } @@ -1312,9 +1356,10 @@ Array.prototype.remove = function(item) { return this.push.apply(this, rest); }; - $(document).ready(function() { + $(document).on('click focus', '.comment-edit-form', handle_comment_form); + jQuery.timeago.settings.strings = { prefixAgo : aStr['t01'], prefixFromNow : aStr['t02'], diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 37277b612..621fa2781 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1073,16 +1073,11 @@ img.mail-conv-sender-photo { } -.comment-edit-text-empty, -.comment-edit-text-full { +.comment-edit-text { border: 1px solid #ccc; border-radius: $radius; } -.comment-edit-text-empty { - color: gray; -} - .divgrow-showmore { display: block; border-top: 1px dashed #ccc; diff --git a/view/tpl/comment_item.tpl b/view/tpl/comment_item.tpl index cba4cd3c5..e53c14024 100755 --- a/view/tpl/comment_item.tpl +++ b/view/tpl/comment_item.tpl @@ -18,7 +18,7 @@ {{$anon_extras}}
{{/if}} - + {{if $qcomment}} + {{if $qcomment}} + {{$mimetype}} {{include file="field_input.tpl" field=$pageName}} @@ -33,7 +34,7 @@ {{if $canadd}} \ No newline at end of file + diff --git a/view/tpl/cdav_calendar.tpl b/view/tpl/cdav_calendar.tpl index 5d683d751..b0245e853 100644 --- a/view/tpl/cdav_calendar.tpl +++ b/view/tpl/cdav_calendar.tpl @@ -129,11 +129,11 @@ $(document).ready(function() { }, loading: function(isLoading, view) { - $('#events-spinner').spin('tiny'); - $('#events-spinner > i').css('color', 'transparent'); + $('#events-spinner').show(); + $('#today-btn > i').hide(); if(!isLoading) { - $('#events-spinner').spin(false); - $('#events-spinner > i').css('color', ''); + $('#events-spinner').hide(); + $('#today-btn > i').show(); } } }); @@ -292,7 +292,7 @@ function on_more() {
- +
diff --git a/view/tpl/chat.tpl b/view/tpl/chat.tpl index 22f3465bf..c189cbd15 100644 --- a/view/tpl/chat.tpl +++ b/view/tpl/chat.tpl @@ -16,6 +16,9 @@
+
@@ -25,7 +28,7 @@
-
+
@@ -42,7 +45,7 @@ {{/if}}
-
+
+
+ +
-
-
-
-
@@ -101,7 +105,7 @@ var last_chat = 0; var chat_timer = null; $(document).ready(function() { - $('#chatTopBar').spin('small'); + $('#chat-top-spinner').show(); chat_timer = setTimeout(load_chats,300); $('#chatroom_bookmarks, #vcard').hide(); $('#chatroom_list, #chatroom_members').show(); @@ -134,7 +138,7 @@ function load_chats() { if(data.success && (! stopped)) { update_inroom(data.inroom); update_chats(data.chats); - $('#chatTopBar').spin(false); + $('#chat-top-spinner').hide(); } }); @@ -293,10 +297,10 @@ function toggleChatNotifications() { function chatJotGetLink() { reply = prompt("{{$linkurl}}"); if(reply && reply.length) { - $('#chat-rotator').spin('tiny'); + $('#chat-rotator').show(); $.get('linkinfo?f=&url=' + reply, function(data) { addmailtext(data); - $('#chat-rotator').spin(false); + $('#chat-rotator').hide(); }); } } diff --git a/view/tpl/conv_frame.tpl b/view/tpl/conv_frame.tpl index 1f0e00db4..8aa865076 100755 --- a/view/tpl/conv_frame.tpl +++ b/view/tpl/conv_frame.tpl @@ -1,6 +1,8 @@
-
+ diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index b3fe60750..b0c143f4a 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -86,6 +86,11 @@ {{/if}}
+
+ +
{{if $item.toplevel && $item.emojis && $item.reactions}}
- {{if $item.responses || $item.attachments}}
diff --git a/view/tpl/event_head.tpl b/view/tpl/event_head.tpl index 3b2cb5041..2f440e826 100755 --- a/view/tpl/event_head.tpl +++ b/view/tpl/event_head.tpl @@ -67,11 +67,11 @@ showEvent(calEvent.id); }, loading: function(isLoading, view) { - $('#events-spinner').spin('tiny'); - $('#events-spinner > i').css('color', 'transparent'); + $('#events-spinner').show(); + $('#today-btn > i').hide(); if(!isLoading) { - $('#events-spinner').spin(false); - $('#events-spinner > i').css('color', ''); + $('#events-spinner').hide(); + $('#today-btn > i').show(); $('td.fc-day').dblclick(function() { openMenu('form'); //window.location.href='/events/new?start='+$(this).data('date'); diff --git a/view/tpl/events-js.tpl b/view/tpl/events-js.tpl index 9d32c76be..d3f3414ff 100755 --- a/view/tpl/events-js.tpl +++ b/view/tpl/events-js.tpl @@ -11,7 +11,7 @@
- +
diff --git a/view/tpl/events_cal-js.tpl b/view/tpl/events_cal-js.tpl index ba9e16dd6..2c4d961f9 100755 --- a/view/tpl/events_cal-js.tpl +++ b/view/tpl/events_cal-js.tpl @@ -4,7 +4,7 @@
- +
diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl index 2d37b3ca2..2f9dd9f15 100755 --- a/view/tpl/jot-header.tpl +++ b/view/tpl/jot-header.tpl @@ -6,10 +6,10 @@ var pretext = '{{$pretext}}'; function initEditor(cb){ if (editor==false){ - $("#profile-jot-text-loading").spin('small').show(); + $("#profile-jot-text-loading").show(); {{$geotag}} if(plaintext == 'none') { - $("#profile-jot-text-loading").spin(false).hide(); + $("#profile-jot-text-loading").hide(); $("#profile-jot-text").css({ 'height': 200 }); {{if $bbco_autocomplete}} $("#profile-jot-text").bbco_autocomplete('{{$bbco_autocomplete}}'); // autocomplete bbcode @@ -80,7 +80,7 @@ function initEditor(cb){ ed.onInit.add(function(ed) { ed.pasteAsPlainText = true; - $("#profile-jot-text-loading").spin(false).hide(); + $("#profile-jot-text-loading").hide(); $(".jothidden").show(); if (typeof cb!="undefined") cb(); }); @@ -121,7 +121,7 @@ var activeCommentText = ''; dropZone: $('#profile-jot-text'), maxChunkSize: 4 * 1024 * 1024, add: function(e,data) { - $('#profile-rotator').spin('tiny'); + $('#profile-rotator').show(); data.submit(); }, done: function(e,data) { @@ -130,7 +130,7 @@ var activeCommentText = ''; }, stop: function(e,data) { preview_post(); - $('#profile-rotator').spin(false); + $('#profile-rotator').hide(); }, }); @@ -204,11 +204,11 @@ var activeCommentText = ''; reply = prompt("{{$linkurl}}"); if(reply && reply.length) { reply = bin2hex(reply); - $('#profile-rotator').spin('tiny'); + $('#profile-rotator').show(); $.get('{{$baseurl}}/linkinfo?f=&binurl=' + reply, function(data) { addeditortext(data); preview_post(); - $('#profile-rotator').spin(false); + $('#profile-rotator').hide(); }); } } @@ -254,12 +254,12 @@ var activeCommentText = ''; else { if ($('#jot-popup').length != 0) $('#jot-popup').show(); - $('#like-rotator-' + id).spin('tiny'); + $('#like-rotator-' + id).show(); $.get('{{$baseurl}}/share/' + id, function(data) { if (!editor) $("#profile-jot-text").val(""); initEditor(function(){ addeditortext(data); - $('#like-rotator-' + id).spin(false); + $('#like-rotator-' + id).hide(); $(window).scrollTop(0); }); }); @@ -312,17 +312,17 @@ var activeCommentText = ''; if(reply && reply.length) { reply = bin2hex(reply); - $('#profile-rotator').spin('tiny'); + $('#profile-rotator').show(); $.get('{{$baseurl}}/linkinfo?f=&binurl=' + reply, function(data) { if(commentwin) { $(editwin).val( $(editwin).val() + data ); - $('#profile-rotator').spin(false); + $('#profile-rotator').hide(); } else { if (!editor) $("#profile-jot-text").val(""); initEditor(function(){ addeditortext(data); - $('#profile-rotator').spin(false); + $('#profile-rotator').hide(); }); } }); diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index ce17f2f24..13e7602be 100755 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -168,9 +168,11 @@
{{/if}} -
-
-
+
+ +
{{if $preview}} diff --git a/view/tpl/msg-header.tpl b/view/tpl/msg-header.tpl index 48bf5de4b..d71d432fb 100755 --- a/view/tpl/msg-header.tpl +++ b/view/tpl/msg-header.tpl @@ -12,7 +12,7 @@ dropZone: $('#prvmail-text'), maxChunkSize: 4 * 1024 * 1024, add: function(e,data) { - $('#prvmail-rotator').spin('tiny'); + $('#prvmail-rotator').show(); data.submit(); }, done: function(e,data) { @@ -21,7 +21,7 @@ }, stop: function(e,data) { preview_mail(); - $('#prvmail-rotator').spin(false); + $('#prvmail-rotator').hide(); }, }); @@ -34,11 +34,11 @@ function prvmailJotGetLink() { reply = prompt("{{$linkurl}}"); if(reply && reply.length) { - $('#prvmail-rotator').spin('tiny'); + $('#prvmail-rotator').show(); $.get('linkinfo?f=&url=' + reply, function(data) { addmailtext(data); preview_mail(); - $('#prvmail-rotator').spin(false); + $('#prvmail-rotator').hide(); }); } } @@ -61,11 +61,11 @@ event.target.textContent = reply; event.preventDefault(); if(reply && reply.length) { - $('#prvmail-rotator').spin('tiny'); + $('#prvmail-rotator').show(); $.get('linkinfo?f=&url=' + reply, function(data) { addmailtext(data); preview_mail(); - $('#prvmail-rotator').spin(false); + $('#prvmail-rotator').hide(); }); } } diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index f21017076..72860aebe 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -191,7 +191,9 @@ - +
{{/if}} -
+
@@ -31,12 +31,12 @@
-
+
-
+
{{if $feature_expire || $feature_encrypt}} -
+
{{if $feature_expire}}
+
+ +
-
-
-
-
From 4a270d10d189471496438489a9b444bd12340aab Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Tue, 26 Sep 2017 13:50:29 +0200 Subject: [PATCH 325/441] bump version --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot.php b/boot.php index df5c77e43..4f738a7a1 100755 --- a/boot.php +++ b/boot.php @@ -49,7 +49,7 @@ require_once('include/hubloc.php'); require_once('include/attach.php'); define ( 'PLATFORM_NAME', 'hubzilla' ); -define ( 'STD_VERSION', '2.7.4' ); +define ( 'STD_VERSION', '2.7.5' ); define ( 'ZOT_REVISION', '1.3' ); define ( 'DB_UPDATE_VERSION', 1196 ); From b8a0bc0b0b31670d2c424a40f7511132896a76d2 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 27 Sep 2017 12:06:06 +0200 Subject: [PATCH 326/441] fix some missing spinners --- view/theme/redbasic/css/style.css | 3 ++- view/tpl/connections.tpl | 4 +++- view/tpl/conv_item.tpl | 2 +- view/tpl/conv_list.tpl | 2 +- view/tpl/directory_header.tpl | 4 +++- view/tpl/photo_album.tpl | 4 +++- view/tpl/photos_recent.tpl | 4 +++- view/tpl/search_item.tpl | 2 +- view/tpl/viewcontact_template.tpl | 4 +++- 9 files changed, 20 insertions(+), 9 deletions(-) diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 0d85162d3..1b7aee30d 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1259,7 +1259,8 @@ img.mail-conv-sender-photo { .generic-content-wrapper { border: 1px solid #ccc; box-shadow: 0px 0px 5px 1px rgba(0,0,0,0.2); - border-radius: $radius; + border-radius: $radius; + margin-bottom: 1.5rem; } .section-title-wrapper { diff --git a/view/tpl/connections.tpl b/view/tpl/connections.tpl index 13261965a..3b152ef5e 100755 --- a/view/tpl/connections.tpl +++ b/view/tpl/connections.tpl @@ -33,4 +33,6 @@
-
+ diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index b0c143f4a..b0e1cb6fb 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -4,7 +4,7 @@